summaryrefslogtreecommitdiff
path: root/strata/core.morph
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-11 18:37:59 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-11 18:37:59 +0000
commit312e07068a496879e867eabf7ad11041b7779f80 (patch)
treeba3390c2e23a8489b2d94c9591ce0b1b4e88a4b9 /strata/core.morph
parent72b3eb1ceb8eff3d765f57c2a932a515fa7b2c36 (diff)
parent755636110227894d1eab44c1b6401a3ec0b696f2 (diff)
downloaddefinitions-312e07068a496879e867eabf7ad11041b7779f80.tar.gz
Merge branch 'baserock/pedroalvarez/glibc10'
Reviewed-by: - Sam Thursfield - Richard Maw - Javier Jardon
Diffstat (limited to 'strata/core.morph')
-rw-r--r--strata/core.morph6
1 files changed, 3 insertions, 3 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 5c90c964..96731777 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -31,7 +31,7 @@ chunks:
- name: m4
morph: strata/core/m4.morph
repo: upstream:m4
- ref: d533342af991401d865de9b037ac03cdc9bd852e
+ ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db
unpetrify-ref: baserock/build-essential
build-depends: []
- name: mini-utils
@@ -226,8 +226,8 @@ chunks:
- name: bison
morph: strata/core/bison.morph
repo: upstream:bison
- ref: 6729ad1c314b179225325dcc1bc684077a71f859
- unpetrify-ref: baserock/morph
+ ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308
+ unpetrify-ref: baserock/v3.0.2
build-depends:
- autoconf
- automake