diff options
-rw-r--r-- | clusters/jetson-upgrade.morph | 3 | ||||
-rw-r--r-- | distbuild.configure | 3 | ||||
-rw-r--r-- | mason.configure | 7 | ||||
-rw-r--r-- | strata/armv7lhf-cross-toolchain.morph | 4 | ||||
-rw-r--r-- | strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph | 1 | ||||
-rw-r--r-- | strata/audio-bluetooth.morph | 2 | ||||
-rw-r--r-- | strata/build-essential.morph | 8 | ||||
-rw-r--r-- | strata/build-essential/linux-api-headers.morph | 1 | ||||
-rw-r--r-- | strata/build-essential/stage2-linux-api-headers.morph | 1 | ||||
-rw-r--r-- | strata/connectivity.morph | 2 | ||||
-rw-r--r-- | strata/core.morph | 13 | ||||
-rw-r--r-- | strata/core/ca-certificates.morph | 18 | ||||
-rw-r--r-- | strata/cross-bootstrap.morph | 2 | ||||
-rw-r--r-- | strata/foundation.morph | 9 | ||||
-rw-r--r-- | strata/genivi-foundation.morph | 5 | ||||
-rw-r--r-- | strata/input-common.morph | 2 | ||||
-rw-r--r-- | strata/mesa-common.morph | 4 | ||||
-rw-r--r-- | strata/mesa-common/mesa.morph | 4 | ||||
-rw-r--r-- | strata/tools.morph | 2 | ||||
-rw-r--r-- | strata/wayland-generic.morph | 1 | ||||
-rw-r--r-- | strata/x-common.morph | 22 | ||||
-rw-r--r-- | strata/x-generic.morph | 1 |
22 files changed, 79 insertions, 36 deletions
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph index e378cca5..59f7155f 100644 --- a/clusters/jetson-upgrade.morph +++ b/clusters/jetson-upgrade.morph @@ -1,7 +1,7 @@ name: jetson-upgrade kind: cluster systems: -- morph: devel-system-armv7lhf-jetson +- morph: systems/devel-system-armv7lhf-jetson.morph deploy-defaults: TROVE_HOST: TROVE_HOST TROVE_ID: TROVE_ID @@ -15,4 +15,3 @@ systems: jetson: type: ssh-rsync location: root@localhost - HOSTNAME: baserock-jetson diff --git a/distbuild.configure b/distbuild.configure index 79148106..d9b9fb8a 100644 --- a/distbuild.configure +++ b/distbuild.configure @@ -40,13 +40,12 @@ set -e -set -u - if [ -n "$DISTBUILD_GENERIC" ]; then echo "Not configuring the distbuild node, it will be generic" exit 0 fi +set -u # Check that all the variables needed are present: diff --git a/mason.configure b/mason.configure index 4341d8c0..4d11feb4 100644 --- a/mason.configure +++ b/mason.configure @@ -102,19 +102,18 @@ mkdir -p "$MASON_DATA" python <<'EOF' >"$MASON_DATA/mason.conf" import os, sys, yaml -trove_configuration={ - 'ARTIFACT_CACHE_SERVIER': os.environ['ARTIFACT_CACHE_SERVER'], +mason_configuration={ + 'ARTIFACT_CACHE_SERVER': os.environ['ARTIFACT_CACHE_SERVER'], 'MASON_CLUSTER_MORPHOLOGY': os.environ['MASON_CLUSTER_MORPHOLOGY'], 'MASON_DEFINITIONS_REF': os.environ['MASON_DEFINITIONS_REF'], 'MASON_DISTBUILD_ARCH': os.environ['MASON_DISTBUILD_ARCH'], 'MASON_TEST_HOST': os.environ['MASON_TEST_HOST'], - 'TROVE_ADMIN_NAME': os.environ['TROVE_ADMIN_NAME'], 'TROVE_ID': os.environ['TROVE_ID'], 'TROVE_HOST': os.environ['TROVE_HOST'], 'CONTROLLERHOST': os.environ['CONTROLLERHOST'], } -yaml.dump(trove_configuration, sys.stdout, default_flow_style=False) +yaml.dump(mason_configuration, sys.stdout, default_flow_style=False) EOF diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph index 0e2f7922..c76ae537 100644 --- a/strata/armv7lhf-cross-toolchain.morph +++ b/strata/armv7lhf-cross-toolchain.morph @@ -13,8 +13,8 @@ chunks: - name: armv7lhf-cross-linux-api-headers morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph repo: upstream:linux - ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8 - unpetrify-ref: baserock/build-essential + ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa + unpetrify-ref: baserock/v3.8 build-depends: [] - name: armv7lhf-cross-gcc-nolibc morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph index 351134b7..c2654419 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph @@ -1,7 +1,6 @@ name: armv7lhf-cross-linux-api-headers kind: chunk install-commands: -- make mrproper - ARCH=arm make INSTALL_HDR_PATH=dest headers_install - | # Copy headers to the sysroot where the eglibc build will find them, diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 7ab792af..a24158b6 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -2,7 +2,7 @@ name: audio-bluetooth kind: stratum description: Components required for audio and bluetooth. build-depends: -- morph: strata/genivi-foundation.morph +- morph: strata/foundation.morph chunks: - name: libatomic_ops repo: upstream:libatomic_ops diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 3918a13e..7886b610 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -58,8 +58,8 @@ chunks: - name: stage2-linux-api-headers morph: strata/build-essential/stage2-linux-api-headers.morph repo: upstream:linux - ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8 - unpetrify-ref: baserock/build-essential + ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa + unpetrify-ref: baserock/v3.8 build-depends: - stage1-binutils - stage1-gcc @@ -181,8 +181,8 @@ chunks: - name: linux-api-headers morph: strata/build-essential/linux-api-headers.morph repo: upstream:linux - ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8 - unpetrify-ref: baserock/build-essential + ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa + unpetrify-ref: baserock/v3.8 build-depends: - stage2-binutils - stage2-busybox diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.morph index d28b0905..e1ff2638 100644 --- a/strata/build-essential/linux-api-headers.morph +++ b/strata/build-essential/linux-api-headers.morph @@ -1,7 +1,6 @@ name: linux-api-headers kind: chunk install-commands: -- make mrproper - ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install - install -d "$DESTDIR${PREFIX-/usr}/include" - cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include" diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph index e7d1f8ed..5cbf2f05 100644 --- a/strata/build-essential/stage2-linux-api-headers.morph +++ b/strata/build-essential/stage2-linux-api-headers.morph @@ -1,7 +1,6 @@ name: stage2-linux-api-headers kind: chunk install-commands: -- make mrproper - | export ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install diff --git a/strata/connectivity.morph b/strata/connectivity.morph index 460c5ddc..a8697f3a 100644 --- a/strata/connectivity.morph +++ b/strata/connectivity.morph @@ -1,7 +1,7 @@ name: connectivity kind: stratum build-depends: -- morph: strata/genivi-foundation.morph +- morph: strata/foundation.morph chunks: - name: libnl repo: upstream:libnl diff --git a/strata/core.morph b/strata/core.morph index 4c6a23bf..f0f22871 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -13,8 +13,8 @@ chunks: - name: cmake morph: strata/core/cmake.morph repo: upstream:cmake - ref: 99c4f0a49237633372f218a44e3503e0a2bddae6 - unpetrify-ref: baserock/morph + ref: 0b3781e4c497566acaa504d4106d11c02a642501 + unpetrify-ref: v2.8.12.2 build-depends: [] - name: gdbm morph: strata/core/gdbm.morph @@ -166,6 +166,14 @@ chunks: - cpython - libtool - xz +- name: ca-certificates + morph: strata/core/ca-certificates.morph + repo: upstream:ca-certificates + ref: e9b06b26d9e57444e74a5cb6beca3f12726fc3c6 + unpetrify-ref: baserock/debian/20140325 + build-depends: + - automake + - cpython - name: curl morph: strata/core/curl.morph repo: upstream:curl @@ -176,6 +184,7 @@ chunks: - automake - libtool - openssl-new + - ca-certificates - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.morph new file mode 100644 index 00000000..3072e4f3 --- /dev/null +++ b/strata/core/ca-certificates.morph @@ -0,0 +1,18 @@ +name: ca-certificates +kind: chunk +build-system: autotools +configure-commands: [] +pre-install-commands: +- mkdir -p "$DESTDIR"/usr/share/ca-certificates +- mkdir -p "$DESTDIR"/usr/sbin +post-install-commands: +- mkdir "$DESTDIR"/etc +- | + cd "$DESTDIR"/usr/share/ca-certificates + find * -type f > "$DESTDIR"/etc/ca-certificates.conf +- | + export CERTSCONF="$DESTDIR/etc/ca-certificates.conf" + export CERTSDIR="$DESTDIR/usr/share/ca-certificates" + export ETCCERTSDIR="$DESTDIR/etc/ssl/certs" + mkdir -p "$ETCCERTSDIR" + ./sbin/update-ca-certificates diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 50a230d6..7b1a362b 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -74,7 +74,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: a32de7934cce79dda2b8dc20be1c5ec94109869e + ref: b15babc4a166e476d5bcd3946e8db8e2d4583969 unpetrify-ref: master build-depends: - cliapp diff --git a/strata/foundation.morph b/strata/foundation.morph index df3ff73f..c97a1cff 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -132,7 +132,14 @@ chunks: - name: tbdiff morph: strata/foundation/tbdiff.morph repo: baserock:baserock/tbdiff - ref: a6c4f3b9a1d7cb509ccce670c7d2ee4048e56525 + ref: fb9bdefbbbdbd8fef01278b7c3d9c1592998f6d1 unpetrify-ref: master build-depends: - attr +- name: dbus-glib + repo: upstream:dbus-glib + ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c + unpetrify-ref: dbus-glib_0.102 + build-depends: + - dbus + - glib diff --git a/strata/genivi-foundation.morph b/strata/genivi-foundation.morph index 0c4c7047..2dd44f40 100644 --- a/strata/genivi-foundation.morph +++ b/strata/genivi-foundation.morph @@ -4,11 +4,6 @@ description: Basic components needed by the GENIVI baseline. build-depends: - morph: strata/foundation.morph chunks: -- name: dbus-glib - repo: upstream:dbus-glib - ref: ee85b071fb51efb9f9a48d4a658cbefefd14544a - unpetrify-ref: baserock/morph - build-depends: [] - name: linuxquota morph: strata/genivi-foundation/linuxquota.morph repo: upstream:linuxquota diff --git a/strata/input-common.morph b/strata/input-common.morph index 20fe6ec0..8cee9f7d 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -1,7 +1,7 @@ name: input-common kind: stratum build-depends: -- morph: strata/build-essential.morph +- morph: strata/foundation.morph - morph: strata/x-common.morph chunks: - name: mtdev diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index b5a3ec6c..6a84aa8e 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -5,6 +5,8 @@ build-depends: - morph: strata/wayland-generic.morph chunks: - name: mesa + morph: strata/mesa-common/mesa.morph repo: upstream:mesa - ref: baserock/unified + ref: 1b12af300dfa77c24088780e88200703653293d3 + unpetrify-ref: mesa-10.3 build-depends: [] diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index 733e1b1f..44a9af85 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -6,10 +6,10 @@ configure-commands: cpu=$(echo $TARGET | cut -d '-' -f 1) case "$cpu" in x86_32|x64_64) - DRIDRIVERS=intel,i915,i965,swrast + DRIDRIVERS=i915,i965,swrast,nouveau ;; *) - DRIDRIVERS=swrast + DRIDRIVERS=swrast,nouveau ;; esac ./autogen.sh --prefix="$PREFIX" \ diff --git a/strata/tools.morph b/strata/tools.morph index 4f7a4435..f9380943 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -100,7 +100,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: cb7eed0a589c7b2ea62ca6df789422d09b9dcb43 + ref: b15babc4a166e476d5bcd3946e8db8e2d4583969 unpetrify-ref: master build-depends: - cliapp diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index e21a5d5d..a2f97de2 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -1,6 +1,7 @@ name: wayland-generic kind: stratum build-depends: +- morph: strata/foundation.morph - morph: strata/x-common.morph chunks: - name: libxkbcommon diff --git a/strata/x-common.morph b/strata/x-common.morph index 537569a2..987862a9 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -1,7 +1,7 @@ name: x-common kind: stratum build-depends: -- morph: strata/genivi-foundation.morph +- morph: strata/foundation.morph chunks: - name: llvm morph: strata/x-common/llvm.morph @@ -158,6 +158,16 @@ chunks: unpetrify-ref: baserock/morph build-depends: - xorg-util-macros +- name: xorg-proto-dri3proto + repo: upstream:xorg-proto-dri3proto + ref: 91df0f88b70c268f3580385a7b37543ab8c544c8 + build-depends: + - xorg-util-macros +- name: xorg-proto-presentproto + repo: upstream:xorg-proto-presentproto + ref: ef84007fc4a23d3897b4776906139de9d0698c2a + build-depends: + - xorg-util-macros - name: xcb-pthread-stubs repo: upstream:xcb-pthread-stubs ref: 431d2c0be218d878b9dd3862e4232243c599df4b @@ -170,6 +180,12 @@ chunks: unpetrify-ref: "1.11" build-depends: - xorg-util-macros +- name: xorg-lib-libxshmfence + repo: upstream:xorg-lib-libxshmfence + ref: 9c4f070e1304a3503cfab08f68573443025fc4c9 + build-depends: + - xorg-proto-x11proto + - xorg-util-macros - name: xorg-lib-libXau repo: upstream:xorg-lib-libXau ref: 1a8a1b2c68967b48c07b56142799b1020f017027 @@ -216,8 +232,8 @@ chunks: - xorg-util-macros - name: drm repo: upstream:drm - ref: 7ddc98f92f92560e2b52287ae8cf816ca4a057de - unpetrify-ref: baserock/libdrm-2.4.49 + ref: d6861609b2b887612d652bb2be7c39f199802937 + unpetrify-ref: libdrm-2.4.56 build-depends: - xcb-pthread-stubs - xorg-lib-libpciaccess diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 5128ef19..b30b2a9a 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -1,6 +1,7 @@ name: x-generic kind: stratum build-depends: +- morph: strata/foundation.morph - morph: strata/mesa-common.morph - morph: strata/x-common.morph - morph: strata/graphics-common.morph |