diff options
126 files changed, 1263 insertions, 305 deletions
diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph index 25ee579d..1b1e9777 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 @@ -40,7 +39,6 @@ systems: RAM_SIZE: 2G DISK_SIZE: 8G LORRY_SSH_KEY: ssh_keys/lorry.key - MASON_SSH_PUBKEY: ssh_keys/mason.key.pub WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub TROVE_ADMIN_EMAIL: adminuser@example.com TROVE_ADMIN_NAME: Nobody 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..aaba1954 --- /dev/null +++ b/strata/apache-httpd-server/apr.morph @@ -0,0 +1,22 @@ +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: +# Install files required for apr-util and httpd +- | + 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 (this is needed for httpd) +- ln -sf /usr/include/apr-2 "$DESTDIR$PREFIX"/share/apr-1/build/ +# Copy apr headers needed for mod_wsgi +- 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..f7662912 --- /dev/null +++ b/strata/apache-httpd-server/httpd-server.morph @@ -0,0 +1,67 @@ +name: httpd-server +kind: chunk +build-system: autotools +configure-commands: +- ./buildconf --with-apr=/usr/share/apr-1 +# We override --libexecdir with the same value as --enable-layout=RPM +# ought to provide, because otherwise there is a bug where when mod_wsgi +# calls apxs, it fails as follows because the variable is empty. +# +#/usr/share/apr-1/build/libtool --silent --mode=link gcc -std=gnu99 +# -o src/server/mod_wsgi.la -rpath # -module -avoid-version +# src/server/wsgi_validate.lo src/server/wsgi_stream.lo +# src/server/wsgi_server.lo src/server/wsgi_restrict.lo +# src/server/wsgi_metrics.lo src/server/wsgi_logger.lo +# src/server/wsgi_interp.lo src/server/wsgi_daemon.lo +# src/server/wsgi_convert.lo src/server/wsgi_buckets.lo +# src/server/wsgi_apache.lo src/server/mod_wsgi.lo +# -L/usr/lib -L/usr/lib/python2.7/config -lpython2.7 -lpthread -ldl -lutil -lm +# libtool: error: only absolute run-paths are allowed +# apxs:Error: Command failed with rc=65536 +# +- | + ./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: +# Add perl interpreter path to apxs script, required for loading mod_wsgi. +- | + sed -i 's|#!/replace/with/path/to/perl/interpreter -w|#!/usr/bin/perl -w|g' \ + "$DESTDIR$PREFIX"/bin/apxs +# Add conf.d directory where apache will look for other configurations to load. +- mkdir -p "$DESTDIR"/etc/httpd/conf.d +- echo 'Include /etc/httpd/conf.d/*.conf' >> "$DESTDIR"/etc/httpd/conf/httpd.conf +#################################################################################### +# This chunk should add an apache user and an apache group, create the apache home +# directory and move suexec to /usr/lib/httpd/suexec as system-integration time. +# This is not possible because linux-user-chroot drops all capabilities for security so +# it does not allow to change the owners of directories or files. +# So for now you should create a script which includes the following commands: +# - mkdir -p /var/www +# - groupadd -r apache +# - | +# useradd -c "Apache Server" -d /var/www -g apache \ +# -s /bin/false apache +# +# - mkdir -p /usr/lib/httpd +# - mv -v /usr/bin/suexec /usr/lib/httpd/suexec +# - chgrp apache /usr/lib/httpd/suexec +# - chmod 4754 /usr/lib/httpd/suexec +# - chown -R apache:apache /var/www +#################################################################################### 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. + + <IfModule !wsgi_module> + LoadModule wsgi_module /usr/lib/httpd/modules/mod_wsgi.so + </IfModule> + EOF diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index e4dc0e68..829cf6f8 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..120239b9 --- /dev/null +++ b/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph @@ -0,0 +1,104 @@ +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 +# Required for M400 +- 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: +# Only generate Image here, uImage generated in deployment +# due to availability of mkimage build systems +- 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..b5bee9cb 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 1611dbe8..9884d29d 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -163,8 +163,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 @@ -174,9 +174,9 @@ chunks: - 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 @@ -308,8 +308,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 @@ -322,11 +322,11 @@ chunks: - stage2-reset-specs - glibc -- name: m4 - morph: strata/build-essential/m4.morph - repo: upstream:m4 - ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db - unpetrify-ref: baserock/build-essential +- name: m4-tarball + morph: strata/build-essential/m4-tarball.morph + repo: upstream:m4-tarball + ref: 23c11479b3ad787adc7a651ee0c4347839e47723 + unpetrify-ref: m4-1.4.17 build-depends: - stage2-binutils - stage2-busybox @@ -354,15 +354,15 @@ chunks: - stage2-reset-specs - glibc - zlib - - m4 + - m4-tarball artifacts: 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 new file mode 100644 index 00000000..eb16726a --- /dev/null +++ b/strata/build-essential/m4-tarball.morph @@ -0,0 +1,5 @@ +name: m4-tarball +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" --disable-gcc-warnings diff --git a/strata/build-essential/m4.morph b/strata/build-essential/m4.morph deleted file mode 100644 index b76afbe4..00000000 --- a/strata/build-essential/m4.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: m4 -kind: chunk -build-system: autotools -configure-commands: -- ./configure --prefix="$PREFIX" --disable-nls 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 87033546..0184de51 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -7,8 +7,8 @@ build-depends: chunks: - name: sqlite3 repo: upstream:sqlite3 - ref: f6c2a9fe49d20654c2c41844d056033692a223b7 - unpetrify-ref: baserock/morph + ref: 24adc227bc29cd17e39df097fbca389c7724cd14 + unpetrify-ref: sqlite-autoconf-3080801 build-depends: [] - name: cmake morph: strata/core/cmake.morph @@ -18,15 +18,15 @@ 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 - morph: strata/core/gettext.morph - repo: upstream:gettext - ref: 3898e324f07c05404b63d71f0e519f352fb1e072 - unpetrify-ref: baserock/build-essential +- name: gettext-tarball + morph: strata/core/gettext-tarball.morph + repo: upstream:gettext-tarball + ref: 482840e61f86ca321838a91e902c41d40c098bbb + unpetrify-ref: gettext-0.19.4 build-depends: [] - name: mini-utils morph: strata/core/mini-utils.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 @@ -47,33 +47,28 @@ chunks: unpetrify-ref: baserock/morph build-depends: - gdbm -- name: pkg-config - morph: strata/core/pkg-config.morph - repo: upstream:pkg-config - ref: 67a702a15cf88e270539484929ffa1f42b90c728 - unpetrify-ref: baserock/build-essential - build-depends: [] - 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 -- name: autoconf - morph: strata/core/autoconf.morph - repo: upstream:autoconf - ref: cffdb90be331111ce3fbe4a32320181ec2b92652 - unpetrify-ref: baserock/build-essential + - perl +- name: autoconf-tarball + morph: strata/core/autoconf-tarball.morph + repo: upstream:autoconf-tarball + ref: 55d1d2c339bc5f935f6d8d702e98b7bd5d968e9d + unpetrify-ref: autoconf-2.69 build-depends: - perl - 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 + - autoconf-tarball - perl - texinfo-tarball - name: bash @@ -87,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 @@ -102,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 @@ -117,11 +116,11 @@ chunks: - sqlite3 - ncurses - readline -- name: libtool - morph: strata/core/libtool.morph - repo: upstream:libtool - ref: d388b7f2dc628b22006025d01179bc09b8aabe81 - unpetrify-ref: baserock/build-essential +- name: libtool-tarball + morph: strata/core/libtool-tarball.morph + repo: upstream:libtool-tarball + ref: f7bbc21981ffdbbe2d4435556e3ead0828dce160 + unpetrify-ref: libtool-2.4.5 build-depends: - bash - name: gtk-doc-stub @@ -129,28 +128,27 @@ chunks: ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - - libtool + - libtool-tarball - name: xz - morph: strata/core/xz.morph repo: upstream:xz - ref: 581deedf9d1eadcd84c4fcd23b9fdfe2dde18cc2 - unpetrify-ref: baserock/morph + ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a + unpetrify-ref: v5.2.0 build-depends: - - autoconf + - autoconf-tarball - automake - - gettext - - libtool + - gettext-tarball + - libtool-tarball - name: libxml2 repo: upstream:libxml2 ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80 unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - cpython - - libtool + - libtool-tarball - xz - name: ca-certificates morph: strata/core/ca-certificates.morph @@ -166,20 +164,18 @@ chunks: ref: 202aa9f7758636730299b86715d924f54468a908 unpetrify-ref: curl-7_38_0 build-depends: - - autoconf + - autoconf-tarball - automake - - libtool + - libtool-tarball - openssl-new - ca-certificates - 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 - - automake - - libtool + - cmake - name: XML-Parser repo: upstream:XML-Parser ref: e1a3ec157140a699e3020836475a0df622f70f1b @@ -191,13 +187,13 @@ 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 + - autoconf-tarball - cpython - curl - - gettext + - gettext-tarball - libexpat - openssl-new - name: help2man @@ -206,7 +202,7 @@ chunks: ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71 unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - name: bison morph: strata/core/bison.morph @@ -214,11 +210,11 @@ chunks: ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308 unpetrify-ref: baserock/v3.0.2 build-depends: - - autoconf + - autoconf-tarball - automake - bash - flex - - gettext + - gettext-tarball - git - help2man - mini-utils @@ -234,27 +230,39 @@ chunks: unpetrify-ref: baserock/morph build-depends: - XML-Parser - - autoconf + - autoconf-tarball - automake - perl +- name: pkg-config + morph: strata/core/pkg-config.morph + repo: upstream:pkg-config + ref: 74ceac54ef6f9247c00f08eecd8cca811a3c5934 + unpetrify-ref: pkg-config-0.28 + build-depends: + - autoconf-tarball + - automake + - libtool-tarball - name: util-linux morph: strata/core/util-linux.morph repo: upstream:util-linux ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0 unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - - gettext + - gettext-tarball - git - - libtool + - 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 @@ -282,10 +290,10 @@ chunks: ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2 unpetrify-ref: baserock/4.2 build-depends: - - autoconf + - autoconf-tarball - automake - - gettext - - libtool + - gettext-tarball + - libtool-tarball - bison - name: patch morph: strata/core/patch.morph diff --git a/strata/core/libtool.morph b/strata/core/autoconf-tarball.morph index f311281d..fbdc5768 100644 --- a/strata/core/libtool.morph +++ b/strata/core/autoconf-tarball.morph @@ -1,6 +1,5 @@ -name: libtool +name: autoconf-tarball kind: chunk -max-jobs: 1 build-system: autotools configure-commands: - ./configure --prefix="$PREFIX" 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/autoconf.morph b/strata/core/gettext-tarball.morph index 046bfc40..4983b484 100644 --- a/strata/core/autoconf.morph +++ b/strata/core/gettext-tarball.morph @@ -1,4 +1,4 @@ -name: autoconf +name: gettext-tarball kind: chunk build-system: autotools configure-commands: diff --git a/strata/core/gettext.morph b/strata/core/gettext.morph deleted file mode 100644 index 3e2c56b5..00000000 --- a/strata/core/gettext.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: gettext -kind: chunk -max-jobs: 1 -configure-commands: -- ./configure --prefix=/usr -build-commands: -- make EXAMPLESPOFILES= -install-commands: -- make EXAMPLESPOFILES= DESTDIR="$DESTDIR" install 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/tools/vala.morph b/strata/core/libtool-tarball.morph index dcac5d49..65a3edbc 100644 --- a/strata/tools/vala.morph +++ b/strata/core/libtool-tarball.morph @@ -1,4 +1,4 @@ -name: vala +name: libtool-tarball kind: chunk build-system: autotools configure-commands: 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/pkg-config.morph b/strata/core/pkg-config.morph index 090a65e5..ed35a2ac 100644 --- a/strata/core/pkg-config.morph +++ b/strata/core/pkg-config.morph @@ -2,4 +2,4 @@ name: pkg-config kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --with-internal-glib +- ./autogen.sh --prefix="$PREFIX" --with-internal-glib 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/core/xz.morph b/strata/core/xz.morph deleted file mode 100644 index 8165abdc..00000000 --- a/strata/core/xz.morph +++ /dev/null @@ -1,3 +0,0 @@ -name: xz -kind: chunk -build-system: autotools 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..cc1ae683 100644 --- a/strata/coreutils-common/coreutils.morph +++ b/strata/coreutils-common/coreutils.morph @@ -9,3 +9,8 @@ build-commands: - make WERROR_CFLAGS= install-commands: - make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install +# This hack is for supporting "fdatasync" argument in "dd" command +# which busybox "dd" does not support. +# This hack should dissappear when we merge /usr/bin and /bin. +- 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..3a05af2d --- /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" diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph new file mode 100644 index 00000000..92f6fa51 --- /dev/null +++ b/strata/coreutils-common/sed.morph @@ -0,0 +1,12 @@ +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: +# This hack is to use GNU sed instead the busybox one. +# This will dissappear when we merge /usr/bin and /bin. +- 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..8380a9cc 100644 --- a/strata/cross-bootstrap/groff.morph +++ b/strata/cross-bootstrap/groff.morph @@ -4,6 +4,8 @@ max-jobs: 1 configure-commands: - PAGE=A4 ./configure --prefix="$PREFIX" build-commands: +# hack to avoid a netpbm dependency +- 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/erlang.morph b/strata/erlang.morph index 657b07be..bea09d61 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 + unpretrify-ref: master + build-depends: + - erlang +- name: erlang-sd_notify + morph: strata/erlang/erlang-sd_notify.morph + repo: upstream:erlang-modules/erlang-sd_notify + ref: 99f4689c2c18570680329f822591f95f9341ca10 + unpretrify-ref: master + build-depends: + - erlang + - rebar 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 10111805..533ac9ee 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 @@ -35,23 +41,12 @@ chunks: ref: 77d4586cc47e8f4c02278afbc220145bba0d442b unpetrify-ref: baserock/morph build-depends: [] -- name: libusbx - repo: upstream:libusbx - ref: 7ec94a45ed8155e7a1d4d5d75575099b09c78834 - unpetrify-ref: baserock/morph - build-depends: [] - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 unpetrify-ref: baserock/morph build-depends: [] -- name: usbutils - repo: upstream:usbutils - ref: 410f1474af0ddb391bc6ec391777f116eee31569 - unpetrify-ref: baserock/morph - build-depends: - - libusbx - name: glib repo: upstream:glib ref: 4125415e7f4d1213fc7122beac0d91af08e37b28 @@ -78,37 +73,71 @@ 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: df0082ede6d0ca4db6773747eaf1c36d97458744 + unpetrify-ref: baserock/v218-with-canonical-hostname-fix build-depends: - dbus-pre - gobject-introspection - kmod - libcap2 - libgcrypt + - linux-pam +- name: libusb + repo: upstream:libusb + ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9 + unpetrify-ref: v1.0.19 + build-depends: + - systemd +- name: usbutils + repo: upstream:usbutils + ref: c37f146eb2c6642c600f1b025a6d56996b0697ff + unpetrify-ref: baserock/v008 + build-depends: + - libusb - 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: 13ee8f62d4aa3360adb6956fb30da0c858928fa2 - unpetrify-ref: baserock/genivi/morph + 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 @@ -124,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/tools/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph index 801f8abe..a57eb15a 100644 --- a/strata/tools/e2fsprogs.morph +++ b/strata/foundation/e2fsprogs.morph @@ -8,14 +8,14 @@ configure-commands: # install it. - | ./configure --prefix="$PREFIX" --sysconfdir=/etc \ - --disable-libuuid --disable-uuidd --disable-fsck + --disable-libuuid --disable-uuidd --disable-fsck --disable-libblkid install-commands: # e2fsprogs also includes tools that are provided by util-linux, so we # need to selectively exclude them. Removing them directly from DESTDIR # causes problems, so we need to remove them beforehand. - | 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..8380a9cc 100644 --- a/strata/foundation/groff.morph +++ b/strata/foundation/groff.morph @@ -4,6 +4,8 @@ max-jobs: 1 configure-commands: - PAGE=A4 ./configure --prefix="$PREFIX" build-commands: +# hack to avoid a netpbm dependency +- 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..0dfbe759 --- /dev/null +++ b/strata/foundation/linux-pam.morph @@ -0,0 +1,15 @@ +name: linux-pam +kind: chunk +build-system: autotools +pre-configure-commands: +- autoreconf -ivf +post-install-commands: +# sudo command is expecting this file. +- | + install -D -m 0644 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/pam.d/other + #%PAM-1.0 + auth required pam_unix.so + account required pam_unix.so + password required pam_unix.so + session required pam_unix.so + EOF diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph new file mode 100644 index 00000000..c3c89bcf --- /dev/null +++ b/strata/foundation/time-zone-database.morph @@ -0,0 +1,10 @@ +name: time-zone-database +kind: chunk +description: | + Time zone database. +build-system: manual +install-commands: +# ETCDIR is actually where the 'tzselect', 'zdump' and 'zic' commands get +# installed. Note that tzselect from this chunk will overlap with and override +# the tzselect binary from GLIBC. +- 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..851cb3dd 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: 9e96461aa59cdb5454a48200b8b80caaf04c4147 + unpetrify-ref: 3.15.5 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/lorry.morph b/strata/lorry.morph index 17f845cf..8a813d58 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -38,18 +38,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 @@ -63,12 +64,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 @@ -84,12 +86,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.morph index e34e3610..26db03ba 100644 --- a/strata/lorry/libapr-util-tarball.morph +++ b/strata/lorry/libapr-util.morph @@ -1,5 +1,7 @@ -name: libapr-util-tarball +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 95d9807c..aecf2a1d 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 @@ -69,9 +64,14 @@ chunks: ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph build-depends: [] +- name: pylru + repo: upstream:python-packages/pylru + ref: 221dd259f5c34562c835611d1cf62384b9019da4 + unpetrify-ref: master + build-depends: [] - name: morph repo: baserock:baserock/morph - ref: f0c5d4c0ef35cc43aa059cd2255e41c60c4cac77 + ref: 74f60a7ed286dd88e24539d46b9a86147a8e78b5 unpetrify-ref: master build-depends: - cliapp @@ -80,3 +80,4 @@ chunks: - pyfilesystem - bottle - flup + - pylru diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph new file mode 100644 index 00000000..5af03abb --- /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..7ba04db6 --- /dev/null +++ b/strata/networking-utils/iproute2.morph @@ -0,0 +1,10 @@ +name: iproute2 +kind: chunk +build-commands: +# arpd binary is dependent on Berkeley DB, which is licensed by Oracle +# as arpd is not needed for Openstack systems, arpd will not be compiled +# or installed. +- 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..409d6f17 --- /dev/null +++ b/strata/python-core.morph @@ -0,0 +1,27 @@ +name: python-core +kind: stratum +description: Core python packages +build-depends: +- morph: strata/core.morph +chunks: +- name: pip + repo: upstream:pip + ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 + unpetrify-ref: baserock/master + build-depends: [] +- name: pbr + repo: upstream:pbr + ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 + unpetrify-ref: 0.10.7 + build-depends: + - pip +- name: python-requests + repo: upstream:python-requests + ref: b83131779c701720a9ae9efae78996277d416269 + unpetrify-ref: v2.5.1 + build-depends: [] +- name: six + repo: upstream:six + ref: 8cfbff6b764af86d825086fa1637aa009e90d75a + unpetrify-ref: 1.9.0 + build-depends: [] diff --git a/strata/python-tools.morph b/strata/python-tools.morph index 0a707bc6..d1ce912d 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -5,8 +5,8 @@ useful python tools that we don't want to include in core." 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/qt5-sdk.morph b/strata/qt5-sdk.morph index 0d877a62..066f62a0 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -8,6 +8,6 @@ chunks: - name: qt-creator morph: strata/qt5-sdk/qt-creator.morph repo: upstream:qt-creator - ref: v3.2.1 - unpetrify-ref: baserock/morph/2.7 + ref: d81cd236df1cc6bc6977c438f0edbff35eef6682 + unpetrify-ref: baserock/3.3.0 build-depends: [] 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 fea33132..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,20 +35,26 @@ 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 - morph: strata/tools/vala.morph +- name: vala-bootstrap + morph: strata/tools/vala-bootstrap.morph repo: upstream:vala ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap build-depends: [] +- name: vala + repo: upstream:vala + ref: 682eba5880fbd76402dec10118883da913a7b255 + unpetrify-ref: 0.26.2 + build-depends: + - vala-bootstrap - name: u-boot morph: strata/tools/u-boot.morph repo: upstream:u-boot @@ -64,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..82adbe50 100644 --- a/strata/tools/distcc.morph +++ b/strata/tools/distcc.morph @@ -1,6 +1,10 @@ name: distcc kind: chunk build-system: autotools -configure-commands: +pre-configure-commands: - NOCONFIGURE=1 ./autogen.sh +# distcc doesn't use automake, so we cannot autoreconf it +- cp /usr/share/automake*/config.guess . +- cp /usr/share/automake*/config.sub . +configure-commands: - ./configure --prefix="$PREFIX" --disable-Werror diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph index 8b82b9d9..808ff7d7 100644 --- a/strata/tools/gdb.morph +++ b/strata/tools/gdb.morph @@ -2,4 +2,4 @@ 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 new file mode 100644 index 00000000..e55b1887 --- /dev/null +++ b/strata/tools/vala-bootstrap.morph @@ -0,0 +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..881b53de 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 + unpretrify-ref: master + build-depends: [] diff --git a/strata/virtualization/dmidecode.morph b/strata/virtualization/dmidecode.morph new file mode 100644 index 00000000..d9ab0fa3 --- /dev/null +++ b/strata/virtualization/dmidecode.morph @@ -0,0 +1,7 @@ +name: dmidecode +kind: chunk +build-system: manual +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..3f4c6c53 100644 --- a/strata/virtualization/dnsmasq.morph +++ b/strata/virtualization/dnsmasq.morph @@ -1,6 +1,10 @@ name: dnsmasq kind: chunk -build-system: autotools -configure-commands: [] +build-system: manual +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..8be1b4f2 --- /dev/null +++ b/strata/virtualization/ebtables.morph @@ -0,0 +1,7 @@ +name: ebtables +kind: chunk +build-system: manual +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..1b5cdd86 --- /dev/null +++ b/strata/virtualization/openvswitch.morph @@ -0,0 +1,11 @@ +name: openvswitch +kind: chunk +build-system: manual +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..13106ea5 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..a632d4df --- /dev/null +++ b/strata/xstatic.morph @@ -0,0 +1,108 @@ +name: xstatic +kind: stratum +description: | + Stratum with Xstatic and some xstatic libraries. + + XStatic is a packaging standard to package external static files as + a python package, so they are easily usable on all OSes. + + This conflicts with the 'everything from Git' policy of Baserock, + but it is required right now for the Openstack system to work. +build-depends: +- morph: strata/foundation.morph +chunks: +- name: xstatic + repo: upstream:xstatic + ref: 6c8604a422ba7f176ce6b372a8e182c293d06fb2 + unpetrify-ref: 1.0.1 + build-depends: [] +- name: xstatic-angular + repo: upstream:xstatic-packages/xstatic-angular + ref: dac047df05da5bb20de4e78876bc03820d0c6671 + unpetrify-ref: 1.3.7.0 + build-depends: [] +- name: xstatic-angular-cookies + repo: upstream:xstatic-packages/xstatic-angular-cookies + ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5 + unpetrify-ref: 1.2.1.1 + build-depends: [] +- name: xstatic-angular-mock + repo: upstream:xstatic-packages/xstatic-angular-mock + ref: 20fdada109b167bcdcacec22986b43fdb42866f3 + unpetrify-ref: 1.2.1.1 + build-depends: [] +- name: xstatic-bootstrap-datepicker + repo: upstream:xstatic-packages/xstatic-bootstrap-datepicker + ref: 60caf41e32d49f9bc715c39570f01449ebfbd37a + unpetrify-ref: master + build-depends: [] +- name: xstatic-bootstrap-scss + repo: upstream:xstatic-packages/xstatic-bootstrap-scss + ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e + unpetrify-ref: master + build-depends: [] +- name: xstatic-d3 + repo: upstream:xstatic-packages/xstatic-d3 + ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf + unpetrify-ref: master + build-depends: [] +- name: xstatic-hogan + repo: upstream:xstatic-packages/xstatic-hogan + ref: 9e39977f6a6744810b08fa0323147e9f31dbd363 + unpetrify-ref: master + build-depends: [] +- name: xstatic-font-awesome + repo: upstream:xstatic-packages/xstatic-font-awesome + ref: c13aad1b95b1d84e73f2565a18a5a8e2bd2194a7 + unpetrify-ref: 4.2.0.0 + build-depends: [] +- name: xstatic-jasmine + repo: upstream:xstatic-packages/xstatic-jasmine + ref: a55f5db1dbe59b23c7d6284250bf4eac1d0143c3 + unpetrify-ref: 2.1.2.0 + build-depends: [] +- name: xstatic-jquery + repo: upstream:xstatic-packages/xstatic-jquery + ref: e91c5bf82535a62c1cfac61b5efb6b5c0157c1f5 + unpetrify-ref: master + build-depends: [] +- name: xstatic-jquery-migrate + repo: upstream:xstatic-packages/xstatic-jquery-migrate + ref: 989b3b31106727542dd83810c3b952f90d8cdb8f + unpetrify-ref: master + build-depends: [] +- name: xstatic-jquery-quicksearch + repo: upstream:xstatic-packages/xstatic-jquery-quicksearch + ref: f5221c8c30507340846d97d6db41a782e7c63316 + unpetrify-ref: master + build-depends: [] +- name: xstatic-jquery-tablesorter + repo: upstream:xstatic-packages/xstatic-jquery-tablesorter + ref: eb78328391f44a9a88033e1aede1a605902c5551 + unpetrify-ref: master + build-depends: [] +- name: xstatic-jquery-ui + repo: upstream:xstatic-packages/xstatic-jquery-ui + ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1 + unpetrify-ref: 1.11.0.1 + build-depends: [] +- name: xstatic-jsencrypt + repo: upstream:xstatic-packages/xstatic-jsencrypt + ref: 5c0f088310ecd602e3aaf5e683385b0d27258409 + unpetrify-ref: master + build-depends: [] +- name: xstatic-qunit + repo: upstream:xstatic-packages/xstatic-qunit + ref: c3189eaa77c68c149a40b8c0afc8722cf394bd1f + unpetrify-ref: master + build-depends: [] +- name: xstatic-rickshaw + repo: upstream:xstatic-packages/xstatic-rickshaw + ref: 6427ca5406852bc779d6918f487bb0fe3f063e77 + unpetrify-ref: master + build-depends: [] +- name: xstatic-spin + repo: upstream:xstatic-packages/xstatic-spin + ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f + unpetrify-ref: master + build-depends: [] diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 3c41fa1e..cf37f5e6 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -9,6 +9,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 5a45c7c8..846681a2 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -9,6 +9,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 1f49c1a7..8be51f90 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -9,6 +9,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 6e2c201e..f74ce07d 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -9,6 +9,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 @@ -23,6 +25,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 87cda465..5bbe38f8 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -9,6 +9,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 @@ -25,6 +27,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 d8eeb7f3..1ca20c00 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -9,6 +9,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 @@ -23,6 +25,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 cdfa65ce..2bf25493 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -9,6 +9,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 @@ -25,6 +27,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 32ddfc56..c071b3ea 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/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 0b5e4709..8798182b 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.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 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 a51bd810..2e139755 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -33,6 +33,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..de099697 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -37,6 +37,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..697ea52d 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 |