summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-03-06 16:02:03 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-03-06 16:02:39 (GMT)
commit88eface4c72dab689bc409c77e209833a0acd038 (patch)
tree63ccd488f3711dc6e81e6ba5d6059a331a619100
parent647a8a2fd8a1b747aa253fedf921831d05f5488a (diff)
parent3766dd82f92a58e47e4f80b1c9583f88f553fcd0 (diff)
downloaddefinitions-88eface4c72dab689bc409c77e209833a0acd038.tar.gz
Merge branch 'baserock/jjardon/busybox_1_23_1'
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk> Reviewed-By: Richard Dale <richard.dale@codethink.co.uk>
-rw-r--r--strata/build-essential.morph8
1 files changed, 4 insertions, 4 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index e7da178..ac88b86 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -136,8 +136,8 @@ chunks:
- name: stage2-busybox
morph: strata/build-essential/stage2-busybox.morph
repo: upstream:busybox
- ref: 8a801e0f024f1385d8e989b80b90443546bceae7
- unpetrify-ref: baserock/build-essential
+ ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca
+ unpetrify-ref: 1_23_1
build-depends:
- stage1-binutils
- stage1-gcc
@@ -294,8 +294,8 @@ chunks:
- name: busybox
morph: strata/build-essential/busybox.morph
repo: upstream:busybox
- ref: 772a98fec669cf881d7c1ea17631bc8560bccf5c
- unpetrify-ref: baserock/build-essential
+ ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca
+ unpetrify-ref: 1_23_1
build-depends:
- stage2-binutils
- stage2-busybox