diff options
| -rw-r--r-- | audio-bluetooth.morph | 6 | ||||
| -rw-r--r-- | base-system-armv7-highbank.morph | 8 | ||||
| -rw-r--r-- | base-system-armv7b-highbank.morph | 8 | ||||
| -rw-r--r-- | base-system-x86_64-generic.morph | 8 | ||||
| -rw-r--r-- | bsp-armv7-highbank.morph | 2 | ||||
| -rw-r--r-- | bsp-armv7b-highbank.morph | 2 | ||||
| -rw-r--r-- | bsp-x86_64-generic.morph | 2 | ||||
| -rw-r--r-- | build-essential-merged.morph | 319 | ||||
| -rw-r--r-- | build-essential.morph | 577 | ||||
| -rw-r--r-- | connectivity.morph | 6 | ||||
| -rw-r--r-- | core.morph | 2 | ||||
| -rw-r--r-- | devel-system-x86_64-generic.morph | 26 | ||||
| -rw-r--r-- | foundation.morph | 2 | ||||
| -rw-r--r-- | genivi-foundation.morph | 4 | ||||
| -rw-r--r-- | genivi-x-x86_64-generic.morph | 10 | ||||
| -rw-r--r-- | genivi.morph | 6 | ||||
| -rw-r--r-- | multimedia.morph | 6 | ||||
| -rw-r--r-- | tools.morph | 2 | ||||
| -rw-r--r-- | x-common.morph | 6 | ||||
| -rw-r--r-- | x-x86_64-generic.morph | 8 |
20 files changed, 372 insertions, 638 deletions
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph index c7389b5b..0c89cba4 100644 --- a/audio-bluetooth.morph +++ b/audio-bluetooth.morph @@ -4,13 +4,13 @@ kind: stratum build-depends: - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi-foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master chunks: - name: libatomic_ops repo: upstream:libatomic_ops diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph index 37985bc6..a317f6a0 100644 --- a/base-system-armv7-highbank.morph +++ b/base-system-armv7-highbank.morph @@ -6,16 +6,16 @@ arch: armv7 strata: - morph: build-essential repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: bsp-armv7-highbank repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master configuration-extensions: - set-hostname - ssh diff --git a/base-system-armv7b-highbank.morph b/base-system-armv7b-highbank.morph index d6a4141b..ce86b415 100644 --- a/base-system-armv7b-highbank.morph +++ b/base-system-armv7b-highbank.morph @@ -6,16 +6,16 @@ arch: armv7b strata: - morph: build-essential repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: bsp-armv7b-highbank repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master configuration-extensions: - set-hostname - ssh diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph index 7950ee3d..89e7f397 100644 --- a/base-system-x86_64-generic.morph +++ b/base-system-x86_64-generic.morph @@ -6,16 +6,16 @@ arch: x86_64 strata: - morph: build-essential repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: bsp-x86_64-generic repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master configuration-extensions: - set-hostname - ssh diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph index 8e23c69e..a3eaf2dc 100644 --- a/bsp-armv7-highbank.morph +++ b/bsp-armv7-highbank.morph @@ -3,7 +3,7 @@ description: The platform dependent components required to boot an ARM highbank kind: stratum build-depends: - repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master morph: core chunks: - name: linux diff --git a/bsp-armv7b-highbank.morph b/bsp-armv7b-highbank.morph index ae41a6a7..0a921f9d 100644 --- a/bsp-armv7b-highbank.morph +++ b/bsp-armv7b-highbank.morph @@ -3,7 +3,7 @@ description: The platform dependent components required to boot an ARM highbank kind: stratum build-depends: - repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master morph: core chunks: - name: linux diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph index 58845629..4f2ad85b 100644 --- a/bsp-x86_64-generic.morph +++ b/bsp-x86_64-generic.morph @@ -4,7 +4,7 @@ description: The set of platform specific components required for booting a 64-b kind: stratum build-depends: - repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master morph: core chunks: - name: linux diff --git a/build-essential-merged.morph b/build-essential-merged.morph deleted file mode 100644 index a19963bb..00000000 --- a/build-essential-merged.morph +++ /dev/null @@ -1,319 +0,0 @@ -name: build-essential -description: Toolchain stratum -kind: stratum - -chunks: - # Stage 1: build a minimal cross compiler with the host's tools. - # - # Starting with a cross compiler ensures that (a) nothing from the host - # can leak into the build-essential artifacts, and (b) cross-compiling - # build-essential is fully tested and supported, since we always use the - # cross code paths. - - - name: stage1-binutils - repo: upstream:binutils-redhat - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: [] - - - name: stage1-gcc - repo: upstream:gcc-tarball - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - # Stage 2: cross-build the whole of build-essential, using the host's tools - # but the cross-compiler toolchain. - # - # Stage 2 GCC outputs code for the same 'bootstrap' machine as stage 1 GCC, - # but because stage 2 GCC is also built to *run* on the bootstrap machine - # it can only execute inside the stage 3 chroot (due to being built against - # a libc with a non-standard prefix). - - - name: stage2-linux-api-headers - repo: upstream:linux - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - - name: stage2-eglibc - repo: upstream:eglibc2 - ref: baserock/2.15-build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-linux-api-headers - - - name: stage2-binutils - repo: upstream:binutils-redhat - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc - - - name: stage2-gcc-fixed-headers - repo: upstream:gcc-tarball - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc - - - name: stage2-gcc - repo: upstream:gcc-tarball - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc - - stage2-gcc-fixed-headers - - - name: stage2-busybox - repo: upstream:busybox - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc - - - name: stage2-fhs-dirs - repo: baserock:baserock/fhs-dirs - ref: master - build-mode: bootstrap - prefix: /tools - build-depends: [] - - - name: stage2-gawk - repo: upstream:gawk - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc - - - name: stage2-make - repo: upstream:make - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc - - - name: stage2-reset-specs - repo: upstream:eglibc2 - ref: baserock/2.15-build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-linux-api-headers - - stage2-eglibc - - # Stage 3: build the whole of build-essential again, this time using a - # staging area containing only the output of stage 2. The result of this - # build is fully reproducible. - # - # We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built - # to run on a host *-bootstrap-* while stage 3 chunks are native-built for - # a *-baserock-* machine. This works, because the cross build was all for - # show (and cleanliness) and the binaries actually still run on the host. - # - # After build-essential is built we do another trick. See - # stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to - # /tools/bin during stage 2 but in stage 3 it becomes a real directory - # again. - - - name: fhs-dirs - repo: baserock:baserock/fhs-dirs - ref: master - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - - name: linux-api-headers - repo: upstream:linux - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - - name: eglibc - repo: upstream:eglibc2 - ref: baserock/2.15-build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - linux-api-headers - - - name: zlib - repo: upstream:zlib - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - - name: binutils - repo: upstream:binutils-redhat - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - zlib - - - name: busybox - repo: upstream:busybox - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - - name: gawk - repo: upstream:gawk - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - - name: gcc - repo: upstream:gcc-tarball - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - zlib - - - name: make - repo: upstream:make - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - # Extras that need to be in build-essential but don't need bootstrapping. - - - name: ccache - repo: upstream:ccache - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - zlib diff --git a/build-essential.morph b/build-essential.morph index 4454bdbd..a19963bb 100644 --- a/build-essential.morph +++ b/build-essential.morph @@ -1,266 +1,319 @@ name: build-essential description: Toolchain stratum kind: stratum + chunks: -- name: stage1-binutils - repo: upstream:binutils-redhat - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: [] -- name: stage1-gcc - repo: upstream:gcc-tarball - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils -- name: stage2-linux-api-headers - repo: upstream:linux - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc -- name: stage2-eglibc - repo: upstream:eglibc2 - ref: baserock/richardmaw/S8564/ro-staging-area - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-linux-api-headers -- name: stage2-binutils - repo: upstream:binutils-redhat - ref: baserock/richardmaw/S8564/ro-staging-area - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc -- name: stage2-gcc-fixed-headers - repo: upstream:gcc-tarball - ref: baserock/richardmaw/S8564/ro-staging-area - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc -- name: stage2-gcc - repo: upstream:gcc-tarball - ref: baserock/richardmaw/S8564/ro-staging-area - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc - - stage2-gcc-fixed-headers -- name: stage2-busybox - repo: upstream:busybox - ref: baserock/richardmaw/S8564/ro-staging-area - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc -- name: stage2-fhs-dirs - repo: baserock:baserock/fhs-dirs - ref: master - build-mode: bootstrap - prefix: /tools - build-depends: [] -- name: stage2-gawk - repo: upstream:gawk - ref: baserock/richardmaw/S8564/ro-staging-area - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc -- name: stage2-make - repo: upstream:make - ref: baserock/richardmaw/S8564/ro-staging-area - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc -- name: stage2-reset-specs - repo: upstream:eglibc2 - ref: baserock/richardmaw/S8564/ro-staging-area - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-linux-api-headers - - stage2-eglibc -- name: fhs-dirs - repo: baserock:baserock/fhs-dirs - ref: master - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs -- name: linux-api-headers - repo: upstream:linux - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs -- name: eglibc - repo: upstream:eglibc2 - ref: baserock/2.15-build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - linux-api-headers -- name: zlib - repo: upstream:zlib - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc -- name: binutils - repo: upstream:binutils-redhat - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - zlib -- name: busybox - repo: upstream:busybox - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc -- name: gawk - repo: upstream:gawk - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc -- name: gcc - repo: upstream:gcc-tarball - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - zlib -- name: make - repo: upstream:make - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc -- name: ccache - repo: upstream:ccache - ref: baserock/build-essential - build-mode: staging - prefix: /usr - build-depends: - - stage2-binutils - - stage2-busybox - - stage2-eglibc - - stage2-fhs-dirs - - stage2-gawk - - stage2-gcc - - stage2-linux-api-headers - - stage2-make - - stage2-reset-specs - - eglibc - - zlib + # Stage 1: build a minimal cross compiler with the host's tools. + # + # Starting with a cross compiler ensures that (a) nothing from the host + # can leak into the build-essential artifacts, and (b) cross-compiling + # build-essential is fully tested and supported, since we always use the + # cross code paths. + + - name: stage1-binutils + repo: upstream:binutils-redhat + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: [] + + - name: stage1-gcc + repo: upstream:gcc-tarball + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + + # Stage 2: cross-build the whole of build-essential, using the host's tools + # but the cross-compiler toolchain. + # + # Stage 2 GCC outputs code for the same 'bootstrap' machine as stage 1 GCC, + # but because stage 2 GCC is also built to *run* on the bootstrap machine + # it can only execute inside the stage 3 chroot (due to being built against + # a libc with a non-standard prefix). + + - name: stage2-linux-api-headers + repo: upstream:linux + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + + - name: stage2-eglibc + repo: upstream:eglibc2 + ref: baserock/2.15-build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-linux-api-headers + + - name: stage2-binutils + repo: upstream:binutils-redhat + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-eglibc + + - name: stage2-gcc-fixed-headers + repo: upstream:gcc-tarball + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-eglibc + + - name: stage2-gcc + repo: upstream:gcc-tarball + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-eglibc + - stage2-gcc-fixed-headers + + - name: stage2-busybox + repo: upstream:busybox + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-eglibc + + - name: stage2-fhs-dirs + repo: baserock:baserock/fhs-dirs + ref: master + build-mode: bootstrap + prefix: /tools + build-depends: [] + + - name: stage2-gawk + repo: upstream:gawk + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-eglibc + + - name: stage2-make + repo: upstream:make + ref: baserock/build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-eglibc + + - name: stage2-reset-specs + repo: upstream:eglibc2 + ref: baserock/2.15-build-essential + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-linux-api-headers + - stage2-eglibc + + # Stage 3: build the whole of build-essential again, this time using a + # staging area containing only the output of stage 2. The result of this + # build is fully reproducible. + # + # We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built + # to run on a host *-bootstrap-* while stage 3 chunks are native-built for + # a *-baserock-* machine. This works, because the cross build was all for + # show (and cleanliness) and the binaries actually still run on the host. + # + # After build-essential is built we do another trick. See + # stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to + # /tools/bin during stage 2 but in stage 3 it becomes a real directory + # again. + + - name: fhs-dirs + repo: baserock:baserock/fhs-dirs + ref: master + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + + - name: linux-api-headers + repo: upstream:linux + ref: baserock/build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + + - name: eglibc + repo: upstream:eglibc2 + ref: baserock/2.15-build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + - linux-api-headers + + - name: zlib + repo: upstream:zlib + ref: baserock/build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + - eglibc + + - name: binutils + repo: upstream:binutils-redhat + ref: baserock/build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + - eglibc + - zlib + + - name: busybox + repo: upstream:busybox + ref: baserock/build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + - eglibc + + - name: gawk + repo: upstream:gawk + ref: baserock/build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + - eglibc + + - name: gcc + repo: upstream:gcc-tarball + ref: baserock/build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + - eglibc + - zlib + + - name: make + repo: upstream:make + ref: baserock/build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + - eglibc + + # Extras that need to be in build-essential but don't need bootstrapping. + + - name: ccache + repo: upstream:ccache + ref: baserock/build-essential + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-reset-specs + - eglibc + - zlib diff --git a/connectivity.morph b/connectivity.morph index f2961c93..41f0c260 100644 --- a/connectivity.morph +++ b/connectivity.morph @@ -3,13 +3,13 @@ kind: stratum build-depends: - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi-foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master chunks: - name: libnl repo: upstream:libnl @@ -4,7 +4,7 @@ description: Core components of a Baserock base system that are build tools requ kind: stratum build-depends: - repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master morph: build-essential chunks: - name: cmake diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index 2a9af58b..55bc76d1 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -6,43 +6,43 @@ arch: x86_64 strata: - morph: build-essential repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi-foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: bsp-x86_64-generic repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: connectivity repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: audio-bluetooth repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: x-common repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: x-x86_64-generic repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: multimedia repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi-x-x86_64-generic repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: tools repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master configuration-extensions: - set-hostname - ssh diff --git a/foundation.morph b/foundation.morph index c4cc1946..329fb35b 100644 --- a/foundation.morph +++ b/foundation.morph @@ -3,7 +3,7 @@ kind: stratum description: Basic userland runtime system build-depends: - repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master morph: core chunks: - name: attr diff --git a/genivi-foundation.morph b/genivi-foundation.morph index e79248f3..22b01bd4 100644 --- a/genivi-foundation.morph +++ b/genivi-foundation.morph @@ -4,10 +4,10 @@ kind: stratum build-depends: - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master chunks: - name: dbus-glib repo: upstream:dbus-glib diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph index 13294d4b..643e051d 100644 --- a/genivi-x-x86_64-generic.morph +++ b/genivi-x-x86_64-generic.morph @@ -4,19 +4,19 @@ description: Software components designed by genivi, for genivi. build-depends: - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi-foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: x-x86_64-generic repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master chunks: - name: layer_management repo: upstream:layer_management diff --git a/genivi.morph b/genivi.morph index 688dd653..84a09927 100644 --- a/genivi.morph +++ b/genivi.morph @@ -4,13 +4,13 @@ description: Software components designed by genivi, for genivi. build-depends: - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi-foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master chunks: - name: DLT-daemon repo: upstream:DLT-daemon diff --git a/multimedia.morph b/multimedia.morph index bb59eca7..1df108b6 100644 --- a/multimedia.morph +++ b/multimedia.morph @@ -4,13 +4,13 @@ description: Codecs build-depends: - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: audio-bluetooth repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master chunks: - name: orc repo: upstream:orc diff --git a/tools.morph b/tools.morph index e5658937..5acecc49 100644 --- a/tools.morph +++ b/tools.morph @@ -3,7 +3,7 @@ description: Extra development tools included in the devel system kind: stratum build-depends: - repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master morph: foundation chunks: - name: patch diff --git a/x-common.morph b/x-common.morph index 6cc79f7f..586fb417 100644 --- a/x-common.morph +++ b/x-common.morph @@ -3,13 +3,13 @@ kind: stratum build-depends: - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi-foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master chunks: - name: llvm repo: upstream:llvm diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph index 3034a060..d5f2e0b5 100644 --- a/x-x86_64-generic.morph +++ b/x-x86_64-generic.morph @@ -3,16 +3,16 @@ kind: stratum build-depends: - morph: core repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: genivi-foundation repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master - morph: x-common repo: baserock:baserock/morphs - ref: baserock/richardmaw/S8564/ro-staging-area + ref: master chunks: - name: mesa-x repo: upstream:mesa |