summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-25 11:47:37 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-02-25 11:50:51 (GMT)
commitffae53a8cbd808aa9f834e197003fe31b18cb9c1 (patch)
treeb6f971cc377b12cfcefb83978fa4575c2a48206f
parent048c29a6e86bbc036db684c7e7aa045b6c7f1e4e (diff)
parent15e545281e39b09217d23de88e9c2bdbd6e71062 (diff)
downloaddefinitions-ffae53a8cbd808aa9f834e197003fe31b18cb9c1.tar.gz
Merge branch 'baserock/jjardon/systemd219'
Reviewed-by: Tiago Gomes <tiago.gomes@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@gmail.com>
-rw-r--r--strata/build-essential.morph8
-rw-r--r--strata/core.morph4
-rw-r--r--strata/foundation.morph4
-rw-r--r--strata/foundation/systemd.morph1
4 files changed, 8 insertions, 9 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 832d611..e7da178 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -63,8 +63,8 @@ chunks:
- name: stage2-linux-api-headers
morph: strata/build-essential/stage2-linux-api-headers.morph
repo: upstream:linux
- ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
- unpetrify-ref: baserock/v3.8
+ ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735
+ unpetrify-ref: v3.19
build-depends:
- stage1-binutils
- stage1-gcc
@@ -219,8 +219,8 @@ chunks:
- name: linux-api-headers
morph: strata/build-essential/linux-api-headers.morph
repo: upstream:linux
- ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
- unpetrify-ref: baserock/v3.8
+ ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735
+ unpetrify-ref: v3.19
build-depends:
- stage2-binutils
- stage2-busybox
diff --git a/strata/core.morph b/strata/core.morph
index 3f8c8ed..470e2df 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -245,8 +245,8 @@ chunks:
- name: util-linux
morph: strata/core/util-linux.morph
repo: upstream:util-linux
- ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
- unpetrify-ref: baserock/morph
+ ref: b567c9cbc854a36da0a198e4dcc463e134d26a25
+ unpetrify-ref: v2.25.2
build-depends:
- autoconf-tarball
- automake
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 533ac9e..9a4a15e 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -82,8 +82,8 @@ chunks:
- name: systemd
morph: strata/foundation/systemd.morph
repo: upstream:systemd
- ref: df0082ede6d0ca4db6773747eaf1c36d97458744
- unpetrify-ref: baserock/v218-with-canonical-hostname-fix
+ ref: a88abde72169ddc2df77df3fa5bed30725022253
+ unpetrify-ref: v219
build-depends:
- dbus-pre
- gobject-introspection
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index c298748..81db9ac 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -1,6 +1,5 @@
name: systemd
kind: chunk
-max-jobs: 1
build-system: autotools
configure-commands:
- sh autogen.sh