From a03288578c2b9dd0711c2d759e3ab3628e08c1a1 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Wed, 25 Feb 2015 17:27:27 +0000 Subject: Morph build da949bf8201c4ad3a43a3e4fbf4ca2a2 System branch: master --- clusters/sdk-example-cluster.morph | 4 +- clusters/trove-example.morph | 2 + sdk.write | 4 +- strata/apache-httpd-server.morph | 40 -------- strata/apache-httpd-server/apr.morph | 19 ---- strata/apache-httpd-server/httpd-server.morph | 31 ------ strata/apache-httpd-server/mod_wsgi.morph | 18 ---- strata/armv7lhf-cross-toolchain.morph | 29 ++---- .../armv7lhf-cross-eglibc.morph | 33 +++++++ .../armv7lhf-cross-gcc-nolibc.morph | 71 +++++--------- .../armv7lhf-cross-gcc.morph | 41 ++++---- .../armv7lhf-cross-glibc.morph | 39 -------- .../armv7lhf-cross-libstdc++.morph | 24 ----- strata/audio-bluetooth.morph | 4 +- strata/bsp-armv7-highbank.morph | 4 +- strata/bsp-armv7-versatile.morph | 4 +- strata/bsp-armv7b-highbank.morph | 4 +- strata/bsp-armv7b-vexpress-tc2.morph | 4 +- strata/bsp-armv8l64-generic.morph | 16 --- .../bsp-armv8l64-generic.morph | 101 ------------------- strata/bsp-ppc64-generic.morph | 4 +- strata/bsp-wandboard.morph | 4 +- strata/bsp-x86_32-generic.morph | 4 +- strata/bsp-x86_64-generic.morph | 4 +- .../bsp-x86_64-generic/linux-x86-64-generic.morph | 2 + strata/bsp-x86_both-tools.morph | 4 +- strata/build-essential.morph | 23 ++--- strata/build-essential/linux-api-headers.morph | 2 - strata/build-essential/m4-tarball.morph | 2 +- .../build-essential/stage2-linux-api-headers.morph | 2 - strata/cloudinit-support.morph | 6 ++ strata/core.morph | 42 ++++---- strata/core/flex.morph | 2 - strata/core/libexpat.morph | 7 +- strata/core/nano.morph | 4 - strata/core/ncurses.morph | 38 +------- strata/core/readline.morph | 6 -- strata/coreutils-common.morph | 14 --- strata/coreutils-common/coreutils.morph | 2 - strata/coreutils-common/diff.morph | 7 -- strata/coreutils-common/sed.morph | 10 -- strata/cross-bootstrap.morph | 25 +++-- strata/cross-bootstrap/groff.morph | 1 - strata/databases.morph | 16 +-- strata/databases/memcached.morph | 8 -- strata/django.morph | 35 ------- strata/enlightenment.morph | 2 +- strata/erlang.morph | 15 --- strata/erlang/erlang-sd_notify.morph | 8 -- strata/erlang/rebar.morph | 6 -- strata/foundation.morph | 54 +++-------- strata/foundation/acl.morph | 4 - strata/foundation/btrfs-progs.morph | 4 +- strata/foundation/e2fsprogs.morph | 14 --- strata/foundation/groff.morph | 1 - strata/foundation/linux-pam.morph | 14 --- strata/foundation/time-zone-database.morph | 7 -- strata/graphics-common.morph | 1 - strata/graphics-common/pixman.morph | 5 - strata/gtk-deps.morph | 16 +-- strata/gtk3.morph | 4 +- strata/input-common.morph | 4 +- strata/libdrm-common.morph | 8 +- strata/libdrm-common/drm.morph | 4 + strata/lorry.morph | 32 +++--- strata/lorry/cvs-tarball.morph | 3 - strata/lorry/libapr-util-tarball.morph | 5 + strata/lorry/libapr-util.morph | 7 -- strata/lorry/libapr.morph | 21 ---- strata/lorry/libserf.morph | 6 -- strata/lorry/subversion-tarball.morph | 2 - strata/lorry/swig-tarball.morph | 2 - strata/morph-utils.morph | 17 ++-- strata/multimedia-common.morph | 17 ---- strata/multimedia-gstreamer-0.10.morph | 1 - strata/multimedia-gstreamer.morph | 41 -------- strata/multimedia.morph | 39 ++++++++ strata/networking-utils.morph | 29 ------ strata/networking-utils/iproute2.morph | 7 -- strata/networking-utils/ipset.morph | 6 -- strata/nfs.morph | 4 +- strata/openstack-clients.morph | 16 ++- strata/python-core.morph | 27 ------ strata/python-tools.morph | 8 +- strata/qt5-tools-qtmultimedia.morph | 2 +- strata/qt5-tools-qtwebkit.morph | 2 +- strata/ruby/ruby-1.8.morph | 10 +- strata/ruby/ruby.morph | 10 +- strata/tools.morph | 26 +++-- strata/tools/distcc.morph | 5 +- strata/tools/e2fsprogs.morph | 15 +++ strata/tools/gdb.morph | 3 +- strata/tools/vala-bootstrap.morph | 2 - strata/trove.morph | 5 +- strata/virtualization.morph | 42 ++------ strata/virtualization/dmidecode.morph | 6 -- strata/virtualization/dnsmasq.morph | 7 +- strata/virtualization/ebtables.morph | 6 -- strata/virtualization/libvirt.morph | 27 +----- strata/virtualization/openvswitch.morph | 10 -- strata/wayland-generic.morph | 4 +- strata/weston-common.morph | 12 ++- strata/weston-genivi.morph | 8 +- strata/x-generic.morph | 22 ----- strata/xstatic.morph | 108 --------------------- ...lhf-cross-toolchain-system-x86_32-generic.morph | 18 ++++ ...lhf-cross-toolchain-system-x86_64-generic.morph | 18 ++++ systems/build-system-armv7lhf-highbank.morph | 2 - systems/build-system-armv7lhf-jetson.morph | 2 - systems/build-system-armv8l64.morph | 39 -------- systems/build-system-ppc64.morph | 2 - systems/build-system-x86_32-chroot.morph | 4 - systems/build-system-x86_32.morph | 4 - systems/build-system-x86_64-chroot.morph | 4 - systems/build-system-x86_64.morph | 4 - systems/ceph-service-x86_64-generic.morph | 4 +- .../cross-bootstrap-system-armv8l64-generic.morph | 11 --- systems/devel-system-armv7-chroot.morph | 2 - systems/devel-system-armv7-highbank.morph | 2 - systems/devel-system-armv7-versatile.morph | 2 - systems/devel-system-armv7-wandboard.morph | 2 - systems/devel-system-armv7b-chroot.morph | 2 - systems/devel-system-armv7b-highbank.morph | 2 - systems/devel-system-armv7lhf-chroot.morph | 2 - systems/devel-system-armv7lhf-highbank.morph | 2 - systems/devel-system-armv7lhf-jetson.morph | 2 - systems/devel-system-armv7lhf-wandboard.morph | 2 - systems/devel-system-armv8l64.morph | 43 -------- systems/devel-system-ppc64-chroot.morph | 2 - systems/devel-system-ppc64-generic.morph | 2 - systems/devel-system-x86_32-chroot.morph | 2 - systems/devel-system-x86_32-generic.morph | 2 - systems/devel-system-x86_64-chroot.morph | 2 - systems/devel-system-x86_64-generic.morph | 4 +- systems/devel-system-x86_64-vagrant.morph | 2 - .../genivi-baseline-system-armv7lhf-jetson.morph | 6 +- ...genivi-baseline-system-armv7lhf-versatile.morph | 6 +- .../genivi-baseline-system-x86_64-generic.morph | 6 +- systems/gitlab-ci-runner.morph | 6 +- systems/installer-system-x86_64.morph | 2 - systems/qt4-devel-system-x86_64-generic.morph | 2 - systems/qt5-devel-system-x86_64-generic.morph | 6 +- systems/test.morph | 47 --------- systems/trove-system-x86_64.morph | 2 - systems/weston-system-armv7lhf-jetson.morph | 12 +-- systems/weston-system-x86_64-generic.morph | 8 +- systems/xfce-system.morph | 8 +- 147 files changed, 427 insertions(+), 1434 deletions(-) delete mode 100644 strata/apache-httpd-server.morph delete mode 100644 strata/apache-httpd-server/apr.morph delete mode 100644 strata/apache-httpd-server/httpd-server.morph delete mode 100644 strata/apache-httpd-server/mod_wsgi.morph create mode 100644 strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph delete mode 100644 strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph delete mode 100644 strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph delete mode 100644 strata/bsp-armv8l64-generic.morph delete mode 100644 strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph delete mode 100644 strata/core/nano.morph delete mode 100644 strata/core/readline.morph delete mode 100644 strata/coreutils-common/diff.morph delete mode 100644 strata/coreutils-common/sed.morph delete mode 100644 strata/databases/memcached.morph delete mode 100644 strata/django.morph delete mode 100644 strata/erlang/erlang-sd_notify.morph delete mode 100644 strata/erlang/rebar.morph delete mode 100644 strata/foundation/acl.morph delete mode 100644 strata/foundation/e2fsprogs.morph delete mode 100644 strata/foundation/linux-pam.morph delete mode 100644 strata/foundation/time-zone-database.morph delete mode 100644 strata/graphics-common/pixman.morph create mode 100644 strata/lorry/libapr-util-tarball.morph delete mode 100644 strata/lorry/libapr-util.morph delete mode 100644 strata/lorry/libapr.morph delete mode 100644 strata/lorry/libserf.morph delete mode 100644 strata/multimedia-common.morph delete mode 100644 strata/multimedia-gstreamer.morph create mode 100644 strata/multimedia.morph delete mode 100644 strata/networking-utils.morph delete mode 100644 strata/networking-utils/iproute2.morph delete mode 100644 strata/networking-utils/ipset.morph delete mode 100644 strata/python-core.morph create mode 100644 strata/tools/e2fsprogs.morph delete mode 100644 strata/virtualization/dmidecode.morph delete mode 100644 strata/virtualization/ebtables.morph delete mode 100644 strata/virtualization/openvswitch.morph delete mode 100644 strata/xstatic.morph create mode 100644 systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph create mode 100644 systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph delete mode 100644 systems/build-system-armv8l64.morph delete mode 100644 systems/cross-bootstrap-system-armv8l64-generic.morph delete mode 100644 systems/devel-system-armv8l64.morph delete mode 100644 systems/test.morph diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph index 92e4a413..f71d093d 100644 --- a/clusters/sdk-example-cluster.morph +++ b/clusters/sdk-example-cluster.morph @@ -31,11 +31,11 @@ description: | See the documentation of the sdk.write extension for more information. systems: -- morph: systems/armv7lhf-cross-toolchain-system-x86_64.morph +- morph: systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph deploy: sdk: type: sdk - location: armv7lhf-cross-toolchain-system-x86_64.sh + location: armv7lhf-cross-toolchain-system-x86_32-generic.sh PREFIX: /usr TARGET: armv7lhf-baserock-linux-gnueabi subsystems: diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph index d31aa172..202f4bb7 100644 --- a/clusters/trove-example.morph +++ b/clusters/trove-example.morph @@ -8,6 +8,7 @@ description: | mkdir ssh_keys ssh-keygen -N '' -f ssh_keys/lorry.key + ssh-keygen -N '' -f ssh_keys/mason.key ssh-keygen -N '' -f ssh_keys/worker.key ssh-keygen -N '' -f ssh_keys/trove-admin.key @@ -37,6 +38,7 @@ systems: DISK_SIZE: 8G HOSTNAME: test-trove LORRY_SSH_KEY: ssh_keys/lorry.key + MASON_SSH_PUBKEY: ssh_keys/mason.key.pub RAM_SIZE: 2G TROVE_ADMIN_EMAIL: adminuser@example.com TROVE_ADMIN_NAME: Nobody diff --git a/sdk.write b/sdk.write index 8d3d2a63..3b07ea9d 100755 --- a/sdk.write +++ b/sdk.write @@ -148,7 +148,7 @@ if [ "$#" != 1 ]; then exit 1 fi -TOOLCHAIN_PATH="$(readlink -f \"$1\")" +TOOLCHAIN_PATH="$1" sedescape(){ # Escape the passed in string so it can be safely interpolated into @@ -227,7 +227,7 @@ patch_elves(){ local linker="$4" local lib_path="$5" find "$root" \( -path "$inner_sysroot" -prune \) -o -type f \ - -type f -perm +u=x \ + -type f -perm +111 \ -exec sh -c 'file "$1" | grep -q "ELF"' - {} \; \ -exec "$linker" --library-path "$lib_path" \ "$patchelf" --set-interpreter "$linker" \ diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph deleted file mode 100644 index 1692c61c..00000000 --- a/strata/apache-httpd-server.morph +++ /dev/null @@ -1,40 +0,0 @@ -name: apache-httpd-server -kind: stratum -description: apache http web server and some utilities related to it -build-depends: -- morph: strata/tools.morph -- morph: strata/pcre-utils.morph -chunks: -- name: apr - morph: strata/apache-httpd-server/apr.morph - repo: upstream:apache/apr - ref: 3c818c6d7351f0130282d212a69035642f5fecad - unpetrify-ref: trunk - build-depends: [] -- name: httpd - morph: strata/apache-httpd-server/httpd-server.morph - repo: upstream:apache/httpd - ref: 6d8e0b2fd95268fcba96326ba9dce7bb8f712c19 - unpetrify-ref: 2.4.10 - build-depends: - - apr -- name: psutil - repo: upstream:python-packages/psutil - ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179 - unpetrify-ref: release-2.2.0 - build-depends: [] -- name: mod_wsgi-metrics - repo: upstream:python-packages/mod_wsgi-metrics - ref: ec715eb593255229f9f45f3f323edbb845c691d8 - unpetrify-ref: 1.1.1 - build-depends: - - psutil -- name: mod_wsgi - morph: strata/apache-httpd-server/mod_wsgi.morph - repo: upstream:python-packages/mod_wsgi - ref: 1be8b37aaf07d8cb3083da99d6fda12375221b07 - unpetrify-ref: 4.4.5 - build-depends: - - apr - - httpd - - mod_wsgi-metrics diff --git a/strata/apache-httpd-server/apr.morph b/strata/apache-httpd-server/apr.morph deleted file mode 100644 index 0e626acc..00000000 --- a/strata/apache-httpd-server/apr.morph +++ /dev/null @@ -1,19 +0,0 @@ -name: apr -kind: chunk -build-system: autotools -configure-commands: -- ./buildconf -- | - ./configure --prefix="$PREFIX" \ - --disable-static \ - --enable-threads \ - --with-installbuilddir="$PREFIX"/share/apr-1/build -post-install-commands: -- | - for file in find_apr.m4 apr_common.m4 install.sh gen-build.py get-version.sh \ - config.guess config.sub; do - cp build/"$file" "$DESTDIR$PREFIX"/share/apr-1/build/"$file"; - done -- ln -sf /usr/include/apr-2 "$DESTDIR$PREFIX"/share/apr-1/build/ -- cp include/private/apr_support.h "$DESTDIR$PREFIX"/include/apr-2 -- cp include/arch/unix/apr_private.h "$DESTDIR$PREFIX"/include/apr-2 diff --git a/strata/apache-httpd-server/httpd-server.morph b/strata/apache-httpd-server/httpd-server.morph deleted file mode 100644 index 131d0475..00000000 --- a/strata/apache-httpd-server/httpd-server.morph +++ /dev/null @@ -1,31 +0,0 @@ -name: httpd-server -kind: chunk -build-system: autotools -configure-commands: -- ./buildconf --with-apr=/usr/share/apr-1 -- | - ./configure --prefix="$PREFIX" \ - --libexecdir="$PREFIX"/lib/httpd/modules \ - --enable-layout=RPM \ - --enable-mpms-shared=all \ - --with-apr="$PREFIX"/bin/apr-2-config \ - --enable-suexec --with-suexec \ - --with-suexec-caller=apache \ - --with-suexec-docroot=/var/www \ - --with-suexec-logfile=/var/log/httpd/suexec.log \ - --with-suexec-bin="$PREFIX"/lib/httpd/suexec \ - --with-suexec-uidmin=500 --with-suexec-gidmin=100\ - --with-suexec-userdir=public_html \ - --enable-pie \ - --with-pcre \ - --enable-mods-shared=all \ - --enable-ssl --with-ssl \ - --enable-case-filter --enable-case-filter-in \ - --enable-cgid --enable-cgi\ - --enable-so -post-install-commands: -- | - sed -i 's|#!/replace/with/path/to/perl/interpreter -w|#!/usr/bin/perl -w|g' \ - "$DESTDIR$PREFIX"/bin/apxs -- mkdir -p "$DESTDIR"/etc/httpd/conf.d -- echo 'Include /etc/httpd/conf.d/*.conf' >> "$DESTDIR"/etc/httpd/conf/httpd.conf diff --git a/strata/apache-httpd-server/mod_wsgi.morph b/strata/apache-httpd-server/mod_wsgi.morph deleted file mode 100644 index 86004ad3..00000000 --- a/strata/apache-httpd-server/mod_wsgi.morph +++ /dev/null @@ -1,18 +0,0 @@ -name: mod_wsgi -kind: chunk -build-system: autotools -configure-commands: -- | - ./configure --prefix="$PREFIX" \ - --with-apxs=/usr/bin/apxs -post-install-commands: -- | - install -D -m 644 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/httpd/conf.d/wsgi.conf - # NOTE: mod_wsgi can not coexist in the same apache process as - # mod_wsgi_python3. Only load if mod_wsgi_python3 is not - # already loaded. - - - LoadModule wsgi_module /usr/lib/httpd/modules/mod_wsgi.so - - EOF diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph index 376de021..c76ae537 100644 --- a/strata/armv7lhf-cross-toolchain.morph +++ b/strata/armv7lhf-cross-toolchain.morph @@ -7,7 +7,7 @@ chunks: - name: armv7lhf-cross-binutils morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph repo: upstream:binutils-redhat - ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 + ref: 987eb543a034cddc4eeb103f08f566f24a5f964a unpetrify-ref: baserock/build-essential build-depends: [] - name: armv7lhf-cross-linux-api-headers @@ -19,15 +19,15 @@ chunks: - name: armv7lhf-cross-gcc-nolibc morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph repo: upstream:gcc-tarball - ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 + ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1 unpetrify-ref: baserock/build-essential build-depends: - armv7lhf-cross-binutils -- name: armv7lhf-cross-glibc - morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph - repo: upstream:glibc - ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c - unpetrify-ref: baserock/glibc-2.20 +- name: armv7lhf-cross-eglibc + morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph + repo: upstream:eglibc2 + ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c + unpetrify-ref: baserock/2.15-build-essential build-depends: - armv7lhf-cross-binutils - armv7lhf-cross-gcc-nolibc @@ -35,17 +35,8 @@ chunks: - name: armv7lhf-cross-gcc morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph repo: upstream:gcc-tarball - ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 - unpetrify-ref: baserock/build-essential - build-depends: - - armv7lhf-cross-binutils - - armv7lhf-cross-glibc -- name: armv7lhf-cross-libstdc++ - morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph - repo: upstream:gcc-tarball - ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 - unpetrify-ref: baserock/build-essential + ref: b0254026149b13782eae26d38435a4c62a002cf0 + unpetrify-ref: baserock/build-essential-4.7 build-depends: - armv7lhf-cross-binutils - - armv7lhf-cross-gcc - - armv7lhf-cross-glibc + - armv7lhf-cross-eglibc diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph new file mode 100644 index 00000000..afbfa939 --- /dev/null +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph @@ -0,0 +1,33 @@ +name: armv7lhf-cross-eglibc +kind: chunk +configure-commands: +- mkdir o +- cd libc && ln -s ../ports ports +- | + export MORPH_ARCH=armv7lhf + export TARGET=armv7lhf-baserock-linux-gnueabi + export TARGET_STAGE1=armv7lhf-none-linux-gnueabi + export CFLAGS="-O2 $CFLAGS" + # eglibc looks for $TARGET-gcc, but not $TARGET_STAGE1-gcc even + # though --build is specified, so we have to override what gcc to + # use here. + export CC="$TARGET_STAGE1-gcc" + cd o && ../libc/configure \ + $(../morph-arch-config) \ + --build=$TARGET_STAGE1 --host=$TARGET \ + --prefix="$PREFIX" \ + `# [1]` --with-headers="$PREFIX/$TARGET/sys-root/$PREFIX/include" \ + `# [2]` --with-binutils="$PREFIX/$TARGET/bin" \ + `# [3]` --disable-profile --enable-kernel=2.6.25 \ + --enable-add-ons=nptl,ports --without-cvs --without-selinux \ + `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \ + libc_cv_forced_unwind=yes libc_cv_ssp=no +build-commands: +- cd o && make localtime=UTC +install-commands: +- | + # eglibc doesn't help with sysroots, so we need to spell out the + # full path ourselves. + export TARGET=armv7lhf-baserock-linux-gnueabi + cd o && make install_root="$DESTDIR/$PREFIX/$TARGET/sys-root/" \ + localtime=UTC install diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph index a5f2d9d9..9f993bc0 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph @@ -6,53 +6,30 @@ configure-commands: export MORPH_ARCH=armv7lhf export TARGET=armv7lhf-baserock-linux-gnueabi export TARGET_STAGE1=armv7lhf-none-linux-gnueabi - - case "$MORPH_ARCH" in - armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ - --with-cpu=cortex-a9 \ - --with-tune=cortex-a9 \ - --with-fpu=vfpv3-d16 \ - --with-float=hard" ;; - armv7*) ARCH_FLAGS="--with-arch=armv7-a" ;; - esac - - cd o && ../configure \ - $ARCH_FLAGS \ - --build=$(sh ../config.guess) \ - --host=$(sh ../config.guess) \ - --target="$TARGET_STAGE1" \ - --prefix="$PREFIX" \ - `# [1]` --libdir="$PREFIX/lib" \ - `# [2]` --with-sysroot=/nonexistentdir \ - --with-newlib \ - `# [2]` --with-local-prefix="$PREFIX" \ - `# [2]` --with-native-system-header-dir="$PREFIX/include" \ - `# [3]` --with-build-time-tools="$PREFIX/$TARGET/bin" \ - `# [3]` --with-as="$PREFIX/$TARGET/bin/as" \ - `# [3]` --with-ld="$PREFIX/$TARGET/bin/ld" \ - --without-headers \ - --disable-nls \ - --disable-shared \ - `# [4]` --disable-multilib \ - `# [4]` --disable-decimal-float \ - `# [4]` --disable-threads \ - `# [4]` --disable-libatomic \ - `# [4]` --disable-libgomp \ - `# [4]` --disable-libitm \ - `# [4]` --disable-libquadmath \ - `# [4]` --disable-libsanitizer \ - `# [4]` --disable-libssp \ - `# [4]` --disable-libvtv \ - `# [4]` --disable-libcilkrts \ - `# [4]` --disable-libstdc++-v3 \ - --enable-languages=c,c++ + cd o && + ../configure \ + $(../morph-arch-config) \ + --build=$(sh ../config.guess) --host=$(sh ../config.guess) \ + --target="$TARGET_STAGE1" \ + --prefix="$PREFIX" \ + --disable-bootstrap --disable-nls \ + `# [1]` --libdir="$PREFIX/lib" --disable-multilib --disable-libgomp \ + --without-cloog --without-ppl \ + --with-mpfr-include="$(pwd)/../mpfr/src" \ + --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \ + `# [2]` --with-build-time-tools="$PREFIX/$TARGET/bin" \ + --with-as="$PREFIX/$TARGET/bin/as" \ + --with-ld="$PREFIX/$TARGET/bin/ld" \ + `# [3]` --enable-languages=c --disable-decimal-float \ + --disable-libmudflap --disable-libquadmath --disable-libssp \ + --disable-shared --disable-threads --disable-target-libiberty \ + --disable-target-zlib --without-headers --with-newlib \ + --with-system-zlib build-commands: -- | - # See stage1-gcc.morph. - case "$MORPH_ARCH" in - armv7*) sed -i "s/--host=none/--host=armv7a/" o/Makefile - sed -i "s/--target=none/--target=armv7a/" o/Makefile ;; - esac - cd o && make +- cd o && make install-commands: - cd o && make DESTDIR="$DESTDIR" install +- | + export TARGET_STAGE1=armv7lhf-none-linux-gnueabi + libgcc_filename="$("$DESTDIR$PREFIX/bin/$TARGET_STAGE1-gcc" -print-libgcc-file-name)" + ln -sv libgcc.a "$(echo "$libgcc_filename" | sed 's/libgcc/&_eh/')" diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph index 4ae3acdb..a5c6eac1 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph @@ -5,33 +5,28 @@ configure-commands: - | export MORPH_ARCH=armv7lhf export TARGET=armv7lhf-baserock-linux-gnueabi - - case "$MORPH_ARCH" in - armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ - --with-cpu=cortex-a9 \ - --with-tune=cortex-a9 \ - --with-fpu=vfpv3-d16 \ - --with-float=hard" ;; - armv7*) ARCH_FLAGS="--with-arch=armv7-a" ;; - esac - - cd o && ../configure \ - $ARCH_FLAGS \ - --build=$(sh ../config.guess) \ - --host=$(sh ../config.guess) \ - --target="$TARGET" \ - --prefix="$PREFIX" \ - `# [1]` --with-sysroot \ - --disable-bootstrap \ - `# [2]` --with-system-zlib \ - `# [3]` --libdir="$PREFIX/lib" \ - `# [3]` --disable-multilib \ - `# [3]` --enable-languages=c,c++,fortran + export TARGET_STAGE1=armv7lhf-none-linux-gnueabi + cd o && ../configure \ + $(../morph-arch-config) \ + --build=$(sh ../config.guess) \ + --host=$(sh ../config.guess) \ + --target="$TARGET" \ + `# [1]` --with-sysroot \ + --prefix="$PREFIX" \ + --disable-bootstrap \ + --enable-shared --enable-threads=posix \ + `# [2]` --enable-__cxa_atexit \ + --enable-languages=c,c++,fortran \ + `# [3]` --libdir="$PREFIX/lib" \ + --disable-libgomp --disable-multilib \ + --without-cloog --without-ppl \ + --with-mpfr-include="$(pwd)/../mpfr/src" \ + --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \ + `# [4]` --with-system-zlib build-commands: - cd o && make install-commands: - cd o && make DESTDIR="$DESTDIR" install -- ln -s gcc "$DESTDIR/$PREFIX/bin/cc" - | export TARGET=armv7lhf-baserock-linux-gnueabi for fortran_alias in f77 f90 f95; do diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph deleted file mode 100644 index 94c8171c..00000000 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph +++ /dev/null @@ -1,39 +0,0 @@ -name: armv7lhf-cross-glibc -kind: chunk -configure-commands: -- mkdir o -- | - export MORPH_ARCH=armv7lhf - export TARGET=armv7lhf-baserock-linux-gnueabi - export TARGET_STAGE1=armv7lhf-none-linux-gnueabi - - export CFLAGS="-O2 $CFLAGS" - - # glibc looks for $TARGET-gcc, but not $TARGET_STAGE1-gcc even - # though --build is specified, so we have to override what gcc to - # use here. - export CC="$TARGET_STAGE1-gcc" - - case "$MORPH_ARCH" in - armv7*) - ARCH_FLAGS="--without-fp" ;; - esac - - cd o && ../configure \ - $ARCH_FLAGS \ - --build=$TARGET_STAGE1 --host=$TARGET \ - --prefix="$PREFIX" \ - `# [1]` --with-headers="$PREFIX/$TARGET/sys-root/$PREFIX/include" \ - `# [2]` --with-binutils="$PREFIX/$TARGET/bin" \ - `# [3]` --disable-profile --enable-kernel=2.6.25 \ - `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \ - libc_cv_forced_unwind=yes libc_cv_ssp=no -build-commands: -- cd o && make localtime=UTC -install-commands: -- | - # glibc doesn't help with sysroots, so we need to spell out the - # full path ourselves. - export TARGET=armv7lhf-baserock-linux-gnueabi - cd o && make install_root="$DESTDIR/$PREFIX/$TARGET/sys-root/" \ - localtime=UTC install diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph deleted file mode 100644 index b4b0e735..00000000 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph +++ /dev/null @@ -1,24 +0,0 @@ -name: armv7lhf-cross-libstdc++ -kind: chunk -configure-commands: -- mkdir o -- | - export MORPH_ARCH=armv7lhf - export TARGET=armv7lhf-baserock-linux-gnueabi - - # -fPIC must be given, otherwise it will not be possible to create - # shared libraries linked to libstdc++ - export CPPFLAGS="-fPIC" - cd o && ../libstdc++-v3/configure \ - --build=$(sh ../config.guess) \ - --host=$(sh ../config.guess) \ - --target="$TARGET" \ - --prefix="$PREFIX" \ - --disable-nls \ - --disable-shared \ - --disable-multilib \ - `# [1]` --with-sysroot -build-commands: -- cd o && make -install-commands: -- cd o && make DESTDIR="$DESTDIR" install diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 6fa4364a..44e08fdc 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -89,8 +89,8 @@ chunks: - name: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio - ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7 - unpetrify-ref: v6.0 + ref: 34862dbd43079d19faff31fa9ba996acc874d586 + unpetrify-ref: v5.99.3 build-depends: - libsndfile - libatomic_ops diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph index bdf047cf..d5ff1264 100644 --- a/strata/bsp-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank.morph @@ -7,6 +7,6 @@ chunks: - name: linux-armv7-highbank morph: strata/bsp-armv7-highbank/linux-armv7-highbank.morph repo: upstream:linux - ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 - unpetrify-ref: v3.19 + ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d + unpetrify-ref: v3.18 build-depends: [] diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph index 529b563c..63d79667 100644 --- a/strata/bsp-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile.morph @@ -8,6 +8,6 @@ chunks: - name: linux-armv7-versatile morph: strata/bsp-armv7-versatile/linux-armv7-versatile.morph repo: upstream:linux - ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 - unpetrify-ref: v3.19 + ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d + unpetrify-ref: v3.18 build-depends: [] diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph index 97ccfe3c..16dd9a17 100644 --- a/strata/bsp-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank.morph @@ -7,6 +7,6 @@ chunks: - name: linux-armv7b-highbank morph: strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph repo: upstream:linux - ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 - unpetrify-ref: v3.19 + ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d + unpetrify-ref: v3.18 build-depends: [] diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph index f8a7ff00..440271de 100644 --- a/strata/bsp-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2.morph @@ -7,6 +7,6 @@ chunks: - name: linux-armv7b-vexpress-tc2 morph: strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph repo: upstream:linux - ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 - unpetrify-ref: v3.19 + ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d + unpetrify-ref: v3.18 build-depends: [] diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph deleted file mode 100644 index 702858de..00000000 --- a/strata/bsp-armv8l64-generic.morph +++ /dev/null @@ -1,16 +0,0 @@ -name: bsp-armv8l64-generic -kind: stratum -description: -- | - The set of platform specific components required for booting - armv8l64-based systems, like the 64-bit APM XGene ARM based m400 - Moonshot cartridge. -build-depends: -- morph: strata/core.morph -chunks: -- name: linux-armv8l64-generic - morph: strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph - repo: upstream:linux - ref: 5f06398ae6a04f414932243de38b5cf3d264ff84 - unpetrify-ref: baserock/apm-xgene-m400-moonshot-cartridge - build-depends: [] diff --git a/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph deleted file mode 100644 index ef61a34b..00000000 --- a/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph +++ /dev/null @@ -1,101 +0,0 @@ -name: linux-armv8l64-generic -kind: chunk -configure-commands: -- make ARCH=arm64 defconfig -- scripts/config -e PACKET -- scripts/config -e SATA_AHCI -- scripts/config -e ATA_GENERIC -- scripts/config -e HAVE_IDE -- scripts/config -d BLK_DEV_IDE_SATA -- scripts/config -e BTRFS_FS -- scripts/config -e BTRFS_FS_POSIX_ACL -- scripts/config -e DEVTMPFS -- scripts/config -e DEVTMPFS_MOUNT -- scripts/config -e CONFIG_FHANDLE -- scripts/config -e CGROUPS -- scripts/config -e AUTOFS4_FS -- scripts/config --set-str UEVENT_HELPER_PATH '' -- scripts/config -e EXT2_FS -- scripts/config -e EXT2_FS_XATTR -- scripts/config -e EXT2_FS_POSIX_ACL -- scripts/config -e EXT2_FS_SECURITY -- scripts/config -e EXT2_FS_XIP -- scripts/config -e EXT3_FS -- scripts/config -d EXT3_DEFAULTS_TO_ORDERED -- scripts/config -e EXT3_FS_XATTR -- scripts/config -e EXT3_FS_POSIX_ACL -- scripts/config -e EXT3_FS_SECURITY -- scripts/config -e EXT4_FS -- scripts/config -e EXT4_FS_XATTR -- scripts/config -e EXT4_FS_POSIX_ACL -- scripts/config -e EXT4_FS_SECURITY -- scripts/config -d EXT4_DEBUG -- scripts/config -d JBD_DEBUG -- scripts/config -d JBD2_DEBUG -- scripts/config -e BLK_DEV_LOOP -- scripts/config -d BLK_DEV_CRYPTOLOOP -- scripts/config -e CEPH_FS -- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8 -- scripts/config -e VIRTIO -- scripts/config -e VIRTIO_RING -- scripts/config -e VIRTIO_PCI -- scripts/config -e VIRTIO_BALLOON -- scripts/config -e VIRTIO_BLK -- scripts/config -e VIRTIO_NET -- scripts/config -e VIRTIO_CONSOLE -- scripts/config -e HW_RANDOM_VIRTIO -- scripts/config -e 9P_FS -- scripts/config -e 9P_FSCACHE -- scripts/config -e 9P_FS_POSIX_ACL -- scripts/config -e NET_9P -- scripts/config -e NET_9P_VIRTIO -- scripts/config -e R8169 -- scripts/config -e 8139TOO -- scripts/config -e 8139CP -- scripts/config -e IKCONFIG -- scripts/config -e IKCONFIG_PROC -- scripts/config -e SECCOMP -- scripts/config -d DEBUG_STACK_TRACE -- scripts/config -e NFSD -- scripts/config -e NFSD_V3 -- scripts/config -e KVM -- scripts/config -e TUN -- scripts/config -e BRIDGE -- scripts/config -e VHOST_NET -- scripts/config -e NF_NAT -- scripts/config -e NF_NAT_IPV4 -- scripts/config -e IP_NF_TARGET_MASQUERADE -- scripts/config -e FB_VESA -- scripts/config -e HOTPLUG_PCI -- scripts/config -e HOTPLUG_PCI_ACPI -- scripts/config -e VLAN_8021Q -- scripts/config -e BRIDGE_VLAN_FILTERING -- scripts/config -e SATA_AHCI_PLATFORM -- scripts/config -e AHCI_XGENE -- scripts/config -e GENERIC_PHY -- scripts/config -e PHY_XGENE -- scripts/config -e NET_VENDOR_MELLANOX -- scripts/config -e MLX4_EN -- scripts/config -e MLX4_EN_DCB -- scripts/config -e MLX4_EN_VXLAN -- scripts/config -e MLX4_CORE -- scripts/config -e MLX5_CORE -- scripts/config -e NET_IP_TUNNEL -- scripts/config -e VXLAN -- scripts/config -e UIO -- scripts/config -e UIO_PDRV_GENIRQ -- scripts/config -e GPIO_DWAPB -- scripts/config -e KEYBOARD_GPIO -- scripts/config -e INPUT_POLLDEV -- scripts/config -e KEYBOARD_GPIO_POLLED -- scripts/config -d DMA_CMA -- scripts/config -e POWER_RESET -- scripts/config -e POWER_RESET_GPIO -- scripts/config -e POWER_RESET_SYSCON -- scripts/config -e POWER_AVS -- yes '' | make ARCH=arm64 oldconfig -build-commands: -- make vmlinux dtbs $MAKEFLAGS -install-commands: -- mkdir -p "$DESTDIR"/boot -- make install dtbs_install INSTALL_PATH="$DESTDIR/boot" diff --git a/strata/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph index 002c00be..f109ecf2 100644 --- a/strata/bsp-ppc64-generic.morph +++ b/strata/bsp-ppc64-generic.morph @@ -7,6 +7,6 @@ chunks: - name: linux-ppc64 morph: strata/bsp-ppc64-generic/linux-ppc64.morph repo: upstream:linux - ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 - unpetrify-ref: v3.19 + ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d + unpetrify-ref: v3.18 build-depends: [] diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index 4ffd2e0e..6f829802 100644 --- a/strata/bsp-wandboard.morph +++ b/strata/bsp-wandboard.morph @@ -13,7 +13,7 @@ chunks: - name: linux-armv7-wandboard morph: strata/bsp-wandboard/linux-armv7-wandboard.morph repo: upstream:linux - ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 - unpetrify-ref: v3.19 + ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d + unpetrify-ref: v3.18 build-depends: - u-boot@wandboard diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 244745bf..ad318db9 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -8,8 +8,8 @@ chunks: - name: linux-x86-32-generic morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph repo: upstream:linux - ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 - unpetrify-ref: v3.19 + ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d + unpetrify-ref: v3.18 build-depends: [] - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index 04be0dcd..624b31a4 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -8,8 +8,8 @@ chunks: - name: linux-x86-64-generic morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph repo: upstream:linux - ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 - unpetrify-ref: v3.19 + ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d + unpetrify-ref: v3.18 build-depends: [] - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph index fe0721cc..a7f1d735 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -45,6 +45,8 @@ configure-commands: - scripts/config -e BLK_DEV_LOOP - scripts/config -d BLK_DEV_CRYPTOLOOP - scripts/config -e CEPH_FS +- scripts/config -e OVERLAY_FS +- scripts/config -e FUSE_FS - scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8 - scripts/config -e VIRTIO - scripts/config -e VIRTIO_RING diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index cad5c07e..008ddf3f 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -14,7 +14,7 @@ chunks: - name: syslinux morph: strata/bsp-x86_both-tools/syslinux.morph repo: upstream:syslinux - ref: d715b39c0801ecea5e52f9029cea7c76320f93cf - unpetrify-ref: baserock/morph + ref: baserock/morph + unpetrify-ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f build-depends: - nasm diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 3243108a..685a0dc9 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -31,9 +31,6 @@ description: | 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. - - PLEASE KEEP THE REFS IN 'armv7lhf-cross-toolchain' STRATUM UP TO DATE WITH - THIS ONE! products: - artifact: build-essential-minimal include: @@ -155,8 +152,8 @@ chunks: - name: stage2-gawk morph: strata/build-essential/stage2-gawk.morph repo: upstream:gawk - ref: dc5af665700d9b04fdf9c18930526d28eef5d5d9 - unpetrify-ref: gawk-4.1.1 + ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133 + unpetrify-ref: baserock/build-essential build-depends: - stage1-binutils - stage1-gcc @@ -165,9 +162,9 @@ chunks: prefix: /tools - name: stage2-make morph: strata/build-essential/stage2-make.morph - repo: upstream:make-tarball - ref: f75919b038da8a28388a911303fb86ed7a70ea2c - unpetrify-ref: make-4.1 + repo: upstream:make + ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba + unpetrify-ref: baserock/build-essential build-depends: - stage1-binutils - stage1-gcc @@ -291,8 +288,8 @@ chunks: - name: gawk morph: strata/build-essential/gawk.morph repo: upstream:gawk - ref: dc5af665700d9b04fdf9c18930526d28eef5d5d9 - unpetrify-ref: gawk-4.1.1 + ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133 + unpetrify-ref: baserock/build-essential build-depends: - stage2-binutils - stage2-busybox @@ -340,9 +337,9 @@ chunks: gcc-libs: build-essential-minimal - name: make morph: strata/build-essential/make.morph - repo: upstream:make-tarball - ref: f75919b038da8a28388a911303fb86ed7a70ea2c - unpetrify-ref: make-4.1 + repo: upstream:make + ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba + unpetrify-ref: baserock/build-essential 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 0cd61ce1..0f7ce171 100644 --- a/strata/build-essential/linux-api-headers.morph +++ b/strata/build-essential/linux-api-headers.morph @@ -5,8 +5,6 @@ install-commands: case "$MORPH_ARCH" in armv7b|armv7l|armv7lhf) ARCH="arm" ;; - armv8l64|armv8b64) - ARCH="arm64" ;; x86_32) ARCH="i386" ;; x86_64) diff --git a/strata/build-essential/m4-tarball.morph b/strata/build-essential/m4-tarball.morph index eb16726a..e460a9dc 100644 --- a/strata/build-essential/m4-tarball.morph +++ b/strata/build-essential/m4-tarball.morph @@ -2,4 +2,4 @@ name: m4-tarball kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --disable-gcc-warnings +- ./configure --prefix="$PREFIX" diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph index b296408f..50e1aaa5 100644 --- a/strata/build-essential/stage2-linux-api-headers.morph +++ b/strata/build-essential/stage2-linux-api-headers.morph @@ -5,8 +5,6 @@ install-commands: case "$MORPH_ARCH" in armv7b|armv7l|armv7lhf) ARCH="arm" ;; - armv8l64|armv8b64) - ARCH="arm64" ;; x86_32) ARCH="i386" ;; x86_64) diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index 14786dde..399df685 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -11,6 +11,11 @@ chunks: ref: 935a78736e4eb43b9fafae87f5e9902328673f63 unpetrify-ref: baserock/morph build-depends: [] +- name: python-requests + repo: upstream:python-requests + ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b + unpetrify-ref: baserock/morph + build-depends: [] - name: python-prettytable morph: strata/cloudinit-support/python-prettytable.morph repo: upstream:python-prettytable @@ -46,6 +51,7 @@ chunks: build-depends: - boto - configobj + - python-requests - python-prettytable - python-json-pointer - python-cheetah diff --git a/strata/core.morph b/strata/core.morph index 0184de51..7bd45767 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -18,9 +18,9 @@ chunks: build-depends: [] - name: gdbm morph: strata/core/gdbm.morph - repo: upstream:gdbm-tarball - ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 - unpetrify-ref: gdbm-1.11 + repo: upstream:gdbm + ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c + unpetrify-ref: baserock/build-essential build-depends: [] - name: gettext-tarball morph: strata/core/gettext-tarball.morph @@ -37,8 +37,8 @@ chunks: - name: ncurses morph: strata/core/ncurses.morph repo: upstream:ncurses - ref: f67398afa6a76fbc902cc0cea963d5151fa2a953 - unpetrify-ref: ncurses-5.9-20150131 + ref: 0fe89dc66ec061b839bea3ab451207e2dee757b9 + unpetrify-ref: baserock/morph build-depends: [] - name: perl morph: strata/core/perl.morph @@ -50,11 +50,10 @@ chunks: - name: texinfo-tarball morph: strata/core/texinfo-tarball.morph repo: upstream:texinfo-tarball - ref: 6a55f074b1f67d02149c13931eb1df9f0e539b15 - unpetrify-ref: texinfo-5.2 + ref: 4843a7f5ff14ac802a56f1cdd49960b25c15702b + unpetrify-ref: baserock/morph build-depends: - ncurses - - perl - name: autoconf-tarball morph: strata/core/autoconf-tarball.morph repo: upstream:autoconf-tarball @@ -65,8 +64,8 @@ chunks: - name: automake morph: strata/core/automake.morph repo: upstream:automake - ref: db43dd473361d90d8b00362cfef5bac8e722000d - unpetrify-ref: v1.15 + ref: ba4b42faff673e3e5265416dff09e59affc688fb + unpetrify-ref: v1.14.1 build-depends: - autoconf-tarball - perl @@ -82,9 +81,7 @@ chunks: repo: upstream:flex ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf unpetrify-ref: baserock/build-essential - build-depends: - - automake - - gettext-tarball + build-depends: [] - name: openssl-new morph: strata/core/openssl-new.morph repo: upstream:openssl-new @@ -99,12 +96,10 @@ chunks: unpetrify-ref: baserock/morph build-depends: [] - name: readline - morph: strata/core/readline.morph repo: upstream:readline ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6 unpetrify-ref: baserock/genivi/baseline - build-depends: - - automake + build-depends: [] - name: cpython morph: strata/core/cpython.morph repo: upstream:cpython @@ -172,10 +167,12 @@ chunks: - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat - ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f - unpetrify-ref: R_2_1_0 + ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c + unpetrify-ref: baserock/morph build-depends: - - cmake + - autoconf-tarball + - automake + - libtool-tarball - name: XML-Parser repo: upstream:XML-Parser ref: e1a3ec157140a699e3020836475a0df622f70f1b @@ -187,8 +184,8 @@ chunks: - name: git morph: strata/core/git.morph repo: upstream:git - ref: 9874fca7122563e28d699a911404fc49d2a24f1c - unpetrify-ref: v2.3.0 + ref: 49c3e926349e964b311b46251bb2b97d3d669855 + unpetrify-ref: v2.1.3 build-depends: - autoconf-tarball - cpython @@ -255,14 +252,11 @@ chunks: - libtool-tarball - pkg-config - name: nano - morph: strata/core/nano.morph repo: upstream:nano-tarball ref: 8b74abeb02c01ddc768c465a826360cf33cec063 unpetrify-ref: baserock/morph build-depends: - ncurses - - automake - - gettext-tarball - name: bc repo: upstream:bc-tarball ref: 0956d119432ff6a2e85bae1fa336df799cad70b0 diff --git a/strata/core/flex.morph b/strata/core/flex.morph index 615bf79e..7ca8f538 100644 --- a/strata/core/flex.morph +++ b/strata/core/flex.morph @@ -1,7 +1,5 @@ name: flex kind: chunk -pre-configure-commands: -- autoreconf -ivf configure-commands: - ./configure --prefix="$PREFIX" build-commands: diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.morph index b36a67aa..1e0fe696 100644 --- a/strata/core/libexpat.morph +++ b/strata/core/libexpat.morph @@ -1,8 +1,9 @@ name: libexpat kind: chunk configure-commands: -- mkdir o && cd o && cmake -DCMAKE_INSTALL_PREFIX=/usr .. +- autoreconf -i +- ./configure --prefix="${PREFIX-/usr}" build-commands: -- cd o && make +- make install-commands: -- cd o && make DESTDIR="$DESTDIR" install +- make DESTDIR="$DESTDIR" install diff --git a/strata/core/nano.morph b/strata/core/nano.morph deleted file mode 100644 index 6a55dc2d..00000000 --- a/strata/core/nano.morph +++ /dev/null @@ -1,4 +0,0 @@ -name: nano -kind: chunk -pre-configure-commands: -- autoreconf -ivf diff --git a/strata/core/ncurses.morph b/strata/core/ncurses.morph index 42acb481..c75495bc 100644 --- a/strata/core/ncurses.morph +++ b/strata/core/ncurses.morph @@ -6,40 +6,4 @@ build-commands: - make install-commands: - make DESTDIR="$DESTDIR" install -post-install-commands: -- | - # lfs recommends some alterations for software that looks for - # libcurses instead of libncurses - # it's more convenient to have this in a separate file than the - # morph as less strings have to be escaped and comments are possible - - # some software expects to find libcurses in /lib - mkdir -p "$DESTDIR/lib" - mv "$DESTDIR"/"$PREFIX"/lib/libncursesw.so.5* "$DESTDIR"/lib - ln -sf ../../lib/libncursesw.so.5 "$DESTDIR"/"$PREFIX"/lib/libncursesw.so - - # some linker tricks for libraries that look for non-wide character - # versions of ncurses - for lib in ncurses form panel menu; do - # remove non-wide shared object - rm -f "$DESTDIR/${PREFIX}/lib/lib${lib}.so" - # use a linker script to find the wide character variant - echo "INPUT(-l${lib}w)" >"$DESTDIR/${PREFIX}/lib/lib${lib}.so" - # symlink the non-shared library - ln -sf "lib${lib}w.a" "$DESTDIR/${PREFIX}/lib/lib${lib}.a" - done - ln -sf libncurses++w.a "$DESTDIR/${PREFIX}/lib/libncurses++.a" - - # redirect software that looks for libcurses - rm -f "$DESTDIR/${PREFIX}/lib/libcursesw.so" - echo "INPUT(-lncursesw)" >"$DESTDIR/${PREFIX}/lib/libcursesw.so" - ln -sf libncurses.so "$DESTDIR/${PREFIX}/lib/libcurses.so" - ln -sf libncursesw.a "$DESTDIR/${PREFIX}/lib/libcursesw.a" - ln -sf libncurses.a "$DESTDIR/${PREFIX}/lib/libcurses.a" - - # install documentation - mkdir -p "$DESTDIR/${PREFIX}/share/doc/ncurses" - cp -R doc/* "$DESTDIR/${PREFIX}/share/doc/ncurses" - - # remove 'clear' and 'reset' executables, busybox provides them - rm -f "$DESTDIR/${PREFIX}/bin/clear" "$DESTDIR/${PREFIX}/bin/reset" +- sh ncurses-morph-postinstall.sh diff --git a/strata/core/readline.morph b/strata/core/readline.morph deleted file mode 100644 index 511e124c..00000000 --- a/strata/core/readline.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: readline -kind: chunk -build-system: autotools -pre-configure-commands: -- cp /usr/share/automake*/config.guess support -- cp /usr/share/automake*/config.sub support diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 2051cf50..9c5c38fe 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -13,17 +13,3 @@ chunks: ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 build-depends: [] -- name: sed - morph: strata/coreutils-common/sed.morph - repo: upstream:sed - ref: ed4b1d7c04f92b330b940d4f0d02cd51d2473ce9 - unpetrify-ref: baserock/morph - build-depends: - - coreutils -- name: diff - morph: strata/coreutils-common/diff.morph - repo: upstream:diffutils - ref: bd86eb1a1e87ab85a7c8dbb658fa829ce69c252e - unpetrify-ref: baserock/v3.3 - build-depends: - - coreutils diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph index 0b96577d..08808333 100644 --- a/strata/coreutils-common/coreutils.morph +++ b/strata/coreutils-common/coreutils.morph @@ -9,5 +9,3 @@ build-commands: - make WERROR_CFLAGS= install-commands: - make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install -- mkdir -p "$DESTDIR"/bin/ -- ln -sf ../usr/bin/dd "$DESTDIR"/bin/ diff --git a/strata/coreutils-common/diff.morph b/strata/coreutils-common/diff.morph deleted file mode 100644 index 3a05af2d..00000000 --- a/strata/coreutils-common/diff.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: diff -kind: chunk -build-system: autotools -configure-commands: -- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf -- ./bootstrap --skip-po -- ./configure --prefix="$PREFIX" diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph deleted file mode 100644 index 9ccfdb8b..00000000 --- a/strata/coreutils-common/sed.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: sed -kind: chunk -build-system: autotools -configure-commands: -- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf -- ./bootstrap --skip-po -- ./configure --prefix="$PREFIX" --disable-gcc-warnings -post-install-commands: -- mkdir -p "$DESTDIR"/bin/ -- ln -sf ../usr/bin/sed "$DESTDIR"/bin/ diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index be4f4db8..9687ac7e 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -3,18 +3,22 @@ kind: stratum description: The minimal development tools to build a baserock devel system build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph chunks: +- name: six + repo: upstream:six + ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa + unpetrify-ref: baserock/morph + build-depends: [] - name: groff morph: strata/cross-bootstrap/groff.morph - repo: upstream:groff-git - ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 - unpetrify-ref: 1.22.3 + repo: upstream:groff + ref: c7017a099f954bb6de60e79c876935b1bf438b9a + unpetrify-ref: baserock/morph build-depends: [] - name: openssh morph: strata/cross-bootstrap/openssh.morph - repo: upstream:openssh-git - ref: 782fe9e725243eeb5ad6ab9a1783b5d6bedfe0d7 + repo: upstream:openssh + ref: 233514106dcde5ac61a70f1043de563122e2f1c9 unpetrify-ref: baserock/morph build-depends: - groff @@ -66,10 +70,11 @@ chunks: repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: [] + build-depends: + - six - name: morph repo: baserock:baserock/morph - ref: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c + ref: 67afd098cd297b769b1341a460d160a2902ba4e4 unpetrify-ref: master build-depends: - cliapp @@ -79,6 +84,6 @@ chunks: - name: rsync morph: strata/cross-bootstrap/rsync.morph repo: upstream:rsync - ref: 7cb0de6326c915a72253fd103dae93308031ec3f - unpetrify-ref: v3.1.1 + ref: 9faf8e0ccff2755cd019ff64d8322226a214b013 + unpetrify-ref: baserock/morph build-depends: [] diff --git a/strata/cross-bootstrap/groff.morph b/strata/cross-bootstrap/groff.morph index 37ee63e9..fed35b7d 100644 --- a/strata/cross-bootstrap/groff.morph +++ b/strata/cross-bootstrap/groff.morph @@ -4,7 +4,6 @@ max-jobs: 1 configure-commands: - PAGE=A4 ./configure --prefix="$PREFIX" build-commands: -- touch doc/gnu.eps - make install-commands: - make DESTDIR="$DESTDIR" install diff --git a/strata/databases.morph b/strata/databases.morph index 4b06edf3..cb09c5a3 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -1,6 +1,6 @@ name: databases kind: stratum -description: some popular databases and some utils related to databases +description: some popular databases build-depends: - morph: strata/tools.morph - morph: strata/nfs.morph @@ -17,19 +17,7 @@ chunks: unpetrify-ref: baserock/3.0 build-depends: [] - name: memcached - morph: strata/databases/memcached.morph repo: upstream:memcached - ref: c5530027c8ea28674358327ab8212ebaf014c848 - unpetrify-ref: 1.4.22 - build-depends: [] -- name: psycopg2 - repo: upstream:python-packages/psycopg2 - ref: 00cafbe85bb82d85cbfe0f062a73c562433b5bc8 - unpetrify-ref: 2.5.4 - build-depends: - - postgresql -- name: python-memcached - repo: upstream:python-packages/python-memcached - ref: 156ee975ff6e5c69e1d6c58b09bedf03c182c5db + ref: d8b1047620a54443f6bdca7f0dc5ee3b4d99378e unpetrify-ref: master build-depends: [] diff --git a/strata/databases/memcached.morph b/strata/databases/memcached.morph deleted file mode 100644 index 28e01362..00000000 --- a/strata/databases/memcached.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: memcached -kind: chunk -build-system: autotools -configure-commands: -- perl version.pl -- touch README -- autoreconf -fvi -- ./configure --prefix="$PREFIX" diff --git a/strata/django.morph b/strata/django.morph deleted file mode 100644 index 7659593c..00000000 --- a/strata/django.morph +++ /dev/null @@ -1,35 +0,0 @@ -name: django -kind: stratum -description: Stratum with Django and its plugins and dependencies. -build-depends: -- morph: strata/foundation.morph -- morph: strata/python-core.morph -chunks: -- name: django - repo: upstream:python-packages/django - ref: 811508b0512d3fa6b2328f8647fbf9eace68eceb - unpetrify-ref: 1.6.8 - build-depends: [] -- name: django-appconf - repo: upstream:python-packages/django-appconf - ref: 0c9835f95b44db1b3eb1a9409f95a3ecd63b8ff5 - unpetrify-ref: 0.6 - build-depends: [] -- name: django-compressor - repo: upstream:python-packages/django-compressor - ref: e747dce3d7e04fe595bbfed54f9554c2725eb757 - unpetrify-ref: 1.4 - build-depends: - - django-appconf -- name: pyscss - repo: upstream:python-packages/pyscss - ref: 85e8806e39e840c4402ee813c3e38fefaf9212b4 - unpetrify-ref: 1.2.1 - build-depends: [] -- name: django-pyscss - repo: upstream:python-packages/django-pyscss - ref: 665270b54eea5de5aca379a78673b411ed6b1f04 - unpetrify-ref: v1.0.6 - build-depends: - - django - - pyscss diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 25eafce2..541b4f7a 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -6,7 +6,7 @@ build-depends: - morph: strata/x-generic.morph - morph: strata/lua.morph - morph: strata/audio-bluetooth.morph -- morph: strata/multimedia-gstreamer.morph +- morph: strata/multimedia.morph - morph: strata/connman-common.morph chunks: - name: fribidi diff --git a/strata/erlang.morph b/strata/erlang.morph index e4b2f3e9..657b07be 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -10,18 +10,3 @@ chunks: ref: 9417f044ee3c291c2ea343c203aebdcc40597226 unpetrify-ref: OTP-17.3.4 build-depends: [] -- name: rebar - morph: strata/erlang/rebar.morph - repo: upstream:erlang-modules/rebar - ref: d42ed4683576d995f60e3222f076e99f0b081f79 - build-depends: - - erlang - unpretrify-ref: master -- name: erlang-sd_notify - morph: strata/erlang/erlang-sd_notify.morph - repo: upstream:erlang-modules/erlang-sd_notify - ref: 99f4689c2c18570680329f822591f95f9341ca10 - build-depends: - - erlang - - rebar - unpretrify-ref: master diff --git a/strata/erlang/erlang-sd_notify.morph b/strata/erlang/erlang-sd_notify.morph deleted file mode 100644 index dd3f66ca..00000000 --- a/strata/erlang/erlang-sd_notify.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: erlang-sd_notify -kind: chunk -build-commands: -- LDFLAGS=-lsystemd REBAR_FLAGS="--verbose 2" make -install-commands: -- install -D -m 644 -p ebin/sd_notify.app "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/ebin/sd_notify.app -- install -D -m 644 -p ebin/sd_notify.beam "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/ebin/sd_notify.beam -- install -D -m 755 -p priv/sd_notify_drv.so "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/priv/sd_notify_drv.so diff --git a/strata/erlang/rebar.morph b/strata/erlang/rebar.morph deleted file mode 100644 index fa5fd64f..00000000 --- a/strata/erlang/rebar.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: rebar -kind: chunk -build-commands: -- ./bootstrap -install-commands: -- install -D -m 755 rebar "$DESTDIR$PREFIX"/bin/rebar diff --git a/strata/foundation.morph b/strata/foundation.morph index 533ac9ee..9738938b 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -12,9 +12,9 @@ chunks: build-depends: [] - name: groff morph: strata/foundation/groff.morph - repo: upstream:groff-git - ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 - unpetrify-ref: 1.22.3 + repo: upstream:groff + ref: c7017a099f954bb6de60e79c876935b1bf438b9a + unpetrify-ref: baserock/morph build-depends: [] - name: kmod morph: strata/foundation/kmod.morph @@ -22,12 +22,6 @@ chunks: ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 unpetrify-ref: v18 build-depends: [] -- name: time-zone-database - morph: strata/foundation/time-zone-database.morph - repo: upstream:tz - ref: a0782484f101ac55c916568bc1c490d7761fc904 - unpetrify-ref: 2015a - build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph repo: upstream:libcap2 @@ -73,24 +67,17 @@ chunks: ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 build-depends: - libgpg-error -- name: linux-pam - morph: strata/foundation/linux-pam.morph - repo: upstream:linux-pam - ref: b1521c97e73b10469f7b34c0571d51c647eca83c - unpetrify-ref: Linux-PAM-1.1.8 - build-depends: [] - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: df0082ede6d0ca4db6773747eaf1c36d97458744 - unpetrify-ref: baserock/v218-with-canonical-hostname-fix + ref: 941a643569dc6b53d0b334276d2a3cc0ed159e88 + unpetrify-ref: v217 build-depends: - dbus-pre - gobject-introspection - kmod - libcap2 - libgcrypt - - linux-pam - name: libusb repo: upstream:libusb ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9 @@ -106,38 +93,23 @@ chunks: - name: lzo morph: strata/foundation/lzo.morph repo: upstream:lzo - ref: 5cca83e4d1b0be5825a597ab24ffa6126dc0bc95 - unpetrify-ref: lzo-2.08 + ref: 2cdfe9375f1145603d002c12be950062ae54da21 + unpetrify-ref: baserock/morph build-depends: [] - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse - ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 - unpetrify-ref: baserock/morph - build-depends: [] -- name: acl - morph: strata/foundation/acl.morph - repo: upstream:acl - ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b - unpetrify-ref: v2.2.52 - build-depends: - - attr -- name: e2fsprogs - morph: strata/foundation/e2fsprogs.morph - repo: upstream:e2fsprogs - ref: 6a3741ad293031447b95b88431eafa77401a8987 - unpetrify-ref: v1.42.12 + ref: 4163109fd5bfe67973262610dd95ae60888c92e9 + unpetrify-ref: fuse_2_9_bugfix build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs - ref: 563ff3b07d85517e3589a1f2e6f45a8265e3f071 - unpetrify-ref: v3.18.2 + ref: 304f215abb836811e6d78e0a3da53d48aa0e7ca7 + unpetrify-ref: baserock/morph build-depends: - attr - - acl - lzo - - e2fsprogs - name: dbus morph: strata/foundation/dbus.morph repo: upstream:dbus @@ -153,8 +125,8 @@ chunks: build-depends: [] - name: openssh morph: strata/foundation/openssh.morph - repo: upstream:openssh-git - ref: 782fe9e725243eeb5ad6ab9a1783b5d6bedfe0d7 + repo: upstream:openssh + ref: 233514106dcde5ac61a70f1043de563122e2f1c9 unpetrify-ref: baserock/morph build-depends: - groff diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph deleted file mode 100644 index 4489f5d5..00000000 --- a/strata/foundation/acl.morph +++ /dev/null @@ -1,4 +0,0 @@ -name: acl -kind: chunk -install-commands: -- make DESTDIR="$DESTDIR" install-dev diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph index d5cb83f0..356c3f06 100644 --- a/strata/foundation/btrfs-progs.morph +++ b/strata/foundation/btrfs-progs.morph @@ -1,6 +1,6 @@ name: btrfs-progs kind: chunk build-commands: -- make DISABLE_DOCUMENTATION=1 +- make install-commands: -- make DESTDIR="$DESTDIR" prefix="$PREFIX" DISABLE_DOCUMENTATION=1 install +- make DESTDIR="$DESTDIR" prefix="$PREFIX" install diff --git a/strata/foundation/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph deleted file mode 100644 index 34aa81d0..00000000 --- a/strata/foundation/e2fsprogs.morph +++ /dev/null @@ -1,14 +0,0 @@ -name: e2fsprogs -kind: chunk -build-system: autotools -configure-commands: -- | - ./configure --prefix="$PREFIX" --sysconfdir=/etc \ - --disable-libuuid --disable-uuidd --disable-fsck --disable-libblkid -install-commands: -- | - td="$(mktemp -d)" - make DESTDIR="$td" install-libs - find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete - find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete - mv "$td"/* "$DESTDIR" diff --git a/strata/foundation/groff.morph b/strata/foundation/groff.morph index 37ee63e9..fed35b7d 100644 --- a/strata/foundation/groff.morph +++ b/strata/foundation/groff.morph @@ -4,7 +4,6 @@ max-jobs: 1 configure-commands: - PAGE=A4 ./configure --prefix="$PREFIX" build-commands: -- touch doc/gnu.eps - make install-commands: - make DESTDIR="$DESTDIR" install diff --git a/strata/foundation/linux-pam.morph b/strata/foundation/linux-pam.morph deleted file mode 100644 index add96332..00000000 --- a/strata/foundation/linux-pam.morph +++ /dev/null @@ -1,14 +0,0 @@ -name: linux-pam -kind: chunk -build-system: autotools -pre-configure-commands: -- autoreconf -ivf -post-install-commands: -- | - install -D -m 0644 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/pam.d/other - #%PAM-1.0 - auth required pam_unix.so - account required pam_unix.so - password required pam_unix.so - session required pam_unix.so - EOF diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph deleted file mode 100644 index 42f6eabd..00000000 --- a/strata/foundation/time-zone-database.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: time-zone-database -kind: chunk -description: | - Time zone database. -install-commands: -- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR" - install diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index baa935f5..9fc05b7c 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -5,7 +5,6 @@ build-depends: - morph: strata/x-common.morph chunks: - name: pixman - morph: strata/graphics-common/pixman.morph repo: upstream:pixman ref: 87eea99e443b389c978cf37efc52788bf03a0ee0 unpetrify-ref: pixman-0.32.6 diff --git a/strata/graphics-common/pixman.morph b/strata/graphics-common/pixman.morph deleted file mode 100644 index d09b3df3..00000000 --- a/strata/graphics-common/pixman.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: pixman -kind: chunk -build-system: autotools -configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-arm-iwmmxt --disable-arm-iwmmxt2 diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index f1141fcd..799ba87a 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -14,8 +14,8 @@ chunks: - name: shared-mime-info morph: strata/gtk-deps/shared-mime-info.morph repo: upstream:shared-mime-info - ref: c136fc2578aa8f7c0e098008da18d324033eb991 - unpetrify-ref: Release-1-4 + ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71 + unpetrify-ref: baserock/morph build-depends: [] - name: gnome-common repo: upstream:gnome-common @@ -30,19 +30,19 @@ chunks: build-depends: [] - name: atk repo: upstream:atk - ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253 - unpetrify-ref: ATK_2_15_4 + ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4 + unpetrify-ref: ATK_2_12_0 build-depends: - gnome-common - name: at-spi2-core repo: upstream:at-spi2-core - ref: 96c2842088008670e72739ea7921d654487a57fb - unpetrify-ref: AT_SPI2_CORE_2_14_1 + ref: c354b5e8d8157e1018eafeca48642116a65c4ff5 + unpetrify-ref: AT_SPI2_CORE_2_12_0 build-depends: [] - name: at-spi2-atk repo: upstream:at-spi2-atk - ref: 2c220ff6565c4f02428a0c80267616a677e81ac9 - unpetrify-ref: AT_SPI2_ATK_2_14_1 + ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6 + unpetrify-ref: AT_SPI2_ATK_2_12_1 build-depends: - at-spi2-core - atk diff --git a/strata/gtk3.morph b/strata/gtk3.morph index 851cb3dd..f471bf6e 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -13,7 +13,7 @@ chunks: - name: gtk3 morph: strata/gtk3/gtk3.morph repo: upstream:gtk+ - ref: 9e96461aa59cdb5454a48200b8b80caaf04c4147 - unpetrify-ref: 3.15.5 + ref: 911f3fb6d29f1570a2d30db6f2085d0202e7ad2a + unpetrify-ref: 3.15.0 build-depends: - libepoxy diff --git a/strata/input-common.morph b/strata/input-common.morph index dab05826..533eff22 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -22,8 +22,8 @@ chunks: build-depends: [] - name: libinput repo: upstream:libinput - ref: ca4e03fb11429b6a3704206124fbff2f57d121f9 - unpetrify-ref: 0.10.0 + ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f + unpetrify-ref: 0.7.0 build-depends: - mtdev - libevdev diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index d8c56f59..91ec8323 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -5,13 +5,13 @@ build-depends: chunks: - name: xorg-lib-libpciaccess repo: upstream:xorg-lib-libpciaccess - ref: f99c2e4199ce37f6f94428df504427f67c3ec543 - unpetrify-ref: libpciaccess-0.13.3 + ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f + unpetrify-ref: baserock/morph build-depends: [] - name: drm morph: strata/libdrm-common/drm.morph repo: upstream:drm - ref: d2e0f552467ca11162fe04dfed55de4590280f23 - unpetrify-ref: libdrm-2.4.59 + ref: 83b2c40922ce451f5844aae0707ae9783a78d74f + unpetrify-ref: baserock/drm_2.4.58/jetson build-depends: - xorg-lib-libpciaccess diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph index c0992cd9..c316cb5c 100644 --- a/strata/libdrm-common/drm.morph +++ b/strata/libdrm-common/drm.morph @@ -4,3 +4,7 @@ build-system: autotools configure-commands: - NOCONFIGURE=1 ./autogen.sh - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api +install-commands: +- make install DESTDIR="$DESTDIR" +- mkdir -p "$DESTDIR"/usr/lib/pkgconfig +- /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig diff --git a/strata/lorry.morph b/strata/lorry.morph index 38356bb1..470a0cca 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -35,19 +35,18 @@ chunks: ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98 unpetrify-ref: baserock/morph build-depends: [] -- name: libapr - morph: strata/lorry/libapr.morph - repo: upstream:libapr - ref: 10835ec9a2d8bb9f7b867d15f29984d29744f028 - unpetrify-ref: 1.5.1 +- name: libapr-tarball + repo: upstream:libapr-tarball + ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db + unpetrify-ref: baserock/morph build-depends: [] -- name: libapr-util - morph: strata/lorry/libapr-util.morph - repo: upstream:libapr-util - ref: 718a507e2e33d87ab15ff80cfe80aea8ae6c7163 - unpetrify-ref: 1.5.4 +- name: libapr-util-tarball + morph: strata/lorry/libapr-util-tarball.morph + repo: upstream:libapr-util-tarball + ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b + unpetrify-ref: baserock/morph build-depends: - - libapr + - libapr-tarball - name: perl-dbi-tarball morph: strata/lorry/perl-dbi-tarball.morph repo: upstream:perl-dbi-tarball @@ -61,13 +60,12 @@ chunks: build-depends: - perl-dbi-tarball - name: libserf-tarball - morph: strata/lorry/libserf.morph repo: upstream:libserf-tarball ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c unpetrify-ref: baserock/morph build-depends: - - libapr - - libapr-util + - libapr-tarball + - libapr-util-tarball - name: swig-tarball morph: strata/lorry/swig-tarball.morph repo: upstream:swig-tarball @@ -83,12 +81,12 @@ chunks: - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball - ref: 2d02ea6f31311bf1b72f28c48d784b8d851ff2e0 + ref: 351e074672d9aa6446d5829938b697a3d6b23266 unpetrify-ref: baserock/morph build-depends: - swig-tarball - - libapr - - libapr-util + - libapr-tarball + - libapr-util-tarball - libserf-tarball - neon - name: mercurial-tarball diff --git a/strata/lorry/cvs-tarball.morph b/strata/lorry/cvs-tarball.morph index 5f34bc57..e8322017 100644 --- a/strata/lorry/cvs-tarball.morph +++ b/strata/lorry/cvs-tarball.morph @@ -1,9 +1,6 @@ name: cvs-tarball kind: chunk build-system: autotools -pre-configure-commands: -- cp /usr/share/automake*/config.guess build-aux -- cp /usr/share/automake*/config.sub build-aux configure-commands: - YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi --without-krb4 --disable-dependency-tracking --disable-nls --disable-rpath diff --git a/strata/lorry/libapr-util-tarball.morph b/strata/lorry/libapr-util-tarball.morph new file mode 100644 index 00000000..e34e3610 --- /dev/null +++ b/strata/lorry/libapr-util-tarball.morph @@ -0,0 +1,5 @@ +name: libapr-util-tarball +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config diff --git a/strata/lorry/libapr-util.morph b/strata/lorry/libapr-util.morph deleted file mode 100644 index 26db03ba..00000000 --- a/strata/lorry/libapr-util.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: libapr-util -kind: chunk -build-system: autotools -pre-configure-commands: -- ./buildconf --with-apr=/usr/share/apr-1 -configure-commands: -- ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config diff --git a/strata/lorry/libapr.morph b/strata/lorry/libapr.morph deleted file mode 100644 index 57d35b84..00000000 --- a/strata/lorry/libapr.morph +++ /dev/null @@ -1,21 +0,0 @@ -name: libapr -kind: chunk -build-system: autotools -pre-configure-commands: -- ./buildconf -configure-commands: -- | - ./configure \ - --prefix "$PREFIX" \ - --disable-static \ - --with-installbuilddir=/usr/share/apr-1/build -post-install-commands: -- | - # Install files required for apr-util - for file in find_apr.m4 apr_common.m4 install.sh gen-build.py \ - get-version.sh config.guess config.sub - do - cp build/$file "$DESTDIR/$PREFIX"/share/apr-1/build/"$file" - done - # Create a symlink in the build directory to the include directory - ln -sf /usr/include/apr-1 "$DESTDIR/$PREFIX"/share/apr-1/build/ diff --git a/strata/lorry/libserf.morph b/strata/lorry/libserf.morph deleted file mode 100644 index d4bb415d..00000000 --- a/strata/lorry/libserf.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: libserf -kind: chunk -build-system: autotools -pre-configure-commands: -- cp /usr/share/automake*/config.guess build -- cp /usr/share/automake*/config.sub build diff --git a/strata/lorry/subversion-tarball.morph b/strata/lorry/subversion-tarball.morph index 8fd1bc08..cb416d53 100644 --- a/strata/lorry/subversion-tarball.morph +++ b/strata/lorry/subversion-tarball.morph @@ -1,8 +1,6 @@ name: subversion-tarball kind: chunk build-system: autotools -pre-configure-commands: -- LIBTOOL_CONFIG=/usr/share/libtool/build-aux/ ./autogen.sh configure-commands: - python gen-make.py build.conf - ./configure --prefix="$PREFIX" --without-berkeley-db diff --git a/strata/lorry/swig-tarball.morph b/strata/lorry/swig-tarball.morph index 7d16d85b..61f154a4 100644 --- a/strata/lorry/swig-tarball.morph +++ b/strata/lorry/swig-tarball.morph @@ -1,7 +1,5 @@ name: swig-tarball kind: chunk build-system: autotools -pre-configure-commands: -- ./autogen.sh configure-commands: - ./configure --prefix="$PREFIX" --disable-ccache diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index aecf2a1d..95d9807c 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,7 +2,6 @@ name: morph-utils kind: stratum build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph chunks: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph @@ -21,12 +20,18 @@ chunks: ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph build-depends: [] +- name: six + repo: upstream:six + ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa + unpetrify-ref: baserock/morph + build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: [] + build-depends: + - six - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy @@ -64,14 +69,9 @@ chunks: ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph build-depends: [] -- name: pylru - repo: upstream:python-packages/pylru - ref: 221dd259f5c34562c835611d1cf62384b9019da4 - unpetrify-ref: master - build-depends: [] - name: morph repo: baserock:baserock/morph - ref: 74f60a7ed286dd88e24539d46b9a86147a8e78b5 + ref: f0c5d4c0ef35cc43aa059cd2255e41c60c4cac77 unpetrify-ref: master build-depends: - cliapp @@ -80,4 +80,3 @@ chunks: - pyfilesystem - bottle - flup - - pylru diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph deleted file mode 100644 index f10dd2b3..00000000 --- a/strata/multimedia-common.morph +++ /dev/null @@ -1,17 +0,0 @@ -name: multimedia-common -kind: stratum -description: Mutimedia Libraries -build-depends: -- morph: strata/core.morph -chunks: -- name: ogg - repo: upstream:ogg - ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f - unpetrify-ref: master - build-depends: [] -- name: libvorbis - repo: upstream:libvorbis - ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8 - unpetrify-ref: libvorbis-1.3.3 - build-depends: - - ogg diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index e87c4050..50917372 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -5,7 +5,6 @@ build-depends: - morph: strata/core.morph - morph: strata/foundation.morph - morph: strata/audio-bluetooth.morph -- morph: strata/multimedia-common.morph chunks: - name: orc repo: upstream:orc diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph deleted file mode 100644 index cee7df71..00000000 --- a/strata/multimedia-gstreamer.morph +++ /dev/null @@ -1,41 +0,0 @@ -name: multimedia-gstreamer -kind: stratum -description: GStreamer multimedia components -build-depends: -- morph: strata/audio-bluetooth.morph -- morph: strata/multimedia-common.morph -- morph: strata/mesa-common.morph -chunks: -- name: orc - repo: upstream:orc - ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9 - unpetrify-ref: orc-0.4.22 - build-depends: [] -- name: gstreamer - repo: upstream:gstreamer - ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558 - unpetrify-ref: baserock/1.4 - build-depends: - - orc -- name: gstreamer-plugins-base - repo: upstream:gstreamer-plugins-base - ref: 3b38ad94a2d58c07c24e4647e08afa1fe4dd7d46 - unpetrify-ref: baserock/1.4 - build-depends: - - gstreamer -- name: gstreamer-plugins-good - repo: upstream:gstreamer-plugins-good - ref: 9d48c2f7a7b63fd967de7eec72434bc876c02667 - unpetrify-ref: baserock/1.4 - build-depends: - - gstreamer - - gstreamer-plugins-base - - orc -- name: gstreamer-plugins-bad - repo: upstream:gstreamer-plugins-bad - ref: bb2a4669ff57af90c8101c54744d3228aa060475 - unpetrify-ref: baserock/1.4 - build-depends: - - gstreamer - - gstreamer-plugins-base - - orc diff --git a/strata/multimedia.morph b/strata/multimedia.morph new file mode 100644 index 00000000..6acab0f7 --- /dev/null +++ b/strata/multimedia.morph @@ -0,0 +1,39 @@ +name: multimedia +kind: stratum +description: Codecs +build-depends: +- morph: strata/audio-bluetooth.morph +chunks: +- name: orc + repo: upstream:orc + ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9 + unpetrify-ref: orc-0.4.22 + build-depends: [] +- name: gstreamer + repo: upstream:gstreamer + ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558 + unpetrify-ref: baserock/1.4 + build-depends: + - orc +- name: gstreamer-plugins-base + repo: upstream:gstreamer-plugins-base + ref: 3b38ad94a2d58c07c24e4647e08afa1fe4dd7d46 + unpetrify-ref: baserock/1.4 + build-depends: + - gstreamer +- name: gstreamer-plugins-good + repo: upstream:gstreamer-plugins-good + ref: 9d48c2f7a7b63fd967de7eec72434bc876c02667 + unpetrify-ref: baserock/1.4 + build-depends: + - gstreamer + - gstreamer-plugins-base + - orc +- name: gstreamer-plugins-bad + repo: upstream:gstreamer-plugins-bad + ref: bb2a4669ff57af90c8101c54744d3228aa060475 + unpetrify-ref: baserock/1.4 + build-depends: + - gstreamer + - gstreamer-plugins-base + - orc diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph deleted file mode 100644 index 90a67c9c..00000000 --- a/strata/networking-utils.morph +++ /dev/null @@ -1,29 +0,0 @@ -name: networking-utils -kind: stratum -description: | - Stratum which contains utils to works with networks: create, enable, filter... - - This stratum requires kernel config flags which are not enabled in the default - Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get - an idea of what is needed. -build-depends: -- morph: strata/foundation.morph -chunks: -- name: iproute2 - morph: strata/networking-utils/iproute2.morph - repo: upstream:iproute2 - ref: 50231ad2a554fcb02462bed6405c970833c1baee - unpetrify-ref: v3.17.0 - build-depends: [] -- name: libmnl - repo: upstream:libmnl - ref: c9f19b98cd8e108617e825e071091df14f78c53a - unpetrify-ref: master - build-depends: [] -- name: ipset - morph: strata/networking-utils/ipset.morph - repo: upstream:ipset - ref: cf25c4c50e9996af30499e5b1c3354ab53be7237 - unpetrify-ref: v6.24 - build-depends: - - libmnl diff --git a/strata/networking-utils/iproute2.morph b/strata/networking-utils/iproute2.morph deleted file mode 100644 index a1a4d37e..00000000 --- a/strata/networking-utils/iproute2.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: iproute2 -kind: chunk -build-commands: -- sed -i '/^TARGETS/s@arpd@@g' misc/Makefile -- make -install-commands: -- DESTDIR="$DESTDIR" PREFIX="$PREFIX" make install diff --git a/strata/networking-utils/ipset.morph b/strata/networking-utils/ipset.morph deleted file mode 100644 index 7fe8c6dc..00000000 --- a/strata/networking-utils/ipset.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: ipset -kind: chunk -build-system: autotools -configure-commands: -- ./autogen.sh -- ./configure --prefix="$PREFIX" --enable-static=no --with-kmod=no diff --git a/strata/nfs.morph b/strata/nfs.morph index 3dbead9d..68988d54 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -6,8 +6,8 @@ build-depends: chunks: - name: libevent repo: upstream:libevent - ref: 0b49ae34594533daa82c06a506078de9e336a013 - unpetrify-ref: release-2.1.5-beta + ref: 9364dff5c20e9e8c18f7f20ee1c92463e9e9c8a7 + unpetrify-ref: baserock/release-2.0.21-stable build-depends: [] - name: ti-rpc morph: strata/nfs/ti-rpc.morph diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 1b348630..616a8762 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -2,7 +2,6 @@ name: openstack-clients kind: stratum description: A stratum with OpenStack clients, for OpenStack deployments. build-depends: -- morph: strata/python-core.morph - morph: strata/tools.morph chunks: - name: jsonschema @@ -34,6 +33,11 @@ chunks: ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1 unpetrify-ref: baserock/morph build-depends: [] +- name: pbr + repo: upstream:pbr + ref: 510ee9e9dcb94c5884c215fa3535a1f77f3d2a51 + unpetrify-ref: baserock/morph + build-depends: [] - name: argparse repo: upstream:argparse ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1 @@ -49,6 +53,11 @@ chunks: ref: ac5470ec9e68332ebc499c4f9f21e7e3cb31ecb6 unpetrify-ref: baserock/morph build-depends: [] +- name: python-requests + repo: upstream:python-requests + ref: b891877ee6d76b0a3f8cbf2e7cd34cc4cbc40b6b + unpetrify-ref: baserock/morph + build-depends: [] - name: simplejson repo: upstream:simplejson ref: 35816bfe2d0ddeb5ddcc68239683cbb35b7e3ff2 @@ -76,8 +85,10 @@ chunks: ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b unpetrify-ref: baserock/morph build-depends: + - pbr - pyiso8601 - python-prettytable + - python-requests - simplejson - netaddr - babel @@ -87,6 +98,7 @@ chunks: unpetrify-ref: baserock/morph build-depends: - python-prettytable + - pbr - argparse - pyopenssl - python-keystoneclient @@ -97,7 +109,9 @@ chunks: unpetrify-ref: baserock/morph build-depends: - python-prettytable + - pbr - argparse - pyiso8601 + - python-requests - simplejson - babel diff --git a/strata/python-core.morph b/strata/python-core.morph deleted file mode 100644 index 409d6f17..00000000 --- a/strata/python-core.morph +++ /dev/null @@ -1,27 +0,0 @@ -name: python-core -kind: stratum -description: Core python packages -build-depends: -- morph: strata/core.morph -chunks: -- name: pip - repo: upstream:pip - ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 - unpetrify-ref: baserock/master - build-depends: [] -- name: pbr - repo: upstream:pbr - ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 - unpetrify-ref: 0.10.7 - build-depends: - - pip -- name: python-requests - repo: upstream:python-requests - ref: b83131779c701720a9ae9efae78996277d416269 - unpetrify-ref: v2.5.1 - build-depends: [] -- name: six - repo: upstream:six - ref: 8cfbff6b764af86d825086fa1637aa009e90d75a - unpetrify-ref: 1.9.0 - build-depends: [] diff --git a/strata/python-tools.morph b/strata/python-tools.morph index 58678372..d5cd11f0 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -5,8 +5,8 @@ description: 'A stratum for non-essential python tools: useful python tools that build-depends: - morph: strata/core.morph chunks: -- name: virtualenv - repo: upstream:python-packages/virtualenv - ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c - unpetrify-ref: 12.0.5 +- name: pip + repo: upstream:pip + ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 + unpetrify-ref: baserock/master build-depends: [] diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index df36ccad..6482db62 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -6,7 +6,7 @@ build-depends: - morph: strata/multimedia-gstreamer-0.10.morph chunks: - name: qtmultimedia - morph: strata/qt5-tools/qtmultimedia-gstreamer.morph + morph: strata/qt5-tools/qtmultimedia.morph repo: upstream:qt5/qtmultimedia ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f unpetrify-ref: v5.3.2 diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index ab553f39..f9950139 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -2,7 +2,7 @@ name: qt5-tools-qtwebkit kind: stratum description: Qt5 WebKit Development Libraries and Tools build-depends: -- morph: strata/multimedia-gstreamer.morph +- morph: strata/multimedia.morph - morph: strata/qt5-tools.morph - morph: strata/ruby.morph chunks: diff --git a/strata/ruby/ruby-1.8.morph b/strata/ruby/ruby-1.8.morph index 4554e441..cee282c0 100644 --- a/strata/ruby/ruby-1.8.morph +++ b/strata/ruby/ruby-1.8.morph @@ -1,9 +1,9 @@ name: ruby-1.8 kind: chunk -build-system: autotools -pre-configure-commands: -- cp /usr/share/automake*/config.guess . -- cp /usr/share/automake*/config.sub . -- autoconf configure-commands: +- autoconf - ./configure --prefix=/usr --program-suffix=-1.8 +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install diff --git a/strata/ruby/ruby.morph b/strata/ruby/ruby.morph index f9f0ae7c..c5d4afe1 100644 --- a/strata/ruby/ruby.morph +++ b/strata/ruby/ruby.morph @@ -1,9 +1,9 @@ name: ruby kind: chunk -build-system: autotools -pre-configure-commands: -- cp /usr/share/automake*/config.guess tool -- cp /usr/share/automake*/config.sub tool -- autoconf configure-commands: +- autoconf - ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8 +build-commands: +- make +install-commands: +- make DESTDIR=$DESTDIR install diff --git a/strata/tools.morph b/strata/tools.morph index 9dcc2c7b..4d8c3f44 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -10,16 +10,22 @@ chunks: ref: c9691a9604fdf9d6711204999787d332b7141692 unpetrify-ref: baserock/morph build-depends: [] +- name: e2fsprogs + morph: strata/tools/e2fsprogs.morph + repo: upstream:e2fsprogs + ref: 6a3741ad293031447b95b88431eafa77401a8987 + unpetrify-ref: v1.42.12 + build-depends: [] - name: file repo: upstream:file - ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 - unpetrify-ref: file-5.22 + ref: 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7 + unpetrify-ref: baserock/morph build-depends: [] - name: gdb morph: strata/tools/gdb.morph - repo: upstream:binutils-gdb - ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 - unpetrify-ref: gdb-7.8-branch + repo: upstream:gdb + ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8 + unpetrify-ref: baserock/morph build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot @@ -35,13 +41,13 @@ chunks: - name: rsync morph: strata/tools/rsync.morph repo: upstream:rsync - ref: 7cb0de6326c915a72253fd103dae93308031ec3f - unpetrify-ref: v3.1.1 + ref: 9faf8e0ccff2755cd019ff64d8322226a214b013 + unpetrify-ref: baserock/morph build-depends: [] - name: strace repo: upstream:strace - ref: 6d8c0637e8dd0f65c667af33c612230552419db1 - unpetrify-ref: v4.8 + ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5 + unpetrify-ref: baserock/morph build-depends: [] - name: vala-bootstrap morph: strata/tools/vala-bootstrap.morph @@ -64,7 +70,7 @@ chunks: - name: kexec-tools morph: strata/tools/kexec-tools.morph repo: upstream:kexec-tools - ref: f4d1d2ad474e882df13418239aa3050673a844d7 + ref: 9359b61ca44980d33c0bee42b9bb2e36e72835dd unpetrify-ref: baserock/morph build-depends: [] - name: device-tree-compiler diff --git a/strata/tools/distcc.morph b/strata/tools/distcc.morph index 6c910f86..9f42b50e 100644 --- a/strata/tools/distcc.morph +++ b/strata/tools/distcc.morph @@ -1,9 +1,6 @@ name: distcc kind: chunk build-system: autotools -pre-configure-commands: -- NOCONFIGURE=1 ./autogen.sh -- cp /usr/share/automake*/config.guess . -- cp /usr/share/automake*/config.sub . configure-commands: +- NOCONFIGURE=1 ./autogen.sh - ./configure --prefix="$PREFIX" --disable-Werror diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph new file mode 100644 index 00000000..db1ea4cc --- /dev/null +++ b/strata/tools/e2fsprogs.morph @@ -0,0 +1,15 @@ +name: e2fsprogs +kind: chunk +build-system: autotools +configure-commands: +- | + ./configure --prefix="$PREFIX" --sysconfdir=/etc \ + --disable-libuuid --disable-uuidd --disable-fsck +install-commands: +- | + td="$(mktemp -d)" + make DESTDIR="$td" install + make DESTDIR="$td" install-libs + find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete + find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete + mv "$td"/* "$DESTDIR" diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph index 6f60da9e..8b82b9d9 100644 --- a/strata/tools/gdb.morph +++ b/strata/tools/gdb.morph @@ -2,5 +2,4 @@ name: gdb kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils - --disable-ld --disable-gold --disable-gprof +- ./configure --prefix="$PREFIX" --disable-werror diff --git a/strata/tools/vala-bootstrap.morph b/strata/tools/vala-bootstrap.morph index e55b1887..c09299f6 100644 --- a/strata/tools/vala-bootstrap.morph +++ b/strata/tools/vala-bootstrap.morph @@ -1,7 +1,5 @@ name: vala-bootstrap kind: chunk build-system: autotools -pre-configure-commands: -- autoreconf -ivf configure-commands: - ./configure --prefix="$PREFIX" diff --git a/strata/trove.morph b/strata/trove.morph index fcd34636..3b5ca528 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -2,7 +2,6 @@ name: trove kind: stratum description: Trove software build-depends: -- morph: strata/python-core.morph - morph: strata/tools.morph - morph: strata/morph-utils.morph - morph: strata/pcre-utils.morph @@ -73,13 +72,13 @@ chunks: - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup - ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 + ref: 98cf2ab9c80c8efd0df9086353972e7dc73f40b8 unpetrify-ref: master build-depends: [] - name: lorry-controller morph: strata/trove/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd + ref: 4b1fcab140d940470c342c6857cdc8682406f0b7 unpetrify-ref: master build-depends: [] - name: lua-scrypt diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 0707c347..7aa8f6af 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -1,13 +1,8 @@ name: virtualization kind: stratum -description: | - Virtualization for baserock - NOTE: this stratum requires kernel support, please see openstack bsp - kernel history to check which config are needed for openvswitch, libvirt, - or ebtables, for example. +description: virtualization for baserock build-depends: - morph: strata/connman-common.morph -- morph: strata/lvm.morph chunks: - name: yajl morph: strata/virtualization/yajl.morph @@ -30,8 +25,8 @@ chunks: - name: qemu morph: strata/virtualization/qemu.morph repo: upstream:qemu - ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d - unpetrify-ref: baserock/v2.2.0 + ref: f8d1fb61e65575011a67d7ba97b690feb5630c91 + unpetrify-ref: baserock/morph build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros @@ -44,24 +39,17 @@ chunks: unpetrify-ref: master build-depends: - xorg-util-macros -- name: dmidecode - morph: strata/virtualization/dmidecode.morph - repo: upstream:dmidecode - ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5 - unpetrify-ref: master - build-depends: [] - name: libvirt morph: strata/virtualization/libvirt.morph repo: upstream:libvirt - ref: 7b1ceec1e2f141d36ed9b7ef3a660ff8bb34fc53 - unpetrify-ref: baserock/v1.2.10 + ref: 13b7bb4acba9b70e015b7faa020b08018885aad8 + unpetrify-ref: baserock/morph build-depends: - libpciaccess - dnsmasq - qemu - xml-catalog - yajl - - dmidecode - name: pycurl repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e @@ -86,16 +74,16 @@ chunks: - cython - name: libvirt-python repo: upstream:libvirt-python - ref: 8e09c79a07b097a6ba9af83be4916fb9c9538500 - unpetrify-ref: v1.2.10 + ref: 4382fc518cbd11d9af5727fb403e175818c25db5 + unpetrify-ref: v1.2.2 build-depends: - libvirt - python-lxml - urlgrabber - name: gnome-common repo: upstream:gnome-common - ref: d213283fcb5228d05eb2c796579f18240e8467e8 - unpetrify-ref: 3.12.0 + ref: 766c35359ef924ceb2288c14c2d6239fcc0618f8 + unpetrify-ref: 3.7.4 build-depends: [] - name: pygobject morph: strata/virtualization/pygobject.morph @@ -126,15 +114,3 @@ chunks: build-depends: - libvirt-python - libosinfo -- name: ebtables - morph: strata/virtualization/ebtables.morph - repo: upstream:ebtables - ref: 09792f0107a9318da809908db31f0b826017de7b - unpetrify-ref: master - build-depends: [] -- name: openvswitch - morph: strata/virtualization/openvswitch.morph - repo: upstream:openvswitch - ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f - build-depends: [] - unpretrify-ref: master diff --git a/strata/virtualization/dmidecode.morph b/strata/virtualization/dmidecode.morph deleted file mode 100644 index d0092ed1..00000000 --- a/strata/virtualization/dmidecode.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: dmidecode -kind: chunk -build-commands: -- make -install-commands: -- make install DESTDIR="$DESTDIR" prefix="$PREFIX" diff --git a/strata/virtualization/dnsmasq.morph b/strata/virtualization/dnsmasq.morph index db9e90a6..4db0bf09 100644 --- a/strata/virtualization/dnsmasq.morph +++ b/strata/virtualization/dnsmasq.morph @@ -1,9 +1,6 @@ name: dnsmasq kind: chunk -build-commands: -- make -- make -C contrib/wrt +build-system: autotools +configure-commands: [] install-commands: - make install PREFIX="$PREFIX" DESTDIR="$DESTDIR" -- install -D -m 755 contrib/wrt/dhcp_release "$DESTDIR$PREFIX"/bin/dhcp_release -- install -D -m 755 contrib/wrt/dhcp_lease_time "$DESTDIR$PREFIX"/bin/dhcp_lease_time diff --git a/strata/virtualization/ebtables.morph b/strata/virtualization/ebtables.morph deleted file mode 100644 index 7915bdac..00000000 --- a/strata/virtualization/ebtables.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: ebtables -kind: chunk -build-commands: -- make -install-commands: -- make install DESTDIR="$DESTDIR" BINDIR="$DESDIR"/sbin diff --git a/strata/virtualization/libvirt.morph b/strata/virtualization/libvirt.morph index bdc99ddf..63b5d768 100644 --- a/strata/virtualization/libvirt.morph +++ b/strata/virtualization/libvirt.morph @@ -3,29 +3,4 @@ kind: chunk build-system: autotools configure-commands: - | - GNULIB_SRCDIR=.gnulib \ - ./autogen.sh \ - --without-apparmor --with-attr --without-audit --without-avahi --with-blkid \ - --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs \ - --without-hal --without-netcf --without-numactl --without-openwsman \ - --with-pciaccess --without-readline --without-sanlock --without-sasl \ - --without-selinux --without-ssh2 --with-systemd-daemon --with-udev \ - --with-yajl --without-xen --with-qemu --without-uml --without-openvz \ - --without-vmware --without-phyp --without-xenapi --without-libxl \ - --without-vbox --without-lxc --without-esx --without-hyperv \ - --without-parallels --with-test --with-remote --with-libvirtd \ - --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit \ - --without-firewalld --without-dtrace --without-numad --with-network \ - --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm \ - --without-storage-iscsi --without-storage-scsi --without-storage-mpath \ - --without-storage-disk --with-storage-rbd --without-storage-sheepdog \ - --without-storage-gluster --without-wireshark-dissector --disable-werror \ - --prefix="$PREFIX" -system-integration: - libvirt-misc: - 01-addgroup: - - groupadd libvirt - 02-setup_libvirtconf: - - sed -i 's/#unix_sock_group = "libvirt"/unix_sock_group = "libvirt"/' /etc/libvirt/libvirtd.conf - - sed -i 's/#unix_sock_rw_perms = "0770"/unix_sock_rw_perms = "0770"/' /etc/libvirt/libvirtd.conf - - sed -i 's/#unix_sock_ro_perms = "0777"/unix_sock_ro_perms = "0777"/' /etc/libvirt/libvirtd.conf + GNULIB_SRCDIR=gnulib-src ./autogen.sh --without-apparmor --with-attr --without-audit --without-avahi --with-blkid --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs --without-hal --without-netcf --without-numactl --without-openwsman --with-pciaccess --without-readline --without-sanlock --without-sasl --without-selinux --without-ssh2 --with-systemd-daemon --with-udev --with-yajl --without-xen --with-qemu --without-uml --without-openvz --without-vmware --without-phyp --without-xenapi --without-libxl --without-vbox --without-lxc --without-esx --without-hyperv --without-parallels --with-test --with-remote --with-libvirtd --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit --without-firewalld --without-dtrace --without-numad --with-network --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm --without-storage-iscsi --without-storage-scsi --without-storage-mpath --without-storage-disk --with-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-wireshark-dissector --with-python --prefix="$PREFIX" diff --git a/strata/virtualization/openvswitch.morph b/strata/virtualization/openvswitch.morph deleted file mode 100644 index 847c69ff..00000000 --- a/strata/virtualization/openvswitch.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: openvswitch -kind: chunk -pre-configure-commands: -- ./boot.sh -configure-commands: -- ./configure --enable-ssl -build-commands: -- make -install-commands: -- make install DESTDIR="$DESTDIR" prefix="$PREFIX" diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 58eefbbd..890489dc 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -13,7 +13,7 @@ chunks: - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland - ref: 8e9d5a108476b3435a8286613b9a63b69afd92b7 - unpetrify-ref: 1.7.0 + ref: 339e83aa579569711cd14623ca4b2db46256b766 + unpetrify-ref: 1.6.0 build-depends: - libxkbcommon diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 0184953e..1d5b015c 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -7,9 +7,15 @@ build-depends: - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: +- name: linux-pam + repo: upstream:linux-pam + ref: b1521c97e73b10469f7b34c0571d51c647eca83c + unpetrify-ref: Linux-PAM-1.1.8 + build-depends: [] - name: weston morph: strata/weston-common/weston.morph repo: upstream:weston - ref: 322383ed469d69401b502618718a97a4e85c97d8 - unpetrify-ref: baserock/weston-1.7.0/tegra - build-depends: [] + ref: 463b914d4f1efbf5de6d1f45e9037b88a1eb107f + unpetrify-ref: baserock/weston-1.6.0/tegra + build-depends: + - linux-pam diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index ce403b6b..d47d0ac4 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -7,12 +7,18 @@ build-depends: - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: +- name: linux-pam + repo: upstream:linux-pam + ref: b1521c97e73b10469f7b34c0571d51c647eca83c + unpetrify-ref: Linux-PAM-1.1.8 + build-depends: [] - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 unpetrify-ref: baserock/genivi/1.3.0 - build-depends: [] + build-depends: + - linux-pam - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 644d47c2..572932b4 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -50,25 +50,3 @@ chunks: unpetrify-ref: baserock/morph build-depends: - xorg-lib-libxkbfile -- name: xcb-util - repo: upstream:xcb-util - ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3 - unpetrify-ref: baserock/morph - build-depends: [] -- name: util-wm - repo: upstream:util-wm - ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3 - unpetrify-ref: baserock/morph - build-depends: [] -- name: util-keysyms - morph: strata/x-generic/util-keysyms.morph - repo: upstream:util-keysyms - ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab - unpetrify-ref: baserock/morph - build-depends: [] -- name: util-image - repo: upstream:util-image - ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816 - unpetrify-ref: baserock/morph - build-depends: - - xcb-util diff --git a/strata/xstatic.morph b/strata/xstatic.morph deleted file mode 100644 index 9b4170e7..00000000 --- a/strata/xstatic.morph +++ /dev/null @@ -1,108 +0,0 @@ -name: xstatic -kind: stratum -description: | - Stratum with Xstatic and some xstatic libraries. - - XStatic is a packaging standard to package external static files as - a python package, so they are easily usable on all OSes. - - This conflicts with the 'everything from Git' policy of Baserock, - but it is required right now for the Openstack system to work. -build-depends: -- morph: strata/foundation.morph -chunks: -- name: xstatic - repo: upstream:xstatic - ref: 6c8604a422ba7f176ce6b372a8e182c293d06fb2 - unpetrify-ref: 1.0.1 - build-depends: [] -- name: xstatic-angular - repo: upstream:xstatic-packages/xstatic-angular - ref: dac047df05da5bb20de4e78876bc03820d0c6671 - unpetrify-ref: 1.3.7.0 - build-depends: [] -- name: xstatic-angular-cookies - repo: upstream:xstatic-packages/xstatic-angular-cookies - ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5 - unpetrify-ref: 1.2.1.1 - build-depends: [] -- name: xstatic-angular-mock - repo: upstream:xstatic-packages/xstatic-angular-mock - ref: 20fdada109b167bcdcacec22986b43fdb42866f3 - unpetrify-ref: 1.2.1.1 - build-depends: [] -- name: xstatic-bootstrap-datepicker - repo: upstream:xstatic-packages/xstatic-bootstrap-datepicker - ref: 60caf41e32d49f9bc715c39570f01449ebfbd37a - unpetrify-ref: master - build-depends: [] -- name: xstatic-bootstrap-scss - repo: upstream:xstatic-packages/xstatic-bootstrap-scss - ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e - unpetrify-ref: master - build-depends: [] -- name: xstatic-d3 - repo: upstream:xstatic-packages/xstatic-d3 - ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf - unpetrify-ref: master - build-depends: [] -- name: xstatic-hogan - repo: upstream:xstatic-packages/xstatic-hogan - ref: 9e39977f6a6744810b08fa0323147e9f31dbd363 - unpetrify-ref: master - build-depends: [] -- name: xstatic-font-awesome - repo: upstream:xstatic-packages/xstatic-font-awesome - ref: c13aad1b95b1d84e73f2565a18a5a8e2bd2194a7 - unpetrify-ref: 4.2.0.0 - build-depends: [] -- name: xstatic-jasmine - repo: upstream:xstatic-packages/xstatic-jasmine - ref: a55f5db1dbe59b23c7d6284250bf4eac1d0143c3 - unpetrify-ref: 2.1.2.0 - build-depends: [] -- name: xstatic-jquery - repo: upstream:xstatic-packages/xstatic-jquery - ref: e91c5bf82535a62c1cfac61b5efb6b5c0157c1f5 - unpetrify-ref: master - build-depends: [] -- name: xstatic-jquery-migrate - repo: upstream:xstatic-packages/xstatic-jquery-migrate - ref: 989b3b31106727542dd83810c3b952f90d8cdb8f - unpetrify-ref: master - build-depends: [] -- name: xstatic-jquery-quicksearch - repo: upstream:xstatic-packages/xstatic-jquery-quicksearch - ref: f5221c8c30507340846d97d6db41a782e7c63316 - unpetrify-ref: master - build-depends: [] -- name: xstatic-jquery-tablesorter - repo: upstream:xstatic-packages/xstatic-jquery-tablesorter - ref: eb78328391f44a9a88033e1aede1a605902c5551 - unpetrify-ref: master - build-depends: [] -- name: xstatic-jquery-ui - repo: upstream:xstatic-packages/xstatic-jquery-ui - ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1 - unpetrify-ref: 1.11.0.1 - build-depends: [] -- name: xstatic-jsencrypt - repo: upstream:xstatic-packages/xstatic-jsencrypt - ref: 5c0f088310ecd602e3aaf5e683385b0d27258409 - unpetrify-ref: master - build-depends: [] -- name: xstatic-qunit - repo: upstream:xstatic-packages/xstatic-qunit - ref: c3189eaa77c68c149a40b8c0afc8722cf394bd1f - unpetrify-ref: master - build-depends: [] -- name: xstatic-rickshaw - repo: upstream:xstatic-packages/xstatic-rickshaw - ref: 6427ca5406852bc779d6918f487bb0fe3f063e77 - unpetrify-ref: master - build-depends: [] -- name: xstatic-spin - repo: upstream:xstatic-packages/xstatic-spin - ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f - unpetrify-ref: master - build-depends: [] diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph new file mode 100644 index 00000000..e983ba7a --- /dev/null +++ b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph @@ -0,0 +1,18 @@ +name: armv7lhf-cross-toolchain-system-x86_32-generic +kind: system +description: A system that contains an ARM cross compiler, intended to be used as + a sysroot. +arch: x86_32 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: armv7lhf-cross-toolchain + morph: strata/armv7lhf-cross-toolchain.morph +- name: cross-tools + morph: strata/cross-tools.morph +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph new file mode 100644 index 00000000..1a8c20bb --- /dev/null +++ b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph @@ -0,0 +1,18 @@ +name: armv7lhf-cross-toolchain-system-x86_64-generic +kind: system +description: A system that contains an ARM cross compiler, intended to be used as + a sysroot. +arch: x86_64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: armv7lhf-cross-toolchain + morph: strata/armv7lhf-cross-toolchain.morph +- name: cross-tools + morph: strata/cross-tools.morph +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index c1f7f155..bd51f8d8 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-armv7-highbank morph: strata/bsp-armv7-highbank.morph - name: tools diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index c1179a36..4c474959 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-jetson morph: strata/bsp-jetson.morph - name: tools diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph deleted file mode 100644 index 15b0a52c..00000000 --- a/systems/build-system-armv8l64.morph +++ /dev/null @@ -1,39 +0,0 @@ -name: build-system-armv8l64 -kind: system -description: -- | - The system that should be used for building all other Baserock systems - for little endian 64-bit ARMv8 computers. -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8l64-generic - morph: strata/bsp-armv8l64-generic.morph -- name: tools - morph: strata/tools.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -configuration-extensions: -- set-hostname -- add-config-files -- nfsboot -- install-files -- distbuild -- fstab -- mason -- cloud-init diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 04bc34bf..174cd8ce 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-ppc64-generic morph: strata/bsp-ppc64-generic.morph - name: tools diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index a118705d..8636d510 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils @@ -26,8 +24,6 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 6f5af401..78d5b7ad 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-x86_32-generic morph: strata/bsp-x86_32-generic.morph - name: tools @@ -28,8 +26,6 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index e1b37185..1c8efb33 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils @@ -26,8 +24,6 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 18fbebc1..969ee125 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -10,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools @@ -28,8 +26,6 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index b03d1653..509bd383 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -36,8 +36,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph +- name: python-tools + morph: strata/python-tools.morph - name: chef morph: strata/chef.morph configuration-extensions: diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph deleted file mode 100644 index 30094e74..00000000 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ /dev/null @@ -1,11 +0,0 @@ -name: cross-bootstrap-system-armv8l64-generic -kind: system -description: A system that produces the minimum needed to build a devel system -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: cross-bootstrap - morph: strata/cross-bootstrap.morph diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index de474c87..305f7a22 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -27,8 +27,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 2cce69d3..427dbb3f 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -30,8 +30,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 38806421..1529522c 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -30,8 +30,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index c47be836..0f6aef58 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -30,8 +30,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 64d75350..2b43bf65 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -21,8 +21,6 @@ strata: morph: strata/openstack-clients.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 3a84d178..2e342fc3 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -24,8 +24,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 2e4b83bd..c50468a9 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -27,8 +27,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 17f8bcbb..4bae3ac8 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -31,8 +31,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index c09caf96..e542f067 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -31,8 +31,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index ffa9edd4..cda52c36 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -31,8 +31,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph deleted file mode 100644 index 27080535..00000000 --- a/systems/devel-system-armv8l64.morph +++ /dev/null @@ -1,43 +0,0 @@ -name: devel-system-armv8l64 -kind: system -description: | - A system with useful tools for doing Baserock development. - - For use on 64-bit ARMv8 computers using little-endian word. -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8l64-generic - morph: strata/bsp-armv8l64-generic.morph -- name: tools - morph: strata/tools.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python-tools - morph: strata/python-tools.morph -- name: devtools - morph: strata/devtools.morph -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- cloud-init diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 9e575d5d..c4918572 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -25,8 +25,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index d92da0fd..a53a6a56 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -28,8 +28,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 3578c221..83e55316 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -29,8 +29,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index b53d6d93..3ad441ca 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -32,8 +32,6 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index aa8d6a1c..569a00d8 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -29,8 +29,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index c071b3ea..95e27414 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -32,12 +32,12 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools morph: strata/devtools.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index c104b29b..7ffddc02 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -30,8 +30,6 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 50581561..5cbfddbe 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -19,10 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 16bed197..a5f07750 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -19,10 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index f4828688..f5fb571e 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -19,10 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 979b73b0..b4e20ec7 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -21,10 +21,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: tools diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index b8bfe41e..880d40dc 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -8,8 +8,6 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph - name: foundation morph: strata/foundation.morph - name: bsp-x86_64-generic diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 0a98f205..9a23bdeb 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -12,8 +12,6 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: multimedia-common - morph: strata/multimedia-common.morph - name: multimedia-gstreamer-0.10 morph: strata/multimedia-gstreamer-0.10.morph - name: bsp-x86_64-generic diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 0f768536..1a78ff4f 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -12,10 +12,8 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools diff --git a/systems/test.morph b/systems/test.morph deleted file mode 100644 index dee92b19..00000000 --- a/systems/test.morph +++ /dev/null @@ -1,47 +0,0 @@ -name: test-system -kind: system -description: | - A system with useful tools for doing Baserock development. - - For use on 64-bit Intel x86 computers. -arch: x86_64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: tools - morph: strata/tools.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: nodejs - morph: strata/nodejs.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: devtools - morph: strata/devtools.morph -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- cloud-init diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 580f53f7..0d633f41 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -11,8 +11,6 @@ strata: morph: strata/foundation.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index 722e85fd..27d56e78 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -20,10 +20,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common @@ -36,12 +34,6 @@ strata: morph: strata/mesa-common.morph - name: weston-common morph: strata/weston-common.morph -- name: x-common - morph: strata/x-common.morph -- name: x-generic - morph: strata/x-generic.morph -- name: tools - morph: strata/tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index dfa5c3df..b84eaeb5 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -19,10 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common @@ -39,8 +37,6 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: tools - morph: strata/tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 5aea4f7b..152bf16b 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -7,8 +7,6 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph - name: foundation morph: strata/foundation.morph - name: bsp-x86_64-generic @@ -23,10 +21,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph +- name: multimedia + morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph - name: gtk2 -- cgit v1.2.1