diff options
| -rw-r--r-- | clusters/ci.morph | 17 | ||||
| -rw-r--r-- | strata/bsp-jetson.morph | 6 | ||||
| -rw-r--r-- | strata/bsp-jetson/u-boot@jetson.morph (renamed from strata/bsp-jetson/u-boot.morph) | 2 | ||||
| -rw-r--r-- | strata/bsp-wandboard.morph | 6 | ||||
| -rw-r--r-- | strata/bsp-wandboard/u-boot@wandboard.morph (renamed from strata/bsp-wandboard/u-boot.morph) | 2 | ||||
| -rw-r--r-- | strata/foundation.morph | 2 | ||||
| -rw-r--r-- | strata/libdrm-common.morph | 4 | ||||
| -rw-r--r-- | strata/multimedia-gstreamer-0.10.morph | 14 | ||||
| -rw-r--r-- | strata/python-tools.morph | 4 | ||||
| -rw-r--r-- | strata/trove.morph | 2 | ||||
| -rw-r--r-- | systems/ceph-service-x86_64-generic.morph | 2 |
11 files changed, 40 insertions, 21 deletions
diff --git a/clusters/ci.morph b/clusters/ci.morph index f860a4ba..734f39ff 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph @@ -12,3 +12,20 @@ systems: type: rawdisk location: devel-system-x86_64-generic.img DISK_SIZE: 4G +- morph: systems/devel-system-x86_32-generic.morph + deploy: + devel-system-x86_32-generic: + type: rawdisk + location: devel-system-x86_32-generic.img + DISK_SIZE: 4G +- morph: systems/build-system-armv7lhf-jetson.morph + deploy: + devel-system-armv7lhf-jetson: + type: rawdisk + location: build-system-armv7lhf-jetson.img + 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 diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index eda1d99b..114e3a27 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -18,8 +18,8 @@ chunks: ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph build-depends: [] -- name: u-boot - morph: strata/bsp-jetson/u-boot.morph +- name: u-boot@jetson + morph: strata/bsp-jetson/u-boot@jetson.morph repo: upstream:u-boot ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e unpetrify-ref: baserock/jetson/u-boot-tegra-next @@ -31,7 +31,7 @@ chunks: ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69 unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3 build-depends: - - u-boot + - u-boot@jetson - name: bsp-support morph: strata/bsp-jetson/bsp-support.morph repo: baserock:baserock/bsp-support diff --git a/strata/bsp-jetson/u-boot.morph b/strata/bsp-jetson/u-boot@jetson.morph index 705b3851..1427e7fd 100644 --- a/strata/bsp-jetson/u-boot.morph +++ b/strata/bsp-jetson/u-boot@jetson.morph @@ -1,4 +1,4 @@ -name: u-boot +name: u-boot@jetson kind: chunk configure-commands: - make ARCH=arm jetson-tk1_config diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index 4b07b150..98f153b8 100644 --- a/strata/bsp-wandboard.morph +++ b/strata/bsp-wandboard.morph @@ -4,8 +4,8 @@ description: The platform dependent components required to boot an wandboard ARM build-depends: - morph: strata/core.morph chunks: -- name: u-boot - morph: strata/bsp-wandboard/u-boot.morph +- name: u-boot@wandboard + morph: strata/bsp-wandboard/u-boot@wandboard.morph repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph @@ -16,4 +16,4 @@ chunks: ref: 9573986cf27ff44814f3efb1f1e95638406db456 unpetrify-ref: baserock/morph build-depends: - - u-boot + - u-boot@wandboard diff --git a/strata/bsp-wandboard/u-boot.morph b/strata/bsp-wandboard/u-boot@wandboard.morph index 9be30bc7..8a51ee7c 100644 --- a/strata/bsp-wandboard/u-boot.morph +++ b/strata/bsp-wandboard/u-boot@wandboard.morph @@ -1,4 +1,4 @@ -name: u-boot +name: u-boot@wandboard kind: chunk build-commands: - make tools diff --git a/strata/foundation.morph b/strata/foundation.morph index efe8fcd5..e19fa70b 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -134,7 +134,7 @@ chunks: - name: tbdiff morph: strata/foundation/tbdiff.morph repo: baserock:baserock/tbdiff - ref: 3190be6906eb21a1ba6878d3c8edb4bd16f925d7 + ref: 47fb728f2432929868666afc915dbc5a64836c08 unpetrify-ref: master build-depends: - attr diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index 37bff746..e364bab2 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -11,7 +11,7 @@ chunks: - name: drm repo: upstream:drm morph: strata/libdrm-common/drm.morph - ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b - unpetrify-ref: baserock/jetson/drm + ref: 83b2c40922ce451f5844aae0707ae9783a78d74f + unpetrify-ref: baserock/drm_2.4.58/jetson build-depends: - xorg-lib-libpciaccess diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index ae5fe656..50917372 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -11,23 +11,23 @@ chunks: ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a unpetrify-ref: baserock/morph build-depends: [] -- name: gstreamer +- name: gstreamer@0.10 repo: upstream:gstreamer - ref: c7e4a97d26396882960fd399b1a5e298e40d2a35 + ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f unpetrify-ref: baserock/morph/0.10 build-depends: - orc -- name: gstreamer-plugins-base +- name: gstreamer-plugins-base@0.10 repo: upstream:gstreamer-plugins-base ref: 960c596309dbb983a1d733259adccc45c47006a2 unpetrify-ref: baserock/morph/0.10 build-depends: - - gstreamer -- name: gstreamer-plugins-good + - gstreamer@0.10 +- name: gstreamer-plugins-good@0.10 repo: upstream:gstreamer-plugins-good ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3 unpetrify-ref: baserock/morph/0.10 build-depends: - - gstreamer - - gstreamer-plugins-base + - gstreamer@0.10 + - gstreamer-plugins-base@0.10 - orc diff --git a/strata/python-tools.morph b/strata/python-tools.morph index 8b82c775..0a707bc6 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -7,6 +7,6 @@ build-depends: chunks: - name: pip repo: upstream:pip - ref: d4b691b743a91500cf49119d28a805db8313f129 - unpetrify-ref: master + ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 + unpetrify-ref: baserock/master build-depends: [] diff --git a/strata/trove.morph b/strata/trove.morph index 133e67fd..7eaa204a 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -78,7 +78,7 @@ chunks: - name: lorry-controller morph: strata/trove/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: 689174532cc4920d2ef96bcebeb8a1adaf985804 + ref: 4b1fcab140d940470c342c6857cdc8682406f0b7 unpetrify-ref: master build-depends: [] - name: lua-scrypt diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 9c0cfb4e..f54af0f7 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -16,6 +16,8 @@ strata: morph: strata/network-security.morph - name: ceph-service morph: strata/ceph-service.morph +- name: tools + morph: strata/tools.morph configuration-extensions: - set-hostname - add-config-files |