diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-01-12 13:41:48 +0000 |
|---|---|---|
| committer | Morph (on behalf of Adam Coldrick) <adam.coldrick@codethink.co.uk> | 2015-01-12 13:41:48 +0000 |
| commit | 5f2cbb6e03d58bd15cea22e3571e8ef3ec3c08df (patch) | |
| tree | 70f02464e6e9e01e144a24322ba05effc8d446e5 | |
| parent | ef8b6b3405005ae7ce7fb337d82cdbd237f1979a (diff) | |
| download | definitions-5f2cbb6e03d58bd15cea22e3571e8ef3ec3c08df.tar.gz | |
Morph build 6f334ffa50134b86aa1e3a669310e51e
System branch: master
62 files changed, 228 insertions, 411 deletions
diff --git a/clusters/ci.morph b/clusters/ci.morph index 48e978bc..2c391477 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph @@ -23,12 +23,13 @@ systems: devel-system-armv7lhf-jetson: type: rawdisk location: build-system-armv7lhf-jetson.img + BOOTLOADER_CONFIG_FORMAT: extlinux + BOOTLOADER_INSTALL: none DISK_SIZE: 2G - ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-jetson-tk1.dtb" - BOOTLOADER_CONFIG_FORMAT: "extlinux" - BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 + DTB_PATH: boot/tegra124-jetson-tk1.dtb + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 + nouveau.pstate=1 + ROOT_DEVICE: /dev/mmcblk0p1 - morph: systems/weston-system-x86_64-generic.morph deploy: weston-system-x86_64-generic: @@ -41,9 +42,10 @@ systems: weston-system-armv7lhf-jetson: type: rawdisk location: weston-system-armv7lhf-jetson.img + BOOTLOADER_CONFIG_FORMAT: extlinux + BOOTLOADER_INSTALL: none DISK_SIZE: 4G - ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-jetson-tk1.dtb" - BOOTLOADER_CONFIG_FORMAT: "extlinux" - BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 + DTB_PATH: boot/tegra124-jetson-tk1.dtb + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 + nouveau.pstate=1 + ROOT_DEVICE: /dev/mmcblk0p1 diff --git a/clusters/gerrit-openstack.morph b/clusters/gerrit-openstack.morph index bdfb128c..8a14fd2a 100644 --- a/clusters/gerrit-openstack.morph +++ b/clusters/gerrit-openstack.morph @@ -5,12 +5,12 @@ description: | systems: - morph: systems/gerrit-x86_64.morph deploy: - openstack-image: - type: openstack - location: http://openstack-host:5000/v2.0/ - DISK_SIZE: 4G - OPENSTACK_USER: openstack-user - OPENSTACK_TENANT: openstack-tenant - OPENSTACK_IMAGENAME: Gerrit - CLOUD_INIT: yes - KERNEL_ARGS: console=ttyS0 console=tty0 + openstack-image: + type: openstack + location: http://openstack-host:5000/v2.0/ + CLOUD_INIT: true + DISK_SIZE: 4G + KERNEL_ARGS: console=ttyS0 console=tty0 + OPENSTACK_IMAGENAME: Gerrit + OPENSTACK_TENANT: openstack-tenant + OPENSTACK_USER: openstack-user diff --git a/clusters/hardware-deployment.morph b/clusters/hardware-deployment.morph index 0b1335ae..ad0ee3c4 100644 --- a/clusters/hardware-deployment.morph +++ b/clusters/hardware-deployment.morph @@ -9,17 +9,17 @@ systems: deploy: installer: type: pxeboot - location: AB:CD:EF:12:34:56:78 #MAC address. - PXEBOOT_MODE: spawn-novlan - PXEBOOT_DEPLOYER_INTERFACE: ens6 + location: AB:CD:EF:12:34:56:78 DISK_SIZE: 6G - KERNEL_ARGS: console=ttyS1,9600 console=tty0 init=/usr/lib/baserock-installer/installer HOSTNAME: installer-system - IPMI_USER: myipmiuser - IPMI_PASSWORD: myipmipassword - IPMI_HOST: 123.34.45.120 #IPMI ip address - INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda INSTALLER_ROOTFS_TO_INSTALL: /rootfs + INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda + IPMI_HOST: 123.34.45.120 + IPMI_PASSWORD: myipmipassword + IPMI_USER: myipmiuser + KERNEL_ARGS: console=ttyS1,9600 console=tty0 init=/usr/lib/baserock-installer/installer + PXEBOOT_DEPLOYER_INTERFACE: ens6 + PXEBOOT_MODE: spawn-novlan subsystems: - morph: systems/build-system-x86_64.morph deploy: diff --git a/clusters/installer-build-system-x86_64.morph b/clusters/installer-build-system-x86_64.morph index b31caced..36157ac8 100644 --- a/clusters/installer-build-system-x86_64.morph +++ b/clusters/installer-build-system-x86_64.morph @@ -19,18 +19,17 @@ description: | This cluster also deploys a subsystem (a build-system in this case) which is going to be the system that the installer system/script is going to install. - systems: - morph: systems/installer-system-x86_64.morph deploy: installer: type: rawdisk location: installer-build-system-x86_64.img - KERNEL_ARGS: init=/usr/lib/baserock-installer/installer DISK_SIZE: 6G HOSTNAME: installer-x86_64 - INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda INSTALLER_ROOTFS_TO_INSTALL: /rootfs + INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda + KERNEL_ARGS: init=/usr/lib/baserock-installer/installer subsystems: - morph: systems/build-system-x86_64.morph deploy: diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph index a73507aa..93e0d443 100644 --- a/clusters/jetson-upgrade.morph +++ b/clusters/jetson-upgrade.morph @@ -3,15 +3,16 @@ kind: cluster systems: - morph: systems/devel-system-armv7lhf-jetson.morph deploy-defaults: + BOOTLOADER_CONFIG_FORMAT: extlinux + BOOTLOADER_INSTALL: none + DTB_PATH: boot/tegra124-jetson-tk1.dtb + FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2 + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 + nouveau.pstate=1 + ROOT_DEVICE: /dev/mmcblk0p1 TROVE_HOST: TROVE_HOST TROVE_ID: TROVE_ID - ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-jetson-tk1.dtb" - BOOTLOADER_CONFIG_FORMAT: "extlinux" - BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 - FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2 deploy: self: - type: ssh-rsync - location: root@127.0.0.1 + type: ssh-rsync + location: root@127.0.0.1 diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph index 6ef14888..278ea2a2 100644 --- a/clusters/mason-openstack.morph +++ b/clusters/mason-openstack.morph @@ -20,20 +20,20 @@ systems: mason-openstack: type: openstack location: openstack-auth-url (eg example.com:5000/v2.0) + CLOUD_INIT: true DISK_SIZE: 6G DISTBUILD_CONTROLLER: true HOSTNAME: controller-hostname + KERNEL_ARGS: console=ttyS0 console=tty0 MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph MASON_DEFINITIONS_REF: master MASON_DISTBUILD_ARCH: x86_64 MASON_TEST_HOST: user@openstack-auth-url - WORKERS: controller-hostname OPENSTACK_AUTH_URL: openstack-auth-url - OPENSTACK_USER: baserock - OPENSTACK_TENANT: baserock - OPENSTACK_TENANT_ID: 7d7ebfe23367490b973a10fa426c3aec OPENSTACK_IMAGENAME: mason-openstack OPENSTACK_NETWORK_ID: 71f5151a-b7c3-405d-a841-d1b07e5db099 - CLOUD_INIT: yes - KERNEL_ARGS: console=ttyS0 console=tty0 + OPENSTACK_TENANT: baserock + OPENSTACK_TENANT_ID: 7d7ebfe23367490b973a10fa426c3aec + OPENSTACK_USER: baserock TEST_INFRASTRUCTURE_TYPE: openstack + WORKERS: controller-hostname diff --git a/clusters/release.morph b/clusters/release.morph index f161d0df..81e84525 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -34,12 +34,13 @@ systems: devel-system-armv7lhf-jetson: type: rawdisk location: build-system-armv7lhf-jetson.img + BOOTLOADER_CONFIG_FORMAT: extlinux + BOOTLOADER_INSTALL: none DISK_SIZE: 2G - ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-jetson-tk1.dtb" - BOOTLOADER_CONFIG_FORMAT: "extlinux" - BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 + DTB_PATH: boot/tegra124-jetson-tk1.dtb + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 + nouveau.pstate=1 + ROOT_DEVICE: /dev/mmcblk0p1 - morph: systems/genivi-baseline-system-x86_64-generic.morph deploy: genivi-baseline-system-x86_64-generic: @@ -52,9 +53,10 @@ systems: genivi-baseline-system-armv7lhf-jetson: type: rawdisk location: genivi-baseline-system-armv7lhf-jetson.img + BOOTLOADER_CONFIG_FORMAT: extlinux + BOOTLOADER_INSTALL: none DISK_SIZE: 4G - ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-jetson-tk1.dtb" - BOOTLOADER_CONFIG_FORMAT: "extlinux" - BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 + DTB_PATH: boot/tegra124-jetson-tk1.dtb + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 + nouveau.pstate=1 + ROOT_DEVICE: /dev/mmcblk0p1 diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph index 25ee579d..202f4bb7 100644 --- a/clusters/trove-example.morph +++ b/clusters/trove-example.morph @@ -35,13 +35,11 @@ description: | systems: - morph: systems/trove-system-x86_64.morph deploy-defaults: - HOSTNAME: test-trove - VCPUS: 2 - RAM_SIZE: 2G DISK_SIZE: 8G + HOSTNAME: test-trove LORRY_SSH_KEY: ssh_keys/lorry.key MASON_SSH_PUBKEY: ssh_keys/mason.key.pub - WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub + RAM_SIZE: 2G TROVE_ADMIN_EMAIL: adminuser@example.com TROVE_ADMIN_NAME: Nobody TROVE_ADMIN_SSH_PUBKEY: ssh_keys/trove-admin.key.pub @@ -50,6 +48,8 @@ systems: TROVE_HOST: test-trove TROVE_ID: test-trove UPSTREAM_TROVE: '' + VCPUS: 2 + WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub deploy: initial: type: kvm diff --git a/clusters/zookeeper.morph b/clusters/zookeeper.morph index 1153d4b0..448b23ba 100644 --- a/clusters/zookeeper.morph +++ b/clusters/zookeeper.morph @@ -1,21 +1,21 @@ name: zookeeper kind: cluster systems: - - morph: systems/zookeeper-client-x86_64.morph - deploy: - my-client-system: - type: kvm - location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-client.img - DISK_SIZE: 4G - RAM_SIZE: 1G - VCPUS: 1 - HOSTNAME: zkclient - - morph: systems/zookeeper-server-x86_64.morph - deploy: - my-server-system: - type: kvm - location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-server.img - DISK_SIZE: 4G - RAM_SIZE: 1G - VCPUS: 1 - HOSTNAME: zkserver +- morph: systems/zookeeper-client-x86_64.morph + deploy: + my-client-system: + type: kvm + location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-client.img + DISK_SIZE: 4G + HOSTNAME: zkclient + RAM_SIZE: 1G + VCPUS: 1 +- morph: systems/zookeeper-server-x86_64.morph + deploy: + my-server-system: + type: kvm + location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-server.img + DISK_SIZE: 4G + HOSTNAME: zkserver + RAM_SIZE: 1G + VCPUS: 1 diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph index 8e842e41..d92150a5 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph @@ -1,7 +1,6 @@ name: armv7lhf-cross-binutils kind: chunk build-system: autotools - configure-commands: - | # The TARGET used is the final triplet we expect, rather than that diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph index ee28c9dd..afbfa939 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-eglibc.morph @@ -1,20 +1,8 @@ name: armv7lhf-cross-eglibc kind: chunk - configure-commands: - mkdir o - -# Necessary for ARM port - cd libc && ln -s ../ports ports - -# Configure flag notes: -# 1. Location of linux-api-headers, needed since eglibc doesn't -# support being given a sysroot. -# 2. Location of binutils, since we build binutils for the final -# target triplet, but our gcc of our stage 1 target triplet. -# 3. Normal flags. See eglibc.morph. -# 4. Force configuration values of certain things that can't be detected -# in a cross-compile. - | export MORPH_ARCH=armv7lhf export TARGET=armv7lhf-baserock-linux-gnueabi @@ -34,10 +22,8 @@ configure-commands: --enable-add-ons=nptl,ports --without-cvs --without-selinux \ `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \ libc_cv_forced_unwind=yes libc_cv_ssp=no - build-commands: - cd o && make localtime=UTC - install-commands: - | # eglibc doesn't help with sysroots, so we need to spell out the diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph index d164a60b..9f993bc0 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph @@ -1,20 +1,7 @@ name: armv7lhf-cross-gcc-nolibc kind: chunk - configure-commands: - mkdir o - -# Configure flag notes: -# 1. Standard flags. See gcc.morph. -# 2. Our binutils is for the final $TARGET, rather than the intermediate -# target our GCC is being built for, so we need to set -# with-build-time-tools to get it to find our binutils at -# build-time and with-as and with-ld so our temporary GCC uses -# the appropriate tools when it compiles our libc, rather than -# trying to use $TARGET_STAGE1-as when producing binaries. -# 3. Disable stuff that doesn't work when building a cross compiler -# without an existing libc, and generally try to keep this build as -# simple as possible. - | export MORPH_ARCH=armv7lhf export TARGET=armv7lhf-baserock-linux-gnueabi @@ -38,16 +25,10 @@ configure-commands: --disable-shared --disable-threads --disable-target-libiberty \ --disable-target-zlib --without-headers --with-newlib \ --with-system-zlib - build-commands: - cd o && make - install-commands: - cd o && make DESTDIR="$DESTDIR" install - -# The file libgcc_eh is required during eglibc's build, but is not created -# because we built GCC with --disable-shared. This is a workaround for -# eglibc's build system being slightly broken. - | export TARGET_STAGE1=armv7lhf-none-linux-gnueabi libgcc_filename="$("$DESTDIR$PREFIX/bin/$TARGET_STAGE1-gcc" -print-libgcc-file-name)" diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph index 50c338e5..a5c6eac1 100644 --- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph +++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph @@ -1,15 +1,7 @@ name: armv7lhf-cross-gcc kind: chunk - configure-commands: - mkdir o - -# Configure flag notes: -# 1. Use the default sysroot path to install to and locate headers -# 2. Recommended by Linux From Scratch; required for C++ ABI -# compatibility with other Linux distributions. -# 3. Standard flags. See gcc.morph. -# 4. Avoid having more than one copy of ZLib in use on the system - | export MORPH_ARCH=armv7lhf export TARGET=armv7lhf-baserock-linux-gnueabi @@ -31,10 +23,8 @@ configure-commands: --with-mpfr-include="$(pwd)/../mpfr/src" \ --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \ `# [4]` --with-system-zlib - build-commands: - cd o && make - install-commands: - cd o && make DESTDIR="$DESTDIR" install - | diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 0c67ee5c..04a0a79b 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -70,7 +70,7 @@ chunks: morph: strata/audio-bluetooth/ofono.morph repo: upstream:ofono ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549 - unpetrify-ref: "1.15" + unpetrify-ref: '1.15' build-depends: - mobile-broadband-provider-info - bluez diff --git a/strata/bsp-jetson/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph index e297a069..bd47b17c 100644 --- a/strata/bsp-jetson/nouveau-drm.morph +++ b/strata/bsp-jetson/nouveau-drm.morph @@ -1,12 +1,15 @@ name: nouveau-drm kind: chunk build-commands: - - cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules +- cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules install-commands: - - cd drm && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install +- cd drm && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" + modules_install system-integration: - nouveau-drm-misc: - 00-earlyconf: - - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done) - - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau_platform.ko"; done) - - (cd /lib/modules && for version in *; do depmod -a "$version"; done) + nouveau-drm-misc: + 00-earlyconf: + - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; + done) + - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau_platform.ko"; + done) + - (cd /lib/modules && for version in *; do depmod -a "$version"; done) diff --git a/strata/build-essential/binutils.morph b/strata/build-essential/binutils.morph index bab52672..81d4d6f7 100644 --- a/strata/build-essential/binutils.morph +++ b/strata/build-essential/binutils.morph @@ -1,7 +1,6 @@ name: binutils kind: chunk build-system: autotools - configure-commands: - | ./configure --prefix="$PREFIX" --disable-nls --disable-werror \ diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph index 35f57357..77fc265f 100644 --- a/strata/build-essential/busybox.morph +++ b/strata/build-essential/busybox.morph @@ -1,41 +1,31 @@ name: busybox kind: chunk - configure-commands: -# Busybox's default config has everything enabled. - make defconfig - -- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config -- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config - -# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin. -- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config' - -# We have GAWK, but in GENIVI baseline we want to get rid of it -# - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config - -# Depends on stuff that was removed since eglibc 2.14. +- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' + -i .config +- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' + -i .config +- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' + -i .config' - sed -e 's/CONFIG_INETD=y.*/# CONFIG_INETD is not set/' -i .config - -# Busybox Patch is incompatible enough with GNU Patch that it can't be -# used for GNULib projects built from Git. - sed -e 's/CONFIG_PATCH=y.*/# CONFIG_PATCH is not set/' -i .config - -# None of this is needed because we have kmod; and it actually breaks the -# Linux build because depmod isn't compatible enough with util-linux's. - sed -e 's/CONFIG_DEPMOD=y.*/# CONFIG_DEPMOD is not set/' -i .config - sed -e 's/CONFIG_INSMOD=y.*/# CONFIG_INSMOD is not set/' -i .config - sed -e 's/CONFIG_MODPROBE=y.*/# CONFIG_MODPROBE is not set/' -i .config - sed -e 's/CONFIG_MODPROBE_SMALL=y.*/# CONFIG_MODPROBE_SMALL is not set/' -i .config - sed -e 's/CONFIG_LSMOD=y.*/# CONFIG_LSMOD is not set/' -i .config - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config - -# General features that we don't need. -- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config +- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not + set/' -i .config +- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' + -i .config - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config @@ -48,23 +38,18 @@ configure-commands: - sed -e 's/CONFIG_UNLZMA=y.*/# CONFIG_UNLZMA is not set/' -i .config - sed -e 's/CONFIG_UNXZ=y.*/# CONFIG_UNXZ is not set/' -i .config - sed -e 's/CONFIG_XZ=y.*/# CONFIG_XZ is not set/' -i .config - -# Now turn on some little bits we do need - sed -e 's/# CONFIG_BBCONFIG is not set/CONFIG_BBCONFIG=y/' -i .config -- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' -i .config -- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' -i .config - - +- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' + -i .config +- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' + -i .config build-commands: - make - install-commands: - | if [ "$PREFIX" = /usr ]; then PREFIX=; fi && make CONFIG_PREFIX="$DESTDIR$PREFIX" install && chmod 6755 "$DESTDIR$PREFIX"/bin/busybox - -# Set up man environment variables - mkdir -p "$DESTDIR"/etc - | cat << EOF > "$DESTDIR/etc/profile" diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph index 50e2918c..c57edb61 100644 --- a/strata/build-essential/gcc.morph +++ b/strata/build-essential/gcc.morph @@ -1,19 +1,7 @@ name: gcc kind: chunk - configure-commands: - mkdir o - -# Configure flag notes: -# 1. An attempt to stop anything going in $PREFIX/lib64 (which doesn't -# fully work; we will need to hobble the multilib configuration in -# config/i386/t-linux64 if we really want to kill /lib64). -# 2. Multilib does not make sense in Baserock. -# 3. Optimisation libraries which for now we do without. -# 4. Recommended by Linux From Scratch; required for C++ ABI -# compatibility with other Linux distributions. -# 5. MPFR is built in the GCC tree, we need to locate it. -# 6. Avoid having more than one copy of ZLib in use on the system - | cd o && \ ../configure \ @@ -29,14 +17,12 @@ configure-commands: `# [5]` --with-mpfr-include="$(pwd)/../mpfr/src" \ --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \ `# [6]` --with-system-zlib - build-commands: - cd o && make - install-commands: - cd o && make DESTDIR="$DESTDIR" install - ln -s gcc "$DESTDIR/$PREFIX/bin/cc" -- > +- | for fortran_alias in f77 f90 f95; do ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias" done diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph index 789283eb..fedc9ca2 100644 --- a/strata/build-essential/glibc.morph +++ b/strata/build-essential/glibc.morph @@ -38,7 +38,6 @@ products: - .* configure-commands: - mkdir o - - | case "$MORPH_ARCH" in armv7*) @@ -60,10 +59,8 @@ configure-commands: --without-cvs \ --without-selinux \ --enable-obsolete-rpc - build-commands: - cd o && make localtime=UTC - install-commands: - cd o && make install_root="$DESTDIR" localtime=UTC install - mkdir -p "$DESTDIR/etc" diff --git a/strata/build-essential/stage1-binutils.morph b/strata/build-essential/stage1-binutils.morph index b6670d5c..d3e73a87 100644 --- a/strata/build-essential/stage1-binutils.morph +++ b/strata/build-essential/stage1-binutils.morph @@ -1,14 +1,7 @@ name: stage1-binutils kind: chunk build-system: autotools - configure-commands: -# We set the sysroot location dynamically at runtime by passing -B to GCC, -# so we configure with sysroot=/. Setting the lib path is vital to avoid -# the tools we build linking to the libraries on the host system; the '=' -# makes the path we give relative to the sysroot, which we can then set -# at runtime by passing -Wl,--sysroot to GCC. - - | ./configure --prefix="$PREFIX" --disable-nls --disable-werror \ --build=$(sh config.guess) \ diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph index 0cb03568..0e0c2d81 100644 --- a/strata/build-essential/stage1-gcc.morph +++ b/strata/build-essential/stage1-gcc.morph @@ -1,19 +1,7 @@ name: stage1-gcc kind: chunk - configure-commands: - mkdir o - -# Configure flag notes: -# 1. Standard flags. See gcc.morph. -# 2. Disable searching /usr/local/include for headers -# 3. The pass 1 compiler needs to find the libraries we build in pass 2. -# Include path must be set explicility, because it defaults to -# $SYSROOT/usr/include rather than $SYSROOT/include. -# FIXME: this flag is not present until GCC 4.6.3! -# 4. Disable stuff that doesn't work when building a cross compiler -# without an existing libc, and generally try to keep this build as -# simple as possible. - | cd o && ../configure \ @@ -33,16 +21,10 @@ configure-commands: --disable-shared --disable-threads --disable-target-libiberty \ --disable-target-zlib --without-headers --with-newlib \ --with-system-zlib - build-commands: - cd o && make - install-commands: - cd o && make DESTDIR="$DESTDIR" install - -# The file libgcc_eh is required during eglibc's build, but is not created -# because we built GCC with --disable-shared. This is a workaround for -# eglibc's build system being slightly broken. - | libgcc_filename=$($DESTDIR$PREFIX/bin/$TARGET_STAGE1-gcc -print-libgcc-file-name) ln -sv libgcc.a $(echo $libgcc_filename | sed 's/libgcc/&_eh/') diff --git a/strata/build-essential/stage2-binutils.morph b/strata/build-essential/stage2-binutils.morph index bc0b18ac..a3701b2c 100644 --- a/strata/build-essential/stage2-binutils.morph +++ b/strata/build-essential/stage2-binutils.morph @@ -1,7 +1,6 @@ name: stage2-binutils kind: chunk build-system: autotools - configure-commands: - | export STAGE2_SYSROOT="$(dirname $(pwd))" @@ -12,11 +11,7 @@ configure-commands: --build=$(sh config.guess) \ --host=$TARGET_STAGE1 \ --target=$TARGET_STAGE1 - build-commands: -# Nested configure scripts require that we set CPPFLAGS here as well -# (I don't think we should have to .. . at least in GCC, I think -# TARGET_CPPFLAGS may be the answer) - | export STAGE2_SYSROOT="$(dirname $(pwd))" export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph index dc23d09b..7d17ea40 100644 --- a/strata/build-essential/stage2-busybox.morph +++ b/strata/build-essential/stage2-busybox.morph @@ -1,42 +1,31 @@ name: stage2-busybox kind: chunk - configure-commands: -# Explicitly setting HOSTCC is required because we have a 'gcc' earlier in -# the PATH supplied by the stage2-gcc chunk, which can't execute outside of -# the stage 3 staging area. - make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- defconfig - -# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin. -- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config' - -# We have GAWK. +- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' + -i .config' - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config - -# Depends on stuff that was removed since eglibc 2.14. - sed -e 's/CONFIG_INETD=y.*/# CONFIG_INETD is not set/' -i .config - -# Busybox Patch is incompatible enough with GNU Patch that it can't be -# used for GNULib projects built from Git. - sed -e 's/CONFIG_PATCH=y.*/# CONFIG_PATCH is not set/' -i .config - -# None of this is needed because we have kmod; and it actually breaks the -# Linux build because depmod isn't compatible enough with util-linux's. - sed -e 's/CONFIG_DEPMOD=y.*/# CONFIG_DEPMOD is not set/' -i .config - sed -e 's/CONFIG_INSMOD=y.*/# CONFIG_INSMOD is not set/' -i .config - sed -e 's/CONFIG_MODPROBE=y.*/# CONFIG_MODPROBE is not set/' -i .config - sed -e 's/CONFIG_MODPROBE_SMALL=y.*/# CONFIG_MODPROBE_SMALL is not set/' -i .config - sed -e 's/CONFIG_LSMOD=y.*/# CONFIG_LSMOD is not set/' -i .config - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config - -# General features that we don't need. -- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config +- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not + set/' -i .config +- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' + -i .config +- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' + -i .config - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config -- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' -i .config +- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' + -i .config - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config - sed -e 's/CONFIG_HALT=y.*/# CONFIG_HALT is not set/' -i .config @@ -52,17 +41,13 @@ configure-commands: - sed -e 's/CONFIG_UNLZMA=y.*/# CONFIG_UNLZMA is not set/' -i .config - sed -e 's/CONFIG_UNXZ=y.*/# CONFIG_UNXZ is not set/' -i .config - sed -e 's/CONFIG_XZ=y.*/# CONFIG_XZ is not set/' -i .config - build-commands: - | export STAGE2_SYSROOT="$(dirname $(pwd))" export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- - install-commands: -# We expect to be built with a non-standard prefix in stage 2 (i.e. not -# /usr). The install will break if prefix is set to /usr. - | export STAGE2_SYSROOT="$(dirname $(pwd))" export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" diff --git a/strata/build-essential/stage2-gcc-fixed-headers.morph b/strata/build-essential/stage2-gcc-fixed-headers.morph index 10794872..2c4741ee 100644 --- a/strata/build-essential/stage2-gcc-fixed-headers.morph +++ b/strata/build-essential/stage2-gcc-fixed-headers.morph @@ -1,14 +1,6 @@ name: stage2-gcc-fixed-headers kind: chunk install-commands: -# Stage 1 GCC's fixincludes process created a limits.h before there was -# a real limits.h available for the target. This step (taken from Linux -# Linux From Scratch) creates a better one so that stage 2 GCC can compile. -# -# THIS IS A FRAGILE HACK! We need to replace the headers. The only way to -# overwrite files in a staging area is to install a new chunk. -# This is undesired behaviour in the long term, as we want to never -# have overlaps, so this functionality may go away. - | libgcc_dir=$(dirname $($TARGET_STAGE1-gcc -print-libgcc-file-name)) sysroot="$(dirname "$(pwd)")" @@ -16,4 +8,3 @@ install-commands: mkdir -p "$DESTDIR/$target_libgcc_dir/include-fixed" cat "gcc/limitx.h" "gcc/glimits.h" "gcc/limity.h" \ >"$DESTDIR/$target_libgcc_dir/include-fixed/limits.h" - diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.morph index bf6378c1..e342d648 100644 --- a/strata/build-essential/stage2-gcc.morph +++ b/strata/build-essential/stage2-gcc.morph @@ -1,25 +1,7 @@ name: stage2-gcc kind: chunk - configure-commands: - mkdir o - -# In other projects we specify the sysroot location using CPPFLAGS. Here, -# that breaks because GCC compiles stuff for the *build* machine, too ... -# and this requires using the host's compiler, which cannot use the same -# set of CPPFLAGS as the target. If we specify the sysroot using CC instead -# then we don't interfere, because we are only specifying the *host* C -# compiler. -# -# Configure flag notes: -# 1. It's vital that this compiler targets the bootstrap machine -# (TARGET_STAGE1) so that the stage 1 GCC is used instead of the -# compiler of the build machine. -# 2. Disable searching /usr/local/include for headers -# 3. This flag causes the correct --sysroot flag to be passed when calling -# stage 1 GCC. -# 4. C++ is built in stage 3. -# 5. Standard flags. See gcc.morph. - | export STAGE2_SYSROOT="$(dirname $(pwd))" export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT" @@ -40,22 +22,12 @@ configure-commands: --without-cloog --without-ppl \ --with-mpfr-include="$(pwd)/../mpfr/src" \ --with-mpfr-lib="$(pwd)/mpfr/src/.libs" - build-commands: - | export STAGE2_SYSROOT="$(dirname $(pwd))" cd o && make - install-commands: - cd o && make DESTDIR="$DESTDIR" install - -# Stage 3 builds need to link against this file in the location that -# it will be in the final system, so we make a temporary link now. -# -# On x86_64 GCC resolutely installs its libraries into lib64. To fix this -# would require hobbling the MULTILIB_OSDIRNAMES field in -# gcc/config/i386/t-linux64 and this might break things, so for now we -# tolerate the inconsistency. - | if [ "$(echo $TARGET | cut -c -6)" = "x86_64" ]; then libdir=lib64 diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph index ffa0970b..1fe00e41 100644 --- a/strata/build-essential/stage2-glibc.morph +++ b/strata/build-essential/stage2-glibc.morph @@ -1,15 +1,7 @@ name: stage2-glibc kind: chunk - configure-commands: - mkdir o - -# Configure flag notes: -# 1. Avoid installing to PREFIX/lib64 on x86_64. -# 2. Location of linux-api-headers. -# 3. Normal flags. See glibc.morph. -# 4. Force configuration values of certain things that can't be detected -# in a cross-compile. - | case "$MORPH_ARCH" in armv7*) @@ -26,19 +18,11 @@ configure-commands: `# [3]` --disable-profile --enable-kernel=2.6.25 \ `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \ libc_cv_forced_unwind=yes libc_cv_ssp=no - build-commands: - cd o && make localtime=UTC - install-commands: - cd o && make install_root="$DESTDIR" localtime=UTC install - sh stage2-glibc-fix-specs - -# Install a symlink for the program interpreter (ld.so) so that binaries -# built in stage 3 before the stage 3 glibc is built can use it. -# FIXME: get a better way of finding the name of the loader. The lib64 -# path is hardcoded into glibc in the file -# sysdeps/unix/sysv/linux/configure. - install -d $DESTDIR/lib - | cpu=$(echo $TARGET | cut -d '-' -f 1) diff --git a/strata/build-essential/stage2-reset-specs.morph b/strata/build-essential/stage2-reset-specs.morph index 8892f67c..6495909c 100644 --- a/strata/build-essential/stage2-reset-specs.morph +++ b/strata/build-essential/stage2-reset-specs.morph @@ -1,17 +1,5 @@ name: stage2-reset-specs kind: chunk - -# Nasty hack to get around being unable to reliably add configuration to gcc, -# hence the gcc specs are modified, combined with Baserock's rootfs protection -# preventing specs being modified before builds. -# The limitation is overcome by installing files as part of a chunk, which -# overwrites previous files. -# New specs were added for the bootstrap builds, but after stage2 we start -# having chrooted builds, so the old specs need to be replaced. -# Unfortunately we can't just replace the specs with the ones gcc produces, -# since gcc behaves differently without specs to with specs it produces! -# So we use a **NASTY HACK** to replace the specs symlink with one that -# points to a file that doesn't exist. install-commands: - | STAGE2_SYSROOT="$(dirname "$(pwd)")" diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 1108ab4b..112a7e71 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -24,7 +24,7 @@ chunks: - name: gperftools repo: upstream:gperftools ref: 846b775dfadb77901202ae7ddbac30ad1de7df01 - unpetrify-ref: gperftools-2.2 + unpetrify-ref: gperftools-2.2 build-depends: - libunwind - name: snappy diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph index cc954076..fa785e3c 100644 --- a/strata/ceph-service/boost.morph +++ b/strata/ceph-service/boost.morph @@ -3,6 +3,6 @@ kind: chunk configure-commands: - ./bootstrap.sh build-commands: -- ./b2 +- ./b2 install-commands: - ./b2 install --prefix="$DESTDIR$PREFIX" diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph index 9bb038d1..814fe22c 100644 --- a/strata/ceph-service/ceph.morph +++ b/strata/ceph-service/ceph.morph @@ -3,9 +3,8 @@ kind: chunk build-system: autotools configure-commands: - NOCONFIGURE=1 ./autogen.sh -- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops --without-libxfs -build-commands: -- make +- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops + --without-libxfs install-commands: - make install - install -D -m 755 src/init-ceph.in "$DESTDIR"/etc/init.d/ceph-SysV diff --git a/strata/ceph-service/leveldb.morph b/strata/ceph-service/leveldb.morph index bff2b87a..2b97c6e6 100644 --- a/strata/ceph-service/leveldb.morph +++ b/strata/ceph-service/leveldb.morph @@ -4,6 +4,6 @@ build-commands: - make install-commands: - mkdir -p "$DESTDIR$PREFIX"/lib -- mkdir -p "$DESTDIR$PREFIX"/include +- mkdir -p "$DESTDIR$PREFIX"/include - cp --preserve=links libleveldb.* "$DESTDIR$PREFIX"/lib - cp -r include/leveldb "$DESTDIR$PREFIX"/include diff --git a/strata/core/bison.morph b/strata/core/bison.morph index a9497d4e..5374c7da 100644 --- a/strata/core/bison.morph +++ b/strata/core/bison.morph @@ -1,7 +1,8 @@ name: bison kind: chunk configure-commands: -- echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version +- echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 + | cut -d' ' -f6) > .tarball-version - bash bootstrap --skip-po - ./configure --prefix=/usr --disable-nls build-commands: diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 9687ac7e..149445c1 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -73,9 +73,9 @@ chunks: build-depends: - six - name: morph - repo: baserock:baserock/morph - ref: 67afd098cd297b769b1341a460d160a2902ba4e4 - unpetrify-ref: master + repo: file:///home/adam/testing-workspace/master/baserock/baserock/morph + ref: refs/heads/baserock/6453f312359f4317803ef7f14b58d21f/d675b946df4f456693ed211dcd2ec95e + unpetrify-ref: 67afd098cd297b769b1341a460d160a2902ba4e4 build-depends: - cliapp - cmdtest diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index e364bab2..91ec8323 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -9,8 +9,8 @@ chunks: unpetrify-ref: baserock/morph build-depends: [] - name: drm - repo: upstream:drm morph: strata/libdrm-common/drm.morph + repo: upstream:drm ref: 83b2c40922ce451f5844aae0707ae9783a78d74f unpetrify-ref: baserock/drm_2.4.58/jetson build-depends: diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph index d3d06fd8..c316cb5c 100644 --- a/strata/libdrm-common/drm.morph +++ b/strata/libdrm-common/drm.morph @@ -2,9 +2,9 @@ name: drm kind: chunk build-system: autotools configure-commands: - - NOCONFIGURE=1 ./autogen.sh - - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api +- NOCONFIGURE=1 ./autogen.sh +- ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api install-commands: - - make install DESTDIR="$DESTDIR" - - mkdir -p "$DESTDIR"/usr/lib/pkgconfig - - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig +- make install DESTDIR="$DESTDIR" +- mkdir -p "$DESTDIR"/usr/lib/pkgconfig +- /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph index 9d280062..d47d1837 100644 --- a/strata/llvm-common/llvm.morph +++ b/strata/llvm-common/llvm.morph @@ -3,6 +3,7 @@ kind: chunk description: Low Level Virtual Machine build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host --enable-optimized --disable-assertions +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host + --enable-optimized --disable-assertions build-commands: - make $MAKEFLAGS diff --git a/strata/lorry.morph b/strata/lorry.morph index 364f8f87..bbe6d845 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -10,9 +10,6 @@ description: | The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available by this stratum. build-depends: -# The 'morph-utils' stratum is required for 'cliapp', which Lorry needs at -# build-time to generate its man page. Otherwise we could simply depend on -# the 'foundation' stratum. - morph: strata/morph-utils.morph chunks: - name: bzr-tarball diff --git a/strata/lua/luajit2.morph b/strata/lua/luajit2.morph index 72f34f02..9c7d1a5f 100644 --- a/strata/lua/luajit2.morph +++ b/strata/lua/luajit2.morph @@ -4,4 +4,3 @@ build-commands: - make PREFIX="$PREFIX" install-commands: - make install PREFIX="$PREFIX" DESTDIR="$DESTDIR" - diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index e4f9e7d0..9d9d0db3 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -70,9 +70,9 @@ chunks: unpetrify-ref: baserock/morph build-depends: [] - name: morph - repo: baserock:baserock/morph - ref: 30aaa46e250a1bd8081283839abd7d5aab97fb1e - unpetrify-ref: master + repo: file:///home/adam/testing-workspace/master/baserock/baserock/morph + ref: refs/heads/baserock/6453f312359f4317803ef7f14b58d21f/d675b946df4f456693ed211dcd2ec95e + unpetrify-ref: 30aaa46e250a1bd8081283839abd7d5aab97fb1e build-depends: - cliapp - cmdtest diff --git a/strata/network-security.morph b/strata/network-security.morph index 3d0c7814..e9b66cb9 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -16,4 +16,3 @@ chunks: unpetrify-ref: baserock/morph build-depends: - nspr - diff --git a/strata/nfs/nfs-utils.morph b/strata/nfs/nfs-utils.morph index c412e1d0..8116a9f4 100644 --- a/strata/nfs/nfs-utils.morph +++ b/strata/nfs/nfs-utils.morph @@ -3,7 +3,8 @@ kind: chunk build-system: autotools configure-commands: - NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal --without-tcp-wrappers +- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal + --without-tcp-wrappers install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR"/lib/systemd/system diff --git a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph b/strata/patch-manager-gerrit/gerrit-installation-binaries.morph index b0d1a393..c604112e 100644 --- a/strata/patch-manager-gerrit/gerrit-installation-binaries.morph +++ b/strata/patch-manager-gerrit/gerrit-installation-binaries.morph @@ -1,6 +1,5 @@ name: gerrit-installation-binaries kind: chunk -configure-commands: [] build-commands: - cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz install-commands: diff --git a/strata/python-tools.morph b/strata/python-tools.morph index 0a707bc6..d5cd11f0 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -1,7 +1,7 @@ name: python-tools kind: stratum -description: "A stratum for non-essential python tools: -useful python tools that we don't want to include in core." +description: 'A stratum for non-essential python tools: useful python tools that we + don''t want to include in core.' build-depends: - morph: strata/core.morph chunks: diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 1d746949..f9950139 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -24,12 +24,12 @@ chunks: repo: upstream:qt5/qttools ref: 8c79a098b8b7da4832ebca1884ee833a2c2078a7 unpetrify-ref: v5.3.2 - build-depends: + build-depends: - qtwebkit - name: qttranslations morph: strata/qt5-tools/qttranslations.morph repo: upstream:qt5/qttranslations ref: cf4d6f7e73bb410ed0aa3d64dffb2b6b242cdfe0 unpetrify-ref: v5.3.2 - build-depends: + build-depends: - qttools diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 34e57bc4..fc3eb69f 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -120,20 +120,19 @@ chunks: repo: upstream:qt5/qtconnectivity ref: 8a33a9b43dcc5e7f9a77237a660a3759286e6b86 unpetrify-ref: v5.3.2 - build-depends: + build-depends: - qtbase - name: qtlocation morph: strata/qt5-tools/qtlocation.morph repo: upstream:qt5/qtlocation ref: a36d9e67e3b8168cb4d1eb76eda96ebb8242fd20 unpetrify-ref: v5.3.2 - build-depends: + build-depends: - qtbase - name: qtwebsockets morph: strata/qt5-tools/qtwebsockets.morph repo: upstream:qt5/qtwebsockets ref: 00f77bdc5beb62e980216cfee906ab7aa1d1c4f7 unpetrify-ref: v5.3.2 - build-depends: + build-depends: - qtbase - diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph index 801f8abe..9d3b32a8 100644 --- a/strata/tools/e2fsprogs.morph +++ b/strata/tools/e2fsprogs.morph @@ -2,17 +2,10 @@ name: e2fsprogs kind: chunk build-system: autotools configure-commands: -# Configure with the usual paths for binaries and config -# but also disable whatever we can that is already provided by util-linux -# Disabling e2fsprofs' libblkid does not work, but we don't have to -# install it. - | ./configure --prefix="$PREFIX" --sysconfdir=/etc \ --disable-libuuid --disable-uuidd --disable-fsck 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 diff --git a/strata/webtools.morph b/strata/webtools.morph index 39175747..f3b4af2e 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -19,7 +19,7 @@ chunks: - name: tar morph: strata/webtools/tar.morph repo: upstream:tar - ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 + ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 unpetrify-ref: baserock/release_1_28 build-depends: [] - name: nginx diff --git a/strata/x-common.morph b/strata/x-common.morph index 8c0bba1d..0382cd90 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -134,7 +134,7 @@ chunks: - name: xcb-proto repo: upstream:xcb-proto ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 - unpetrify-ref: "1.11" + unpetrify-ref: '1.11' build-depends: [] - name: xorg-lib-libxshmfence repo: upstream:xorg-lib-libxshmfence @@ -150,7 +150,7 @@ chunks: - name: xcb-libxcb repo: upstream:xcb-libxcb ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a - unpetrify-ref: "1.11" + unpetrify-ref: '1.11' build-depends: - xcb-proto - xorg-lib-libXau diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph index 6ad4269e..b55a7b7c 100644 --- a/strata/zookeeper-server.morph +++ b/strata/zookeeper-server.morph @@ -1,6 +1,7 @@ name: zookeeper-server kind: stratum -description: This Stratum installs a zookeeper server and small program to populate it with default data. +description: This Stratum installs a zookeeper server and small program to populate + it with default data. build-depends: - morph: strata/zookeeper.morph chunks: diff --git a/strata/zookeeper/java-binary.morph b/strata/zookeeper/java-binary.morph index a6c11f95..d018fe08 100644 --- a/strata/zookeeper/java-binary.morph +++ b/strata/zookeeper/java-binary.morph @@ -1,6 +1,5 @@ name: java-binary kind: chunk -configure-commands: [] build-commands: - cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz install-commands: diff --git a/strata/zookeeper/zookeeper-client.morph b/strata/zookeeper/zookeeper-client.morph index 591c1840..7bc99f08 100644 --- a/strata/zookeeper/zookeeper-client.morph +++ b/strata/zookeeper/zookeeper-client.morph @@ -1,17 +1,17 @@ name: zookeeper-client kind: chunk build-commands: - - mkdir -p "$DESTDIR$PREFIX"/zookeeper-client - - cp -r * "$DESTDIR$PREFIX"/zookeeper-client - - make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/ +- mkdir -p "$DESTDIR$PREFIX"/zookeeper-client +- cp -r * "$DESTDIR$PREFIX"/zookeeper-client +- make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/ post-install-commands: - - | - install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service - [unit] - Description=Zookeeper client init - [Service] - ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198 - RemainAfterExit=yes - [Install] - WantedBy=multi-user.target - EOF +- | + install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service + [unit] + Description=Zookeeper client init + [Service] + ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198 + RemainAfterExit=yes + [Install] + WantedBy=multi-user.target + EOF diff --git a/strata/zookeeper/zookeeper-server.morph b/strata/zookeeper/zookeeper-server.morph index 082c063c..502bbda3 100644 --- a/strata/zookeeper/zookeeper-server.morph +++ b/strata/zookeeper/zookeeper-server.morph @@ -1,30 +1,30 @@ name: zookeeper-server kind: chunk build-commands: - - mkdir -p "$DESTDIR$PREFIX"/zookeeper_server - - cp -r * "$DESTDIR$PREFIX"/zookeeper_server - - make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/ +- mkdir -p "$DESTDIR$PREFIX"/zookeeper_server +- cp -r * "$DESTDIR$PREFIX"/zookeeper_server +- make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/ post-install-commands: - - | - install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service - [unit] - Description=Zookeeper server - [Service] - ExecStart=/usr/zookeeper/bin/zkServer.sh start - RemainAfterExit=yes - [Install] - WantedBy=multi-user.target - EOF - - | - install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service - [unit] - Description=Zookeeper server init - [Service] - ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup - RemainAfterExit=no - [Install] - WantedBy=multi-user.target - EOF - - mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants - - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service - - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service +- | + install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service + [unit] + Description=Zookeeper server + [Service] + ExecStart=/usr/zookeeper/bin/zkServer.sh start + RemainAfterExit=yes + [Install] + WantedBy=multi-user.target + EOF +- | + install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service + [unit] + Description=Zookeeper server init + [Service] + ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup + RemainAfterExit=no + [Install] + WantedBy=multi-user.target + EOF +- mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants +- ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service +- ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service diff --git a/strata/zookeeper/zookeeper.morph b/strata/zookeeper/zookeeper.morph index dbe6ccbb..db446a1b 100644 --- a/strata/zookeeper/zookeeper.morph +++ b/strata/zookeeper/zookeeper.morph @@ -1,14 +1,14 @@ name: zookeeper kind: chunk configure-commands: - - mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper +- mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper build-commands: - - ant -p compile_jute - - mkdir -p "$DESTDIR$PREFIX"/zookeeper - - cp -r * "$DESTDIR$PREFIX"/zookeeper - - cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i - - cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/ - - make -C "$DESTDIR$PREFIX"/zookeeper/src/c - - cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install - - mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg - - make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt +- ant -p compile_jute +- mkdir -p "$DESTDIR$PREFIX"/zookeeper +- cp -r * "$DESTDIR$PREFIX"/zookeeper +- cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i +- cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/ +- make -C "$DESTDIR$PREFIX"/zookeeper/src/c +- cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install +- mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg +- make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 8b92f267..980b084b 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -1,6 +1,7 @@ name: build-system-armv7lhf-highbank kind: system -description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float Calxeda Highbank computers. +description: The system that should be used for building all other Baserock systems + for ARMv7 little-endian hard-float Calxeda Highbank computers. arch: armv7lhf strata: - name: build-essential diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index d28b94df..04245de5 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -1,6 +1,7 @@ name: build-system-armv7lhf-jetson kind: system -description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers. +description: The system that should be used for building all other Baserock systems + for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers. arch: armv7lhf strata: - name: build-essential diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 14762a6e..2c7126c3 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -1,6 +1,7 @@ name: build-system-ppc64 kind: system -description: The system that should be used for building all other Baserock systems for 64-bit POWER computers. +description: The system that should be used for building all other Baserock systems + for 64-bit POWER computers. arch: ppc64 strata: - name: build-essential diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 089a26c8..c090e908 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -1,6 +1,7 @@ name: build-system-x86_32-chroot kind: system -description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers, chroot variant. +description: The system that should be used for building all other Baserock systems + for 32-bit Intel x86 computers, chroot variant. arch: x86_32 strata: - name: build-essential diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 35a86e11..4d3b8fa9 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -1,6 +1,7 @@ name: build-system-x86_32 kind: system -description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers. +description: The system that should be used for building all other Baserock systems + for 32-bit Intel x86 computers. arch: x86_32 strata: - name: build-essential diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index db3a38db..6ea02dd3 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -1,6 +1,7 @@ name: build-system-x86_64-chroot kind: system -description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers, chroot variant. +description: The system that should be used for building all other Baserock systems + for 64-bit Intel x86 computers, chroot variant. arch: x86_64 strata: - name: build-essential diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 06868fed..962c1a28 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -1,6 +1,7 @@ name: build-system-x86_64 kind: system -description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers. +description: The system that should be used for building all other Baserock systems + for 64-bit Intel x86 computers. arch: x86_64 strata: - name: build-essential diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 0b5e4709..880d40dc 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -1,6 +1,7 @@ name: installer-system-x86_64 kind: system -description: The system that should be used as an Installer to install other Baserock systems. +description: The system that should be used as an Installer to install other Baserock + systems. arch: x86_64 strata: - name: build-essential diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index a51bd810..27d56e78 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -1,6 +1,7 @@ name: weston-system-armv7lhf-jetson kind: system -description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers. +description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1 + computers. arch: armv7lhf strata: - name: build-essential |