summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-04-29 10:35:19 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-04-29 10:35:19 +0000
commit10d383472263ab17fe146a9f8bf03543e7357df2 (patch)
treef5fb9fc3b9cdfb06669c07761373b4a15a1a0310
parent754f37101ddc9ff87e94ac458be394fad5e88bd6 (diff)
parent8e21ab8724ffbba60db470471dca7e9af77e1acf (diff)
downloaddefinitions-10d383472263ab17fe146a9f8bf03543e7357df2.tar.gz
Merge branch 'baserock/sam/gcc-4.7'
Reviewed-By: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rw-r--r--armv7lhf-cross-toolchain.morph6
-rw-r--r--build-essential.morph10
-rw-r--r--tools.morph2
3 files changed, 9 insertions, 9 deletions
diff --git a/armv7lhf-cross-toolchain.morph b/armv7lhf-cross-toolchain.morph
index 8d21fa6c..37553c6c 100644
--- a/armv7lhf-cross-toolchain.morph
+++ b/armv7lhf-cross-toolchain.morph
@@ -16,7 +16,7 @@ chunks:
build-depends: []
- name: armv7lhf-cross-gcc-nolibc
repo: upstream:gcc-tarball
- ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
unpetrify-ref: baserock/build-essential
build-depends:
- armv7lhf-cross-binutils
@@ -30,8 +30,8 @@ chunks:
- armv7lhf-cross-linux-api-headers
- name: armv7lhf-cross-gcc
repo: upstream:gcc-tarball
- ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
- unpetrify-ref: baserock/build-essential
+ ref: b0254026149b13782eae26d38435a4c62a002cf0
+ unpetrify-ref: baserock/build-essential-4.7
build-depends:
- armv7lhf-cross-binutils
- armv7lhf-cross-eglibc
diff --git a/build-essential.morph b/build-essential.morph
index 628fffcb..7729611b 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -46,7 +46,7 @@ chunks:
prefix: /tools
- name: stage1-gcc
repo: upstream:gcc-tarball
- ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
@@ -83,7 +83,7 @@ chunks:
prefix: /tools
- name: stage2-gcc-fixed-headers
repo: upstream:gcc-tarball
- ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
@@ -93,7 +93,7 @@ chunks:
prefix: /tools
- name: stage2-gcc
repo: upstream:gcc-tarball
- ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
@@ -276,8 +276,8 @@ chunks:
prefix: /usr
- name: gcc
repo: upstream:gcc-tarball
- ref: 088b7ab28fe53b198ec5c4eaba0f54176c4c35a0
- unpetrify-ref: baserock/build-essential
+ ref: b0254026149b13782eae26d38435a4c62a002cf0
+ unpetrify-ref: baserock/build-essential-4.7
build-depends:
- stage2-binutils
- stage2-busybox
diff --git a/tools.morph b/tools.morph
index 946efbcf..834ea701 100644
--- a/tools.morph
+++ b/tools.morph
@@ -51,7 +51,7 @@ chunks:
build-depends: []
- name: distcc
repo: upstream:distcc
- ref: 2f422c03925e82bf88b05da823813073a985b0e5
+ ref: c9691a9604fdf9d6711204999787d332b7141692
unpetrify-ref: baserock/morph
build-depends: []
- name: e2fsprogs