diff options
-rw-r--r-- | genivi-baseline-system-armv7lhf-versatile.morph (renamed from genivi-baseline-system-armv7-versatile.morph) | 4 | ||||
-rw-r--r-- | genivi.morph | 4 | ||||
-rw-r--r-- | release.morph | 49 | ||||
-rw-r--r-- | wayland-armv7-versatile.morph | 6 | ||||
-rw-r--r-- | wayland-x86_64-generic.morph | 6 |
5 files changed, 35 insertions, 34 deletions
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7lhf-versatile.morph index 32c69100..31185c94 100644 --- a/genivi-baseline-system-armv7-versatile.morph +++ b/genivi-baseline-system-armv7lhf-versatile.morph @@ -1,4 +1,4 @@ -arch: armv7l +arch: armv7lhf configuration-extensions: - set-hostname - add-config-files @@ -9,7 +9,7 @@ configuration-extensions: - fstab description: A GENIVI baseline system for an ARMv7 system. kind: system -name: genivi-baseline-system-armv7-versatile +name: genivi-baseline-system-armv7lhf-versatile strata: - morph: build-essential - morph: core diff --git a/genivi.morph b/genivi.morph index 70384d3c..caf7ff99 100644 --- a/genivi.morph +++ b/genivi.morph @@ -6,8 +6,8 @@ build-depends: chunks: - name: DLT-daemon repo: upstream:DLT-daemon - ref: 6ab10c022d4464628fc2b848b5a56bf1eaafe857 - unpetrify-ref: v2.9.1 + ref: 8b48e73f79b4463393916e4c6696917e3dedd026 + unpetrify-ref: v2.10.0 build-depends: [] - name: node-startup-controller repo: upstream:node-startup-controller diff --git a/release.morph b/release.morph index c0493d9a..7ade0631 100644 --- a/release.morph +++ b/release.morph @@ -3,58 +3,59 @@ kind: cluster description: | Deploy all the systems for we support in a release. systems: -- morph: base-system-armv7-highbank +- morph: devel-system-armv7lhf-highbank deploy: - as-tar: - type: tar - location: /src/release/baserock-13-base-system-armv7-highbank.tar -- morph: devel-system-armv7-highbank - deploy: - as-tar: - type: tar - location: /src/release/baserock-13-devel-system-armv7-highbank.tar -- morph: base-system-armv7b-highbank - deploy: - as-tar: + release: type: tar - location: /src/release/baserock-13-base-system-armv7b-highbank.tar -- morph: devel-system-armv7b-highbank + location: /src/release/baserock-14.20-devel-system-armv7lhf-highbank.tar +- morph: genivi-baseline-system-armv7lhf-versatile deploy: - as-tar: - type: tar - location: /src/release/baserock-13-devel-system-armv7b-highbank.tar -- morph: devel-system-armv7-wandboard + # NOTE: to fully deploy this system requires fishing in the artifact cache + # for the kernel artifact. We should fix deployment to do extract the + # kernel artifact for us. + release: + type: rawdisk + location: /src/release/baserock-14.20-genivi-baseline-system-armv7lhf-versatile.img + DISK_SIZE: 4G + FSTAB_ROOT: /dev/mmcblk0 / btrfs default,rw,noatime 0 1 + VERSION_LABEL: baserock-14.20 +- morph: devel-system-x86_32-chroot deploy: release: type: tar - location: /src/release/baserock-13-devel-system-armv7-wandboard.tar + location: /src/release/baserock-14.20-devel-system-x86_32-chroot.tar - morph: base-system-x86_32-generic deploy: release: type: rawdisk - location: /src/release/baserock-13-base-system-x86_32-generic.img + location: /src/release/baserock-14.20-base-system-x86_32-generic.img DISK_SIZE: 4G + VERSION_LABEL: baserock-14.20 - morph: devel-system-x86_32-generic deploy: release: type: rawdisk - location: /src/release/baserock-13-devel-system-x86_32-generic.img + location: /src/release/baserock-14.20-devel-system-x86_32-generic.img DISK_SIZE: 4G + VERSION_LABEL: baserock-14.20 - morph: base-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-13-base-system-x86_64-generic.img + location: /src/release/baserock-14.20-base-system-x86_64-generic.img DISK_SIZE: 4G + VERSION_LABEL: baserock-14.20 - morph: devel-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-13-devel-system-x86_64-generic.img + location: /src/release/baserock-14.20-devel-system-x86_64-generic.img DISK_SIZE: 4G + VERSION_LABEL: baserock-14.20 - morph: genivi-baseline-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-13-genivi-baseline-system-x86_64-generic.img + location: /src/release/baserock-14.20-genivi-baseline-system-x86_64-generic.img DISK_SIZE: 4G + VERSION_LABEL: baserock-14.20 diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph index a882611f..1bc2019c 100644 --- a/wayland-armv7-versatile.morph +++ b/wayland-armv7-versatile.morph @@ -110,8 +110,8 @@ chunks: - freefont-otf - name: weston repo: upstream:weston - ref: 74f7c94c9186f8fc9ea8f50ab5d5f805d679d05f - unpetrify-ref: baserock/weston-ivi-shell-1.4.0-v12 + ref: 721c0f13ab80eb209983c1d73e168df4ffb70ddc + unpetrify-ref: baserock/genivi/weston-ivi-shell-patches build-depends: - pango - pixman @@ -122,7 +122,7 @@ chunks: - cairo - name: wayland-ivi-extension repo: upstream:genivi/wayland-ivi-extension - ref: 04485758e5aa78f7c7eb548fd117b2001dc416e6 + ref: 167029fad4d2896491093ee313a663f2f057217e unpetrify-ref: baserock/genivi/baseline build-depends: - wayland diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph index b76ea8ca..6441a1f3 100644 --- a/wayland-x86_64-generic.morph +++ b/wayland-x86_64-generic.morph @@ -110,8 +110,8 @@ chunks: - freefont-otf - name: weston repo: upstream:weston - ref: 74f7c94c9186f8fc9ea8f50ab5d5f805d679d05f - unpetrify-ref: baserock/weston-ivi-shell-1.4.0-v12 + ref: 721c0f13ab80eb209983c1d73e168df4ffb70ddc + unpetrify-ref: baserock/genivi/weston-ivi-shell-patches build-depends: - pango - wayland @@ -122,7 +122,7 @@ chunks: - libxkbcommon - name: wayland-ivi-extension repo: upstream:genivi/wayland-ivi-extension - ref: 04485758e5aa78f7c7eb548fd117b2001dc416e6 + ref: 167029fad4d2896491093ee313a663f2f057217e unpetrify-ref: baserock/genivi/baseline build-depends: - wayland |