diff options
77 files changed, 164 insertions, 268 deletions
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph index 4eb6b801..a73507aa 100644 --- a/clusters/jetson-upgrade.morph +++ b/clusters/jetson-upgrade.morph @@ -6,11 +6,11 @@ systems: TROVE_HOST: TROVE_HOST TROVE_ID: TROVE_ID ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-pm375.dtb" + DTB_PATH: "boot/tegra124-jetson-tk1.dtb" BOOTLOADER_CONFIG_FORMAT: "extlinux" BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt - FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime 0 2 + 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 diff --git a/clusters/release.morph b/clusters/release.morph index 5466df22..f161d0df 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -17,7 +17,7 @@ systems: build-system-x86_32: type: rawdisk location: build-system-x86_32.img - DISK_SIZE: 4G + DISK_SIZE: 6G - morph: systems/build-system-x86_64-chroot.morph deploy: build-system-x86_64-chroot: @@ -28,18 +28,18 @@ systems: build-system-x86_64: type: rawdisk location: build-system-x86_64.img - DISK_SIZE: 4G + DISK_SIZE: 6G - morph: systems/build-system-armv7lhf-jetson.morph deploy: devel-system-armv7lhf-jetson: type: rawdisk location: build-system-armv7lhf-jetson.img - DISK_SIZE: 4G + DISK_SIZE: 2G ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-pm375.dtb" + DTB_PATH: "boot/tegra124-jetson-tk1.dtb" BOOTLOADER_CONFIG_FORMAT: "extlinux" BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 - morph: systems/genivi-baseline-system-x86_64-generic.morph deploy: genivi-baseline-system-x86_64-generic: @@ -57,4 +57,4 @@ systems: DTB_PATH: "boot/tegra124-jetson-tk1.dtb" BOOTLOADER_CONFIG_FORMAT: "extlinux" BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: cma=256M console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 7233d84f..44adc1fb 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -7,7 +7,8 @@ build-depends: chunks: - name: libndp repo: upstream:libndp - ref: master + ref: f3a3a63d5b5abced8f75731d7b995606933c6e33 + unpetrify-ref: v1.4 build-depends: [] - name: NetworkManager morph: strata/NetworkManager-common/NetworkManager.morph diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 1d00aa8f..0c67ee5c 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -69,8 +69,8 @@ chunks: - name: ofono morph: strata/audio-bluetooth/ofono.morph repo: upstream:ofono - ref: a53228f6b1b32d0405c0c3c8e0861d6202ffbba2 - unpetrify-ref: baserock/morph + ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549 + unpetrify-ref: "1.15" build-depends: - mobile-broadband-provider-info - bluez diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph new file mode 100644 index 00000000..6e875e8c --- /dev/null +++ b/strata/baserock-import.morph @@ -0,0 +1,31 @@ +name: baserock-import +kind: stratum +description: Tools for importing software into Baserock definitions. +build-depends: +- morph: strata/morph-utils.morph +chunks: +- name: ansicolor + repo: upstream:python-packages/ansicolor + ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef + unpetrify-ref: 0.2.4 + build-depends: [] +- name: python-decorator + repo: upstream:python-packages/python-decorator + ref: b02f7a254c3679dfac57a824e08dd02ced850636 + unpetrify-ref: decorator-3.4.0 + build-depends: [] +- name: networkx + repo: upstream:python-packages/networkx + ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c + unpetrify-ref: networkx-1.9.1 + build-depends: [] +- name: requests-cache + repo: upstream:python-packages/requests-cache + ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf + unpetrify-ref: 0.4.6 + build-depends: [] +- name: baserock-import + repo: baserock:baserock/import + ref: edd18a77973d8cd12b09bc6e3ac06fecd72a7e45 + unpetrify-ref: master + build-depends: [] diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph deleted file mode 100644 index e5f52a9c..00000000 --- a/strata/bsp-jetson-devel.morph +++ /dev/null @@ -1,39 +0,0 @@ -name: bsp-jetson-devel -kind: stratum -description: | - Platform-specific chunks for NVIDIA Jetson TK1 development system. - - Support for the Tegra platform is still being developed. This BSP uses - a patched version of Linux 3.10 supplied by NVIDIA, which provides - reliable SATA, USB and networking and runs the CPUs at full speed. - To make use of the graphics acceleration on the Jetson you will need - to use a newer kernel. -build-depends: -- morph: strata/core.morph -chunks: -- name: device-tree-compiler - morph: strata/bsp-jetson-devel/device-tree-compiler.morph - repo: upstream:device-tree-compiler - ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 - unpetrify-ref: baserock/morph - build-depends: [] -- name: u-boot - morph: strata/bsp-jetson-devel/u-boot.morph - repo: upstream:u-boot - ref: b15ae44ab9f085140039b09a00232d5aed6596a9 - unpetrify-ref: baserock/arm/tegra-uboot-btrfs - build-depends: - - device-tree-compiler -- name: linux-jetson-tk1 - morph: strata/bsp-jetson-devel/linux-jetson-tk1.morph - repo: upstream:linux - ref: de3664efca390a8d2fe525a583d17772deee8500 - unpetrify-ref: baserock/arm/tegra-3.10 - build-depends: - - u-boot -- name: bsp-support - morph: strata/bsp-jetson-devel/bsp-support.morph - repo: baserock:baserock/bsp-support - ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525 - unpetrify-ref: baserock/arm/tegra-3.10 - build-depends: [] diff --git a/strata/bsp-jetson-devel/linux-jetson-tk1.morph b/strata/bsp-jetson-devel/linux-jetson-tk1.morph deleted file mode 100644 index 31cb393f..00000000 --- a/strata/bsp-jetson-devel/linux-jetson-tk1.morph +++ /dev/null @@ -1,55 +0,0 @@ -name: linux-jetson-tk1 -kind: chunk -configure-commands: -- make ARCH=arm tegra12_defconfig -- scripts/config -d KERNEL_LZO -- scripts/config -e KERNEL_GZIP -- scripts/config -e NAMESPACES -- 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 --set-val BLK_DEV_LOOP_MIN_COUNT 8 -- 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 VLAN_8021Q -- scripts/config -e BRIDGE_VLAN_FILTERING -- yes '' | make ARCH=arm oldconfig -build-commands: -- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs -install-commands: -- mkdir -p "$DESTDIR"/boot -- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage -- cp arch/arm/boot/dts/tegra124-pm375.dtb "$DESTDIR"/boot/. diff --git a/strata/bsp-jetson-genivi/bsp-support.morph b/strata/bsp-jetson-genivi/bsp-support.morph deleted file mode 100644 index 23524ac7..00000000 --- a/strata/bsp-jetson-genivi/bsp-support.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: bsp-support -kind: chunk -install-commands: -- install -o 0 -g 0 -m 755 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service" -- install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants" -- ln -s /usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants/nv-ondemand-cpufreq-governor.service" diff --git a/strata/bsp-jetson-genivi/device-tree-compiler.morph b/strata/bsp-jetson-genivi/device-tree-compiler.morph deleted file mode 100644 index 8abfafc8..00000000 --- a/strata/bsp-jetson-genivi/device-tree-compiler.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: device-tree-compiler -kind: chunk -build-commands: -- make all -install-commands: -- make install DESTDIR="$DESTDIR" PREFIX="$PREFIX" diff --git a/strata/bsp-jetson-genivi/u-boot.morph b/strata/bsp-jetson-genivi/u-boot.morph deleted file mode 100644 index 705b3851..00000000 --- a/strata/bsp-jetson-genivi/u-boot.morph +++ /dev/null @@ -1,16 +0,0 @@ -name: u-boot -kind: chunk -configure-commands: -- make ARCH=arm jetson-tk1_config -build-commands: -- make ARCH=arm CROSS_COMPILE=/usr/bin/ -- make ARCH=arm CROSS_COMPILE=/usr/bin/ tools -install-commands: -- mkdir -p "$DESTDIR$PREFIX/bin" -- mkdir -p "$DESTDIR/boot" -- install -m 755 u-boot-dtb-tegra.bin "$DESTDIR/boot/u-boot.bin" -- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/." diff --git a/strata/bsp-jetson-genivi.morph b/strata/bsp-jetson.morph index 62835b74..eda1d99b 100644 --- a/strata/bsp-jetson-genivi.morph +++ b/strata/bsp-jetson.morph @@ -1,7 +1,7 @@ -name: bsp-jetson-genivi +name: bsp-jetson kind: stratum description: | - Platform-specific chunks for NVIDIA Jetson TK1 GENIVI Baseline + Platform-specific chunks for NVIDIA Jetson TK1 Support for the Tegra platform is still being developed. A very recent kernel with some patches is currently required to get a fully @@ -13,35 +13,41 @@ build-depends: - morph: strata/core.morph chunks: - name: device-tree-compiler - morph: strata/bsp-jetson-genivi/device-tree-compiler.morph + morph: strata/bsp-jetson/device-tree-compiler.morph repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph build-depends: [] - name: u-boot - morph: strata/bsp-jetson-genivi/u-boot.morph + morph: strata/bsp-jetson/u-boot.morph repo: upstream:u-boot ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e unpetrify-ref: baserock/jetson/u-boot-tegra-next build-depends: - device-tree-compiler -- name: linux-jetson-tk1-genivi - morph: strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph +- name: linux-jetson-tk1 + morph: strata/bsp-jetson/linux-jetson-tk1.morph repo: upstream:linux - ref: 8da6ad2e1c6366ebb2d9a72aeaf4a42dc32c8623 - unpetrify-ref: baserock/jetson/3.17.0-rc5 + ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69 + unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3 build-depends: - u-boot - name: bsp-support - morph: strata/bsp-jetson-genivi/bsp-support.morph + morph: strata/bsp-jetson/bsp-support.morph repo: baserock:baserock/bsp-support ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525 unpetrify-ref: baserock/arm/tegra-3.10 build-depends: [] - name: nouveau-drm - morph: strata/bsp-jetson-genivi/nouveau-drm.morph + morph: strata/bsp-jetson/nouveau-drm.morph repo: upstream:nouveau - ref: 62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45 - unpetrify-ref: baserock/jetson/3.17-rc5 + ref: 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501 + unpetrify-ref: baserock/jetson/gk20a build-depends: - - linux-jetson-tk1-genivi + - linux-jetson-tk1 +- name: linux-firmware-jetson + morph: strata/bsp-jetson/linux-firmware-jetson.morph + repo: upstream:linux-firmware + ref: 9322ef5b14c78ec28163baa41bff240a0e098810 + unpetrify-ref: baserock/jetson + build-depends: [] diff --git a/strata/bsp-jetson-devel/bsp-support.morph b/strata/bsp-jetson/bsp-support.morph index 23524ac7..23524ac7 100644 --- a/strata/bsp-jetson-devel/bsp-support.morph +++ b/strata/bsp-jetson/bsp-support.morph diff --git a/strata/bsp-jetson-devel/device-tree-compiler.morph b/strata/bsp-jetson/device-tree-compiler.morph index 8abfafc8..8abfafc8 100644 --- a/strata/bsp-jetson-devel/device-tree-compiler.morph +++ b/strata/bsp-jetson/device-tree-compiler.morph diff --git a/strata/bsp-jetson/linux-firmware-jetson.morph b/strata/bsp-jetson/linux-firmware-jetson.morph new file mode 100644 index 00000000..c803eab2 --- /dev/null +++ b/strata/bsp-jetson/linux-firmware-jetson.morph @@ -0,0 +1,6 @@ +name: linux-firmware-jetson +kind: chunk +install-commands: +- install -d "$DESTDIR/lib/firmware/nvidia/tegra124" +- install -m644 nvidia/tegra124/gk20a_ctxsw.bin "$DESTDIR/lib/firmware/nvidia/tegra124" +- install -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124" diff --git a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph b/strata/bsp-jetson/linux-jetson-tk1.morph index c3dfe0f1..42c16f01 100644 --- a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -1,4 +1,4 @@ -name: linux-jetson-tk1-genivi +name: linux-jetson-tk1 kind: chunk configure-commands: - make ARCH=arm tegra_defconfig diff --git a/strata/bsp-jetson-genivi/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph index e297a069..e297a069 100644 --- a/strata/bsp-jetson-genivi/nouveau-drm.morph +++ b/strata/bsp-jetson/nouveau-drm.morph diff --git a/strata/bsp-jetson-devel/u-boot.morph b/strata/bsp-jetson/u-boot.morph index 705b3851..705b3851 100644 --- a/strata/bsp-jetson-devel/u-boot.morph +++ b/strata/bsp-jetson/u-boot.morph diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 38bd60d8..d7b86648 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -261,7 +261,7 @@ chunks: - name: busybox morph: strata/build-essential/busybox.morph repo: upstream:busybox - ref: 8a801e0f024f1385d8e989b80b90443546bceae7 + ref: 772a98fec669cf881d7c1ea17631bc8560bccf5c unpetrify-ref: baserock/build-essential build-depends: - stage2-binutils diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph index b0bb46f5..35f57357 100644 --- a/strata/build-essential/busybox.morph +++ b/strata/build-essential/busybox.morph @@ -57,12 +57,6 @@ configure-commands: build-commands: - make -- | - for fin in systemd-units/*.in - do - f=$(echo "$fin" | sed 's/\.in$//') - sed -e 's|@rootprefix@||g' "$fin" >"$f"; - done install-commands: - | @@ -70,41 +64,8 @@ install-commands: make CONFIG_PREFIX="$DESTDIR$PREFIX" install && chmod 6755 "$DESTDIR$PREFIX"/bin/busybox -- mkdir -p "$DESTDIR/var/spool/cron/crontabs" - -# Install systemd units -- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants" -- | - for f in systemd-units/*.service; do - install -m 644 "$f" "$DESTDIR/lib/systemd/system"; - done -- | - for f in $(cd systemd-units; ls *.service | grep -v -F "@"); do - ln -s "../$f" "$DESTDIR/lib/systemd/system/multi-user.target.wants/"; - done - -# Install custom udev rule to run ifup for every network device detected -- mkdir -p "$DESTDIR/lib/udev/rules.d" -- for f in udev-rules/100-baserock.rules; do - install -m 644 "$f" "$DESTDIR/lib/udev/rules.d"; - done - -# Set up DHCP -- mkdir -p "$DESTDIR$PREFIX"/share/udhcpc -- cp examples/udhcp/simple.script "$DESTDIR$PREFIX"/share/udhcpc/default.script - -# Set up NTP -- install scripts/run-ntpd-with-config "$DESTDIR$PREFIX"/sbin/. -- install -d "$DESTDIR/etc" -- | - cat << EOF > "$DESTDIR/etc/ntpd.conf" - server 0.pool.ntp.org - server 1.pool.ntp.org - server 2.pool.ntp.org - server 3.pool.ntp.org - EOF - # Set up man environment variables +- mkdir -p "$DESTDIR"/etc - | cat << EOF > "$DESTDIR/etc/profile" # Set default pager to less diff --git a/strata/core.morph b/strata/core.morph index 6f66adbc..140674f1 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -105,8 +105,8 @@ chunks: - name: openssl-new morph: strata/core/openssl-new.morph repo: upstream:openssl-new - ref: ed9938171f80c7534f6eb52f75c2538bca462807 - unpetrify-ref: baserock/OpenSSL_1_0_1g + ref: 872e681c00a713e840ebed77a4e05fa0e181f16f + unpetrify-ref: OpenSSL_1_0_1j build-depends: - perl - name: bzip2 diff --git a/strata/foundation.morph b/strata/foundation.morph index a652fbd6..efe8fcd5 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -19,8 +19,8 @@ chunks: - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod - ref: 7f3b215d4e848afa74aea20a4c64f0cc1ef30eb4 - unpetrify-ref: baserock/morph + ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 + unpetrify-ref: v18 build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph @@ -69,16 +69,26 @@ chunks: unpetrify-ref: baserock/genivi/dbus-1.8.8 build-depends: - glib +- name: libgpg-error + repo: upstream:libgpg-error + ref: a498812d767c59ae2b75b0c985f5280b139e7dc4 + build-depends: [] +- name: libgcrypt + repo: upstream:libgcrypt + ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 + build-depends: + - libgpg-error - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: a77af3ec96015b2382ea31020d0a14b482d10a76 - unpetrify-ref: baserock/morph + ref: 941a643569dc6b53d0b334276d2a3cc0ed159e88 + unpetrify-ref: v217 build-depends: - dbus-pre - gobject-introspection - kmod - libcap2 + - libgcrypt - pciutils - usbutils - name: lzo diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 2a1933d7..1ee23cb8 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -6,16 +6,23 @@ configure-commands: - sh autogen.sh - ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix= - --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware + --with-rootlibdir=/lib install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR"/sbin - ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init - for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl "$DESTDIR/sbin/$f"; done -- rm -f "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules" -- touch "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules" - sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service" - sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount" >"$DESTDIR/etc/systemd/system/tmp.mount" - touch "$DESTDIR/etc/machine-id" +post-install-commands: +- | + cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF" + [Match] + Name=en* + + [Network] + DHCP=yes + EOF diff --git a/strata/genivi.morph b/strata/genivi.morph index 1ba464c6..24050b4c 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -18,8 +18,8 @@ chunks: - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller - ref: c78fddaddc24a2c49f5ef18896c93403575295ae - unpetrify-ref: baserock/morph + ref: b77fb1dbb280ec45525853e52a362eafd736b400 + unpetrify-ref: baserock/systemd_v216 build-depends: - DLT-daemon - name: googletest @@ -37,13 +37,13 @@ chunks: - googletest - name: genivi-common-api-runtime repo: upstream:genivi-common-api-runtime - ref: 8a62115bad2c0615fdf40f4e54a41454ae6e4698 + ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c unpetrify-ref: 2.1.6 build-depends: [] - name: genivi-common-api-dbus-runtime repo: upstream:genivi-common-api-dbus-runtime - ref: 53d9341444ff9a31b9cc551b10fd0b341207937b - unpetrify-ref: 2.1.6 + ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f + unpetrify-ref: 2.1.6-p1 build-depends: - genivi-common-api-runtime - name: audiomanager @@ -71,8 +71,8 @@ chunks: - itzam-tarball - name: node-state-manager repo: upstream:node-state-manager - ref: dd4a86b9459537d2e85489b36abf80f34d12f098 - unpetrify-ref: baserock/genivi/baseline + ref: 30add4659e002f1df205cc36f71ef3141c10c1fb + unpetrify-ref: baserock/systemd_v216 build-depends: - DLT-daemon - persistence-client-library diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index f946390f..4194acc2 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -8,7 +8,6 @@ configure-commands: armv7lhf) DRIDRIVERS=no GALLIUMDRIVERS=nouveau,freedreno,svga,swrast,vc4 - EXTRAARGS="--enable-gallium-egl" ;; *) DRIDRIVERS=yes @@ -21,4 +20,4 @@ configure-commands: --with-egl-platforms=drm,wayland \ --with-gallium-drivers="$GALLIUMDRIVERS" \ --with-dri-drivers="$DRIDRIVERS" \ - $EXTRAARGS + --enable-gallium-egl diff --git a/strata/trove.morph b/strata/trove.morph index d0773314..3b285372 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -190,7 +190,7 @@ chunks: - name: lorry-controller morph: strata/trove/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: d7ca3f2f14ad28437f7332ca387a790fecb8b081 + ref: 689174532cc4920d2ef96bcebeb8a1adaf985804 unpetrify-ref: master build-depends: [] - name: lua-scrypt diff --git a/strata/webtools.morph b/strata/webtools.morph index fd893ae6..8df32e9c 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -19,8 +19,8 @@ chunks: - name: tar morph: strata/webtools/tar.morph repo: upstream:tar - ref: 0492b656656ca7973b126b8c117804d80952de48 - unpetrify-ref: baserock/morph + ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 + unpetrify-ref: baserock/release_1_28 build-depends: [] - name: pip repo: upstream:pip.git diff --git a/strata/webtools/tar.morph b/strata/webtools/tar.morph index 2253e3b7..9219abeb 100644 --- a/strata/webtools/tar.morph +++ b/strata/webtools/tar.morph @@ -3,7 +3,7 @@ kind: chunk configure-commands: - bash bootstrap --skip-po - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin - --disable-nls + --disable-nls --disable-gcc-warnings build-commands: - make install-commands: diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index c676d636..d47d0ac4 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -15,13 +15,14 @@ chunks: - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston - ref: 5d9e9c1393c6b0ea6ce52912fc458c963e644547 - unpetrify-ref: baserock/genivi/1.2.0 + ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 + unpetrify-ref: baserock/genivi/1.3.0 build-depends: - linux-pam - name: wayland-ivi-extension + morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension - ref: 633ce4f89f695c575bdfc080551b0e59c8287427 - unpetrify-ref: baserock/genivi/1.2.0 + ref: 43fa65ede93cef9e6c902df2248229ad204b510a + unpetrify-ref: master build-depends: - weston diff --git a/strata/weston-genivi/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.morph new file mode 100644 index 00000000..bceb2a88 --- /dev/null +++ b/strata/weston-genivi/wayland-ivi-extension.morph @@ -0,0 +1,8 @@ +name: wayland-ivi-extension +kind: chunk +configure-commands: +- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_C_FLAGS="-I/usr/include/weston" +build-commands: +- make +install-commands: +- make install DESTDIR="$DESTDIR" diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph index 892adfb4..810ce5e9 100644 --- a/strata/weston-genivi/weston.morph +++ b/strata/weston-genivi/weston.morph @@ -6,7 +6,7 @@ configure-commands: - autoreconf -ivf - | LDFLAGS='-L/lib64 -lrt' \ - ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \ + ./configure --prefix=$PREFIX --disable-xwayland \ --disable-x11-compositor \ --disable-wayland-compositor --enable-egl \ --enable-clients --enable-demo-clients-install --enable-fbdev-compositor diff --git a/systems/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph index 4efd3981..47c69bad 100644 --- a/systems/base-system-armv7-highbank.morph +++ b/systems/base-system-armv7-highbank.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile.morph index 2c3634b5..e5b9d7f5 100644 --- a/systems/base-system-armv7-versatile.morph +++ b/systems/base-system-armv7-versatile.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank.morph index 2218af6f..169d490e 100644 --- a/systems/base-system-armv7b-highbank.morph +++ b/systems/base-system-armv7b-highbank.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2.morph index 83b437a1..76d5c006 100644 --- a/systems/base-system-armv7b-vexpress-tc2.morph +++ b/systems/base-system-armv7b-vexpress-tc2.morph @@ -14,6 +14,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank.morph index f5ced471..b889278d 100644 --- a/systems/base-system-armv7lhf-highbank.morph +++ b/systems/base-system-armv7lhf-highbank.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic.morph index 85bc50b4..488bf5e4 100644 --- a/systems/base-system-ppc64-generic.morph +++ b/systems/base-system-ppc64-generic.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-x86_32-generic.morph b/systems/base-system-x86_32-generic.morph index f82d1667..40e62cad 100644 --- a/systems/base-system-x86_32-generic.morph +++ b/systems/base-system-x86_32-generic.morph @@ -16,7 +16,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - cloud-init diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph index 1bcafc2a..a3346a44 100644 --- a/systems/base-system-x86_64-generic.morph +++ b/systems/base-system-x86_64-generic.morph @@ -17,7 +17,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - cloud-init diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 43e701b5..e26c4003 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index db0b36e9..f557722b 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -9,8 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: tools morph: strata/tools.morph - name: morph-utils @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index a317c696..d1176135 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 776fa4ab..c77d7e3f 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -22,7 +22,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index e336d2ec..697119c7 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 4cc66226..b24bd8f4 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -22,7 +22,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 6db657a1..83a58ae1 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 182cf0cd..9c0cfb4e 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -19,7 +19,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - ceph diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph index 4d731ea3..d75fbd14 100644 --- a/systems/cxmanage-system-x86_64-generic.morph +++ b/systems/cxmanage-system-x86_64-generic.morph @@ -18,7 +18,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - fstab diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 265f63fa..9d4de4dd 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -23,9 +23,10 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 91716fc8..a408b557 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -24,11 +24,12 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 8e911703..6e386a94 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -24,11 +24,12 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 973f05ea..2797c00e 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -24,11 +24,12 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index c74e52b3..ad3a145c 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -19,9 +19,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: baserock-import + morph: strata/baserock-import.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 4f3944c2..6804c7fb 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -20,11 +20,12 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 4d106fba..3cb93869 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -23,9 +23,10 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 7049b1b0..d83c46a0 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -25,11 +25,12 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 35976a70..736033d6 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -21,15 +21,16 @@ strata: morph: strata/openstack-clients.morph - name: nfs morph: strata/nfs.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: nodejs morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index 7c27bcdf..859f8ad5 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -25,11 +25,12 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index b74f164c..804cf606 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -21,9 +21,10 @@ strata: morph: strata/openstack-clients.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 16bc7fc3..6a9cb092 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -22,11 +22,12 @@ strata: morph: strata/openstack-clients.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index cf3d6ad1..4c882c22 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -25,9 +25,10 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 5afb6f72..d6fb17ec 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -26,12 +26,13 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - cloud-init diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index c2da5e1a..65a53072 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -25,9 +25,10 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 969f32b6..5a16c90b 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -26,6 +26,8 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph configuration-extensions: diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 85bbe90c..413c5b54 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -26,10 +26,11 @@ strata: morph: strata/nodejs.morph - name: ruby morph: strata/ruby.morph +- name: baserock-import + morph: strata/baserock-import.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - vagrant diff --git a/systems/distbuild-system-x86_64-openstack.morph b/systems/distbuild-system-x86_64-openstack.morph index 483d8b99..aab6b08f 100644 --- a/systems/distbuild-system-x86_64-openstack.morph +++ b/systems/distbuild-system-x86_64-openstack.morph @@ -26,7 +26,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 39f05b4f..5cbfddbe 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -9,8 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-jetson-genivi - morph: strata/bsp-jetson-genivi.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: connectivity morph: strata/connectivity.morph - name: connman-common @@ -36,7 +36,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - strip-gplv3 diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index ccc1419d..a5f07750 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -34,7 +34,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - strip-gplv3 diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index 883c0efe..f5fb571e 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -38,7 +38,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - strip-gplv3 diff --git a/systems/gerrit-x86_64.morph b/systems/gerrit-x86_64.morph index 0dbca14e..91d4c701 100644 --- a/systems/gerrit-x86_64.morph +++ b/systems/gerrit-x86_64.morph @@ -26,7 +26,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - cloud-init diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index f7398793..9eabc403 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -44,6 +44,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph index a9c9bbd3..83093ac1 100644 --- a/systems/gitlab-server.morph +++ b/systems/gitlab-server.morph @@ -28,7 +28,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - gitlab diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph index b34d6626..2692e2fc 100644 --- a/systems/nodejs-system-x86_64.morph +++ b/systems/nodejs-system-x86_64.morph @@ -17,6 +17,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 0b4e4638..9a23bdeb 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -37,6 +37,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 7171c0ca..6cb9377b 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -37,6 +37,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index d603f531..b4f2c537 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -32,6 +32,5 @@ configuration-extensions: - trove - nfsboot-server - fstab -- simple-network - install-files - cloud-init diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index e916cffc..22aa88c0 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -32,6 +32,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 1a2f8a97..152bf16b 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -36,6 +36,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files |