From 3fadb15754eeaa76b3c711ea60e73f638e05ec48 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 24 Apr 2014 13:31:38 +0000 Subject: Partially upgrade Baserock to use GCC 4.7 The bootstrap still uses GCC 4.6 at this point. To use 4.7, we must change the bootstrap to give GCC a sysroot path at configure time, which has various consequences. A bug in GCC 4.6.2 prevents GCC 4.7 from building it, so we must also apply the patch from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51969 to GCC 4.6. --- armv7lhf-cross-toolchain.morph | 6 ++---- build-essential.morph | 12 ++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/armv7lhf-cross-toolchain.morph b/armv7lhf-cross-toolchain.morph index 8d21fa6c..692f14f2 100644 --- a/armv7lhf-cross-toolchain.morph +++ b/armv7lhf-cross-toolchain.morph @@ -16,8 +16,7 @@ chunks: build-depends: [] - name: armv7lhf-cross-gcc-nolibc repo: upstream:gcc-tarball - ref: dd78b627480ed8d3c135271cd627096ae76fa5fc - unpetrify-ref: baserock/build-essential + ref: baserock/sam/gcc-4.6-fixed-for-4.7 build-depends: - armv7lhf-cross-binutils - name: armv7lhf-cross-eglibc @@ -30,8 +29,7 @@ chunks: - armv7lhf-cross-linux-api-headers - name: armv7lhf-cross-gcc repo: upstream:gcc-tarball - ref: dd78b627480ed8d3c135271cd627096ae76fa5fc - unpetrify-ref: baserock/build-essential + ref: baserock/sam/gcc-4.7 build-depends: - armv7lhf-cross-binutils - armv7lhf-cross-eglibc diff --git a/build-essential.morph b/build-essential.morph index 628fffcb..e1d70046 100644 --- a/build-essential.morph +++ b/build-essential.morph @@ -46,8 +46,7 @@ chunks: prefix: /tools - name: stage1-gcc repo: upstream:gcc-tarball - ref: dd78b627480ed8d3c135271cd627096ae76fa5fc - unpetrify-ref: baserock/build-essential + ref: baserock/sam/gcc-4.6-fixed-for-4.7 build-depends: - stage1-binutils build-mode: bootstrap @@ -83,8 +82,7 @@ chunks: prefix: /tools - name: stage2-gcc-fixed-headers repo: upstream:gcc-tarball - ref: dd78b627480ed8d3c135271cd627096ae76fa5fc - unpetrify-ref: baserock/build-essential + ref: baserock/sam/gcc-4.6-fixed-for-4.7 build-depends: - stage1-binutils - stage1-gcc @@ -93,8 +91,7 @@ chunks: prefix: /tools - name: stage2-gcc repo: upstream:gcc-tarball - ref: dd78b627480ed8d3c135271cd627096ae76fa5fc - unpetrify-ref: baserock/build-essential + ref: baserock/sam/gcc-4.6-fixed-for-4.7 build-depends: - stage1-binutils - stage1-gcc @@ -276,8 +273,7 @@ chunks: prefix: /usr - name: gcc repo: upstream:gcc-tarball - ref: 088b7ab28fe53b198ec5c4eaba0f54176c4c35a0 - unpetrify-ref: baserock/build-essential + ref: baserock/sam/gcc-4.7 build-depends: - stage2-binutils - stage2-busybox -- cgit v1.2.1 From 8e21ab8724ffbba60db470471dca7e9af77e1acf Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 25 Apr 2014 08:00:58 +0000 Subject: Branch distcc to disable -Werror so that it compiles with GCC 4.7.3 --- tools.morph | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools.morph b/tools.morph index 80908497..ed0985a6 100644 --- a/tools.morph +++ b/tools.morph @@ -51,8 +51,7 @@ chunks: build-depends: [] - name: distcc repo: upstream:distcc - ref: 2f422c03925e82bf88b05da823813073a985b0e5 - unpetrify-ref: baserock/morph + ref: baserock/sam/gcc-4.7 build-depends: [] - name: e2fsprogs repo: upstream:e2fsprogs -- cgit v1.2.1 From 754f37101ddc9ff87e94ac458be394fad5e88bd6 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Mon, 28 Apr 2014 15:13:28 +0100 Subject: Update morph: improve check --- tools.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.morph b/tools.morph index a74095e5..946efbcf 100644 --- a/tools.morph +++ b/tools.morph @@ -92,7 +92,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: 2c682e6192b86eccaa869c23d82cde81b4ea42d4 + ref: f23b51aaa0dff06c7926e803b0f09103c60147a4 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 86ba226c1d76d4e5e1f762a30e5e63681a0464d2 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Mon, 28 Apr 2014 15:41:06 +0000 Subject: Add nodejs stratum --- nodejs.morph | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 nodejs.morph diff --git a/nodejs.morph b/nodejs.morph new file mode 100644 index 00000000..aece2d2a --- /dev/null +++ b/nodejs.morph @@ -0,0 +1,11 @@ +name: nodejs +kind: stratum +description: Stratum for nodejs related stuff +build-depends: +- morph: core +chunks: +- name: node + repo: upstream:node + ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e + unpetrify-ref: v0.10.26 + build-depends: [] -- cgit v1.2.1 From fce9e9483b86f6a758249be340f164673a1f684e Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Mon, 28 Apr 2014 16:39:37 +0000 Subject: Add nodejs-system --- nodejs-system-x86_64.morph | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 nodejs-system-x86_64.morph diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph new file mode 100644 index 00000000..876f1432 --- /dev/null +++ b/nodejs-system-x86_64.morph @@ -0,0 +1,28 @@ +arch: x86_64 +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +description: A system that is able to build other systems based on the 64-bit x86 + architecture. +kind: system +name: nodejs-system-x86_64 +strata: +- morph: build-essential +- morph: core +- morph: foundation +- morph: genivi-foundation +- morph: bsp-x86_64-generic +- morph: connectivity +- morph: audio-bluetooth +- morph: x-common +- morph: x-x86_64-generic +- morph: multimedia +- morph: genivi +- morph: genivi-x-x86_64-generic +- morph: tools +- morph: virtualization +- morph: glanceclient +- morph: nodejs -- cgit v1.2.1 From bab0a6be3f08b530ea6432096edad61f23ba3f59 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Wed, 7 May 2014 14:55:26 +0100 Subject: Update morph: improve syntax error message --- tools.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.morph b/tools.morph index 834ea701..b8922a8c 100644 --- a/tools.morph +++ b/tools.morph @@ -92,7 +92,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: f23b51aaa0dff06c7926e803b0f09103c60147a4 + ref: 201b043e4d7ab03d11ad1e71bac7916b19aed294 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From c077a70572b526d4429c351b7c3766dcac3f78d0 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Wed, 7 May 2014 15:11:31 +0100 Subject: Update morph: Distbuild cancelling --- tools.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.morph b/tools.morph index b8922a8c..8004c79c 100644 --- a/tools.morph +++ b/tools.morph @@ -92,7 +92,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: 201b043e4d7ab03d11ad1e71bac7916b19aed294 + ref: 9ea146fdcfbe9b93b297165b1b5222e1eadb9d23 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 92064a1dcefe3a7899b168187ec9a86d2702b443 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Thu, 8 May 2014 10:37:41 +0000 Subject: Update to qemu with gitmodules from trove --- virtualization.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtualization.morph b/virtualization.morph index 4300b627..33e662b4 100644 --- a/virtualization.morph +++ b/virtualization.morph @@ -27,7 +27,7 @@ chunks: - lvm2 - name: qemu repo: upstream:qemu - ref: 5e4eac434b4ff85af2a8821cce8a4ef2b12d8e5e + ref: f8d1fb61e65575011a67d7ba97b690feb5630c91 unpetrify-ref: baserock/morph build-depends: [] - name: xorg-util-macros -- cgit v1.2.1