summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFirehose merge bot <firehose@merge.bot>2015-09-21 15:24:08 +0000
committerFirehose merge bot <firehose@merge.bot>2015-09-21 15:24:08 +0000
commit786d664ed35505a5b61a08268b8fd225a1ec64d6 (patch)
treec513c468f5b99843265041a4515b0cb169821614
parent8ff013ea5d0c634d32ef331fb71095786b1d8835 (diff)
downloaddefinitions-786d664ed35505a5b61a08268b8fd225a1ec64d6.tar.gz
Firehose test commit
-rw-r--r--strata/bsp-x86_64-generic.morph2
-rw-r--r--strata/core.morph1
-rw-r--r--strata/foundation.morph2
3 files changed, 3 insertions, 2 deletions
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index 356c26e3..aef0e3ce 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -8,7 +8,7 @@ chunks:
- name: linux-x86-64-generic
morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
repo: upstream:linux
- ref: a7d5c189719846889c029c34e24e166a465368fa
+ ref: 1f93e4a96c9109378204c147b3eec0d0e8100fde
unpetrify-ref: master
- name: nasm
morph: strata/bsp-x86_64-generic/nasm.morph
diff --git a/strata/core.morph b/strata/core.morph
index e7124c5f..f36feeb9 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -2,6 +2,7 @@ name: core
kind: stratum
description: Core components of a Baserock base system that are build tools required
for the BSP and Foundation strata, but a step above build-essential.
+ testing pushing to baseref
build-depends:
- morph: strata/build-essential.morph
chunks:
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 9bbcf2b2..df7b2554 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -46,7 +46,7 @@ chunks:
- name: systemd
morph: strata/foundation/systemd.morph
repo: upstream:systemd
- ref: 2b2eac39e889bdbcc6cbf44443f7682b3ac502f7
+ ref: 8c710f3ce64110a4cfe977116c55bd87777e641c
unpetrify-ref: master
build-depends:
- dbus-pre