From 02341f16d6bc6e9d6292dd522a5a7b44d6187797 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 12 May 2014 15:30:12 +0000 Subject: Upgrade DLT-daemon version to v2.10.0 --- genivi.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.1 From b0f23cd18cac25118cde8e9314fc6326fb328537 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 12 May 2014 16:06:17 +0000 Subject: Update Wayland components for GENIVI Horizon H-1.0 compliance --- wayland-armv7-versatile.morph | 6 +++--- wayland-x86_64-generic.morph | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 -- cgit v1.2.1 From c3ca475451831f2839477b0de743bde4741c7828 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 12 May 2014 16:08:23 +0000 Subject: Use hard-float for GENIVI ARMv7 baseline --- genivi-baseline-system-armv7-versatile.morph | 24 ------------------------ genivi-baseline-system-armv7lhf-versatile.morph | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 genivi-baseline-system-armv7-versatile.morph create mode 100644 genivi-baseline-system-armv7lhf-versatile.morph diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph deleted file mode 100644 index 32c69100..00000000 --- a/genivi-baseline-system-armv7-versatile.morph +++ /dev/null @@ -1,24 +0,0 @@ -arch: armv7l -configuration-extensions: -- set-hostname -- add-config-files -- simple-network -- nfsboot -- install-files -- strip-gplv3 -- fstab -description: A GENIVI baseline system for an ARMv7 system. -kind: system -name: genivi-baseline-system-armv7-versatile -strata: -- morph: build-essential -- morph: core -- morph: foundation -- morph: genivi-foundation -- morph: bsp-armv7-versatile -- morph: connectivity -- morph: audio-bluetooth -- morph: x-common -- morph: multimedia -- morph: genivi -- morph: wayland-armv7-versatile diff --git a/genivi-baseline-system-armv7lhf-versatile.morph b/genivi-baseline-system-armv7lhf-versatile.morph new file mode 100644 index 00000000..31185c94 --- /dev/null +++ b/genivi-baseline-system-armv7lhf-versatile.morph @@ -0,0 +1,24 @@ +arch: armv7lhf +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- strip-gplv3 +- fstab +description: A GENIVI baseline system for an ARMv7 system. +kind: system +name: genivi-baseline-system-armv7lhf-versatile +strata: +- morph: build-essential +- morph: core +- morph: foundation +- morph: genivi-foundation +- morph: bsp-armv7-versatile +- morph: connectivity +- morph: audio-bluetooth +- morph: x-common +- morph: multimedia +- morph: genivi +- morph: wayland-armv7-versatile -- cgit v1.2.1 From 11e655b2ea4b3d28f6751c0962b41773969215a1 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 14 May 2014 10:01:18 +0000 Subject: Remove most ARM systems from release cluster Until we make these available on the Baserock website, it doesn't seem worth deploying them as part of the release process. --- release.morph | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/release.morph b/release.morph index c0493d9a..3acd4c1a 100644 --- a/release.morph +++ b/release.morph @@ -3,31 +3,6 @@ kind: cluster description: | Deploy all the systems for we support in a release. systems: -- morph: base-system-armv7-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: - type: tar - location: /src/release/baserock-13-base-system-armv7b-highbank.tar -- morph: devel-system-armv7b-highbank - deploy: - as-tar: - type: tar - location: /src/release/baserock-13-devel-system-armv7b-highbank.tar -- morph: devel-system-armv7-wandboard - deploy: - release: - type: tar - location: /src/release/baserock-13-devel-system-armv7-wandboard.tar - morph: base-system-x86_32-generic deploy: release: -- cgit v1.2.1 From d65f06dc10489937d4bdbd405289b1442ed2f7a5 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 14 May 2014 10:04:07 +0000 Subject: Update release cluster for Baserock 14.20 release --- release.morph | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release.morph b/release.morph index 3acd4c1a..12e015b9 100644 --- a/release.morph +++ b/release.morph @@ -7,29 +7,29 @@ systems: 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 - 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 - 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 - 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 - 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 -- cgit v1.2.1 From 16cd80ca23174754478ac2476a22ead713a04f84 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 14 May 2014 10:05:38 +0000 Subject: Add current ARM systems to release cluster We release an ARM versatile image of the GENIVI Baseline system. Our current focus for ARM building is armv7lhf, so a devel system for Calxeda Highbank servers is also built. --- release.morph | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/release.morph b/release.morph index 12e015b9..cfc30d69 100644 --- a/release.morph +++ b/release.morph @@ -3,6 +3,21 @@ kind: cluster description: | Deploy all the systems for we support in a release. systems: +- morph: devel-system-armv7lhf-highbank + deploy: + release: + type: tar + location: /src/release/baserock-14.20-devel-system-armv7lhf-highbank.tar +- morph: genivi-baseline-system-armv7lhf-versatile + deploy: + # 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 - morph: base-system-x86_32-generic deploy: release: -- cgit v1.2.1 From 692f6b7338a4fb1548e55f9ea0a72c3bda01c766 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 14 May 2014 14:37:42 +0100 Subject: Add x86_32 chroot system to release cluster. We now support running Baserock in an x86_32 chroot (although there is some missing functionality compared to the full development system right now, mainly that x86 VM deployments cannot be done due to the lack of extlinux in the chroot). --- release.morph | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release.morph b/release.morph index cfc30d69..6759c06c 100644 --- a/release.morph +++ b/release.morph @@ -18,6 +18,11 @@ systems: 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 +- morph: devel-system-x86_32-chroot + deploy: + release: + type: tar + location: /src/release/baserock-14.20-devel-system-x86_32-chroot.tar - morph: base-system-x86_32-generic deploy: release: -- cgit v1.2.1 From ffbb7ae938ea3bc43d7018136764273c90a0f6cc Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 14 May 2014 14:30:24 +0000 Subject: Add VERSION_LABEL field to release cluster, for the disk images. This is clearer than 'factory'. --- release.morph | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release.morph b/release.morph index 6759c06c..7ade0631 100644 --- a/release.morph +++ b/release.morph @@ -18,6 +18,7 @@ systems: 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: @@ -29,27 +30,32 @@ systems: type: rawdisk 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-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-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-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-14.20-genivi-baseline-system-x86_64-generic.img DISK_SIZE: 4G + VERSION_LABEL: baserock-14.20 -- cgit v1.2.1