From 811c937e9b4f5d9a5db56822c89a4a61b5f4913e Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Fri, 4 Apr 2014 10:50:31 +0000 Subject: Morph build 2b9145c3fe3444379c6c32e529e3a28f System branch: master --- audio-bluetooth.morph | 88 +++--- base-system-armv7-highbank.morph | 26 +- base-system-armv7-versatile.morph | 26 +- base-system-armv7b-highbank.morph | 26 +- base-system-armv7b-vexpress-tc2.morph | 24 +- base-system-ppc64-generic.morph | 26 +- base-system-x86_32-generic.morph | 26 +- base-system-x86_64-generic.morph | 26 +- bsp-armv7-highbank.morph | 14 +- bsp-armv7-versatile.morph | 16 +- bsp-armv7b-highbank.morph | 14 +- bsp-armv7b-vexpress-tc2.morph | 14 +- bsp-imx53.morph | 16 +- bsp-ppc64-generic.morph | 14 +- bsp-wandboard.morph | 22 +- bsp-x86_32-generic.morph | 26 +- bsp-x86_64-generic.morph | 26 +- build-essential.morph | 244 +++++++++-------- ceph-service-x86_64-generic.morph | 12 +- ceph-service.morph | 2 - cloudinit-support.morph | 52 ++-- connectivity.morph | 32 ++- core.morph | 218 ++++++++------- cross-bootstrap-system-armv7lhf-generic.morph | 12 +- cross-bootstrap-system-ppc64-generic.morph | 12 +- cross-bootstrap-system-x86_64-generic.morph | 12 +- cross-bootstrap.morph | 82 +++--- devel-system-armv7-highbank.morph | 44 +-- devel-system-armv7-versatile.morph | 44 +-- devel-system-armv7-wandboard.morph | 44 +-- devel-system-armv7b-highbank.morph | 44 +-- devel-system-armv7lhf-highbank.morph | 44 +-- devel-system-ppc64-generic.morph | 46 +--- devel-system-x86_32-generic.morph | 46 +--- devel-system-x86_64-generic.morph | 46 +--- enlightenment.morph | 62 ++--- foundation.morph | 120 ++++----- genivi-baseline-system-armv7-versatile.morph | 44 +-- genivi-baseline-system-x86_64-generic.morph | 44 +-- genivi-foundation.morph | 24 +- genivi-wayland-armv7-versatile.morph | 22 +- genivi-wayland-x86_64-generic.morph | 22 +- genivi-x-armv7-versatile.morph | 16 +- genivi-x-ppc64-generic.morph | 16 +- genivi-x-x86_64-generic.morph | 16 +- genivi.morph | 52 ++-- glanceclient.morph | 88 +++--- gtk2.morph | 116 ++++---- lua.morph | 14 +- multimedia-gstreamer-0.10.morph | 38 ++- multimedia.morph | 22 +- nfs.morph | 40 ++- openstack-client-base-system-x86_32-generic.morph | 30 +-- openstack-client-base-system-x86_64-generic.morph | 30 +-- qt4-devel-system-x86_64-generic.morph | 46 +--- qt4-sdk.morph | 14 +- qt4-tools.morph | 38 ++- qt5-devel-system-x86_64-generic.morph | 46 +--- qt5-sdk.morph | 20 +- qt5-tools.morph | 152 +++++------ release.morph | 5 +- tools.morph | 134 +++++---- trove-system-x86_64.morph | 32 +-- trove.morph | 6 +- wayland-armv7-versatile.morph | 34 +-- wayland-x86_64-generic.morph | 34 +-- x-armv7-versatile.morph | 170 ++++++------ x-common.morph | 314 +++++++++++----------- x-ppc64-generic.morph | 196 +++++++------- x-x86_64-generic.morph | 196 +++++++------- xfce-system.morph | 48 +--- xfce.morph | 130 +++++---- 72 files changed, 1649 insertions(+), 2248 deletions(-) diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph index f74c479..8a89a43 100644 --- a/audio-bluetooth.morph +++ b/audio-bluetooth.morph @@ -1,78 +1,76 @@ +name: audio-bluetooth +kind: stratum +description: Components required for audio and bluetooth. build-depends: - morph: genivi-foundation - ref: null - repo: null chunks: -- build-depends: [] - name: libatomic_ops - ref: baserock/morph +- name: libatomic_ops repo: upstream:libatomic_ops -- build-depends: [] - name: alsa-lib ref: baserock/morph + build-depends: [] +- name: alsa-lib repo: upstream:alsa-lib -- build-depends: - - alsa-lib - name: alsa-utils ref: baserock/morph + build-depends: [] +- name: alsa-utils repo: upstream:alsa-utils -- build-depends: + ref: baserock/morph + build-depends: - alsa-lib - name: bluez - ref: baserock/genivi/baseline +- name: bluez repo: upstream:bluez -- build-depends: [] - name: bluez-tools - ref: baserock/morph + ref: baserock/genivi/baseline + build-depends: + - alsa-lib +- name: bluez-tools repo: upstream:bluez-tools -- build-depends: [] - name: libical ref: baserock/morph + build-depends: [] +- name: libical repo: upstream:libical -- build-depends: - - bluez - - libical - name: obexd ref: baserock/morph + build-depends: [] +- name: obexd repo: upstream:obexd -- build-depends: [] - name: speex ref: baserock/morph - repo: upstream:speex -- build-depends: + build-depends: - bluez - - speex - name: nohands + - libical +- name: speex + repo: upstream:speex ref: baserock/morph + build-depends: [] +- name: nohands repo: upstream:nohands -- build-depends: [] - name: mobile-broadband-provider-info ref: baserock/morph - repo: upstream:mobile-broadband-provider-info -- build-depends: - - mobile-broadband-provider-info + build-depends: - bluez - name: ofono + - speex +- name: mobile-broadband-provider-info + repo: upstream:mobile-broadband-provider-info ref: baserock/morph + build-depends: [] +- name: ofono repo: upstream:ofono -- build-depends: [] - name: json-c ref: baserock/morph + build-depends: + - mobile-broadband-provider-info + - bluez +- name: json-c repo: upstream:json-c -- build-depends: [] - name: libsndfile ref: baserock/morph + build-depends: [] +- name: libsndfile repo: upstream:libsndfile -- build-depends: + ref: baserock/morph + build-depends: [] +- name: pulseaudio + repo: upstream:pulseaudio + ref: baserock/morph + build-depends: - libsndfile - libatomic_ops - speex - json-c - alsa-lib - bluez - name: pulseaudio - ref: baserock/morph - repo: upstream:pulseaudio -description: Components required for audio and bluetooth. -kind: stratum -name: audio-bluetooth diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph index c2c056a..7f85152 100644 --- a/base-system-armv7-highbank.morph +++ b/base-system-armv7-highbank.morph @@ -1,24 +1,16 @@ -arch: armv7l -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: base-system-armv7-highbank +kind: system description: The set of strata required to have a minimal system for an ARM highbank system. -kind: system -name: base-system-armv7-highbank +arch: armv7l strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: bsp-armv7-highbank - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph index 2e56998..5e89140 100644 --- a/base-system-armv7-versatile.morph +++ b/base-system-armv7-versatile.morph @@ -1,24 +1,16 @@ -arch: armv7l -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: base-system-armv7-versatile +kind: system description: The set of strata required to have a minimal system for an ARM versatile system. -kind: system -name: base-system-armv7-versatile +arch: armv7l strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: bsp-armv7-versatile - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/base-system-armv7b-highbank.morph b/base-system-armv7b-highbank.morph index c35cdea..436afc2 100644 --- a/base-system-armv7b-highbank.morph +++ b/base-system-armv7b-highbank.morph @@ -1,24 +1,16 @@ -arch: armv7b -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: base-system-armv7b-highbank +kind: system description: The set of strata required to have a minimal system for an ARM highbank system. -kind: system -name: base-system-armv7b-highbank +arch: armv7b strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: bsp-armv7b-highbank - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/base-system-armv7b-vexpress-tc2.morph b/base-system-armv7b-vexpress-tc2.morph index 4d140a8..380e415 100644 --- a/base-system-armv7b-vexpress-tc2.morph +++ b/base-system-armv7b-vexpress-tc2.morph @@ -1,23 +1,15 @@ +name: base-system-armv7b-vexpress-tc2 +kind: system +description: A small system for Versatile TC2 boards system. arch: armv7b +strata: +- morph: build-essential +- morph: core +- morph: foundation +- morph: bsp-armv7b-vexpress-tc2 configuration-extensions: - set-hostname - add-config-files - simple-network - nfsboot - install-files -description: A small system for Versatile TC2 boards system. -kind: system -name: base-system-armv7b-vexpress-tc2 -strata: -- morph: build-essential - ref: null - repo: null -- morph: core - ref: null - repo: null -- morph: foundation - ref: null - repo: null -- morph: bsp-armv7b-vexpress-tc2 - ref: null - repo: null diff --git a/base-system-ppc64-generic.morph b/base-system-ppc64-generic.morph index 5d0382c..563e1bb 100644 --- a/base-system-ppc64-generic.morph +++ b/base-system-ppc64-generic.morph @@ -1,24 +1,16 @@ -arch: ppc64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: base-system-ppc64-generic +kind: system description: The set of strata required to have a minimal system for a 64-bit ppc64 system. -kind: system -name: base-system-ppc64-generic +arch: ppc64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: bsp-ppc64-generic - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph index 4ea9fc9..b081c91 100644 --- a/base-system-x86_32-generic.morph +++ b/base-system-x86_32-generic.morph @@ -1,24 +1,16 @@ -arch: x86_32 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: base-system-x86_32-generic +kind: system description: The set of strata required to have a minimal system for a 32-bit x86 system. -kind: system -name: base-system-x86_32-generic +arch: x86_32 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: bsp-x86_32-generic - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph index ebb8478..a9c591c 100644 --- a/base-system-x86_64-generic.morph +++ b/base-system-x86_64-generic.morph @@ -1,24 +1,16 @@ -arch: x86_64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: base-system-x86_64-generic +kind: system description: The set of strata required to have a minimal system for a 64-bit x86 system. -kind: system -name: base-system-x86_64-generic +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: bsp-x86_64-generic - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph index 978ab16..eb03525 100644 --- a/bsp-armv7-highbank.morph +++ b/bsp-armv7-highbank.morph @@ -1,12 +1,10 @@ +name: bsp-armv7-highbank +kind: stratum +description: The platform dependent components required to boot an ARM highbank board. build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: linux - ref: baserock/arm/highbank +- name: linux repo: upstream:linux -description: The platform dependent components required to boot an ARM highbank board. -kind: stratum -name: bsp-armv7-highbank + ref: baserock/arm/highbank + build-depends: [] diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph index 829c6b0..825c54a 100644 --- a/bsp-armv7-versatile.morph +++ b/bsp-armv7-versatile.morph @@ -1,13 +1,11 @@ +name: bsp-armv7-versatile +kind: stratum +description: The platform dependent components required to boot an ARM versatile development + board. build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: linux - ref: baserock/arm/versatile +- name: linux repo: upstream:linux -description: The platform dependent components required to boot an ARM versatile development - board. -kind: stratum -name: bsp-armv7-versatile + ref: baserock/arm/versatile + build-depends: [] diff --git a/bsp-armv7b-highbank.morph b/bsp-armv7b-highbank.morph index d39b007..f75a2cc 100644 --- a/bsp-armv7b-highbank.morph +++ b/bsp-armv7b-highbank.morph @@ -1,12 +1,10 @@ +name: bsp-armv7b-highbank +kind: stratum +description: The platform dependent components required to boot an ARM highbank board. build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: linux - ref: baserock/arm/highbank-be +- name: linux repo: upstream:linux -description: The platform dependent components required to boot an ARM highbank board. -kind: stratum -name: bsp-armv7b-highbank + ref: baserock/arm/highbank-be + build-depends: [] diff --git a/bsp-armv7b-vexpress-tc2.morph b/bsp-armv7b-vexpress-tc2.morph index 9d7416b..48d24b7 100644 --- a/bsp-armv7b-vexpress-tc2.morph +++ b/bsp-armv7b-vexpress-tc2.morph @@ -1,12 +1,10 @@ +name: bsp-armv7b-vexpress-tc2 +kind: stratum +description: The platform dependent components required to boot Versatile TC2 board build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: linux - ref: baserock/arm/vexpress-tc2 +- name: linux repo: upstream:linux -description: The platform dependent components required to boot Versatile TC2 board -kind: stratum -name: bsp-armv7b-vexpress-tc2 + ref: baserock/arm/vexpress-tc2 + build-depends: [] diff --git a/bsp-imx53.morph b/bsp-imx53.morph index 0a41a54..3a0c71b 100644 --- a/bsp-imx53.morph +++ b/bsp-imx53.morph @@ -1,13 +1,11 @@ +name: bsp-imx53 +kind: stratum +description: The platform dependent components required to boot an i.MX 53 ARM development + board. build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: linux - ref: baserock/morph +- name: linux repo: upstream:linux -description: The platform dependent components required to boot an i.MX 53 ARM development - board. -kind: stratum -name: bsp-imx53 + ref: baserock/morph + build-depends: [] diff --git a/bsp-ppc64-generic.morph b/bsp-ppc64-generic.morph index 47d8099..6484455 100644 --- a/bsp-ppc64-generic.morph +++ b/bsp-ppc64-generic.morph @@ -1,12 +1,10 @@ +name: bsp-ppc64-generic +kind: stratum +description: The platform dependent components required to boot a ppc64 board. build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: linux - ref: baserock/powerpc/ppc64 +- name: linux repo: upstream:linux -description: The platform dependent components required to boot a ppc64 board. -kind: stratum -name: bsp-ppc64-generic + ref: baserock/powerpc/ppc64 + build-depends: [] diff --git a/bsp-wandboard.morph b/bsp-wandboard.morph index 3d71d40..dae8e7a 100644 --- a/bsp-wandboard.morph +++ b/bsp-wandboard.morph @@ -1,17 +1,15 @@ +name: bsp-wandboard +kind: stratum +description: The platform dependent components required to boot an wandboard ARM board. build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: u-boot - ref: baserock/morph +- name: u-boot repo: upstream:u-boot -- build-depends: - - u-boot - name: linux - ref: baserock/arm/wandboard_bsp + ref: baserock/morph + build-depends: [] +- name: linux repo: upstream:linux -description: The platform dependent components required to boot an wandboard ARM board. -kind: stratum -name: bsp-wandboard + ref: baserock/arm/wandboard_bsp + build-depends: + - u-boot diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph index 4064c48..4d78608 100644 --- a/bsp-x86_32-generic.morph +++ b/bsp-x86_32-generic.morph @@ -1,22 +1,20 @@ +name: bsp-x86_32-generic +kind: stratum +description: The set of platform specific components required for booting a 32-bit + x86 based system. build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: linux - ref: baserock/morph +- name: linux repo: upstream:linux -- build-depends: [] - name: nasm ref: baserock/morph + build-depends: [] +- name: nasm repo: upstream:nasm -- build-depends: - - nasm - name: syslinux ref: baserock/morph + build-depends: [] +- name: syslinux repo: upstream:syslinux -description: The set of platform specific components required for booting a 32-bit - x86 based system. -kind: stratum -name: bsp-x86_32-generic + ref: baserock/morph + build-depends: + - nasm diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph index 9bd0947..4687262 100644 --- a/bsp-x86_64-generic.morph +++ b/bsp-x86_64-generic.morph @@ -1,22 +1,20 @@ +name: bsp-x86_64-generic +kind: stratum +description: The set of platform specific components required for booting a 64-bit + x86 based system. build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: linux - ref: baserock/morph +- name: linux repo: upstream:linux -- build-depends: [] - name: nasm ref: baserock/morph + build-depends: [] +- name: nasm repo: upstream:nasm -- build-depends: - - nasm - name: syslinux ref: baserock/morph + build-depends: [] +- name: syslinux repo: upstream:syslinux -description: The set of platform specific components required for booting a 64-bit - x86 based system. -kind: stratum -name: bsp-x86_64-generic + ref: baserock/morph + build-depends: + - nasm diff --git a/build-essential.morph b/build-essential.morph index 0163093..2423f02 100644 --- a/build-essential.morph +++ b/build-essential.morph @@ -1,108 +1,165 @@ +name: build-essential +kind: stratum +description: 'Toolchain stratum + + + 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. + + + 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). + + + 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. + + ' chunks: -- build-depends: [] +- name: stage1-binutils + repo: upstream:binutils-redhat + ref: baserock/build-essential + build-depends: [] build-mode: bootstrap - name: stage1-binutils prefix: /tools +- name: stage1-gcc + repo: upstream:gcc-tarball ref: baserock/build-essential - repo: upstream:binutils-redhat -- build-depends: + build-depends: - stage1-binutils build-mode: bootstrap - name: stage1-gcc prefix: /tools +- name: stage2-linux-api-headers + repo: upstream:linux ref: baserock/build-essential - repo: upstream:gcc-tarball - -- build-depends: + build-depends: - stage1-binutils - stage1-gcc build-mode: bootstrap - name: stage2-linux-api-headers prefix: /tools - ref: baserock/build-essential - repo: upstream:linux -- build-depends: +- name: stage2-eglibc + repo: upstream:eglibc2 + ref: baserock/2.15-build-essential + build-depends: - stage1-binutils - stage1-gcc - stage2-linux-api-headers build-mode: bootstrap - name: stage2-eglibc prefix: /tools - ref: baserock/2.15-build-essential - repo: upstream:eglibc2 -- build-depends: +- name: stage2-binutils + repo: upstream:binutils-redhat + ref: baserock/build-essential + build-depends: - stage1-binutils - stage1-gcc - stage2-eglibc build-mode: bootstrap - name: stage2-binutils prefix: /tools +- name: stage2-gcc-fixed-headers + repo: upstream:gcc-tarball ref: baserock/build-essential - repo: upstream:binutils-redhat -- build-depends: + build-depends: - stage1-binutils - stage1-gcc - stage2-eglibc build-mode: bootstrap - name: stage2-gcc-fixed-headers prefix: /tools - ref: baserock/build-essential +- name: stage2-gcc repo: upstream:gcc-tarball -- build-depends: + ref: baserock/build-essential + build-depends: - stage1-binutils - stage1-gcc - stage2-eglibc - stage2-gcc-fixed-headers build-mode: bootstrap - name: stage2-gcc prefix: /tools +- name: stage2-busybox + repo: upstream:busybox ref: baserock/build-essential - repo: upstream:gcc-tarball -- build-depends: + build-depends: - stage1-binutils - stage1-gcc - stage2-eglibc build-mode: bootstrap - name: stage2-busybox prefix: /tools - ref: baserock/build-essential - repo: upstream:busybox -- build-depends: [] +- name: stage2-fhs-dirs + repo: baserock:baserock/fhs-dirs + ref: master + build-depends: [] build-mode: bootstrap - name: stage2-fhs-dirs prefix: /tools - ref: master - repo: baserock:baserock/fhs-dirs -- build-depends: +- name: stage2-gawk + repo: upstream:gawk + ref: baserock/build-essential + build-depends: - stage1-binutils - stage1-gcc - stage2-eglibc build-mode: bootstrap - name: stage2-gawk prefix: /tools +- name: stage2-make + repo: upstream:make ref: baserock/build-essential - repo: upstream:gawk -- build-depends: + build-depends: - stage1-binutils - stage1-gcc - stage2-eglibc build-mode: bootstrap - name: stage2-make prefix: /tools - ref: baserock/build-essential - repo: upstream:make -- build-depends: +- name: stage2-reset-specs + repo: upstream:eglibc2 + ref: baserock/2.15-build-essential + build-depends: - stage1-binutils - stage1-gcc - stage2-linux-api-headers - stage2-eglibc build-mode: bootstrap - name: stage2-reset-specs prefix: /tools - ref: baserock/2.15-build-essential - repo: upstream:eglibc2 - -- build-depends: +- name: fhs-dirs + repo: baserock:baserock/fhs-dirs + ref: master + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -113,11 +170,11 @@ chunks: - stage2-make - stage2-reset-specs build-mode: staging - name: fhs-dirs prefix: /usr - ref: master - repo: baserock:baserock/fhs-dirs -- build-depends: +- name: linux-api-headers + repo: upstream:linux + ref: baserock/build-essential + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -128,11 +185,11 @@ chunks: - stage2-make - stage2-reset-specs build-mode: staging - name: linux-api-headers prefix: /usr - ref: baserock/build-essential - repo: upstream:linux -- build-depends: +- name: eglibc + repo: upstream:eglibc2 + ref: baserock/2.15-build-essential + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -144,11 +201,11 @@ chunks: - stage2-reset-specs - linux-api-headers build-mode: staging - name: eglibc prefix: /usr - ref: baserock/2.15-build-essential - repo: upstream:eglibc2 -- build-depends: +- name: zlib + repo: upstream:zlib + ref: baserock/build-essential + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -160,11 +217,11 @@ chunks: - stage2-reset-specs - eglibc build-mode: staging - name: zlib prefix: /usr +- name: binutils + repo: upstream:binutils-redhat ref: baserock/build-essential - repo: upstream:zlib -- build-depends: + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -177,11 +234,11 @@ chunks: - eglibc - zlib build-mode: staging - name: binutils prefix: /usr +- name: busybox + repo: upstream:busybox ref: baserock/build-essential - repo: upstream:binutils-redhat -- build-depends: + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -193,11 +250,11 @@ chunks: - stage2-reset-specs - eglibc build-mode: staging - name: busybox prefix: /usr +- name: gawk + repo: upstream:gawk ref: baserock/build-essential - repo: upstream:busybox -- build-depends: + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -209,11 +266,11 @@ chunks: - stage2-reset-specs - eglibc build-mode: staging - name: gawk prefix: /usr +- name: gcc + repo: upstream:gcc-tarball ref: baserock/build-essential - repo: upstream:gawk -- build-depends: + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -226,11 +283,11 @@ chunks: - eglibc - zlib build-mode: staging - name: gcc prefix: /usr +- name: make + repo: upstream:make ref: baserock/build-essential - repo: upstream:gcc-tarball -- build-depends: + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -242,12 +299,11 @@ chunks: - stage2-reset-specs - eglibc build-mode: staging - name: make prefix: /usr +- name: ccache + repo: upstream:ccache ref: baserock/build-essential - repo: upstream:make - -- build-depends: + build-depends: - stage2-binutils - stage2-busybox - stage2-eglibc @@ -260,40 +316,4 @@ chunks: - eglibc - zlib build-mode: staging - name: ccache prefix: /usr - ref: baserock/build-essential - repo: upstream:ccache -description: | - Toolchain stratum - - 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. - - 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). - - 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. -kind: stratum -name: build-essential diff --git a/ceph-service-x86_64-generic.morph b/ceph-service-x86_64-generic.morph index b834efc..1f1cdcc 100644 --- a/ceph-service-x86_64-generic.morph +++ b/ceph-service-x86_64-generic.morph @@ -1,24 +1,14 @@ name: ceph-service-x86_64-generic +kind: system description: The set of strata required to have a minimal system for a 64-bit x86 system + the service daemons for ceph object, block and file storage. -kind: system arch: x86_64 strata: - morph: build-essential - repo: null - ref: null - morph: core - repo: null - ref: null - morph: foundation - repo: null - ref: null - morph: bsp-x86_64-generic - repo: null - ref: null - morph: ceph-service - repo: null - ref: null configuration-extensions: - set-hostname - add-config-files diff --git a/ceph-service.morph b/ceph-service.morph index 562b4d1..8c5b5d1 100644 --- a/ceph-service.morph +++ b/ceph-service.morph @@ -2,8 +2,6 @@ name: ceph-service kind: stratum build-depends: - morph: foundation - repo: null - ref: null chunks: - name: nspr repo: upstream:nspr-hg diff --git a/cloudinit-support.morph b/cloudinit-support.morph index 9d0805a..a811fb5 100644 --- a/cloudinit-support.morph +++ b/cloudinit-support.morph @@ -1,53 +1,47 @@ +name: cloudinit-support +kind: stratum +description: A stratum with cloudinit to fit a system in the OpenStack cloud. build-depends: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null chunks: -- build-depends: [] - name: configobj - ref: baserock/morph +- name: configobj repo: upstream:configobj -- build-depends: [] - name: python-requests ref: baserock/morph + build-depends: [] +- name: python-requests repo: upstream:python-requests -- build-depends: [] - name: python-prettytable ref: baserock/morph + build-depends: [] +- name: python-prettytable repo: upstream:python-prettytable -- build-depends: [] - name: python-json-patch ref: baserock/morph + build-depends: [] +- name: python-json-patch repo: upstream:python-json-patch -- build-depends: - - python-json-patch - name: python-json-pointer ref: baserock/morph + build-depends: [] +- name: python-json-pointer repo: upstream:python-json-pointer -- build-depends: [] - name: python-cheetah ref: baserock/morph + build-depends: + - python-json-patch +- name: python-cheetah repo: upstream:python-cheetah -- build-depends: [] - name: boto ref: baserock/morph + build-depends: [] +- name: boto repo: upstream:boto -- build-depends: + ref: baserock/morph + build-depends: [] +- name: cloud-init + repo: upstream:cloud-init + ref: baserock/morph + build-depends: - boto - configobj - python-requests - python-prettytable - python-json-pointer - python-cheetah - name: cloud-init - ref: baserock/morph - repo: upstream:cloud-init -description: A stratum with cloudinit to fit a system in the OpenStack cloud. -kind: stratum -name: cloudinit-support diff --git a/connectivity.morph b/connectivity.morph index 8ef72df..7497207 100644 --- a/connectivity.morph +++ b/connectivity.morph @@ -1,25 +1,23 @@ +name: connectivity +kind: stratum build-depends: - morph: genivi-foundation - ref: null - repo: null chunks: -- build-depends: [] - name: libnl - ref: baserock/morph +- name: libnl repo: upstream:libnl -- build-depends: - - libnl - name: wpa_supplicant - ref: baserock/genivi/morph - repo: upstream:hostap -- build-depends: [] - name: iptables ref: baserock/morph + build-depends: [] +- name: wpa_supplicant + repo: upstream:hostap + ref: baserock/genivi/morph + build-depends: + - libnl +- name: iptables repo: upstream:iptables -- build-depends: - - iptables - name: connman ref: baserock/morph + build-depends: [] +- name: connman repo: upstream:connman -kind: stratum -name: connectivity + ref: baserock/morph + build-depends: + - iptables diff --git a/core.morph b/core.morph index a7ac466..6d56a8d 100644 --- a/core.morph +++ b/core.morph @@ -1,131 +1,136 @@ +name: core +kind: stratum +description: Core components of a Baserock base system that are build tools required + for the BSP and Foundation strata, but a step above build-essential build-depends: - morph: build-essential - ref: null - repo: null chunks: -- build-depends: [] - name: cmake - ref: baserock/morph +- name: cmake repo: upstream:cmake -- build-depends: [] - name: gdbm - ref: baserock/build-essential + ref: baserock/morph + build-depends: [] +- name: gdbm repo: upstream:gdbm -- build-depends: [] - name: gettext ref: baserock/build-essential + build-depends: [] +- name: gettext repo: upstream:gettext -- build-depends: [] - name: m4 ref: baserock/build-essential + build-depends: [] +- name: m4 repo: upstream:m4 -- build-depends: [] - name: mini-utils - ref: master + ref: baserock/build-essential + build-depends: [] +- name: mini-utils repo: baserock:baserock/mini-utils -- build-depends: [] - name: ncurses - ref: baserock/morph + ref: master + build-depends: [] +- name: ncurses repo: upstream:ncurses -- build-depends: - - gdbm - name: perl ref: baserock/morph + build-depends: [] +- name: perl repo: upstream:perl -- build-depends: [] - name: pkg-config - ref: baserock/build-essential - repo: upstream:pkg-config -- build-depends: - - ncurses - name: texinfo-tarball ref: baserock/morph + build-depends: + - gdbm +- name: pkg-config + repo: upstream:pkg-config + ref: baserock/build-essential + build-depends: [] +- name: texinfo-tarball repo: upstream:texinfo-tarball -- build-depends: + ref: baserock/morph + build-depends: + - ncurses +- name: autoconf + repo: upstream:autoconf + ref: baserock/build-essential + build-depends: - m4 - perl - name: autoconf - ref: baserock/build-essential - repo: upstream:autoconf -- build-depends: +- name: automake + repo: upstream:automake + ref: baserock/morph + build-depends: - autoconf - perl - texinfo-tarball - name: automake - ref: baserock/morph - repo: upstream:automake -- build-depends: [] - name: bash - ref: baserock/morph +- name: bash repo: upstream:bash -- build-depends: - - perl - name: error-perl-tarball ref: baserock/morph + build-depends: [] +- name: error-perl-tarball repo: upstream:error-perl-tarball -- build-depends: - - m4 - name: flex - ref: baserock/build-essential - repo: upstream:flex -- build-depends: - - perl - name: openssl-new ref: baserock/morph + build-depends: + - perl +- name: flex + repo: upstream:flex + ref: baserock/build-essential + build-depends: + - m4 +- name: openssl-new repo: upstream:openssl-new -- build-depends: [] - name: bzip2 ref: baserock/morph + build-depends: + - perl +- name: bzip2 repo: upstream:bzip2 -- build-depends: + ref: baserock/morph + build-depends: [] +- name: cpython + repo: upstream:cpython + ref: baserock/morph-2.7 + build-depends: - openssl-new - bzip2 - name: cpython - ref: baserock/morph-2.7 - repo: upstream:cpython -- build-depends: - - bash - name: libtool - ref: baserock/build-essential +- name: libtool repo: upstream:libtool -- build-depends: + ref: baserock/build-essential + build-depends: + - bash +- name: gtk-doc-stub + repo: upstream:gtk-doc-stub + ref: baserock/morph + build-depends: - autoconf - automake - libtool - name: gtk-doc-stub +- name: libxml2 + repo: upstream:libxml2 ref: baserock/morph - repo: upstream:gtk-doc-stub -- build-depends: + build-depends: - autoconf - automake - cpython - libtool - name: libxml2 +- name: curl + repo: upstream:curl ref: baserock/morph - repo: upstream:libxml2 -- build-depends: + build-depends: - autoconf - automake - libtool - openssl-new - name: curl +- name: libexpat + repo: upstream:libexpat ref: baserock/morph - repo: upstream:curl -- build-depends: + build-depends: - autoconf - automake - libtool - name: libexpat +- name: XML-Parser + repo: upstream:XML-Parser ref: baserock/morph - repo: upstream:libexpat -- build-depends: + build-depends: - libexpat - libxml2 - perl - name: XML-Parser +- name: git + repo: upstream:git ref: baserock/morph - repo: upstream:XML-Parser -- build-depends: + build-depends: - autoconf - cpython - curl @@ -133,10 +138,10 @@ chunks: - gettext - libexpat - openssl-new - name: git +- name: bison + repo: upstream:bison ref: baserock/morph - repo: upstream:git -- build-depends: + build-depends: - autoconf - automake - bash @@ -144,61 +149,54 @@ chunks: - gettext - git - mini-utils - name: bison +- name: gperf + repo: upstream:gperf ref: baserock/morph - repo: upstream:bison -- build-depends: [] - name: gperf + build-depends: [] +- name: intltool + repo: upstream:intltool ref: baserock/morph - repo: upstream:gperf -- build-depends: + build-depends: - XML-Parser - autoconf - automake - perl - name: intltool +- name: util-linux + repo: upstream:util-linux ref: baserock/morph - repo: upstream:intltool -- build-depends: + build-depends: - autoconf - automake - gettext - git - libtool - pkg-config - name: util-linux +- name: xz + repo: upstream:xz ref: baserock/morph - repo: upstream:util-linux -- build-depends: + build-depends: - autoconf - automake - gettext - libtool - name: xz +- name: nano + repo: upstream:nano-tarball ref: baserock/morph - repo: upstream:xz -- build-depends: + build-depends: - ncurses - name: nano +- name: bc + repo: upstream:bc-tarball ref: baserock/morph - repo: upstream:nano-tarball -- build-depends: + build-depends: - flex - texinfo-tarball - name: bc +- name: python-setuptools + repo: upstream:python-setuptools ref: baserock/morph - repo: upstream:bc-tarball -- build-depends: + build-depends: - cpython - name: python-setuptools +- name: pyyaml + repo: upstream:pyyaml ref: baserock/morph - repo: upstream:python-setuptools -- build-depends: + build-depends: - python-setuptools - name: pyyaml - ref: baserock/morph - repo: upstream:pyyaml -description: Core components of a Baserock base system that are build tools required - for the BSP and Foundation strata, but a step above build-essential -kind: stratum -name: core diff --git a/cross-bootstrap-system-armv7lhf-generic.morph b/cross-bootstrap-system-armv7lhf-generic.morph index 9361753..3a281c5 100644 --- a/cross-bootstrap-system-armv7lhf-generic.morph +++ b/cross-bootstrap-system-armv7lhf-generic.morph @@ -1,14 +1,8 @@ -arch: armv7lhf -description: A system that produces the minimum needed to build a devel system -kind: system name: cross-bootstrap-system-armv7lhf-generic +kind: system +description: A system that produces the minimum needed to build a devel system +arch: armv7lhf strata: - morph: build-essential - ref: master - repo: baserock:baserock/morphs - morph: core - ref: master - repo: baserock:baserock/morphs - morph: cross-bootstrap - ref: master - repo: baserock:baserock/morphs diff --git a/cross-bootstrap-system-ppc64-generic.morph b/cross-bootstrap-system-ppc64-generic.morph index 3eb86dc..7f73fcc 100644 --- a/cross-bootstrap-system-ppc64-generic.morph +++ b/cross-bootstrap-system-ppc64-generic.morph @@ -1,14 +1,8 @@ -arch: ppc64 -description: A system that produces the minimum needed to build a devel system -kind: system name: cross-bootstrap-system-ppc64-generic +kind: system +description: A system that produces the minimum needed to build a devel system +arch: ppc64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: cross-bootstrap - ref: null - repo: null diff --git a/cross-bootstrap-system-x86_64-generic.morph b/cross-bootstrap-system-x86_64-generic.morph index fac8249..946fe56 100644 --- a/cross-bootstrap-system-x86_64-generic.morph +++ b/cross-bootstrap-system-x86_64-generic.morph @@ -1,14 +1,8 @@ -arch: x86_64 -description: A system that produces the minimum needed to build a devel system -kind: system name: cross-bootstrap-system-x86_64-generic +kind: system +description: A system that produces the minimum needed to build a devel system +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: cross-bootstrap - ref: null - repo: null diff --git a/cross-bootstrap.morph b/cross-bootstrap.morph index 6c2d874..7327249 100644 --- a/cross-bootstrap.morph +++ b/cross-bootstrap.morph @@ -1,71 +1,69 @@ +name: cross-bootstrap +kind: stratum +description: The minimal development tools to build a baserock devel system build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: six - ref: baserock/morph +- name: six repo: upstream:six -- build-depends: [] - name: groff ref: baserock/morph + build-depends: [] +- name: groff repo: upstream:groff -- build-depends: - - groff - name: openssh ref: baserock/morph + build-depends: [] +- name: openssh repo: upstream:openssh -- build-depends: [] - name: python-ttystatus ref: baserock/morph + build-depends: + - groff +- name: python-ttystatus repo: upstream:python-ttystatus -- build-depends: [] - name: python-coveragepy ref: baserock/morph + build-depends: [] +- name: python-coveragepy repo: upstream:python-coveragepy -- build-depends: - - python-coveragepy - name: python-coverage-test-runner ref: baserock/morph + build-depends: [] +- name: python-coverage-test-runner repo: upstream:python-coverage-test-runner -- build-depends: - - python-coverage-test-runner - name: cliapp ref: baserock/morph + build-depends: + - python-coveragepy +- name: cliapp repo: upstream:cliapp -- build-depends: [] - name: python-markdown ref: baserock/morph + build-depends: + - python-coverage-test-runner +- name: python-markdown repo: upstream:python-markdown -- build-depends: - - cliapp - - python-ttystatus - - python-markdown - name: cmdtest ref: baserock/morph + build-depends: [] +- name: cmdtest repo: upstream:cmdtest -- build-depends: [] - name: linux-user-chroot ref: baserock/morph + build-depends: + - cliapp + - python-ttystatus + - python-markdown +- name: linux-user-chroot repo: upstream:linux-user-chroot -- build-depends: - - six - name: pyfilesystem ref: baserock/morph + build-depends: [] +- name: pyfilesystem repo: upstream:pyfilesystem -- build-depends: + ref: baserock/morph + build-depends: + - six +- name: morph + repo: baserock:baserock/morph + ref: master + build-depends: - cliapp - cmdtest - python-coverage-test-runner - pyfilesystem - name: morph - ref: master - repo: baserock:baserock/morph -- build-depends: [] - name: rsync - ref: baserock/morph +- name: rsync repo: upstream:rsync -description: The minimal development tools to build a baserock devel system -kind: stratum -name: cross-bootstrap + ref: baserock/morph + build-depends: [] diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph index 8210f31..f7b6796 100644 --- a/devel-system-armv7-highbank.morph +++ b/devel-system-armv7-highbank.morph @@ -1,51 +1,25 @@ -arch: armv7l -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: devel-system-armv7-highbank +kind: system description: A system that is able to build other systems based on the ARM highbank architecture. -kind: system -name: devel-system-armv7-highbank +arch: armv7l strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-armv7-highbank - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-armv7-versatile - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-armv7-versatile - ref: null - repo: null - morph: tools - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph index f9a1c9d..2696a1b 100644 --- a/devel-system-armv7-versatile.morph +++ b/devel-system-armv7-versatile.morph @@ -1,51 +1,25 @@ -arch: armv7l -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: devel-system-armv7-versatile +kind: system description: A system that is able to build other systems based on the ARM versatile architecture. -kind: system -name: devel-system-armv7-versatile +arch: armv7l strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-armv7-versatile - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-armv7-versatile - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-armv7-versatile - ref: null - repo: null - morph: tools - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph index 0df0b8b..cf06dcd 100644 --- a/devel-system-armv7-wandboard.morph +++ b/devel-system-armv7-wandboard.morph @@ -1,50 +1,24 @@ -arch: armv7l -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 Wandboard. -kind: system name: devel-system-armv7-wandboard +kind: system +description: A system that is able to build other systems based on the Wandboard. +arch: armv7l strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-wandboard - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-armv7-versatile - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-armv7-versatile - ref: null - repo: null - morph: tools - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph index 1c03c24..c9146be 100644 --- a/devel-system-armv7b-highbank.morph +++ b/devel-system-armv7b-highbank.morph @@ -1,51 +1,25 @@ -arch: armv7b -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: devel-system-armv7b-highbank +kind: system description: A system that is able to build other systems based on the ARM highbank architecture. -kind: system -name: devel-system-armv7b-highbank +arch: armv7b strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-armv7b-highbank - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-armv7-versatile - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-armv7-versatile - ref: null - repo: null - morph: tools - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/devel-system-armv7lhf-highbank.morph b/devel-system-armv7lhf-highbank.morph index 139f9eb..d279d73 100644 --- a/devel-system-armv7lhf-highbank.morph +++ b/devel-system-armv7lhf-highbank.morph @@ -1,51 +1,25 @@ -arch: armv7lhf -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: devel-system-armv7lhf-highbank +kind: system description: A system that is able to build other systems based on the ARM highbank architecture. -kind: system -name: devel-system-armv7lhf-highbank +arch: armv7lhf strata: - morph: build-essential - ref: master - repo: baserock:baserock/morphs - morph: core - ref: master - repo: baserock:baserock/morphs - morph: foundation - ref: master - repo: baserock:baserock/morphs - morph: genivi-foundation - ref: master - repo: baserock:baserock/morphs - morph: bsp-armv7-highbank - ref: master - repo: baserock:baserock/morphs - morph: connectivity - ref: master - repo: baserock:baserock/morphs - morph: audio-bluetooth - ref: master - repo: baserock:baserock/morphs - morph: x-common - ref: master - repo: baserock:baserock/morphs - morph: x-armv7-versatile - ref: master - repo: baserock:baserock/morphs - morph: multimedia - ref: master - repo: baserock:baserock/morphs - morph: genivi - ref: master - repo: baserock:baserock/morphs - morph: genivi-x-armv7-versatile - ref: master - repo: baserock:baserock/morphs - morph: tools - ref: master - repo: baserock:baserock/morphs +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph index 87e6b69..d7facf1 100644 --- a/devel-system-ppc64-generic.morph +++ b/devel-system-ppc64-generic.morph @@ -1,54 +1,26 @@ -arch: ppc64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: devel-system-ppc64-generic +kind: system description: A system that is able to build other systems based on the 64-bit PowerPc architecture. -kind: system -name: devel-system-ppc64-generic +arch: ppc64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-ppc64-generic - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-ppc64-generic - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-ppc64-generic - ref: null - repo: null - morph: tools - ref: null - repo: null - morph: glanceclient - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index ca14953..c3bd00a 100644 --- a/devel-system-x86_32-generic.morph +++ b/devel-system-x86_32-generic.morph @@ -1,54 +1,26 @@ -arch: x86_32 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: devel-system-x86_32-generic +kind: system description: A system that is able to build other systems based on the 32-bit x86 architecture. -kind: system -name: devel-system-x86_32-generic +arch: x86_32 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-x86_32-generic - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-x86_64-generic - ref: null - repo: null - morph: tools - ref: null - repo: null - morph: glanceclient - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index 75646ce..e62d356 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -1,54 +1,26 @@ -arch: x86_64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: devel-system-x86_64-generic +kind: system description: A system that is able to build other systems based on the 64-bit x86 architecture. -kind: system -name: devel-system-x86_64-generic +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-x86_64-generic - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-x86_64-generic - ref: null - repo: null - morph: tools - ref: null - repo: null - morph: glanceclient - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/enlightenment.morph b/enlightenment.morph index 4a56e76..f7d87af 100644 --- a/enlightenment.morph +++ b/enlightenment.morph @@ -1,67 +1,55 @@ +name: enlightenment +kind: stratum +description: Enlightenment Desktop and Window Manager build-depends: - morph: tools - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: lua - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: multimedia-gstreamer-0.10 - ref: null - repo: null - morph: connectivity - ref: null - repo: null chunks: -- build-depends: [] - name: efl - ref: baserock/morph +- name: efl repo: upstream:enlightenment/efl -- build-depends: - - efl - name: elementary ref: baserock/morph + build-depends: [] +- name: elementary repo: upstream:enlightenment/elementary -- build-depends: - - efl - name: evas_generic_loaders ref: baserock/morph + build-depends: + - efl +- name: evas_generic_loaders repo: upstream:enlightenment/evas_generic_loaders -- build-depends: + ref: baserock/morph + build-depends: + - efl +- name: enlightenment + repo: upstream:enlightenment/enlightenment + ref: baserock/morph + build-depends: - efl - elementary - name: enlightenment +- name: imlib2 + repo: upstream:enlightenment/imlib2 ref: baserock/morph - repo: upstream:enlightenment/enlightenment -- build-depends: + build-depends: - efl - elementary - enlightenment - name: imlib2 +- name: libast + repo: upstream:enlightenment/libast ref: baserock/morph - repo: upstream:enlightenment/imlib2 -- build-depends: + build-depends: - efl - elementary - enlightenment - imlib2 - name: libast +- name: eterm + repo: upstream:enlightenment/eterm ref: baserock/morph - repo: upstream:enlightenment/libast -- build-depends: + build-depends: - efl - elementary - enlightenment - libast - imlib2 - name: eterm - ref: baserock/morph - repo: upstream:enlightenment/eterm -description: Enlightenment Desktop and Window Manager -kind: stratum -name: enlightenment diff --git a/foundation.morph b/foundation.morph index 5389618..1c3118a 100644 --- a/foundation.morph +++ b/foundation.morph @@ -1,105 +1,103 @@ +name: foundation +kind: stratum +description: Basic userland runtime system build-depends: - morph: core - ref: null - repo: null chunks: -- build-depends: [] - name: attr - ref: baserock/morph +- name: attr repo: upstream:attr -- build-depends: [] - name: groff ref: baserock/morph + build-depends: [] +- name: groff repo: upstream:groff -- build-depends: [] - name: kmod ref: baserock/morph + build-depends: [] +- name: kmod repo: upstream:kmod -- build-depends: - - attr - name: libcap2 ref: baserock/morph + build-depends: [] +- name: libcap2 repo: upstream:libcap2 -- build-depends: [] - name: libffi ref: baserock/morph + build-depends: + - attr +- name: libffi repo: upstream:libffi -- build-depends: [] - name: sqlite3 ref: baserock/morph + build-depends: [] +- name: sqlite3 repo: upstream:sqlite3 -- build-depends: [] - name: libusbx ref: baserock/morph + build-depends: [] +- name: libusbx repo: upstream:libusbx -- build-depends: [] - name: pciutils ref: baserock/morph + build-depends: [] +- name: pciutils repo: upstream:pciutils -- build-depends: - - libusbx - name: usbutils ref: baserock/morph + build-depends: [] +- name: usbutils repo: upstream:usbutils -- build-depends: - - libffi - name: glib ref: baserock/morph + build-depends: + - libusbx +- name: glib repo: upstream:glib -- build-depends: - - glib - name: gobject-introspection ref: baserock/morph + build-depends: + - libffi +- name: gobject-introspection repo: upstream:gobject-introspection -- build-depends: + ref: baserock/morph + build-depends: - glib - name: dbus-pre - ref: baserock/build-essential +- name: dbus-pre repo: upstream:dbus -- build-depends: + ref: baserock/build-essential + build-depends: + - glib +- name: systemd + repo: upstream:systemd + ref: baserock/morph + build-depends: - dbus-pre - gobject-introspection - kmod - libcap2 - pciutils - usbutils - name: systemd +- name: lzo + repo: upstream:lzo ref: baserock/morph - repo: upstream:systemd -- build-depends: [] - name: lzo + build-depends: [] +- name: btrfs-progs + repo: upstream:btrfs-progs ref: baserock/morph - repo: upstream:lzo -- build-depends: + build-depends: - attr - lzo - name: btrfs-progs - ref: baserock/morph - repo: upstream:btrfs-progs -- build-depends: +- name: dbus + repo: upstream:dbus + ref: baserock/build-essential + build-depends: - glib - systemd - name: dbus - ref: baserock/build-essential - repo: upstream:dbus -- build-depends: [] - name: help2man - ref: baserock/morph +- name: help2man repo: upstream:help2man -- build-depends: [] - name: libxslt ref: baserock/morph + build-depends: [] +- name: libxslt repo: upstream:libxslt -- build-depends: - - groff - name: openssh ref: baserock/morph + build-depends: [] +- name: openssh repo: upstream:openssh -- build-depends: - - attr - name: tbdiff - ref: master + ref: baserock/morph + build-depends: + - groff +- name: tbdiff repo: baserock:baserock/tbdiff -description: Basic userland runtime system -kind: stratum -name: foundation + ref: master + build-depends: + - attr diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph index 355f25a..c16ba69 100644 --- a/genivi-baseline-system-armv7-versatile.morph +++ b/genivi-baseline-system-armv7-versatile.morph @@ -1,48 +1,24 @@ -arch: armv7l -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- strip-gplv3 -description: A GENIVI baseline system for an ARMv7 system. -kind: system name: genivi-baseline-system-armv7-versatile +kind: system +description: A GENIVI baseline system for an ARMv7 system. +arch: armv7l strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-armv7-versatile - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-armv7-versatile - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-armv7-versatile - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- strip-gplv3 diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph index 25b4b7e..71fcc47 100644 --- a/genivi-baseline-system-x86_64-generic.morph +++ b/genivi-baseline-system-x86_64-generic.morph @@ -1,48 +1,24 @@ -arch: x86_64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- strip-gplv3 -description: A GENIVI baseline system for a 64-bit x86 system. -kind: system name: genivi-baseline-system-x86_64-generic +kind: system +description: A GENIVI baseline system for a 64-bit x86 system. +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-x86_64-generic - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-x86_64-generic - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- strip-gplv3 diff --git a/genivi-foundation.morph b/genivi-foundation.morph index f1343ba..5b24cfe 100644 --- a/genivi-foundation.morph +++ b/genivi-foundation.morph @@ -1,20 +1,18 @@ +name: genivi-foundation +kind: stratum +description: Basic components needed by the GENIVI baseline. build-depends: - morph: foundation - ref: null - repo: null chunks: -- build-depends: [] - name: dbus-glib - ref: baserock/morph +- name: dbus-glib repo: upstream:dbus-glib -- build-depends: [] - name: fuse - ref: baserock/genivi/morph + ref: baserock/morph + build-depends: [] +- name: fuse repo: upstream:fuse -- build-depends: [] - name: linuxquota ref: baserock/genivi/morph + build-depends: [] +- name: linuxquota repo: upstream:linuxquota -description: Basic components needed by the GENIVI baseline. -kind: stratum -name: genivi-foundation + ref: baserock/genivi/morph + build-depends: [] diff --git a/genivi-wayland-armv7-versatile.morph b/genivi-wayland-armv7-versatile.morph index 3f3c778..f5ca84d 100644 --- a/genivi-wayland-armv7-versatile.morph +++ b/genivi-wayland-armv7-versatile.morph @@ -1,24 +1,14 @@ +name: genivi-wayland-armv7-versatile +kind: stratum +description: Software components designed by genivi, for genivi. build-depends: - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: wayland-armv7-versatile - ref: null - repo: null chunks: -- build-depends: [] - name: layer_management-wayland - ref: baserock/genivi/baseline +- name: layer_management-wayland repo: upstream:layer_management -description: Software components designed by genivi, for genivi. -kind: stratum -name: genivi-wayland-armv7-versatile + ref: baserock/genivi/baseline + build-depends: [] diff --git a/genivi-wayland-x86_64-generic.morph b/genivi-wayland-x86_64-generic.morph index ddd5c03..f426d15 100644 --- a/genivi-wayland-x86_64-generic.morph +++ b/genivi-wayland-x86_64-generic.morph @@ -1,24 +1,14 @@ +name: genivi-wayland-x86_64-generic +kind: stratum +description: Software components designed by genivi, for genivi. build-depends: - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: wayland-x86_64-generic - ref: null - repo: null chunks: -- build-depends: [] - name: layer_management-wayland - ref: baserock/genivi/baseline +- name: layer_management-wayland repo: upstream:layer_management -description: Software components designed by genivi, for genivi. -kind: stratum -name: genivi-wayland-x86_64-generic + ref: baserock/genivi/baseline + build-depends: [] diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph index 560e0d7..9b623b6 100644 --- a/genivi-x-armv7-versatile.morph +++ b/genivi-x-armv7-versatile.morph @@ -1,15 +1,11 @@ +name: genivi-x-armv7-versatile +kind: stratum +description: Software components designed by genivi, for genivi. build-depends: - morph: genivi - ref: null - repo: null - morph: x-armv7-versatile - ref: null - repo: null chunks: -- build-depends: [] - name: layer_management - ref: baserock/genivi/baseline +- name: layer_management repo: upstream:layer_management -description: Software components designed by genivi, for genivi. -kind: stratum -name: genivi-x-armv7-versatile + ref: baserock/genivi/baseline + build-depends: [] diff --git a/genivi-x-ppc64-generic.morph b/genivi-x-ppc64-generic.morph index 478b086..fd74d46 100644 --- a/genivi-x-ppc64-generic.morph +++ b/genivi-x-ppc64-generic.morph @@ -1,15 +1,11 @@ +name: genivi-x-ppc64-generic +kind: stratum +description: Software components designed by genivi, for genivi. build-depends: - morph: genivi - ref: null - repo: null - morph: x-ppc64-generic - ref: null - repo: null chunks: -- build-depends: [] - name: layer_management - ref: baserock/genivi/baseline +- name: layer_management repo: upstream:layer_management -description: Software components designed by genivi, for genivi. -kind: stratum -name: genivi-x-ppc64-generic + ref: baserock/genivi/baseline + build-depends: [] diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph index e30161c..3ba18d7 100644 --- a/genivi-x-x86_64-generic.morph +++ b/genivi-x-x86_64-generic.morph @@ -1,15 +1,11 @@ +name: genivi-x-x86_64-generic +kind: stratum +description: Software components designed by genivi, for genivi. build-depends: - morph: genivi - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null chunks: -- build-depends: [] - name: layer_management - ref: baserock/genivi/baseline +- name: layer_management repo: upstream:layer_management -description: Software components designed by genivi, for genivi. -kind: stratum -name: genivi-x-x86_64-generic + ref: baserock/genivi/baseline + build-depends: [] diff --git a/genivi.morph b/genivi.morph index c7472f7..ed3b03a 100644 --- a/genivi.morph +++ b/genivi.morph @@ -1,44 +1,42 @@ +name: genivi +kind: stratum +description: Software components designed by genivi, for genivi. build-depends: - morph: genivi-foundation - ref: null - repo: null chunks: -- build-depends: [] - name: DLT-daemon - ref: v2.9.1 +- name: DLT-daemon repo: upstream:DLT-daemon -- build-depends: - - DLT-daemon - name: node-startup-controller - ref: baserock/morph + ref: v2.9.1 + build-depends: [] +- name: node-startup-controller repo: upstream:node-startup-controller -- build-depends: [] - name: googletest ref: baserock/morph + build-depends: + - DLT-daemon +- name: googletest repo: upstream:googletest -- build-depends: - - googletest - name: googlemock ref: baserock/morph + build-depends: [] +- name: googlemock repo: upstream:googlemock -- build-depends: [] - name: genivi-common-api-runtime - ref: 2.1.4 + ref: baserock/morph + build-depends: + - googletest +- name: genivi-common-api-runtime repo: upstream:genivi-common-api-runtime -- build-depends: - - genivi-common-api-runtime - name: genivi-common-api-dbus-runtime ref: 2.1.4 + build-depends: [] +- name: genivi-common-api-dbus-runtime repo: upstream:genivi-common-api-dbus-runtime -- build-depends: + ref: 2.1.4 + build-depends: + - genivi-common-api-runtime +- name: audiomanager + repo: upstream:audiomanager + ref: '5.0' + build-depends: - DLT-daemon - googletest - googlemock - genivi-common-api-runtime - genivi-common-api-dbus-runtime - name: audiomanager - ref: '5.0' - repo: upstream:audiomanager -description: Software components designed by genivi, for genivi. -kind: stratum -name: genivi diff --git a/glanceclient.morph b/glanceclient.morph index 066060a..58cfc6e 100644 --- a/glanceclient.morph +++ b/glanceclient.morph @@ -1,69 +1,73 @@ +name: glanceclient +kind: stratum +description: A stratum with glanceclient to let the Openstack deployment. build-depends: - morph: tools - ref: null - repo: null chunks: -- build-depends: [] - name: jsonschema - ref: baserock/morph +- name: jsonschema repo: upstream:jsonschema -- build-depends: [] - name: python-json-pointer ref: baserock/morph + build-depends: [] +- name: python-json-pointer repo: upstream:python-json-pointer -- build-depends: [] - name: python-json-patch ref: baserock/morph + build-depends: [] +- name: python-json-patch repo: upstream:python-json-patch -- build-depends: - - jsonschema - - python-json-pointer - - python-json-patch - name: warlock ref: baserock/morph + build-depends: [] +- name: warlock repo: upstream:warlock -- build-depends: [] - name: python-prettytable ref: baserock/morph + build-depends: + - jsonschema + - python-json-pointer + - python-json-patch +- name: python-prettytable repo: upstream:python-prettytable -- build-depends: [] - name: pbr ref: baserock/morph + build-depends: [] +- name: pbr repo: upstream:pbr -- build-depends: [] - name: argparse ref: baserock/morph + build-depends: [] +- name: argparse repo: upstream:argparse -- build-depends: [] - name: pyopenssl ref: baserock/morph + build-depends: [] +- name: pyopenssl repo: upstream:pyopenssl -- build-depends: [] - name: pyiso8601 ref: baserock/morph + build-depends: [] +- name: pyiso8601 repo: upstream:pyiso8601 -- build-depends: [] - name: python-requests ref: baserock/morph + build-depends: [] +- name: python-requests repo: upstream:python-requests -- build-depends: [] - name: simplejson ref: baserock/morph + build-depends: [] +- name: simplejson repo: upstream:simplejson -- build-depends: [] - name: netaddr ref: baserock/morph + build-depends: [] +- name: netaddr repo: upstream:netaddr -- build-depends: [] - name: pytz ref: baserock/morph + build-depends: [] +- name: pytz repo: upstream:pytz -- build-depends: - - pytz - name: babel ref: baserock/morph + build-depends: [] +- name: babel repo: upstream:babel -- build-depends: + ref: baserock/morph + build-depends: + - pytz +- name: python-keystoneclient + repo: upstream:python-keystoneclient + ref: baserock/morph + build-depends: - pbr - pyiso8601 - python-prettytable @@ -71,19 +75,13 @@ chunks: - simplejson - netaddr - babel - name: python-keystoneclient +- name: python-glanceclient + repo: upstream:python-glanceclient ref: baserock/morph - repo: upstream:python-keystoneclient -- build-depends: + build-depends: - python-prettytable - pbr - argparse - pyopenssl - python-keystoneclient - warlock - name: python-glanceclient - ref: baserock/morph - repo: upstream:python-glanceclient -description: A stratum with glanceclient to let the Openstack deployment. -kind: stratum -name: glanceclient diff --git a/gtk2.morph b/gtk2.morph index 3e34d65..2a2e8fb 100644 --- a/gtk2.morph +++ b/gtk2.morph @@ -1,94 +1,88 @@ +name: gtk2 +kind: stratum +description: the gtk2 stratum build-depends: - morph: genivi-foundation - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null chunks: -- build-depends: [] - name: shared-mime-info - ref: baserock/morph +- name: shared-mime-info repo: upstream:shared-mime-info -- build-depends: [] - name: gnome-common - ref: 3.7.4 + ref: baserock/morph + build-depends: [] +- name: gnome-common repo: upstream:gnome-common -- build-depends: [] - name: libtiff - ref: Release-v4-0-3 + ref: 3.7.4 + build-depends: [] +- name: libtiff repo: upstream:libtiff -- build-depends: - - gnome-common - name: libcroco - ref: baserock/morph + ref: Release-v4-0-3 + build-depends: [] +- name: libcroco repo: upstream:libcroco -- build-depends: - - libtiff - name: gdk-pixbuf ref: baserock/morph - repo: upstream:gdk-pixbuf -- build-depends: + build-depends: - gnome-common - name: atk - ref: ATK_2_9_3 +- name: gdk-pixbuf + repo: upstream:gdk-pixbuf + ref: baserock/morph + build-depends: + - libtiff +- name: atk repo: upstream:atk -- build-depends: [] - name: at-spi2-core - ref: AT_SPI2_CORE_2_9_5 + ref: ATK_2_9_3 + build-depends: + - gnome-common +- name: at-spi2-core repo: upstream:at-spi2-core -- build-depends: + ref: AT_SPI2_CORE_2_9_5 + build-depends: [] +- name: at-spi2-atk + repo: upstream:at-spi2-atk + ref: baserock/morph + build-depends: - at-spi2-core - atk - name: at-spi2-atk - ref: baserock/morph - repo: upstream:at-spi2-atk -- build-depends: [] - name: cairo - ref: 1.12.14 +- name: cairo repo: upstream:cairo -- build-depends: [] - name: colm - ref: master + ref: 1.12.14 + build-depends: [] +- name: colm repo: upstream:colm -- build-depends: - - colm - name: ragel - ref: baserock/morph + ref: master + build-depends: [] +- name: ragel repo: upstream:ragel -- build-depends: - - ragel - name: harfbuzz - ref: 0.9.19 + ref: baserock/morph + build-depends: + - colm +- name: harfbuzz repo: upstream:harfbuzz -- build-depends: + ref: 0.9.19 + build-depends: + - ragel +- name: pango + repo: upstream:pango + ref: baserock/xfce-build + build-depends: - cairo - harfbuzz - name: pango +- name: gtk+ + repo: upstream:gtk+ ref: baserock/xfce-build - repo: upstream:pango -- build-depends: + build-depends: - pango - gdk-pixbuf - cairo - atk - at-spi2-atk - name: gtk+ - ref: baserock/xfce-build - repo: upstream:gtk+ -- build-depends: +- name: librsvg + repo: upstream:librsvg + ref: baserock/morph + build-depends: - cairo - gdk-pixbuf - gnome-common - gtk+ - libcroco - pango - name: librsvg - ref: baserock/morph - repo: upstream:librsvg -description: the gtk2 stratum -kind: stratum -name: gtk2 diff --git a/lua.morph b/lua.morph index 5516084..d81f3c8 100644 --- a/lua.morph +++ b/lua.morph @@ -1,12 +1,10 @@ +name: lua +kind: stratum +description: Interpreter for the lua scripting language. build-depends: - morph: tools - ref: null - repo: null chunks: -- build-depends: [] - name: lua - ref: baserock/5.1-morph +- name: lua repo: upstream:lua -description: Interpreter for the lua scripting language. -kind: stratum -name: lua + ref: baserock/5.1-morph + build-depends: [] diff --git a/multimedia-gstreamer-0.10.morph b/multimedia-gstreamer-0.10.morph index 5ec8f48..67f802e 100644 --- a/multimedia-gstreamer-0.10.morph +++ b/multimedia-gstreamer-0.10.morph @@ -1,35 +1,29 @@ +name: multimedia-gstreamer-0.10 +kind: stratum +description: Codecs build-depends: - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null chunks: -- build-depends: [] - name: orc - ref: baserock/morph +- name: orc repo: upstream:orc -- build-depends: + ref: baserock/morph + build-depends: [] +- name: gstreamer + repo: upstream:gstreamer + ref: baserock/morph/0.10 + build-depends: - orc - name: gstreamer +- name: gstreamer-plugins-base + repo: upstream:gstreamer-plugins-base ref: baserock/morph/0.10 - repo: upstream:gstreamer -- build-depends: + build-depends: - gstreamer - name: gstreamer-plugins-base +- name: gstreamer-plugins-good + repo: upstream:gstreamer-plugins-good ref: baserock/morph/0.10 - repo: upstream:gstreamer-plugins-base -- build-depends: + build-depends: - gstreamer - gstreamer-plugins-base - orc - name: gstreamer-plugins-good - ref: baserock/morph/0.10 - repo: upstream:gstreamer-plugins-good -description: Codecs -kind: stratum -name: multimedia-gstreamer-0.10 diff --git a/multimedia.morph b/multimedia.morph index a886729..ebe2fa6 100644 --- a/multimedia.morph +++ b/multimedia.morph @@ -1,17 +1,15 @@ +name: multimedia +kind: stratum +description: Codecs build-depends: - morph: audio-bluetooth - ref: null - repo: null chunks: -- build-depends: [] - name: orc - ref: baserock/morph +- name: orc repo: upstream:orc -- build-depends: - - orc - name: gstreamer - ref: baserock/genivi/baseline + ref: baserock/morph + build-depends: [] +- name: gstreamer repo: upstream:gstreamer -description: Codecs -kind: stratum -name: multimedia + ref: baserock/genivi/baseline + build-depends: + - orc diff --git a/nfs.morph b/nfs.morph index 3de2833..bbf123e 100644 --- a/nfs.morph +++ b/nfs.morph @@ -1,33 +1,31 @@ +name: nfs +kind: stratum +description: NFS utilities build-depends: - morph: foundation - ref: null - repo: null chunks: -- build-depends: [] - name: libevent - ref: release-2.0.20-stable +- name: libevent repo: upstream:libevent -- build-depends: [] - name: tcp-wrappers - ref: baserock/fedora-patches + ref: release-2.0.20-stable + build-depends: [] +- name: tcp-wrappers repo: upstream:tcp-wrappers -- build-depends: [] - name: ti-rpc - ref: baserock/master + ref: baserock/fedora-patches + build-depends: [] +- name: ti-rpc repo: upstream:ti-rpc -- build-depends: + ref: baserock/master + build-depends: [] +- name: rpcbind + repo: upstream:rpcbind + ref: baserock/master + build-depends: - ti-rpc - tcp-wrappers - name: rpcbind +- name: nfs-utils + repo: upstream:nfs-utils ref: baserock/master - repo: upstream:rpcbind -- build-depends: + build-depends: - libevent - tcp-wrappers - ti-rpc - name: nfs-utils - ref: baserock/master - repo: upstream:nfs-utils -description: NFS utilities -kind: stratum -name: nfs diff --git a/openstack-client-base-system-x86_32-generic.morph b/openstack-client-base-system-x86_32-generic.morph index 76c5560..c1bd0d6 100644 --- a/openstack-client-base-system-x86_32-generic.morph +++ b/openstack-client-base-system-x86_32-generic.morph @@ -1,28 +1,18 @@ -arch: x86_32 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- vdaboot +name: openstack-client-base-system-x86_32-generic +kind: system description: The set of strata required to have a minimal system for a 32-bit x86 system suitable in OpenStack. -kind: system -name: openstack-client-base-system-x86_32-generic +arch: x86_32 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: bsp-x86_32-generic - ref: null - repo: null - morph: cloudinit-support - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- vdaboot diff --git a/openstack-client-base-system-x86_64-generic.morph b/openstack-client-base-system-x86_64-generic.morph index 0a89488..a599a53 100644 --- a/openstack-client-base-system-x86_64-generic.morph +++ b/openstack-client-base-system-x86_64-generic.morph @@ -1,28 +1,18 @@ -arch: x86_64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- vdaboot +name: openstack-client-base-system-x86_64-generic +kind: system description: The set of strata required to have a minimal system for a 64-bit x86 system suitable in OpenStack. -kind: system -name: openstack-client-base-system-x86_64-generic +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: bsp-x86_64-generic - ref: null - repo: null - morph: cloudinit-support - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- vdaboot diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph index 747d252..0fbbcaf 100644 --- a/qt4-devel-system-x86_64-generic.morph +++ b/qt4-devel-system-x86_64-generic.morph @@ -1,54 +1,26 @@ -arch: x86_64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: qt4-devel-system-x86_64-generic +kind: system description: A system that is able to build other systems based on the 64-bit x86 architecture. -kind: system -name: qt4-devel-system-x86_64-generic +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: multimedia-gstreamer-0.10 - ref: null - repo: null - morph: bsp-x86_64-generic - ref: null - repo: null - morph: tools - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: qt4-tools - ref: null - repo: null - morph: qt4-sdk - ref: null - repo: null - morph: lua - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: enlightenment - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/qt4-sdk.morph b/qt4-sdk.morph index c83c498..b4844ff 100644 --- a/qt4-sdk.morph +++ b/qt4-sdk.morph @@ -1,12 +1,10 @@ +name: qt4-sdk +kind: stratum +description: Qt4 Desktop Environment, IDE and Example Apps build-depends: - morph: qt4-tools - ref: null - repo: null chunks: -- build-depends: [] - name: qt-creator - ref: baserock/morph/2.7 +- name: qt-creator repo: upstream:qt-creator -description: Qt4 Desktop Environment, IDE and Example Apps -kind: stratum -name: qt4-sdk + ref: baserock/morph/2.7 + build-depends: [] diff --git a/qt4-tools.morph b/qt4-tools.morph index 0141357..387b5dd 100644 --- a/qt4-tools.morph +++ b/qt4-tools.morph @@ -1,33 +1,27 @@ +name: qt4-tools +kind: stratum +description: Qt4 Development Libraries and Tools build-depends: - morph: tools - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: multimedia-gstreamer-0.10 - ref: null - repo: null chunks: -- build-depends: [] - name: icu - ref: baserock/morph +- name: icu repo: upstream:icu -- build-depends: [] - name: ruby-1.8 + ref: baserock/morph + build-depends: [] +- name: ruby-1.8 + repo: upstream:ruby ref: baserock/morph/ruby_1_8_7 + build-depends: [] +- name: ruby-1.9 repo: upstream:ruby -- build-depends: - - ruby-1.8 - name: ruby-1.9 ref: baserock/morph/ruby_1_9_3 - repo: upstream:ruby -- build-depends: + build-depends: + - ruby-1.8 +- name: qt4-tools + repo: upstream:qt4-tools + ref: baserock/morph + build-depends: - icu - ruby-1.9 - name: qt4-tools - ref: baserock/morph - repo: upstream:qt4-tools -description: Qt4 Development Libraries and Tools -kind: stratum -name: qt4-tools diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph index 36d9762..14261eb 100644 --- a/qt5-devel-system-x86_64-generic.morph +++ b/qt5-devel-system-x86_64-generic.morph @@ -1,54 +1,26 @@ -arch: x86_64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files +name: qt5-devel-system-x86_64-generic +kind: system description: A system that is able to build other systems based on the 64-bit x86 architecture. -kind: system -name: qt5-devel-system-x86_64-generic +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: multimedia-gstreamer-0.10 - ref: null - repo: null - morph: bsp-x86_64-generic - ref: null - repo: null - morph: tools - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: qt5-tools - ref: null - repo: null - morph: qt5-sdk - ref: null - repo: null - morph: lua - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: enlightenment - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/qt5-sdk.morph b/qt5-sdk.morph index 6137796..897c809 100644 --- a/qt5-sdk.morph +++ b/qt5-sdk.morph @@ -1,16 +1,14 @@ +name: qt5-sdk +kind: stratum +description: Qt5 Desktop Environment, IDE and Example Apps build-depends: - morph: qt5-tools - ref: null - repo: null chunks: -- build-depends: [] - name: qt-creator - ref: baserock/morph/2.7 +- name: qt-creator repo: upstream:qt-creator -- build-depends: [] - name: snowshoe - ref: baserock/morph + ref: baserock/morph/2.7 + build-depends: [] +- name: snowshoe repo: upstream:snowshoe -description: Qt5 Desktop Environment, IDE and Example Apps -kind: stratum -name: qt5-sdk + ref: baserock/morph + build-depends: [] diff --git a/qt5-tools.morph b/qt5-tools.morph index d9d8486..9f36f41 100644 --- a/qt5-tools.morph +++ b/qt5-tools.morph @@ -1,150 +1,144 @@ +name: qt5-tools +kind: stratum +description: Qt5 Development Libraries and Tools build-depends: - morph: tools - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: multimedia-gstreamer-0.10 - ref: null - repo: null chunks: -- build-depends: [] - name: icu - ref: baserock/morph +- name: icu repo: upstream:icu -- build-depends: [] - name: ruby-1.8 + ref: baserock/morph + build-depends: [] +- name: ruby-1.8 + repo: upstream:ruby ref: baserock/morph/ruby_1_8_7 + build-depends: [] +- name: ruby-1.9 repo: upstream:ruby -- build-depends: - - ruby-1.8 - name: ruby-1.9 ref: baserock/morph/ruby_1_9_3 - repo: upstream:ruby -- build-depends: + build-depends: + - ruby-1.8 +- name: qtbase + repo: upstream:qt5/qtbase + ref: baserock/morph + build-depends: - icu - name: qtbase +- name: qtsvg + repo: upstream:qt5/qtsvg ref: baserock/morph - repo: upstream:qt5/qtbase -- build-depends: + build-depends: - qtbase - name: qtsvg +- name: qtjsbackend + repo: upstream:qt5/qtjsbackend ref: baserock/morph - repo: upstream:qt5/qtsvg -- build-depends: + build-depends: - qtbase - name: qtjsbackend +- name: qtscript + repo: upstream:qt5/qtscript ref: baserock/morph - repo: upstream:qt5/qtjsbackend -- build-depends: + build-depends: - qtbase - qtjsbackend - name: qtscript +- name: qtdeclarative + repo: upstream:qt5/qtdeclarative ref: baserock/morph - repo: upstream:qt5/qtscript -- build-depends: + build-depends: - qtbase - qtjsbackend - qtscript - name: qtdeclarative +- name: qtquick1 + repo: upstream:qt5/qtquick1 ref: baserock/morph - repo: upstream:qt5/qtdeclarative -- build-depends: + build-depends: - qtbase - qtjsbackend - qtscript - name: qtquick1 +- name: qt3d + repo: upstream:qt5/qt3d ref: baserock/morph - repo: upstream:qt5/qtquick1 -- build-depends: + build-depends: - qtbase - qtjsbackend - qtscript - qtdeclarative - name: qt3d +- name: qtquickcontrols + repo: upstream:qt5/qtquickcontrols ref: baserock/morph - repo: upstream:qt5/qt3d -- build-depends: + build-depends: - qtbase - qtjsbackend - qtdeclarative - name: qtquickcontrols +- name: qtsensors + repo: upstream:qt5/qtsensors ref: baserock/morph - repo: upstream:qt5/qtquickcontrols -- build-depends: + build-depends: - qtbase - name: qtsensors +- name: qtserialport + repo: upstream:qt5/qtserialport ref: baserock/morph - repo: upstream:qt5/qtsensors -- build-depends: + build-depends: - qtbase - name: qtserialport +- name: qtx11extras + repo: upstream:qt5/qtx11extras ref: baserock/morph - repo: upstream:qt5/qtserialport -- build-depends: + build-depends: - qtbase - name: qtx11extras +- name: qtwebkit + repo: upstream:qt5/qtwebkit ref: baserock/morph - repo: upstream:qt5/qtx11extras -- build-depends: + build-depends: - qtbase - icu - ruby-1.9 - qtjsbackend - qtdeclarative - name: qtwebkit +- name: qtwebkit-examples + repo: upstream:qt5/qtwebkit-examples ref: baserock/morph - repo: upstream:qt5/qtwebkit -- build-depends: + build-depends: - qtbase - qtjsbackend - qtdeclarative - qtwebkit - name: qtwebkit-examples +- name: qtmultimedia + repo: upstream:qt5/qtmultimedia ref: baserock/morph - repo: upstream:qt5/qtwebkit-examples -- build-depends: + build-depends: - qtbase - name: qtmultimedia +- name: qtxmlpatterns + repo: upstream:qt5/qtxmlpatterns ref: baserock/morph - repo: upstream:qt5/qtmultimedia -- build-depends: + build-depends: - qtbase - name: qtxmlpatterns +- name: qtdoc + repo: upstream:qt5/qtdoc ref: baserock/morph - repo: upstream:qt5/qtxmlpatterns -- build-depends: + build-depends: - qtbase - name: qtdoc +- name: qtgraphicaleffects + repo: upstream:qt5/qtgraphicaleffects ref: baserock/morph - repo: upstream:qt5/qtdoc -- build-depends: + build-depends: - qtbase - qtjsbackend - qtdeclarative - name: qtgraphicaleffects +- name: qtimageformats + repo: upstream:qt5/qtimageformats ref: baserock/morph - repo: upstream:qt5/qtgraphicaleffects -- build-depends: + build-depends: - qtbase - name: qtimageformats +- name: qttools + repo: upstream:qt5/qttools ref: baserock/morph - repo: upstream:qt5/qtimageformats -- build-depends: + build-depends: - qtbase - qtjsbackend - qtdeclarative - qtwebkit - name: qttools +- name: qttranslations + repo: upstream:qt5/qttranslations ref: baserock/morph - repo: upstream:qt5/qttools -- build-depends: + build-depends: - qtbase - qttools - name: qttranslations - ref: baserock/morph - repo: upstream:qt5/qttranslations -description: Qt5 Development Libraries and Tools -kind: stratum -name: qt5-tools diff --git a/release.morph b/release.morph index c0493d9..790e564 100644 --- a/release.morph +++ b/release.morph @@ -1,7 +1,8 @@ name: release kind: cluster -description: | - Deploy all the systems for we support in a release. +description: 'Deploy all the systems for we support in a release. + + ' systems: - morph: base-system-armv7-highbank deploy: diff --git a/tools.morph b/tools.morph index c37716a..a6d1904 100644 --- a/tools.morph +++ b/tools.morph @@ -1,123 +1,121 @@ +name: tools +kind: stratum +description: Extra development tools included in the devel system build-depends: - morph: foundation - ref: null - repo: null chunks: -- build-depends: [] - name: six - ref: baserock/morph +- name: six repo: upstream:six -- build-depends: [] - name: patch ref: baserock/morph + build-depends: [] +- name: patch repo: upstream:patch -- build-depends: [] - name: python-ttystatus ref: baserock/morph + build-depends: [] +- name: python-ttystatus repo: upstream:python-ttystatus -- build-depends: [] - name: python-coveragepy ref: baserock/morph + build-depends: [] +- name: python-coveragepy repo: upstream:python-coveragepy -- build-depends: - - python-coveragepy - name: python-coverage-test-runner ref: baserock/morph + build-depends: [] +- name: python-coverage-test-runner repo: upstream:python-coverage-test-runner -- build-depends: - - python-coverage-test-runner - name: cliapp ref: baserock/morph + build-depends: + - python-coveragepy +- name: cliapp repo: upstream:cliapp -- build-depends: [] - name: python-markdown ref: baserock/morph + build-depends: + - python-coverage-test-runner +- name: python-markdown repo: upstream:python-markdown -- build-depends: - - cliapp - - python-ttystatus - - python-markdown - name: cmdtest ref: baserock/morph + build-depends: [] +- name: cmdtest repo: upstream:cmdtest -- build-depends: - - patch - name: coreutils ref: baserock/morph + build-depends: + - cliapp + - python-ttystatus + - python-markdown +- name: coreutils repo: upstream:coreutils -- build-depends: [] - name: distcc ref: baserock/morph + build-depends: + - patch +- name: distcc repo: upstream:distcc -- build-depends: [] - name: e2fsprogs ref: baserock/morph + build-depends: [] +- name: e2fsprogs repo: upstream:e2fsprogs -- build-depends: [] - name: file ref: baserock/morph + build-depends: [] +- name: file repo: upstream:file -- build-depends: [] - name: gdb ref: baserock/morph + build-depends: [] +- name: gdb repo: upstream:gdb -- build-depends: [] - name: less ref: baserock/morph + build-depends: [] +- name: less repo: upstream:less -- build-depends: [] - name: linux-user-chroot ref: baserock/morph + build-depends: [] +- name: linux-user-chroot repo: upstream:linux-user-chroot -- build-depends: [] - name: lsof ref: baserock/morph + build-depends: [] +- name: lsof repo: upstream:lsof -- build-depends: - - six - name: pyfilesystem ref: baserock/morph + build-depends: [] +- name: pyfilesystem repo: upstream:pyfilesystem -- build-depends: + ref: baserock/morph + build-depends: + - six +- name: morph + repo: baserock:baserock/morph + ref: master + build-depends: - cliapp - cmdtest - python-coverage-test-runner - pyfilesystem - name: morph - ref: master - repo: baserock:baserock/morph -- build-depends: [] - name: pv - ref: baserock/morph +- name: pv repo: upstream:pv -- build-depends: [] - name: rsync ref: baserock/morph + build-depends: [] +- name: rsync repo: upstream:rsync -- build-depends: [] - name: strace ref: baserock/morph + build-depends: [] +- name: strace repo: upstream:strace -- build-depends: [] - name: vala - ref: baserock/bootstrap - repo: upstream:vala -- build-depends: [] - name: vim ref: baserock/morph + build-depends: [] +- name: vala + repo: upstream:vala + ref: baserock/bootstrap + build-depends: [] +- name: vim repo: upstream:vim -- build-depends: [] - name: screen ref: baserock/morph + build-depends: [] +- name: screen repo: upstream:screen -- build-depends: [] - name: u-boot ref: baserock/morph + build-depends: [] +- name: u-boot repo: upstream:u-boot + ref: baserock/morph + build-depends: [] - name: kexec-tools repo: upstream:kexec-tools ref: baserock/morph build-depends: [] -description: Extra development tools included in the devel system -kind: stratum -name: tools diff --git a/trove-system-x86_64.morph b/trove-system-x86_64.morph index 8eb3d80..56dd95c 100644 --- a/trove-system-x86_64.morph +++ b/trove-system-x86_64.morph @@ -1,32 +1,18 @@ -arch: x86_64 -configuration-extensions: -- trove -- nfsboot-server -- trove-backup -- fstab -- simple-network -description: Trove server -kind: system name: trove-system-x86_64 +kind: system +description: Trove server +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: bsp-x86_64-generic - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: core - ref: null - repo: null - morph: tools - ref: null - repo: null - morph: trove - ref: null - repo: null - morph: nfs - ref: null - repo: null +configuration-extensions: +- trove +- nfsboot-server +- trove-backup +- fstab +- simple-network diff --git a/trove.morph b/trove.morph index 43569d0..4c8ecd1 100644 --- a/trove.morph +++ b/trove.morph @@ -1,10 +1,8 @@ name: trove -description: Trove software kind: stratum +description: Trove software build-depends: -- repo: null - ref: null - morph: tools +- morph: tools chunks: - name: bottle repo: upstream:bottle diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph index 97be6b1..7cc41a1 100644 --- a/wayland-armv7-versatile.morph +++ b/wayland-armv7-versatile.morph @@ -1,30 +1,22 @@ +name: wayland-armv7-versatile +kind: stratum build-depends: - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: x-common - ref: null - repo: null chunks: -- build-depends: [] - name: libxkbcommon - ref: baserock/morph +- name: libxkbcommon repo: upstream:xorg-lib-libxkbcommon -- build-depends: - - libxkbcommon - name: wayland - ref: baserock/genivi/wayland + ref: baserock/morph + build-depends: [] +- name: wayland repo: upstream:wayland -- build-depends: - - wayland - name: mesa-wayland - ref: baserock/genivi/baseline-armv7-versatile + ref: baserock/genivi/wayland + build-depends: + - libxkbcommon +- name: mesa-wayland repo: upstream:mesa -kind: stratum -name: wayland-armv7-versatile + ref: baserock/genivi/baseline-armv7-versatile + build-depends: + - wayland diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph index 85c84b6..211606e 100644 --- a/wayland-x86_64-generic.morph +++ b/wayland-x86_64-generic.morph @@ -1,30 +1,22 @@ +name: wayland-x86_64-generic +kind: stratum build-depends: - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: x-common - ref: null - repo: null chunks: -- build-depends: [] - name: libxkbcommon - ref: baserock/morph +- name: libxkbcommon repo: upstream:xorg-lib-libxkbcommon -- build-depends: - - libxkbcommon - name: wayland - ref: baserock/genivi/wayland + ref: baserock/morph + build-depends: [] +- name: wayland repo: upstream:wayland -- build-depends: - - wayland - name: mesa-wayland - ref: baserock/genivi/morph + ref: baserock/genivi/wayland + build-depends: + - libxkbcommon +- name: mesa-wayland repo: upstream:mesa -kind: stratum -name: wayland-x86_64-generic + ref: baserock/genivi/morph + build-depends: + - wayland diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph index 0f0b89e..026020d 100644 --- a/x-armv7-versatile.morph +++ b/x-armv7-versatile.morph @@ -1,80 +1,83 @@ +name: x-armv7-versatile +kind: stratum build-depends: - morph: x-common - ref: null - repo: null chunks: -- build-depends: [] - name: mesa-x - ref: baserock/genivi/baseline-armv7-versatile +- name: mesa-x repo: upstream:mesa -- build-depends: [] - name: xorg-lib-libxkbfile - ref: baserock/morph + ref: baserock/genivi/baseline-armv7-versatile + build-depends: [] +- name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile -- build-depends: [] - name: pixman ref: baserock/morph + build-depends: [] +- name: pixman repo: upstream:pixman -- build-depends: [] - name: xorg-font-util ref: baserock/morph + build-depends: [] +- name: xorg-font-util repo: upstream:xorg-font-util -- build-depends: - - xorg-font-util - name: xorg-lib-libfontenc ref: baserock/morph + build-depends: [] +- name: xorg-lib-libfontenc repo: upstream:xorg-lib-libfontenc -- build-depends: [] - name: freetype2 ref: baserock/morph + build-depends: + - xorg-font-util +- name: freetype2 repo: upstream:freetype2 -- build-depends: - - freetype2 - name: fontconfig ref: baserock/morph + build-depends: [] +- name: fontconfig repo: upstream:fontconfig -- build-depends: - - freetype2 - - xorg-lib-libfontenc - name: xorg-lib-libXfont ref: baserock/morph + build-depends: + - freetype2 +- name: xorg-lib-libXfont repo: upstream:xorg-lib-libXfont -- build-depends: [] - name: xorg-lib-libICE ref: baserock/morph + build-depends: + - freetype2 + - xorg-lib-libfontenc +- name: xorg-lib-libICE repo: upstream:xorg-lib-libICE -- build-depends: - - xorg-lib-libICE - name: xorg-lib-libSM ref: baserock/morph + build-depends: [] +- name: xorg-lib-libSM repo: upstream:xorg-lib-libSM -- build-depends: - - xorg-lib-libSM - name: xorg-lib-libXt ref: baserock/morph + build-depends: + - xorg-lib-libICE +- name: xorg-lib-libXt repo: upstream:xorg-lib-libXt -- build-depends: - - xorg-lib-libXt - name: xorg-lib-libXmu ref: baserock/morph + build-depends: + - xorg-lib-libSM +- name: xorg-lib-libXmu repo: upstream:xorg-lib-libXmu -- build-depends: - - xorg-lib-libXt - name: xorg-lib-libXpm ref: baserock/morph + build-depends: + - xorg-lib-libXt +- name: xorg-lib-libXpm repo: upstream:xorg-lib-libXpm -- build-depends: + ref: baserock/morph + build-depends: + - xorg-lib-libXt +- name: xorg-lib-libXaw + repo: upstream:xorg-lib-libXaw + ref: baserock/morph + build-depends: - xorg-lib-libXmu - xorg-lib-libXpm - xorg-lib-libXt - name: xorg-lib-libXaw +- name: libsha1 + repo: upstream:libsha1 ref: baserock/morph - repo: upstream:xorg-lib-libXaw -- build-depends: [] - name: libsha1 + build-depends: [] +- name: xserver + repo: upstream:xserver ref: baserock/morph - repo: upstream:libsha1 -- build-depends: + build-depends: - libsha1 - mesa-x - pixman @@ -86,68 +89,63 @@ chunks: - xorg-lib-libXt - xorg-lib-libfontenc - xorg-lib-libxkbfile - name: xserver +- name: xorg-driver-xf86-video-cirrus + repo: upstream:xorg-driver-xf86-video-cirrus ref: baserock/morph - repo: upstream:xserver -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-video-cirrus +- name: xorg-driver-xf86-video-fbdev + repo: upstream:xorg-driver-xf86-video-fbdev ref: baserock/morph - repo: upstream:xorg-driver-xf86-video-cirrus -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-video-fbdev +- name: xorg-driver-xf86-video-vesa + repo: upstream:xorg-driver-xf86-video-vesa ref: baserock/morph - repo: upstream:xorg-driver-xf86-video-fbdev -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-video-vesa +- name: xorg-driver-xf86-input-evdev + repo: upstream:xorg-driver-xf86-input-evdev ref: baserock/morph - repo: upstream:xorg-driver-xf86-video-vesa -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-evdev +- name: xorg-driver-xf86-input-keyboard + repo: upstream:xorg-driver-xf86-input-keyboard ref: baserock/morph - repo: upstream:xorg-driver-xf86-input-evdev -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-keyboard +- name: xorg-driver-xf86-input-mouse + repo: upstream:xorg-driver-xf86-input-mouse ref: baserock/morph - repo: upstream:xorg-driver-xf86-input-keyboard -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-mouse +- name: xorg-app-xkbcomp + repo: upstream:xorg-app-xkbcomp ref: baserock/morph - repo: upstream:xorg-driver-xf86-input-mouse -- build-depends: + build-depends: - xorg-lib-libxkbfile - name: xorg-app-xkbcomp +- name: xkeyboard-config + repo: upstream:xkeyboard-config ref: baserock/morph - repo: upstream:xorg-app-xkbcomp -- build-depends: + build-depends: - xorg-app-xkbcomp - name: xkeyboard-config +- name: xorg-app-xinit + repo: upstream:xorg-app-xinit ref: baserock/morph - repo: upstream:xkeyboard-config -- build-depends: [] - name: xorg-app-xinit + build-depends: [] +- name: xorg-lib-libXft + repo: upstream:xorg-lib-libXft ref: baserock/morph - repo: upstream:xorg-app-xinit -- build-depends: + build-depends: - fontconfig - freetype2 - name: xorg-lib-libXft +- name: xcb-util + repo: upstream:xcb-util ref: baserock/morph - repo: upstream:xorg-lib-libXft -- build-depends: [] - name: xcb-util + build-depends: [] +- name: xterm + repo: upstream:xterm ref: baserock/morph - repo: upstream:xcb-util -- build-depends: + build-depends: - xorg-lib-libXaw - xorg-lib-libxkbfile - name: xterm - ref: baserock/morph - repo: upstream:xterm -kind: stratum -name: x-armv7-versatile diff --git a/x-common.morph b/x-common.morph index c1d69e9..475de36 100644 --- a/x-common.morph +++ b/x-common.morph @@ -1,174 +1,177 @@ +name: x-common +kind: stratum build-depends: - morph: genivi-foundation - ref: null - repo: null chunks: -- build-depends: [] - name: llvm - ref: baserock/morph +- name: llvm repo: upstream:llvm -- build-depends: [] - name: libpng ref: baserock/morph + build-depends: [] +- name: libpng repo: upstream:libpng -- build-depends: [] - name: libjpeg ref: baserock/morph + build-depends: [] +- name: libjpeg repo: upstream:libjpeg -- build-depends: [] - name: xorg-util-macros ref: baserock/morph + build-depends: [] +- name: xorg-util-macros repo: upstream:xorg-util-macros -- build-depends: - - xorg-util-macros - name: xorg-proto-bigreqsproto ref: baserock/morph + build-depends: [] +- name: xorg-proto-bigreqsproto repo: upstream:xorg-proto-bigreqsproto -- build-depends: - - xorg-util-macros - name: xorg-proto-compositeproto ref: baserock/morph - repo: upstream:xorg-proto-compositeproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-damageproto +- name: xorg-proto-compositeproto + repo: upstream:xorg-proto-compositeproto ref: baserock/morph - repo: upstream:xorg-proto-damageproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-dmxproto +- name: xorg-proto-damageproto + repo: upstream:xorg-proto-damageproto ref: baserock/morph - repo: upstream:xorg-proto-dmxproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-fixesproto +- name: xorg-proto-dmxproto + repo: upstream:xorg-proto-dmxproto ref: baserock/morph - repo: upstream:xorg-proto-fixesproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-fontsproto +- name: xorg-proto-fixesproto + repo: upstream:xorg-proto-fixesproto ref: baserock/morph - repo: upstream:xorg-proto-fontsproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-glproto +- name: xorg-proto-fontsproto + repo: upstream:xorg-proto-fontsproto ref: baserock/morph - repo: upstream:xorg-proto-glproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-inputproto +- name: xorg-proto-glproto + repo: upstream:xorg-proto-glproto ref: baserock/morph - repo: upstream:xorg-proto-inputproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-kbproto +- name: xorg-proto-inputproto + repo: upstream:xorg-proto-inputproto ref: baserock/morph - repo: upstream:xorg-proto-kbproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-xineramaproto +- name: xorg-proto-kbproto + repo: upstream:xorg-proto-kbproto ref: baserock/morph - repo: upstream:xorg-proto-xineramaproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-randrproto +- name: xorg-proto-xineramaproto + repo: upstream:xorg-proto-xineramaproto ref: baserock/morph - repo: upstream:xorg-proto-randrproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-recordproto +- name: xorg-proto-randrproto + repo: upstream:xorg-proto-randrproto ref: baserock/morph - repo: upstream:xorg-proto-recordproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-renderproto +- name: xorg-proto-recordproto + repo: upstream:xorg-proto-recordproto ref: baserock/morph - repo: upstream:xorg-proto-renderproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-resourceproto +- name: xorg-proto-renderproto + repo: upstream:xorg-proto-renderproto ref: baserock/morph - repo: upstream:xorg-proto-resourceproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-scrnsaverproto +- name: xorg-proto-resourceproto + repo: upstream:xorg-proto-resourceproto ref: baserock/morph - repo: upstream:xorg-proto-scrnsaverproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-videoproto +- name: xorg-proto-scrnsaverproto + repo: upstream:xorg-proto-scrnsaverproto ref: baserock/morph - repo: upstream:xorg-proto-videoproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-xcmiscproto +- name: xorg-proto-videoproto + repo: upstream:xorg-proto-videoproto ref: baserock/morph - repo: upstream:xorg-proto-xcmiscproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-xextproto +- name: xorg-proto-xcmiscproto + repo: upstream:xorg-proto-xcmiscproto ref: baserock/morph - repo: upstream:xorg-proto-xextproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-xf86bigfontproto +- name: xorg-proto-xextproto + repo: upstream:xorg-proto-xextproto ref: baserock/morph - repo: upstream:xorg-proto-xf86bigfontproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-xf86dgaproto +- name: xorg-proto-xf86bigfontproto + repo: upstream:xorg-proto-xf86bigfontproto ref: baserock/morph - repo: upstream:xorg-proto-xf86dgaproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-xf86driproto +- name: xorg-proto-xf86dgaproto + repo: upstream:xorg-proto-xf86dgaproto ref: baserock/morph - repo: upstream:xorg-proto-xf86driproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-xf86vidmodeproto +- name: xorg-proto-xf86driproto + repo: upstream:xorg-proto-xf86driproto ref: baserock/morph - repo: upstream:xorg-proto-xf86vidmodeproto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-x11proto +- name: xorg-proto-xf86vidmodeproto + repo: upstream:xorg-proto-xf86vidmodeproto ref: baserock/morph - repo: upstream:xorg-proto-x11proto -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-dri2proto +- name: xorg-proto-x11proto + repo: upstream:xorg-proto-x11proto ref: baserock/morph - repo: upstream:xorg-proto-dri2proto -- build-depends: + build-depends: - xorg-util-macros - name: xcb-pthread-stubs +- name: xorg-proto-dri2proto + repo: upstream:xorg-proto-dri2proto ref: baserock/morph - repo: upstream:xcb-pthread-stubs -- build-depends: + build-depends: - xorg-util-macros - name: xcb-proto +- name: xcb-pthread-stubs + repo: upstream:xcb-pthread-stubs ref: baserock/morph + build-depends: + - xorg-util-macros +- name: xcb-proto repo: upstream:xcb-proto -- build-depends: + ref: baserock/morph + build-depends: + - xorg-util-macros +- name: xorg-lib-libXau + repo: upstream:xorg-lib-libXau + ref: baserock/morph + build-depends: - xorg-proto-x11proto - xorg-util-macros - name: xorg-lib-libXau +- name: xcb-libxcb + repo: upstream:xcb-libxcb ref: baserock/morph - repo: upstream:xorg-lib-libXau -- build-depends: + build-depends: - xcb-proto - xcb-pthread-stubs - xorg-lib-libXau - xorg-util-macros - name: xcb-libxcb +- name: xorg-lib-libxtrans + repo: upstream:xorg-lib-libxtrans ref: baserock/morph - repo: upstream:xcb-libxcb -- build-depends: + build-depends: - xorg-util-macros - name: xorg-lib-libxtrans +- name: xorg-lib-libX11 + repo: upstream:xorg-lib-libX11 ref: baserock/morph - repo: upstream:xorg-lib-libxtrans -- build-depends: + build-depends: - xcb-libxcb - xorg-lib-libXau - xorg-lib-libxtrans @@ -180,68 +183,68 @@ chunks: - xorg-proto-xextproto - xorg-proto-xf86bigfontproto - xorg-util-macros - name: xorg-lib-libX11 +- name: xorg-lib-libpciaccess + repo: upstream:xorg-lib-libpciaccess ref: baserock/morph - repo: upstream:xorg-lib-libX11 -- build-depends: + build-depends: - xorg-util-macros - name: xorg-lib-libpciaccess +- name: drm + repo: upstream:drm ref: baserock/morph - repo: upstream:xorg-lib-libpciaccess -- build-depends: + build-depends: - xcb-pthread-stubs - xorg-lib-libpciaccess - name: drm +- name: xorg-lib-libXext + repo: upstream:xorg-lib-libXext ref: baserock/morph - repo: upstream:drm -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-lib-libXau - xorg-proto-x11proto - xorg-proto-xextproto - xorg-util-macros - name: xorg-lib-libXext +- name: xorg-lib-libXi + repo: upstream:xorg-lib-libXi ref: baserock/morph - repo: upstream:xorg-lib-libXext -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-lib-libXext - xorg-proto-inputproto - xorg-proto-x11proto - xorg-proto-xextproto - xorg-util-macros - name: xorg-lib-libXi +- name: xorg-util-makedepend + repo: upstream:xorg-util-makedepend ref: baserock/morph - repo: upstream:xorg-lib-libXi -- build-depends: + build-depends: - xorg-proto-x11proto - xorg-util-macros - name: xorg-util-makedepend +- name: xorg-lib-libXfixes + repo: upstream:xorg-lib-libXfixes ref: baserock/morph - repo: upstream:xorg-util-makedepend -- build-depends: + build-depends: - xorg-lib-libXext - xorg-proto-fixesproto - xorg-util-macros - name: xorg-lib-libXfixes +- name: xorg-lib-libXcomposite + repo: upstream:xorg-lib-libXcomposite ref: baserock/morph - repo: upstream:xorg-lib-libXfixes -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-lib-libXfixes - xorg-proto-compositeproto - xorg-util-macros - name: xorg-lib-libXcomposite +- name: xorg-lib-libXrender + repo: upstream:xorg-lib-libXrender ref: baserock/morph - repo: upstream:xorg-lib-libXcomposite -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-proto-renderproto - xorg-util-macros - name: xorg-lib-libXrender +- name: xorg-lib-libXrandr + repo: upstream:xorg-lib-libXrandr ref: baserock/morph - repo: upstream:xorg-lib-libXrender -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-lib-libXext - xorg-lib-libXrender @@ -249,28 +252,28 @@ chunks: - xorg-proto-renderproto - xorg-proto-xextproto - xorg-util-macros - name: xorg-lib-libXrandr +- name: xorg-lib-libXinerama + repo: upstream:xorg-lib-libXinerama ref: baserock/morph - repo: upstream:xorg-lib-libXrandr -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-lib-libXext - xorg-proto-xextproto - xorg-proto-xineramaproto - xorg-util-macros - name: xorg-lib-libXinerama +- name: xorg-lib-libdmx + repo: upstream:xorg-lib-libdmx ref: baserock/morph - repo: upstream:xorg-lib-libXinerama -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-lib-libXext - xorg-proto-dmxproto - xorg-proto-xextproto - xorg-util-macros - name: xorg-lib-libdmx +- name: xorg-lib-libXtst + repo: upstream:xorg-lib-libXtst ref: baserock/morph - repo: upstream:xorg-lib-libdmx -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-lib-libXext - xorg-lib-libXi @@ -278,55 +281,50 @@ chunks: - xorg-proto-recordproto - xorg-proto-xextproto - xorg-util-macros - name: xorg-lib-libXtst +- name: xorg-lib-libXRes + repo: upstream:xorg-lib-libXRes ref: baserock/morph - repo: upstream:xorg-lib-libXtst -- build-depends: + build-depends: - xorg-lib-libX11 - xorg-lib-libXext - xorg-proto-resourceproto - xorg-proto-xextproto - xorg-util-macros - name: xorg-lib-libXRes +- name: xorg-lib-libXdamage + repo: upstream:xorg-lib-libXdamage ref: baserock/morph - repo: upstream:xorg-lib-libXRes -- build-depends: + build-depends: - xorg-lib-libXfixes - xorg-proto-damageproto - xorg-util-macros - name: xorg-lib-libXdamage +- name: xorg-lib-libXcursor + repo: upstream:xorg-lib-libXcursor ref: baserock/morph - repo: upstream:xorg-lib-libXdamage -- build-depends: + build-depends: - xorg-util-macros - xorg-lib-libXrender - xorg-lib-libXfixes - xorg-proto-fixesproto - xorg-lib-libXau - xorg-lib-libX11 - name: xorg-lib-libXcursor +- name: xorg-proto-printproto + repo: upstream:xorg-proto-printproto ref: baserock/morph - repo: upstream:xorg-lib-libXcursor -- build-depends: + build-depends: - xorg-util-macros - name: xorg-proto-printproto +- name: xorg-lib-libXp + repo: upstream:xorg-lib-libXp ref: baserock/morph - repo: upstream:xorg-proto-printproto -- build-depends: + build-depends: - xorg-proto-printproto - xorg-proto-xextproto - xorg-lib-libXext - xorg-lib-libX11 - name: xorg-lib-libXp +- name: xorg-lib-libXScrnSaver + repo: upstream:xorg-lib-libXScrnSaver ref: baserock/morph - repo: upstream:xorg-lib-libXp -- build-depends: + build-depends: - xorg-proto-scrnsaverproto - xorg-proto-xextproto - xorg-lib-libXext - xorg-lib-libX11 - name: xorg-lib-libXScrnSaver - ref: baserock/morph - repo: upstream:xorg-lib-libXScrnSaver -kind: stratum -name: x-common diff --git a/x-ppc64-generic.morph b/x-ppc64-generic.morph index f801a35..0029cd6 100644 --- a/x-ppc64-generic.morph +++ b/x-ppc64-generic.morph @@ -1,84 +1,87 @@ +name: x-ppc64-generic +kind: stratum build-depends: - morph: x-common - ref: null - repo: null chunks: -- build-depends: [] - name: mesa-x - ref: baserock/genivi/baseline-armv7-versatile +- name: mesa-x repo: upstream:mesa -- build-depends: [] - name: xorg-lib-libxkbfile - ref: baserock/morph + ref: baserock/genivi/baseline-armv7-versatile + build-depends: [] +- name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile -- build-depends: [] - name: pixman ref: baserock/morph + build-depends: [] +- name: pixman repo: upstream:pixman -- build-depends: [] - name: xorg-font-util ref: baserock/morph + build-depends: [] +- name: xorg-font-util repo: upstream:xorg-font-util -- build-depends: - - xorg-font-util - name: xorg-lib-libfontenc ref: baserock/morph + build-depends: [] +- name: xorg-lib-libfontenc repo: upstream:xorg-lib-libfontenc -- build-depends: [] - name: freetype2 ref: baserock/morph + build-depends: + - xorg-font-util +- name: freetype2 repo: upstream:freetype2 -- build-depends: - - freetype2 - name: fontconfig ref: baserock/morph + build-depends: [] +- name: fontconfig repo: upstream:fontconfig -- build-depends: - - freetype2 - - xorg-lib-libfontenc - name: xorg-lib-libXfont ref: baserock/morph + build-depends: + - freetype2 +- name: xorg-lib-libXfont repo: upstream:xorg-lib-libXfont -- build-depends: [] - name: freefont-otf ref: baserock/morph + build-depends: + - freetype2 + - xorg-lib-libfontenc +- name: freefont-otf repo: upstream:freefont-otf -- build-depends: [] - name: xorg-lib-libICE ref: baserock/morph + build-depends: [] +- name: xorg-lib-libICE repo: upstream:xorg-lib-libICE -- build-depends: - - xorg-lib-libICE - name: xorg-lib-libSM ref: baserock/morph + build-depends: [] +- name: xorg-lib-libSM repo: upstream:xorg-lib-libSM -- build-depends: - - xorg-lib-libSM - name: xorg-lib-libXt ref: baserock/morph + build-depends: + - xorg-lib-libICE +- name: xorg-lib-libXt repo: upstream:xorg-lib-libXt -- build-depends: - - xorg-lib-libXt - name: xorg-lib-libXmu ref: baserock/morph + build-depends: + - xorg-lib-libSM +- name: xorg-lib-libXmu repo: upstream:xorg-lib-libXmu -- build-depends: - - xorg-lib-libXt - name: xorg-lib-libXpm ref: baserock/morph + build-depends: + - xorg-lib-libXt +- name: xorg-lib-libXpm repo: upstream:xorg-lib-libXpm -- build-depends: + ref: baserock/morph + build-depends: + - xorg-lib-libXt +- name: xorg-lib-libXaw + repo: upstream:xorg-lib-libXaw + ref: baserock/morph + build-depends: - xorg-lib-libXmu - xorg-lib-libXpm - xorg-lib-libXt - name: xorg-lib-libXaw +- name: libsha1 + repo: upstream:libsha1 ref: baserock/morph - repo: upstream:xorg-lib-libXaw -- build-depends: [] - name: libsha1 + build-depends: [] +- name: xserver + repo: upstream:xserver ref: baserock/morph - repo: upstream:libsha1 -- build-depends: + build-depends: - libsha1 - mesa-x - pixman @@ -90,86 +93,81 @@ chunks: - xorg-lib-libXt - xorg-lib-libfontenc - xorg-lib-libxkbfile - name: xserver - ref: baserock/morph - repo: upstream:xserver -- build-depends: - - xserver - name: xorg-driver-xf86-video-cirrus - ref: baserock/morph +- name: xorg-driver-xf86-video-cirrus repo: upstream:xorg-driver-xf86-video-cirrus -- build-depends: - - xserver - name: xorg-driver-xf86-video-fbdev ref: baserock/morph - repo: upstream:xorg-driver-xf86-video-fbdev -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-video-vesa +- name: xorg-driver-xf86-video-fbdev + repo: upstream:xorg-driver-xf86-video-fbdev ref: baserock/morph - repo: upstream:xorg-driver-xf86-video-vesa -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-evdev +- name: xorg-driver-xf86-video-vesa + repo: upstream:xorg-driver-xf86-video-vesa ref: baserock/morph - repo: upstream:xorg-driver-xf86-input-evdev -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-keyboard +- name: xorg-driver-xf86-input-evdev + repo: upstream:xorg-driver-xf86-input-evdev ref: baserock/morph - repo: upstream:xorg-driver-xf86-input-keyboard -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-mouse +- name: xorg-driver-xf86-input-keyboard + repo: upstream:xorg-driver-xf86-input-keyboard ref: baserock/morph + build-depends: + - xserver +- name: xorg-driver-xf86-input-mouse repo: upstream:xorg-driver-xf86-input-mouse -- build-depends: - - xorg-lib-libxkbfile - name: xorg-app-xkbcomp ref: baserock/morph + build-depends: + - xserver +- name: xorg-app-xkbcomp repo: upstream:xorg-app-xkbcomp -- build-depends: - - xorg-app-xkbcomp - name: xkeyboard-config ref: baserock/morph + build-depends: + - xorg-lib-libxkbfile +- name: xkeyboard-config repo: upstream:xkeyboard-config -- build-depends: [] - name: xorg-app-xinit ref: baserock/morph + build-depends: + - xorg-app-xkbcomp +- name: xorg-app-xinit repo: upstream:xorg-app-xinit -- build-depends: - - fontconfig - - freetype2 - name: xorg-lib-libXft ref: baserock/morph + build-depends: [] +- name: xorg-lib-libXft repo: upstream:xorg-lib-libXft -- build-depends: [] - name: xcb-util ref: baserock/morph + build-depends: + - fontconfig + - freetype2 +- name: xcb-util repo: upstream:xcb-util -- build-depends: [] - name: util-wm ref: baserock/morph + build-depends: [] +- name: util-wm repo: upstream:util-wm -- build-depends: [] - name: util-keysyms ref: baserock/morph + build-depends: [] +- name: util-keysyms repo: upstream:util-keysyms -- build-depends: - - xcb-util - name: util-image ref: baserock/morph + build-depends: [] +- name: util-image repo: upstream:util-image -- build-depends: - - xorg-lib-libXaw - - xorg-lib-libxkbfile - name: xterm ref: baserock/morph + build-depends: + - xcb-util +- name: xterm repo: upstream:xterm -- build-depends: - - xorg-lib-libXmu - name: xorg-app-xauth ref: baserock/morph + build-depends: + - xorg-lib-libXaw + - xorg-lib-libxkbfile +- name: xorg-app-xauth repo: upstream:xorg-app-xauth -kind: stratum -name: x-ppc64-generic + ref: baserock/morph + build-depends: + - xorg-lib-libXmu diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph index f878c66..0b08052 100644 --- a/x-x86_64-generic.morph +++ b/x-x86_64-generic.morph @@ -1,84 +1,87 @@ +name: x-x86_64-generic +kind: stratum build-depends: - morph: x-common - ref: null - repo: null chunks: -- build-depends: [] - name: mesa-x - ref: baserock/genivi/morph +- name: mesa-x repo: upstream:mesa -- build-depends: [] - name: xorg-lib-libxkbfile - ref: baserock/morph + ref: baserock/genivi/morph + build-depends: [] +- name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile -- build-depends: [] - name: pixman ref: baserock/morph + build-depends: [] +- name: pixman repo: upstream:pixman -- build-depends: [] - name: xorg-font-util ref: baserock/morph + build-depends: [] +- name: xorg-font-util repo: upstream:xorg-font-util -- build-depends: - - xorg-font-util - name: xorg-lib-libfontenc ref: baserock/morph + build-depends: [] +- name: xorg-lib-libfontenc repo: upstream:xorg-lib-libfontenc -- build-depends: [] - name: freetype2 ref: baserock/morph + build-depends: + - xorg-font-util +- name: freetype2 repo: upstream:freetype2 -- build-depends: - - freetype2 - name: fontconfig ref: baserock/morph + build-depends: [] +- name: fontconfig repo: upstream:fontconfig -- build-depends: - - freetype2 - - xorg-lib-libfontenc - name: xorg-lib-libXfont ref: baserock/morph + build-depends: + - freetype2 +- name: xorg-lib-libXfont repo: upstream:xorg-lib-libXfont -- build-depends: [] - name: freefont-otf ref: baserock/morph + build-depends: + - freetype2 + - xorg-lib-libfontenc +- name: freefont-otf repo: upstream:freefont-otf -- build-depends: [] - name: xorg-lib-libICE ref: baserock/morph + build-depends: [] +- name: xorg-lib-libICE repo: upstream:xorg-lib-libICE -- build-depends: - - xorg-lib-libICE - name: xorg-lib-libSM ref: baserock/morph + build-depends: [] +- name: xorg-lib-libSM repo: upstream:xorg-lib-libSM -- build-depends: - - xorg-lib-libSM - name: xorg-lib-libXt ref: baserock/morph + build-depends: + - xorg-lib-libICE +- name: xorg-lib-libXt repo: upstream:xorg-lib-libXt -- build-depends: - - xorg-lib-libXt - name: xorg-lib-libXmu ref: baserock/morph + build-depends: + - xorg-lib-libSM +- name: xorg-lib-libXmu repo: upstream:xorg-lib-libXmu -- build-depends: - - xorg-lib-libXt - name: xorg-lib-libXpm ref: baserock/morph + build-depends: + - xorg-lib-libXt +- name: xorg-lib-libXpm repo: upstream:xorg-lib-libXpm -- build-depends: + ref: baserock/morph + build-depends: + - xorg-lib-libXt +- name: xorg-lib-libXaw + repo: upstream:xorg-lib-libXaw + ref: baserock/morph + build-depends: - xorg-lib-libXmu - xorg-lib-libXpm - xorg-lib-libXt - name: xorg-lib-libXaw +- name: libsha1 + repo: upstream:libsha1 ref: baserock/morph - repo: upstream:xorg-lib-libXaw -- build-depends: [] - name: libsha1 + build-depends: [] +- name: xserver + repo: upstream:xserver ref: baserock/morph - repo: upstream:libsha1 -- build-depends: + build-depends: - libsha1 - mesa-x - pixman @@ -90,86 +93,81 @@ chunks: - xorg-lib-libXt - xorg-lib-libfontenc - xorg-lib-libxkbfile - name: xserver - ref: baserock/morph - repo: upstream:xserver -- build-depends: - - xserver - name: xorg-driver-xf86-video-cirrus - ref: baserock/morph +- name: xorg-driver-xf86-video-cirrus repo: upstream:xorg-driver-xf86-video-cirrus -- build-depends: - - xserver - name: xorg-driver-xf86-video-fbdev ref: baserock/morph - repo: upstream:xorg-driver-xf86-video-fbdev -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-video-vesa +- name: xorg-driver-xf86-video-fbdev + repo: upstream:xorg-driver-xf86-video-fbdev ref: baserock/morph - repo: upstream:xorg-driver-xf86-video-vesa -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-evdev +- name: xorg-driver-xf86-video-vesa + repo: upstream:xorg-driver-xf86-video-vesa ref: baserock/morph - repo: upstream:xorg-driver-xf86-input-evdev -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-keyboard +- name: xorg-driver-xf86-input-evdev + repo: upstream:xorg-driver-xf86-input-evdev ref: baserock/morph - repo: upstream:xorg-driver-xf86-input-keyboard -- build-depends: + build-depends: - xserver - name: xorg-driver-xf86-input-mouse +- name: xorg-driver-xf86-input-keyboard + repo: upstream:xorg-driver-xf86-input-keyboard ref: baserock/morph + build-depends: + - xserver +- name: xorg-driver-xf86-input-mouse repo: upstream:xorg-driver-xf86-input-mouse -- build-depends: - - xorg-lib-libxkbfile - name: xorg-app-xkbcomp ref: baserock/morph + build-depends: + - xserver +- name: xorg-app-xkbcomp repo: upstream:xorg-app-xkbcomp -- build-depends: - - xorg-app-xkbcomp - name: xkeyboard-config ref: baserock/morph + build-depends: + - xorg-lib-libxkbfile +- name: xkeyboard-config repo: upstream:xkeyboard-config -- build-depends: [] - name: xorg-app-xinit ref: baserock/morph + build-depends: + - xorg-app-xkbcomp +- name: xorg-app-xinit repo: upstream:xorg-app-xinit -- build-depends: - - fontconfig - - freetype2 - name: xorg-lib-libXft ref: baserock/morph + build-depends: [] +- name: xorg-lib-libXft repo: upstream:xorg-lib-libXft -- build-depends: [] - name: xcb-util ref: baserock/morph + build-depends: + - fontconfig + - freetype2 +- name: xcb-util repo: upstream:xcb-util -- build-depends: [] - name: util-wm ref: baserock/morph + build-depends: [] +- name: util-wm repo: upstream:util-wm -- build-depends: [] - name: util-keysyms ref: baserock/morph + build-depends: [] +- name: util-keysyms repo: upstream:util-keysyms -- build-depends: - - xcb-util - name: util-image ref: baserock/morph + build-depends: [] +- name: util-image repo: upstream:util-image -- build-depends: - - xorg-lib-libXaw - - xorg-lib-libxkbfile - name: xterm ref: baserock/morph + build-depends: + - xcb-util +- name: xterm repo: upstream:xterm -- build-depends: - - xorg-lib-libXmu - name: xorg-app-xauth ref: baserock/morph + build-depends: + - xorg-lib-libXaw + - xorg-lib-libxkbfile +- name: xorg-app-xauth repo: upstream:xorg-app-xauth -kind: stratum -name: x-x86_64-generic + ref: baserock/morph + build-depends: + - xorg-lib-libXmu diff --git a/xfce-system.morph b/xfce-system.morph index aafb4b6..ebc55cf 100644 --- a/xfce-system.morph +++ b/xfce-system.morph @@ -1,56 +1,26 @@ -arch: x86_64 -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -description: A GENIVI devel with XFCE -kind: system name: xfce-system +kind: system +description: A GENIVI devel with XFCE +arch: x86_64 strata: - morph: build-essential - ref: null - repo: null - morph: core - ref: null - repo: null - morph: foundation - ref: null - repo: null - morph: genivi-foundation - ref: null - repo: null - morph: bsp-x86_64-generic - ref: null - repo: null - morph: connectivity - ref: null - repo: null - morph: audio-bluetooth - ref: null - repo: null - morph: x-common - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null - morph: multimedia - ref: null - repo: null - morph: genivi - ref: null - repo: null - morph: genivi-x-x86_64-generic - ref: null - repo: null - morph: gtk2 - ref: null - repo: null - morph: tools - ref: null - repo: null - morph: xfce - ref: null - repo: null +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/xfce.morph b/xfce.morph index 0f49d8d..3939bf1 100644 --- a/xfce.morph +++ b/xfce.morph @@ -1,132 +1,126 @@ +name: xfce +kind: stratum +description: xfce stratum build-depends: - morph: genivi-x-x86_64-generic - ref: null - repo: null - morph: gtk2 - ref: null - repo: null - morph: x-x86_64-generic - ref: null - repo: null chunks: -- build-depends: [] - name: xfce-dev-tools - ref: baserock/morph +- name: xfce-dev-tools repo: upstream:xfce/xfce4-dev-tools -- build-depends: - - xfce-dev-tools - name: libxfce4util ref: baserock/morph + build-depends: [] +- name: libxfce4util repo: upstream:xfce/libxfce4util -- build-depends: + ref: baserock/morph + build-depends: + - xfce-dev-tools +- name: xfconf + repo: upstream:xfce/xfconf + ref: baserock/morph + build-depends: - xfce-dev-tools - libxfce4util - name: xfconf +- name: libxfce4ui + repo: upstream:xfce/libxfce4ui ref: baserock/morph - repo: upstream:xfce/xfconf -- build-depends: + build-depends: - xfce-dev-tools - libxfce4util - xfconf - name: libxfce4ui +- name: garcon + repo: upstream:xfce/garcon ref: baserock/morph - repo: upstream:xfce/libxfce4ui -- build-depends: + build-depends: - libxfce4util - name: garcon +- name: perl-uri + repo: upstream:libwww-perl/uri ref: baserock/morph - repo: upstream:xfce/garcon -- build-depends: [] - name: perl-uri + build-depends: [] +- name: exo + repo: upstream:xfce/exo ref: baserock/morph - repo: upstream:libwww-perl/uri -- build-depends: + build-depends: - libxfce4util - libxfce4ui - perl-uri - name: exo - ref: baserock/morph - repo: upstream:xfce/exo -- build-depends: [] - name: libwnck - ref: baserock/xfce-build +- name: libwnck repo: upstream:libwnck -- build-depends: + ref: baserock/xfce-build + build-depends: [] +- name: xfce4-panel + repo: upstream:xfce/xfce4-panel + ref: baserock/morph + build-depends: - libxfce4ui - garcon - exo - libwnck - name: xfce4-panel +- name: thunar + repo: upstream:xfce/thunar ref: baserock/morph - repo: upstream:xfce/xfce4-panel -- build-depends: + build-depends: - libxfce4ui - exo - garcon - libwnck - name: thunar +- name: xfce4-settings + repo: upstream:xfce/xfce4-settings ref: baserock/morph - repo: upstream:xfce/thunar -- build-depends: + build-depends: - xfce-dev-tools - xfconf - exo - libxfce4ui - garcon - name: xfce4-settings +- name: iceauth + repo: upstream:iceauth ref: baserock/morph - repo: upstream:xfce/xfce4-settings -- build-depends: [] - name: iceauth + build-depends: [] +- name: xfce4-session + repo: upstream:xfce/xfce4-session ref: baserock/morph - repo: upstream:iceauth -- build-depends: + build-depends: - iceauth - exo - xfce-dev-tools - libxfce4ui - libwnck - name: xfce4-session +- name: gtk-xfce-engine-2 + repo: upstream:xfce/gtk-xfce-engine ref: baserock/morph - repo: upstream:xfce/xfce4-session -- build-depends: + build-depends: - xfce-dev-tools - name: gtk-xfce-engine-2 +- name: xfdesktop + repo: upstream:xfce/xfdesktop ref: baserock/morph - repo: upstream:xfce/gtk-xfce-engine -- build-depends: + build-depends: - exo - libxfce4ui - xfconf - libwnck - name: xfdesktop +- name: xfwm4 + repo: upstream:xfce/xfwm4 ref: baserock/morph - repo: upstream:xfce/xfdesktop -- build-depends: + build-depends: - exo - libxfce4util - libxfce4ui - xfconf - libwnck - name: xfwm4 +- name: xfce4-appfinder + repo: upstream:xfce/xfce4-appfinder ref: baserock/morph - repo: upstream:xfce/xfwm4 -- build-depends: + build-depends: - exo - libxfce4ui - garcon - name: xfce4-appfinder - ref: baserock/morph - repo: upstream:xfce/xfce4-appfinder -- build-depends: - - xfce-dev-tools - name: tumbler - ref: baserock/morph +- name: tumbler repo: upstream:xfce/tumbler -- build-depends: [] - name: elementary-xfce ref: baserock/morph + build-depends: + - xfce-dev-tools +- name: elementary-xfce repo: upstream:elementary-xfce -description: xfce stratum -kind: stratum -name: xfce + ref: baserock/morph + build-depends: [] -- cgit v1.2.1