From 212d7e801320a0b73370cdc2c1fa3ed92d8c9106 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Thu, 26 Feb 2015 09:17:13 +0000 Subject: Morph build 620e4e6dd8e242abafdbaeea45ac464e 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 +- strata/bsp-x86_both-tools.morph | 4 +- strata/build-essential.morph | 31 ++--- 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 | 64 +++++----- strata/core/flex.morph | 2 + strata/core/libexpat.morph | 7 +- strata/core/nano.morph | 4 + strata/core/ncurses.morph | 38 +++++- strata/core/pyyaml.morph | 6 - 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 | 15 +++ strata/foundation/groff.morph | 1 + strata/foundation/linux-pam.morph | 14 +++ strata/foundation/systemd.morph | 1 - 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 | 9 +- 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 | 41 ++++++ strata/python-core/pyyaml.morph | 6 + strata/python-tools.morph | 8 +- strata/python3-core.morph | 12 ++ strata/python3-core/python3.morph | 7 ++ 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 | 138 +++++++++++++++++++++ ...lhf-cross-toolchain-system-x86_32-generic.morph | 18 --- .../armv7lhf-cross-toolchain-system-x86_32.morph | 18 +++ ...lhf-cross-toolchain-system-x86_64-generic.morph | 18 --- .../armv7lhf-cross-toolchain-system-x86_64.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 | 2 + 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/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 +- 152 files changed, 1494 insertions(+), 451 deletions(-) create mode 100644 strata/apache-httpd-server.morph create mode 100644 strata/apache-httpd-server/apr.morph create mode 100644 strata/apache-httpd-server/httpd-server.morph create mode 100644 strata/apache-httpd-server/mod_wsgi.morph delete mode 100644 strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph create mode 100644 strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph create mode 100644 strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph create mode 100644 strata/bsp-armv8l64-generic.morph create mode 100644 strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph create mode 100644 strata/core/nano.morph delete mode 100644 strata/core/pyyaml.morph create mode 100644 strata/core/readline.morph create mode 100644 strata/coreutils-common/diff.morph create mode 100644 strata/coreutils-common/sed.morph create mode 100644 strata/databases/memcached.morph create mode 100644 strata/django.morph create mode 100644 strata/erlang/erlang-sd_notify.morph create mode 100644 strata/erlang/rebar.morph create mode 100644 strata/foundation/acl.morph create mode 100644 strata/foundation/e2fsprogs.morph create mode 100644 strata/foundation/linux-pam.morph create mode 100644 strata/foundation/time-zone-database.morph create mode 100644 strata/graphics-common/pixman.morph delete mode 100644 strata/lorry/libapr-util-tarball.morph create mode 100644 strata/lorry/libapr-util.morph create mode 100644 strata/lorry/libapr.morph create mode 100644 strata/lorry/libserf.morph create mode 100644 strata/multimedia-common.morph create mode 100644 strata/multimedia-gstreamer.morph delete mode 100644 strata/multimedia.morph create mode 100644 strata/networking-utils.morph create mode 100644 strata/networking-utils/iproute2.morph create mode 100644 strata/networking-utils/ipset.morph create mode 100644 strata/python-core.morph create mode 100644 strata/python-core/pyyaml.morph create mode 100644 strata/python3-core.morph create mode 100644 strata/python3-core/python3.morph delete mode 100644 strata/tools/e2fsprogs.morph create mode 100644 strata/virtualization/dmidecode.morph create mode 100644 strata/virtualization/ebtables.morph create mode 100644 strata/virtualization/openvswitch.morph create mode 100644 strata/xstatic.morph delete mode 100644 systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph create mode 100644 systems/armv7lhf-cross-toolchain-system-x86_32.morph delete mode 100644 systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph create mode 100644 systems/armv7lhf-cross-toolchain-system-x86_64.morph create mode 100644 systems/build-system-armv8l64.morph create mode 100644 systems/cross-bootstrap-system-armv8l64-generic.morph create mode 100644 systems/devel-system-armv8l64.morph diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph index f71d093d..92e4a413 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_32-generic.morph +- morph: systems/armv7lhf-cross-toolchain-system-x86_64.morph deploy: sdk: type: sdk - location: armv7lhf-cross-toolchain-system-x86_32-generic.sh + location: armv7lhf-cross-toolchain-system-x86_64.sh PREFIX: /usr TARGET: armv7lhf-baserock-linux-gnueabi subsystems: diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph index 202f4bb7..d31aa172 100644 --- a/clusters/trove-example.morph +++ b/clusters/trove-example.morph @@ -8,7 +8,6 @@ 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 @@ -38,7 +37,6 @@ 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 3b07ea9d..8d3d2a63 100755 --- a/sdk.write +++ b/sdk.write @@ -148,7 +148,7 @@ if [ "$#" != 1 ]; then exit 1 fi -TOOLCHAIN_PATH="$1" +TOOLCHAIN_PATH="$(readlink -f \"$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 +111 \ + -type f -perm +u=x \ -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 new file mode 100644 index 00000000..1692c61c --- /dev/null +++ b/strata/apache-httpd-server.morph @@ -0,0 +1,40 @@ +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 new file mode 100644 index 00000000..0e626acc --- /dev/null +++ b/strata/apache-httpd-server/apr.morph @@ -0,0 +1,19 @@ +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 new file mode 100644 index 00000000..131d0475 --- /dev/null +++ b/strata/apache-httpd-server/httpd-server.morph @@ -0,0 +1,31 @@ +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 new file mode 100644 index 00000000..86004ad3 --- /dev/null +++ b/strata/apache-httpd-server/mod_wsgi.morph @@ -0,0 +1,18 @@ +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 c76ae537..376de021 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: 987eb543a034cddc4eeb103f08f566f24a5f964a + ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 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: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1 + ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 unpetrify-ref: baserock/build-essential build-depends: - armv7lhf-cross-binutils -- 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 +- name: armv7lhf-cross-glibc + morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph + repo: upstream:glibc + ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c + unpetrify-ref: baserock/glibc-2.20 build-depends: - armv7lhf-cross-binutils - armv7lhf-cross-gcc-nolibc @@ -35,8 +35,17 @@ chunks: - name: armv7lhf-cross-gcc morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph repo: upstream:gcc-tarball - ref: b0254026149b13782eae26d38435a4c62a002cf0 - unpetrify-ref: baserock/build-essential-4.7 + 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 build-depends: - armv7lhf-cross-binutils - - armv7lhf-cross-eglibc + - armv7lhf-cross-gcc + - armv7lhf-cross-glibc diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph deleted file mode 100644 index afbfa939..00000000 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph +++ /dev/null @@ -1,33 +0,0 @@ -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 9f993bc0..a5f2d9d9 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph @@ -6,30 +6,53 @@ configure-commands: export MORPH_ARCH=armv7lhf export TARGET=armv7lhf-baserock-linux-gnueabi export TARGET_STAGE1=armv7lhf-none-linux-gnueabi - 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 + + 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++ build-commands: -- cd o && make +- | + # 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 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 a5c6eac1..4ae3acdb 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph @@ -5,28 +5,33 @@ configure-commands: - | export MORPH_ARCH=armv7lhf export TARGET=armv7lhf-baserock-linux-gnueabi - 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 + + 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 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 new file mode 100644 index 00000000..94c8171c --- /dev/null +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph @@ -0,0 +1,39 @@ +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 new file mode 100644 index 00000000..b4b0e735 --- /dev/null +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph @@ -0,0 +1,24 @@ +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 44e08fdc..6fa4364a 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: 34862dbd43079d19faff31fa9ba996acc874d586 - unpetrify-ref: v5.99.3 + ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7 + unpetrify-ref: v6.0 build-depends: - libsndfile - libatomic_ops diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph index d5ff1264..bdf047cf 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: b2776bf7149bddd1f4161f14f79520f17fc1d71d - unpetrify-ref: v3.18 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: [] diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph index 63d79667..529b563c 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: b2776bf7149bddd1f4161f14f79520f17fc1d71d - unpetrify-ref: v3.18 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: [] diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph index 16dd9a17..97ccfe3c 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: b2776bf7149bddd1f4161f14f79520f17fc1d71d - unpetrify-ref: v3.18 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: [] diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph index 440271de..f8a7ff00 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: b2776bf7149bddd1f4161f14f79520f17fc1d71d - unpetrify-ref: v3.18 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: [] diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph new file mode 100644 index 00000000..702858de --- /dev/null +++ b/strata/bsp-armv8l64-generic.morph @@ -0,0 +1,16 @@ +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 new file mode 100644 index 00000000..ef61a34b --- /dev/null +++ b/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph @@ -0,0 +1,101 @@ +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 f109ecf2..002c00be 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: b2776bf7149bddd1f4161f14f79520f17fc1d71d - unpetrify-ref: v3.18 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: [] diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index 6f829802..4ffd2e0e 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: b2776bf7149bddd1f4161f14f79520f17fc1d71d - unpetrify-ref: v3.18 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: - u-boot@wandboard diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index ad318db9..244745bf 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: b2776bf7149bddd1f4161f14f79520f17fc1d71d - unpetrify-ref: v3.18 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 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 624b31a4..04be0dcd 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: b2776bf7149bddd1f4161f14f79520f17fc1d71d - unpetrify-ref: v3.18 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: [] - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index 008ddf3f..cad5c07e 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: baserock/morph - unpetrify-ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f + ref: d715b39c0801ecea5e52f9029cea7c76320f93cf + unpetrify-ref: baserock/morph build-depends: - nasm diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 685a0dc9..db373cfc 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -31,6 +31,9 @@ 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: @@ -58,8 +61,8 @@ chunks: - name: stage2-linux-api-headers morph: strata/build-essential/stage2-linux-api-headers.morph repo: upstream:linux - ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa - unpetrify-ref: baserock/v3.8 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: - stage1-binutils - stage1-gcc @@ -152,8 +155,8 @@ chunks: - name: stage2-gawk morph: strata/build-essential/stage2-gawk.morph repo: upstream:gawk - ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133 - unpetrify-ref: baserock/build-essential + ref: dc5af665700d9b04fdf9c18930526d28eef5d5d9 + unpetrify-ref: gawk-4.1.1 build-depends: - stage1-binutils - stage1-gcc @@ -162,9 +165,9 @@ chunks: prefix: /tools - name: stage2-make morph: strata/build-essential/stage2-make.morph - repo: upstream:make - ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba - unpetrify-ref: baserock/build-essential + repo: upstream:make-tarball + ref: f75919b038da8a28388a911303fb86ed7a70ea2c + unpetrify-ref: make-4.1 build-depends: - stage1-binutils - stage1-gcc @@ -201,8 +204,8 @@ chunks: - name: linux-api-headers morph: strata/build-essential/linux-api-headers.morph repo: upstream:linux - ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa - unpetrify-ref: baserock/v3.8 + ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 + unpetrify-ref: v3.19 build-depends: - stage2-binutils - stage2-busybox @@ -288,8 +291,8 @@ chunks: - name: gawk morph: strata/build-essential/gawk.morph repo: upstream:gawk - ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133 - unpetrify-ref: baserock/build-essential + ref: dc5af665700d9b04fdf9c18930526d28eef5d5d9 + unpetrify-ref: gawk-4.1.1 build-depends: - stage2-binutils - stage2-busybox @@ -337,9 +340,9 @@ chunks: gcc-libs: build-essential-minimal - name: make morph: strata/build-essential/make.morph - repo: upstream:make - ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba - unpetrify-ref: baserock/build-essential + repo: upstream:make-tarball + ref: f75919b038da8a28388a911303fb86ed7a70ea2c + unpetrify-ref: make-4.1 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 0f7ce171..0cd61ce1 100644 --- a/strata/build-essential/linux-api-headers.morph +++ b/strata/build-essential/linux-api-headers.morph @@ -5,6 +5,8 @@ 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 e460a9dc..eb16726a 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" +- ./configure --prefix="$PREFIX" --disable-gcc-warnings diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph index 50e1aaa5..b296408f 100644 --- a/strata/build-essential/stage2-linux-api-headers.morph +++ b/strata/build-essential/stage2-linux-api-headers.morph @@ -5,6 +5,8 @@ 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 399df685..14786dde 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -11,11 +11,6 @@ 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 @@ -51,7 +46,6 @@ 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 7bd45767..a5ec5204 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 - ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c - unpetrify-ref: baserock/build-essential + repo: upstream:gdbm-tarball + ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 + unpetrify-ref: gdbm-1.11 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: 0fe89dc66ec061b839bea3ab451207e2dee757b9 - unpetrify-ref: baserock/morph + ref: f67398afa6a76fbc902cc0cea963d5151fa2a953 + unpetrify-ref: ncurses-5.9-20150131 build-depends: [] - name: perl morph: strata/core/perl.morph @@ -50,10 +50,11 @@ chunks: - name: texinfo-tarball morph: strata/core/texinfo-tarball.morph repo: upstream:texinfo-tarball - ref: 4843a7f5ff14ac802a56f1cdd49960b25c15702b - unpetrify-ref: baserock/morph + ref: 6a55f074b1f67d02149c13931eb1df9f0e539b15 + unpetrify-ref: texinfo-5.2 build-depends: - ncurses + - perl - name: autoconf-tarball morph: strata/core/autoconf-tarball.morph repo: upstream:autoconf-tarball @@ -64,8 +65,8 @@ chunks: - name: automake morph: strata/core/automake.morph repo: upstream:automake - ref: ba4b42faff673e3e5265416dff09e59affc688fb - unpetrify-ref: v1.14.1 + ref: db43dd473361d90d8b00362cfef5bac8e722000d + unpetrify-ref: v1.15 build-depends: - autoconf-tarball - perl @@ -81,7 +82,9 @@ chunks: repo: upstream:flex ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf unpetrify-ref: baserock/build-essential - build-depends: [] + build-depends: + - automake + - gettext-tarball - name: openssl-new morph: strata/core/openssl-new.morph repo: upstream:openssl-new @@ -96,10 +99,12 @@ 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: [] + build-depends: + - automake - name: cpython morph: strata/core/cpython.morph repo: upstream:cpython @@ -114,8 +119,8 @@ chunks: - name: libtool-tarball morph: strata/core/libtool-tarball.morph repo: upstream:libtool-tarball - ref: f7bbc21981ffdbbe2d4435556e3ead0828dce160 - unpetrify-ref: libtool-2.4.5 + ref: c026ca36e37d2643623a75d0d3e9e451023139f3 + unpetrify-ref: libtool-2.4.6 build-depends: - bash - name: gtk-doc-stub @@ -167,12 +172,10 @@ chunks: - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat - ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c - unpetrify-ref: baserock/morph + ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f + unpetrify-ref: R_2_1_0 build-depends: - - autoconf-tarball - - automake - - libtool-tarball + - cmake - name: XML-Parser repo: upstream:XML-Parser ref: e1a3ec157140a699e3020836475a0df622f70f1b @@ -184,8 +187,8 @@ chunks: - name: git morph: strata/core/git.morph repo: upstream:git - ref: 49c3e926349e964b311b46251bb2b97d3d669855 - unpetrify-ref: v2.1.3 + ref: 9874fca7122563e28d699a911404fc49d2a24f1c + unpetrify-ref: v2.3.0 build-depends: - autoconf-tarball - cpython @@ -242,8 +245,8 @@ chunks: - name: util-linux morph: strata/core/util-linux.morph repo: upstream:util-linux - ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0 - unpetrify-ref: baserock/morph + ref: b567c9cbc854a36da0a198e4dcc463e134d26a25 + unpetrify-ref: v2.25.2 build-depends: - autoconf-tarball - automake @@ -252,11 +255,14 @@ 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 @@ -264,20 +270,6 @@ chunks: build-depends: - flex - texinfo-tarball -- name: python-setuptools - morph: strata/core/python-setuptools.morph - repo: upstream:python-setuptools-bitbucket - ref: 0aa6a4de5931d02876428388678802db2371fd37 - unpetrify-ref: baserock/master - build-depends: - - cpython -- name: pyyaml - morph: strata/core/pyyaml.morph - repo: upstream:pyyaml - ref: d9fbcceaed39d955f6871b07c61dc42f824285c1 - unpetrify-ref: baserock/morph - build-depends: - - python-setuptools - name: shadow morph: strata/core/shadow.morph repo: upstream:shadow diff --git a/strata/core/flex.morph b/strata/core/flex.morph index 7ca8f538..615bf79e 100644 --- a/strata/core/flex.morph +++ b/strata/core/flex.morph @@ -1,5 +1,7 @@ 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 1e0fe696..b36a67aa 100644 --- a/strata/core/libexpat.morph +++ b/strata/core/libexpat.morph @@ -1,9 +1,8 @@ name: libexpat kind: chunk configure-commands: -- autoreconf -i -- ./configure --prefix="${PREFIX-/usr}" +- mkdir o && cd o && cmake -DCMAKE_INSTALL_PREFIX=/usr .. build-commands: -- make +- cd o && make install-commands: -- make DESTDIR="$DESTDIR" install +- cd o && make DESTDIR="$DESTDIR" install diff --git a/strata/core/nano.morph b/strata/core/nano.morph new file mode 100644 index 00000000..6a55dc2d --- /dev/null +++ b/strata/core/nano.morph @@ -0,0 +1,4 @@ +name: nano +kind: chunk +pre-configure-commands: +- autoreconf -ivf diff --git a/strata/core/ncurses.morph b/strata/core/ncurses.morph index c75495bc..42acb481 100644 --- a/strata/core/ncurses.morph +++ b/strata/core/ncurses.morph @@ -6,4 +6,40 @@ build-commands: - make install-commands: - make DESTDIR="$DESTDIR" install -- sh ncurses-morph-postinstall.sh +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" diff --git a/strata/core/pyyaml.morph b/strata/core/pyyaml.morph deleted file mode 100644 index 8ebd7b57..00000000 --- a/strata/core/pyyaml.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: pyyaml -kind: chunk -build-commands: -- python setup.py --without-libyaml build -install-commands: -- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/core/readline.morph b/strata/core/readline.morph new file mode 100644 index 00000000..511e124c --- /dev/null +++ b/strata/core/readline.morph @@ -0,0 +1,6 @@ +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 9c5c38fe..2051cf50 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -13,3 +13,17 @@ 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 08808333..0b96577d 100644 --- a/strata/coreutils-common/coreutils.morph +++ b/strata/coreutils-common/coreutils.morph @@ -9,3 +9,5 @@ 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 new file mode 100644 index 00000000..346f8635 --- /dev/null +++ b/strata/coreutils-common/diff.morph @@ -0,0 +1,7 @@ +name: diff +kind: chunk +build-system: autotools +configure-commands: +- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf +- ./bootstrap --skip-po +- ./configure --prefix="$PREFIX" --disable-gcc-warnings diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph new file mode 100644 index 00000000..9ccfdb8b --- /dev/null +++ b/strata/coreutils-common/sed.morph @@ -0,0 +1,10 @@ +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 9687ac7e..be4f4db8 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -3,22 +3,18 @@ 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 - ref: c7017a099f954bb6de60e79c876935b1bf438b9a - unpetrify-ref: baserock/morph + repo: upstream:groff-git + ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 + unpetrify-ref: 1.22.3 build-depends: [] - name: openssh morph: strata/cross-bootstrap/openssh.morph - repo: upstream:openssh - ref: 233514106dcde5ac61a70f1043de563122e2f1c9 + repo: upstream:openssh-git + ref: 782fe9e725243eeb5ad6ab9a1783b5d6bedfe0d7 unpetrify-ref: baserock/morph build-depends: - groff @@ -70,11 +66,10 @@ chunks: repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: - - six + build-depends: [] - name: morph repo: baserock:baserock/morph - ref: 67afd098cd297b769b1341a460d160a2902ba4e4 + ref: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c unpetrify-ref: master build-depends: - cliapp @@ -84,6 +79,6 @@ chunks: - name: rsync morph: strata/cross-bootstrap/rsync.morph repo: upstream:rsync - ref: 9faf8e0ccff2755cd019ff64d8322226a214b013 - unpetrify-ref: baserock/morph + ref: 7cb0de6326c915a72253fd103dae93308031ec3f + unpetrify-ref: v3.1.1 build-depends: [] diff --git a/strata/cross-bootstrap/groff.morph b/strata/cross-bootstrap/groff.morph index fed35b7d..37ee63e9 100644 --- a/strata/cross-bootstrap/groff.morph +++ b/strata/cross-bootstrap/groff.morph @@ -4,6 +4,7 @@ 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 cb09c5a3..4b06edf3 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -1,6 +1,6 @@ name: databases kind: stratum -description: some popular databases +description: some popular databases and some utils related to databases build-depends: - morph: strata/tools.morph - morph: strata/nfs.morph @@ -17,7 +17,19 @@ chunks: unpetrify-ref: baserock/3.0 build-depends: [] - name: memcached + morph: strata/databases/memcached.morph repo: upstream:memcached - ref: d8b1047620a54443f6bdca7f0dc5ee3b4d99378e + 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 unpetrify-ref: master build-depends: [] diff --git a/strata/databases/memcached.morph b/strata/databases/memcached.morph new file mode 100644 index 00000000..28e01362 --- /dev/null +++ b/strata/databases/memcached.morph @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..7659593c --- /dev/null +++ b/strata/django.morph @@ -0,0 +1,35 @@ +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 541b4f7a..25eafce2 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.morph +- morph: strata/multimedia-gstreamer.morph - morph: strata/connman-common.morph chunks: - name: fribidi diff --git a/strata/erlang.morph b/strata/erlang.morph index 657b07be..e4b2f3e9 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -10,3 +10,18 @@ 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 new file mode 100644 index 00000000..dd3f66ca --- /dev/null +++ b/strata/erlang/erlang-sd_notify.morph @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..fa5fd64f --- /dev/null +++ b/strata/erlang/rebar.morph @@ -0,0 +1,6 @@ +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 9738938b..9a4a15ec 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 - ref: c7017a099f954bb6de60e79c876935b1bf438b9a - unpetrify-ref: baserock/morph + repo: upstream:groff-git + ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 + unpetrify-ref: 1.22.3 build-depends: [] - name: kmod morph: strata/foundation/kmod.morph @@ -22,6 +22,12 @@ 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 @@ -67,17 +73,24 @@ 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: 941a643569dc6b53d0b334276d2a3cc0ed159e88 - unpetrify-ref: v217 + ref: a88abde72169ddc2df77df3fa5bed30725022253 + unpetrify-ref: v219 build-depends: - dbus-pre - gobject-introspection - kmod - libcap2 - libgcrypt + - linux-pam - name: libusb repo: upstream:libusb ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9 @@ -93,23 +106,38 @@ chunks: - name: lzo morph: strata/foundation/lzo.morph repo: upstream:lzo - ref: 2cdfe9375f1145603d002c12be950062ae54da21 - unpetrify-ref: baserock/morph + ref: 5cca83e4d1b0be5825a597ab24ffa6126dc0bc95 + unpetrify-ref: lzo-2.08 build-depends: [] - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse - ref: 4163109fd5bfe67973262610dd95ae60888c92e9 - unpetrify-ref: fuse_2_9_bugfix + 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 build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs - ref: 304f215abb836811e6d78e0a3da53d48aa0e7ca7 - unpetrify-ref: baserock/morph + ref: 563ff3b07d85517e3589a1f2e6f45a8265e3f071 + unpetrify-ref: v3.18.2 build-depends: - attr + - acl - lzo + - e2fsprogs - name: dbus morph: strata/foundation/dbus.morph repo: upstream:dbus @@ -125,8 +153,8 @@ chunks: build-depends: [] - name: openssh morph: strata/foundation/openssh.morph - repo: upstream:openssh - ref: 233514106dcde5ac61a70f1043de563122e2f1c9 + repo: upstream:openssh-git + ref: 782fe9e725243eeb5ad6ab9a1783b5d6bedfe0d7 unpetrify-ref: baserock/morph build-depends: - groff diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph new file mode 100644 index 00000000..4489f5d5 --- /dev/null +++ b/strata/foundation/acl.morph @@ -0,0 +1,4 @@ +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 356c3f06..d5cb83f0 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 +- make DISABLE_DOCUMENTATION=1 install-commands: -- make DESTDIR="$DESTDIR" prefix="$PREFIX" install +- make DESTDIR="$DESTDIR" prefix="$PREFIX" DISABLE_DOCUMENTATION=1 install diff --git a/strata/foundation/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph new file mode 100644 index 00000000..e54bdd37 --- /dev/null +++ b/strata/foundation/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 --disable-libblkid +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/foundation/groff.morph b/strata/foundation/groff.morph index fed35b7d..37ee63e9 100644 --- a/strata/foundation/groff.morph +++ b/strata/foundation/groff.morph @@ -4,6 +4,7 @@ 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 new file mode 100644 index 00000000..add96332 --- /dev/null +++ b/strata/foundation/linux-pam.morph @@ -0,0 +1,14 @@ +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/systemd.morph b/strata/foundation/systemd.morph index c298748a..81db9acd 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -1,6 +1,5 @@ name: systemd kind: chunk -max-jobs: 1 build-system: autotools configure-commands: - sh autogen.sh diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph new file mode 100644 index 00000000..42f6eabd --- /dev/null +++ b/strata/foundation/time-zone-database.morph @@ -0,0 +1,7 @@ +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 9fc05b7c..baa935f5 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -5,6 +5,7 @@ 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 new file mode 100644 index 00000000..d09b3df3 --- /dev/null +++ b/strata/graphics-common/pixman.morph @@ -0,0 +1,5 @@ +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 799ba87a..f1141fcd 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: 0d440d85a126ff8d535d4f70f2203a76a21d5f71 - unpetrify-ref: baserock/morph + ref: c136fc2578aa8f7c0e098008da18d324033eb991 + unpetrify-ref: Release-1-4 build-depends: [] - name: gnome-common repo: upstream:gnome-common @@ -30,19 +30,19 @@ chunks: build-depends: [] - name: atk repo: upstream:atk - ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4 - unpetrify-ref: ATK_2_12_0 + ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253 + unpetrify-ref: ATK_2_15_4 build-depends: - gnome-common - name: at-spi2-core repo: upstream:at-spi2-core - ref: c354b5e8d8157e1018eafeca48642116a65c4ff5 - unpetrify-ref: AT_SPI2_CORE_2_12_0 + ref: 96c2842088008670e72739ea7921d654487a57fb + unpetrify-ref: AT_SPI2_CORE_2_14_1 build-depends: [] - name: at-spi2-atk repo: upstream:at-spi2-atk - ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6 - unpetrify-ref: AT_SPI2_ATK_2_12_1 + ref: 2c220ff6565c4f02428a0c80267616a677e81ac9 + unpetrify-ref: AT_SPI2_ATK_2_14_1 build-depends: - at-spi2-core - atk diff --git a/strata/gtk3.morph b/strata/gtk3.morph index f471bf6e..8af030bb 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: 911f3fb6d29f1570a2d30db6f2085d0202e7ad2a - unpetrify-ref: 3.15.0 + ref: da163469f9d344190f69bfc163517154af0e2dab + unpetrify-ref: 3.15.4 build-depends: - libepoxy diff --git a/strata/input-common.morph b/strata/input-common.morph index 533eff22..dab05826 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -22,8 +22,8 @@ chunks: build-depends: [] - name: libinput repo: upstream:libinput - ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f - unpetrify-ref: 0.7.0 + ref: ca4e03fb11429b6a3704206124fbff2f57d121f9 + unpetrify-ref: 0.10.0 build-depends: - mtdev - libevdev diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index 91ec8323..d8c56f59 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: 3e17f069682a226c14bb29c802e776c6e39f7e8f - unpetrify-ref: baserock/morph + ref: f99c2e4199ce37f6f94428df504427f67c3ec543 + unpetrify-ref: libpciaccess-0.13.3 build-depends: [] - name: drm morph: strata/libdrm-common/drm.morph repo: upstream:drm - ref: 83b2c40922ce451f5844aae0707ae9783a78d74f - unpetrify-ref: baserock/drm_2.4.58/jetson + ref: d2e0f552467ca11162fe04dfed55de4590280f23 + unpetrify-ref: libdrm-2.4.59 build-depends: - xorg-lib-libpciaccess diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph index c316cb5c..c0992cd9 100644 --- a/strata/libdrm-common/drm.morph +++ b/strata/libdrm-common/drm.morph @@ -4,7 +4,3 @@ 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 470a0cca..38356bb1 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -35,18 +35,19 @@ chunks: ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98 unpetrify-ref: baserock/morph build-depends: [] -- name: libapr-tarball - repo: upstream:libapr-tarball - ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db - unpetrify-ref: baserock/morph +- name: libapr + morph: strata/lorry/libapr.morph + repo: upstream:libapr + ref: 10835ec9a2d8bb9f7b867d15f29984d29744f028 + unpetrify-ref: 1.5.1 build-depends: [] -- name: libapr-util-tarball - morph: strata/lorry/libapr-util-tarball.morph - repo: upstream:libapr-util-tarball - ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b - unpetrify-ref: baserock/morph +- name: libapr-util + morph: strata/lorry/libapr-util.morph + repo: upstream:libapr-util + ref: 718a507e2e33d87ab15ff80cfe80aea8ae6c7163 + unpetrify-ref: 1.5.4 build-depends: - - libapr-tarball + - libapr - name: perl-dbi-tarball morph: strata/lorry/perl-dbi-tarball.morph repo: upstream:perl-dbi-tarball @@ -60,12 +61,13 @@ 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-tarball - - libapr-util-tarball + - libapr + - libapr-util - name: swig-tarball morph: strata/lorry/swig-tarball.morph repo: upstream:swig-tarball @@ -81,12 +83,12 @@ chunks: - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball - ref: 351e074672d9aa6446d5829938b697a3d6b23266 + ref: 2d02ea6f31311bf1b72f28c48d784b8d851ff2e0 unpetrify-ref: baserock/morph build-depends: - swig-tarball - - libapr-tarball - - libapr-util-tarball + - libapr + - libapr-util - libserf-tarball - neon - name: mercurial-tarball diff --git a/strata/lorry/cvs-tarball.morph b/strata/lorry/cvs-tarball.morph index e8322017..5f34bc57 100644 --- a/strata/lorry/cvs-tarball.morph +++ b/strata/lorry/cvs-tarball.morph @@ -1,6 +1,9 @@ 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 deleted file mode 100644 index e34e3610..00000000 --- a/strata/lorry/libapr-util-tarball.morph +++ /dev/null @@ -1,5 +0,0 @@ -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 new file mode 100644 index 00000000..26db03ba --- /dev/null +++ b/strata/lorry/libapr-util.morph @@ -0,0 +1,7 @@ +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 new file mode 100644 index 00000000..57d35b84 --- /dev/null +++ b/strata/lorry/libapr.morph @@ -0,0 +1,21 @@ +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 new file mode 100644 index 00000000..d4bb415d --- /dev/null +++ b/strata/lorry/libserf.morph @@ -0,0 +1,6 @@ +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 cb416d53..8fd1bc08 100644 --- a/strata/lorry/subversion-tarball.morph +++ b/strata/lorry/subversion-tarball.morph @@ -1,6 +1,8 @@ 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 61f154a4..7d16d85b 100644 --- a/strata/lorry/swig-tarball.morph +++ b/strata/lorry/swig-tarball.morph @@ -1,5 +1,7 @@ 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 3bacc04b..57874396 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,6 +2,7 @@ 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 @@ -20,18 +21,12 @@ 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: - - six + build-depends: [] - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph new file mode 100644 index 00000000..f10dd2b3 --- /dev/null +++ b/strata/multimedia-common.morph @@ -0,0 +1,17 @@ +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 50917372..e87c4050 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -5,6 +5,7 @@ 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 new file mode 100644 index 00000000..cee7df71 --- /dev/null +++ b/strata/multimedia-gstreamer.morph @@ -0,0 +1,41 @@ +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 deleted file mode 100644 index 6acab0f7..00000000 --- a/strata/multimedia.morph +++ /dev/null @@ -1,39 +0,0 @@ -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 new file mode 100644 index 00000000..90a67c9c --- /dev/null +++ b/strata/networking-utils.morph @@ -0,0 +1,29 @@ +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 new file mode 100644 index 00000000..a1a4d37e --- /dev/null +++ b/strata/networking-utils/iproute2.morph @@ -0,0 +1,7 @@ +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 new file mode 100644 index 00000000..7fe8c6dc --- /dev/null +++ b/strata/networking-utils/ipset.morph @@ -0,0 +1,6 @@ +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 68988d54..3dbead9d 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -6,8 +6,8 @@ build-depends: chunks: - name: libevent repo: upstream:libevent - ref: 9364dff5c20e9e8c18f7f20ee1c92463e9e9c8a7 - unpetrify-ref: baserock/release-2.0.21-stable + ref: 0b49ae34594533daa82c06a506078de9e336a013 + unpetrify-ref: release-2.1.5-beta build-depends: [] - name: ti-rpc morph: strata/nfs/ti-rpc.morph diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 616a8762..1b348630 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -2,6 +2,7 @@ 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 @@ -33,11 +34,6 @@ 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 @@ -53,11 +49,6 @@ 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 @@ -85,10 +76,8 @@ chunks: ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b unpetrify-ref: baserock/morph build-depends: - - pbr - pyiso8601 - python-prettytable - - python-requests - simplejson - netaddr - babel @@ -98,7 +87,6 @@ chunks: unpetrify-ref: baserock/morph build-depends: - python-prettytable - - pbr - argparse - pyopenssl - python-keystoneclient @@ -109,9 +97,7 @@ 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 new file mode 100644 index 00000000..2daf78b0 --- /dev/null +++ b/strata/python-core.morph @@ -0,0 +1,41 @@ +name: python-core +kind: stratum +description: Core python packages +build-depends: +- morph: strata/core.morph +chunks: +- name: python-setuptools + morph: strata/core/python-setuptools.morph + repo: upstream:python-setuptools-bitbucket + ref: 0aa6a4de5931d02876428388678802db2371fd37 + unpetrify-ref: baserock/master + build-depends: [] +- name: pip + repo: upstream:pip + ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 + unpetrify-ref: baserock/master + build-depends: + - python-setuptools +- 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: [] +- name: pyyaml + morph: strata/python-core/pyyaml.morph + repo: upstream:pyyaml + ref: d9fbcceaed39d955f6871b07c61dc42f824285c1 + unpetrify-ref: baserock/morph + build-depends: + - python-setuptools diff --git a/strata/python-core/pyyaml.morph b/strata/python-core/pyyaml.morph new file mode 100644 index 00000000..8ebd7b57 --- /dev/null +++ b/strata/python-core/pyyaml.morph @@ -0,0 +1,6 @@ +name: pyyaml +kind: chunk +build-commands: +- python setup.py --without-libyaml build +install-commands: +- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/python-tools.morph b/strata/python-tools.morph index d5cd11f0..58678372 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: pip - repo: upstream:pip - ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 - unpetrify-ref: baserock/master +- name: virtualenv + repo: upstream:python-packages/virtualenv + ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c + unpetrify-ref: 12.0.5 build-depends: [] diff --git a/strata/python3-core.morph b/strata/python3-core.morph new file mode 100644 index 00000000..2dc41438 --- /dev/null +++ b/strata/python3-core.morph @@ -0,0 +1,12 @@ +name: python3-core +kind: stratum +description: Core python3 packages +build-depends: +- morph: strata/core.morph +chunks: +- name: python3 + morph: strata/python3-core/python3.morph + repo: upstream:cpython + ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c + unpetrify-ref: v3.4.2 + build-depends: [] diff --git a/strata/python3-core/python3.morph b/strata/python3-core/python3.morph new file mode 100644 index 00000000..f02452d4 --- /dev/null +++ b/strata/python3-core/python3.morph @@ -0,0 +1,7 @@ +name: python3 +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" --enable-shared +post-install-commands: +- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3 diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index 6482db62..df36ccad 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.morph + morph: strata/qt5-tools/qtmultimedia-gstreamer.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 f9950139..ab553f39 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.morph +- morph: strata/multimedia-gstreamer.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 cee282c0..4554e441 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 -configure-commands: +build-system: autotools +pre-configure-commands: +- cp /usr/share/automake*/config.guess . +- cp /usr/share/automake*/config.sub . - autoconf +configure-commands: - ./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 c5d4afe1..f9f0ae7c 100644 --- a/strata/ruby/ruby.morph +++ b/strata/ruby/ruby.morph @@ -1,9 +1,9 @@ name: ruby kind: chunk -configure-commands: +build-system: autotools +pre-configure-commands: +- cp /usr/share/automake*/config.guess tool +- cp /usr/share/automake*/config.sub tool - autoconf +configure-commands: - ./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 4d8c3f44..9dcc2c7b 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -10,22 +10,16 @@ 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: 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7 - unpetrify-ref: baserock/morph + ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 + unpetrify-ref: file-5.22 build-depends: [] - name: gdb morph: strata/tools/gdb.morph - repo: upstream:gdb - ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8 - unpetrify-ref: baserock/morph + repo: upstream:binutils-gdb + ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 + unpetrify-ref: gdb-7.8-branch build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot @@ -41,13 +35,13 @@ chunks: - name: rsync morph: strata/tools/rsync.morph repo: upstream:rsync - ref: 9faf8e0ccff2755cd019ff64d8322226a214b013 - unpetrify-ref: baserock/morph + ref: 7cb0de6326c915a72253fd103dae93308031ec3f + unpetrify-ref: v3.1.1 build-depends: [] - name: strace repo: upstream:strace - ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5 - unpetrify-ref: baserock/morph + ref: 6d8c0637e8dd0f65c667af33c612230552419db1 + unpetrify-ref: v4.8 build-depends: [] - name: vala-bootstrap morph: strata/tools/vala-bootstrap.morph @@ -70,7 +64,7 @@ chunks: - name: kexec-tools morph: strata/tools/kexec-tools.morph repo: upstream:kexec-tools - ref: 9359b61ca44980d33c0bee42b9bb2e36e72835dd + ref: f4d1d2ad474e882df13418239aa3050673a844d7 unpetrify-ref: baserock/morph build-depends: [] - name: device-tree-compiler diff --git a/strata/tools/distcc.morph b/strata/tools/distcc.morph index 9f42b50e..6c910f86 100644 --- a/strata/tools/distcc.morph +++ b/strata/tools/distcc.morph @@ -1,6 +1,9 @@ name: distcc kind: chunk build-system: autotools -configure-commands: +pre-configure-commands: - NOCONFIGURE=1 ./autogen.sh +- cp /usr/share/automake*/config.guess . +- cp /usr/share/automake*/config.sub . +configure-commands: - ./configure --prefix="$PREFIX" --disable-Werror diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph deleted file mode 100644 index db1ea4cc..00000000 --- a/strata/tools/e2fsprogs.morph +++ /dev/null @@ -1,15 +0,0 @@ -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 8b82b9d9..6f60da9e 100644 --- a/strata/tools/gdb.morph +++ b/strata/tools/gdb.morph @@ -2,4 +2,5 @@ name: gdb kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --disable-werror +- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils + --disable-ld --disable-gold --disable-gprof diff --git a/strata/tools/vala-bootstrap.morph b/strata/tools/vala-bootstrap.morph index c09299f6..e55b1887 100644 --- a/strata/tools/vala-bootstrap.morph +++ b/strata/tools/vala-bootstrap.morph @@ -1,5 +1,7 @@ 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 3b5ca528..fcd34636 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -2,6 +2,7 @@ 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 @@ -72,13 +73,13 @@ chunks: - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup - ref: 98cf2ab9c80c8efd0df9086353972e7dc73f40b8 + ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 unpetrify-ref: master build-depends: [] - name: lorry-controller morph: strata/trove/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: 4b1fcab140d940470c342c6857cdc8682406f0b7 + ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd unpetrify-ref: master build-depends: [] - name: lua-scrypt diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 7aa8f6af..0707c347 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -1,8 +1,13 @@ name: virtualization kind: stratum -description: virtualization for baserock +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. build-depends: - morph: strata/connman-common.morph +- morph: strata/lvm.morph chunks: - name: yajl morph: strata/virtualization/yajl.morph @@ -25,8 +30,8 @@ chunks: - name: qemu morph: strata/virtualization/qemu.morph repo: upstream:qemu - ref: f8d1fb61e65575011a67d7ba97b690feb5630c91 - unpetrify-ref: baserock/morph + ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d + unpetrify-ref: baserock/v2.2.0 build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros @@ -39,17 +44,24 @@ 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: 13b7bb4acba9b70e015b7faa020b08018885aad8 - unpetrify-ref: baserock/morph + ref: 7b1ceec1e2f141d36ed9b7ef3a660ff8bb34fc53 + unpetrify-ref: baserock/v1.2.10 build-depends: - libpciaccess - dnsmasq - qemu - xml-catalog - yajl + - dmidecode - name: pycurl repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e @@ -74,16 +86,16 @@ chunks: - cython - name: libvirt-python repo: upstream:libvirt-python - ref: 4382fc518cbd11d9af5727fb403e175818c25db5 - unpetrify-ref: v1.2.2 + ref: 8e09c79a07b097a6ba9af83be4916fb9c9538500 + unpetrify-ref: v1.2.10 build-depends: - libvirt - python-lxml - urlgrabber - name: gnome-common repo: upstream:gnome-common - ref: 766c35359ef924ceb2288c14c2d6239fcc0618f8 - unpetrify-ref: 3.7.4 + ref: d213283fcb5228d05eb2c796579f18240e8467e8 + unpetrify-ref: 3.12.0 build-depends: [] - name: pygobject morph: strata/virtualization/pygobject.morph @@ -114,3 +126,15 @@ 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 new file mode 100644 index 00000000..d0092ed1 --- /dev/null +++ b/strata/virtualization/dmidecode.morph @@ -0,0 +1,6 @@ +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 4db0bf09..db9e90a6 100644 --- a/strata/virtualization/dnsmasq.morph +++ b/strata/virtualization/dnsmasq.morph @@ -1,6 +1,9 @@ name: dnsmasq kind: chunk -build-system: autotools -configure-commands: [] +build-commands: +- make +- make -C contrib/wrt 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 new file mode 100644 index 00000000..7915bdac --- /dev/null +++ b/strata/virtualization/ebtables.morph @@ -0,0 +1,6 @@ +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 63b5d768..bdc99ddf 100644 --- a/strata/virtualization/libvirt.morph +++ b/strata/virtualization/libvirt.morph @@ -3,4 +3,29 @@ kind: chunk build-system: autotools configure-commands: - | - 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" + 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 diff --git a/strata/virtualization/openvswitch.morph b/strata/virtualization/openvswitch.morph new file mode 100644 index 00000000..847c69ff --- /dev/null +++ b/strata/virtualization/openvswitch.morph @@ -0,0 +1,10 @@ +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 890489dc..58eefbbd 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: 339e83aa579569711cd14623ca4b2db46256b766 - unpetrify-ref: 1.6.0 + ref: 8e9d5a108476b3435a8286613b9a63b69afd92b7 + unpetrify-ref: 1.7.0 build-depends: - libxkbcommon diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 1d5b015c..0184953e 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -7,15 +7,9 @@ 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: 463b914d4f1efbf5de6d1f45e9037b88a1eb107f - unpetrify-ref: baserock/weston-1.6.0/tegra - build-depends: - - linux-pam + ref: 322383ed469d69401b502618718a97a4e85c97d8 + unpetrify-ref: baserock/weston-1.7.0/tegra + build-depends: [] diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index d47d0ac4..ce403b6b 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -7,18 +7,12 @@ 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: - - linux-pam + build-depends: [] - 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 572932b4..644d47c2 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -50,3 +50,25 @@ 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 new file mode 100644 index 00000000..95cacdfb --- /dev/null +++ b/strata/xstatic.morph @@ -0,0 +1,138 @@ +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-animate + repo: upstream:xstatic-packages/xstatic-angular-animate + ref: 91b9d3197f67213e4e35e9a35ba7196b898731e7 + unpetrify-ref: master + build-depends: [] +- name: xstatic-angular-bootstrap + repo: upstream:xstatic-packages/xstatic-angular-bootstrap + ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483 + unpetrify-ref: master + 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-fileupload + repo: upstream:xstatic-packages/xstatic-angular-fileupload + ref: 04bcd774dae17cfff5e826fc0874f6403b4a6cae + unpetrify-ref: master + 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-angular-sanitize + repo: upstream:xstatic-packages/xstatic-angular-sanitize + ref: 9e0f03ada6fc00f8583903aeb6d9fc6516784999 + unpetrify-ref: master + build-depends: [] +- name: xstatic-angular-smart-table + repo: upstream:xstatic-packages/xstatic-angular-smart-table + ref: e0fbf69fb156b995547471d71c5c6a7f88989d47 + unpetrify-ref: master + 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-bootstrap-wizard + repo: upstream:xstatic-packages/xstatic-jquery-bootstrap-wizard + ref: 07ae7e3a15b3af3d3d378d1f2412fe503ee42142 + 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 deleted file mode 100644 index e983ba7a..00000000 --- a/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph +++ /dev/null @@ -1,18 +0,0 @@ -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_32.morph b/systems/armv7lhf-cross-toolchain-system-x86_32.morph new file mode 100644 index 00000000..3f66d178 --- /dev/null +++ b/systems/armv7lhf-cross-toolchain-system-x86_32.morph @@ -0,0 +1,18 @@ +name: armv7lhf-cross-toolchain-system-x86_32 +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 deleted file mode 100644 index 1a8c20bb..00000000 --- a/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph +++ /dev/null @@ -1,18 +0,0 @@ -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/armv7lhf-cross-toolchain-system-x86_64.morph b/systems/armv7lhf-cross-toolchain-system-x86_64.morph new file mode 100644 index 00000000..76197491 --- /dev/null +++ b/systems/armv7lhf-cross-toolchain-system-x86_64.morph @@ -0,0 +1,18 @@ +name: armv7lhf-cross-toolchain-system-x86_64 +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 bd51f8d8..c1f7f155 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -10,6 +10,8 @@ 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 4c474959..c1179a36 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -10,6 +10,8 @@ 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 new file mode 100644 index 00000000..15b0a52c --- /dev/null +++ b/systems/build-system-armv8l64.morph @@ -0,0 +1,39 @@ +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 174cd8ce..04bc34bf 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -10,6 +10,8 @@ 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 8636d510..a118705d 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -10,6 +10,8 @@ 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 @@ -24,6 +26,8 @@ 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 78d5b7ad..6f5af401 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -10,6 +10,8 @@ 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 @@ -26,6 +28,8 @@ 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 1c8efb33..e1b37185 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -10,6 +10,8 @@ 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 @@ -24,6 +26,8 @@ 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 969ee125..18fbebc1 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -10,6 +10,8 @@ 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 @@ -26,6 +28,8 @@ 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 509bd383..b03d1653 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-tools - morph: strata/python-tools.morph +- name: python-core + morph: strata/python-core.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 new file mode 100644 index 00000000..30094e74 --- /dev/null +++ b/systems/cross-bootstrap-system-armv8l64-generic.morph @@ -0,0 +1,11 @@ +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 305f7a22..de474c87 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -27,6 +27,8 @@ 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 427dbb3f..2cce69d3 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -30,6 +30,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: devtools diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 1529522c..38806421 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -30,6 +30,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: devtools diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 0f6aef58..c47be836 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -30,6 +30,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: devtools diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 2b43bf65..64d75350 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -21,6 +21,8 @@ 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 2e342fc3..3a84d178 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -24,6 +24,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: devtools diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index c50468a9..2e4b83bd 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -27,6 +27,8 @@ 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 4bae3ac8..17f8bcbb 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -31,6 +31,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: devtools diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index e542f067..c09caf96 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -31,6 +31,8 @@ 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 cda52c36..ffa9edd4 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -31,6 +31,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: devtools diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph new file mode 100644 index 00000000..27080535 --- /dev/null +++ b/systems/devel-system-armv8l64.morph @@ -0,0 +1,43 @@ +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 c4918572..9e575d5d 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -25,6 +25,8 @@ 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 a53a6a56..d92da0fd 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -28,6 +28,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: devtools diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 83e55316..3578c221 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -29,6 +29,8 @@ 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 3ad441ca..b53d6d93 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -32,6 +32,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: devtools diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index 569a00d8..aa8d6a1c 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -29,6 +29,8 @@ 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 95e27414..4e950a47 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -32,6 +32,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: devtools diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 7ffddc02..c104b29b 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -30,6 +30,8 @@ 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 5cbfddbe..50581561 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.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 a5f07750..16bed197 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.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 f5fb571e..f4828688 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.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 b4e20ec7..979b73b0 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -21,8 +21,10 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.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 880d40dc..b8bfe41e 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -8,6 +8,8 @@ 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 9a23bdeb..0a98f205 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -12,6 +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-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 1a78ff4f..0f768536 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -12,8 +12,10 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 0d633f41..580f53f7 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -11,6 +11,8 @@ 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 27d56e78..722e85fd 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -20,8 +20,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common @@ -34,6 +36,12 @@ 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 b84eaeb5..dfa5c3df 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common @@ -37,6 +39,8 @@ 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 152bf16b..5aea4f7b 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -7,6 +7,8 @@ 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 @@ -21,8 +23,10 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: gtk2 -- cgit v1.2.1