diff options
33 files changed, 108 insertions, 39 deletions
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/NetworkManager-common.morph b/strata/NetworkManager-common.morph new file mode 100644 index 00000000..7233d84f --- /dev/null +++ b/strata/NetworkManager-common.morph @@ -0,0 +1,18 @@ +name: NetworkManager-common +kind: stratum +build-depends: +- morph: strata/audio-bluetooth.morph +- morph: strata/network-security.morph +- morph: strata/connectivity.morph +chunks: +- name: libndp + repo: upstream:libndp + ref: master + build-depends: [] +- name: NetworkManager + morph: strata/NetworkManager-common/NetworkManager.morph + repo: upstream:NetworkManager + ref: 6eb82acd6dce882f4b91aafcf68dd9e143ce34e2 + unpetrify-ref: 0.9.10 + build-depends: + - libndp diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.morph new file mode 100644 index 00000000..9840dfa4 --- /dev/null +++ b/strata/NetworkManager-common/NetworkManager.morph @@ -0,0 +1,5 @@ +name: NetworkManager +kind: chunk +build-system: autotools +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp 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 bf83b8c3..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 @@ -20,10 +20,3 @@ chunks: ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4 unpetrify-ref: baserock/morph build-depends: [] -- name: connman - morph: strata/connectivity/connman.morph - repo: upstream:connman - ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44 - unpetrify-ref: baserock/1.24 - build-depends: - - iptables diff --git a/strata/connman-common.morph b/strata/connman-common.morph new file mode 100644 index 00000000..f6f7ddb0 --- /dev/null +++ b/strata/connman-common.morph @@ -0,0 +1,11 @@ +name: connman-common +kind: stratum +build-depends: +- morph: strata/connectivity.morph +chunks: +- name: connman + morph: strata/connman-common/connman.morph + repo: upstream:connman + ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44 + unpetrify-ref: baserock/1.24 + build-depends: [] diff --git a/strata/connectivity/connman.morph b/strata/connman-common/connman.morph index e468bc49..e468bc49 100644 --- a/strata/connectivity/connman.morph +++ b/strata/connman-common/connman.morph diff --git a/strata/core.morph b/strata/core.morph index 4c6a23bf..0f660b5a 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 @@ -86,8 +86,8 @@ chunks: - name: bash morph: strata/core/bash.morph repo: upstream:bash - ref: 783c677f45354b0d6df70e552217ecad8481804f - unpetrify-ref: baserock/morph + ref: 3590145af6f1c9fa321dff231f69ae696e7e740b + unpetrify-ref: baserock/bash-4.3-patch-27 build-depends: [] - name: error-perl-tarball repo: upstream:error-perl-tarball @@ -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..43f0802b 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: 963dca9868938241740d63ec1475c5f887513e0c unpetrify-ref: master build-depends: - cliapp diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 95b42a6b..7ef6e22a 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -7,7 +7,7 @@ build-depends: - morph: strata/lua.morph - morph: strata/audio-bluetooth.morph - morph: strata/multimedia-gstreamer-0.10.morph -- morph: strata/connectivity.morph +- morph: strata/connman-common.morph chunks: - name: efl morph: strata/enlightenment/efl.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index 7cc03ed8..c97a1cff 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -136,3 +136,10 @@ chunks: 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/tools.morph b/strata/tools.morph index f1ce9d85..bddd9800 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -100,7 +100,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: c754d0366d4557910775bfa83c85ffdf98af0610 + ref: 963dca9868938241740d63ec1475c5f887513e0c unpetrify-ref: master build-depends: - cliapp diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 1f35df7e..e3261f84 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -2,7 +2,7 @@ name: virtualization kind: stratum description: virtualization for baserock build-depends: -- morph: strata/connectivity.morph +- morph: strata/connman-common.morph chunks: - name: yajl morph: strata/virtualization/yajl.morph 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 20eb7c06..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 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 diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 454f981d..29acb5bc 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -17,6 +17,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph - name: x-common diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 7c283170..bffcb2e7 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-armv7-versatile.morph - name: connectivity morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph - name: x-common diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index fe7447ee..d1f479d9 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph - name: x-common diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 35eef485..0f9e296c 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph - name: x-common diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph index 1dab9f2a..1a810554 100644 --- a/systems/nodejs-system-x86_64.morph +++ b/systems/nodejs-system-x86_64.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph - name: x-common diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index eb3ab48d..0b4e4638 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -30,6 +30,8 @@ strata: morph: strata/lua.morph - name: connectivity morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph - name: enlightenment morph: strata/enlightenment.morph configuration-extensions: diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index eafd97e0..7171c0ca 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -30,6 +30,8 @@ strata: morph: strata/lua.morph - name: connectivity morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph - name: enlightenment morph: strata/enlightenment.morph configuration-extensions: diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index efdd7bdb..17531e89 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph - name: x-common |