aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2024-06-02 16:57:52 +0900
committerNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2024-06-02 17:39:14 +0900
commit150c77a0fb6d36c1aba4e7ec9b7fd784328ec933 (patch)
tree4ce2c5afca4dd3e3904d9589b4ed6846f9bcdc15
parent64caacaf9636d1ad1ba7b98b5e9790f7d1a2a113 (diff)
Adjust image based on RR release policy
Change image name to new naming. Remove dropped image from multi container integration. Bug-AGL: SPEC-5158 Change-Id: I5fad2dbac1f0302f170f08d4a6d538db43fd1e4c Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
-rw-r--r--meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json3
-rw-r--r--meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json174
-rw-r--r--meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json183
-rw-r--r--meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in2
-rw-r--r--meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_1.0.bb22
-rw-r--r--meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc8
-rw-r--r--meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid-demo.wks5
-rw-r--r--meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks1
-rw-r--r--meta-agl-ic-container/wic/agl-ic-container-noloader-demo.wks5
-rw-r--r--meta-agl-ic-container/wic/agl-ic-container-noloader.wks1
10 files changed, 7 insertions, 397 deletions
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json
deleted file mode 100644
index 73e321be..00000000
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "name": "agl-html5-ivi-demo"
-}
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json
deleted file mode 100644
index 508ba225..00000000
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
- "name": "agl-html5-ivi-demo",
- "role": "ivi",
- "base": {
- "autoboot": false,
- "bootpriority": 10,
- "rootfs": {
- "path": "/opt/container/guests/agl-html5-ivi-demo/rootfs",
- "filesystem": "ext4",
- "mode": "rw",
- "blockdev": [
- "/dev/mmcblk0p8",
- "/dev/mmcblk0p8"
- ]
- },
- "lifecycle": {
- "halt": "SIGRTMIN+3",
- "reboot": "SIGTERM",
- "timeout": 15000
- },
- "cap": {
- "drop": "sys_module mac_admin mac_override",
- "keep": ""
- },
- "environment": [
- "PIPEWIRE_RUNTIME_DIR=/var",
- "HOME=/home/root"
- ]
- },
- "fs": {
- "mount": [
- {
- "type": "filesystem",
- "from": "tmpfs",
- "to": "run",
- "fstype": "tmpfs",
- "option": "defaults 0 0"
- },
- {
- "type": "directory",
- "from": "/sys/kernel/security",
- "to": "sys/kernel/security",
- "fstype": "none",
- "option": "ro,bind,optional 0 0"
- },
- {
- "type": "directory",
- "from": "/run/udev/data",
- "to": "run/udev/data",
- "fstype": "none",
- "option": "ro,bind,optional,create=dir"
- },
- {
- "type": "directory",
- "from": "/run/drm-lease-manager/lease-ivi",
- "to": "var/display/drm-lease-manager/lease",
- "fstype": "none",
- "option": "bind,create=file"
- },
- {
- "type": "directory",
- "from": "/run/pipewire/pipewire-0",
- "to": "var/pipewire-0",
- "fstype": "none",
- "option": "bind,optional,create=file"
- },
- {
- "type": "directory",
- "from": "/run/dlt",
- "to": "run/dlt",
- "fstype": "none",
- "option": "bind,optional,create=dir"
- },
- {
- "type": "directory",
- "from": "/opt/container/guests/agl-html5-ivi-demo/system.conf",
- "to": "etc/systemd/system.conf.d/10-environment.conf",
- "fstype": "none",
- "option": "bind,optional,create=file"
- }
- ]
- },
- "device": {
- "static": [
- {
- "type": "devdir",
- "from": "/dev/dri",
- "to": "dev/dri",
- "devnode": "/dev/dri/card0",
- "optional": 0,
- "wideallow": 1,
- "exclusive": 0
- },
- {
- "type": "devdir",
- "from": "/dev/input",
- "to": "dev/input",
- "devnode": "/dev/input/event0",
- "optional": 1,
- "wideallow": 1,
- "exclusive": 0
- }
- ],
- "dynamic": [
- {
- "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/",
- "items": [
- {
- "subsystem": "usb",
- "rule": {
- "devtype": ["usb_device","usb_interface"],
- "action": ["add", "remove"]
- },
- "behavior": {
- "injection": 1,
- "devnode": 0,
- "allow": 0,
- "permission": "rw"
- }
- },
- {
- "subsystem": "block",
- "rule": {
- "action": ["add", "remove","change"],
- "extra" : [
- {
- "checker": "exclude-fs",
- "value": "ext4"
- }
- ]
- },
- "behavior": {
- "injection": 1,
- "devnode": 0,
- "allow": 1,
- "permission": "rwm"
- }
- }
- ]
- },
- {
- "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/",
- "items": [
- {
- "subsystem": "hid",
- "rule": {
- "action": ["add", "remove"]
- },
- "behavior": {
- "injection": 1,
- "devnode": 1,
- "allow": 1,
- "permission": "rw"
- }
- }
- ]
- }
- ]
- },
- "network": {
- "static": [
- {
- "type": "veth",
- "param": {
- "name": "veth0",
- "link": "lxcbr0",
- "flags": "up",
- "hwaddr": "00:16:3e:xx:xx:xx",
- "mode": "bridge"
- }
- }
- ]
- }
-}
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json
deleted file mode 100644
index fd92b73e..00000000
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
- "name": "agl-html5-ivi-demo",
- "role": "ivi",
- "base": {
- "autoboot": false,
- "bootpriority": 10,
- "rootfs": {
- "path": "/opt/container/guests/agl-html5-ivi-demo/rootfs",
- "filesystem": "ext4",
- "mode": "rw",
- "blockdev": [
- "/dev/mmcblk1p6",
- "/dev/mmcblk1p6"
- ]
- },
- "lifecycle": {
- "halt": "SIGRTMIN+3",
- "reboot": "SIGTERM",
- "timeout": 15000
- },
- "cap": {
- "drop": "sys_module mac_admin mac_override",
- "keep": ""
- },
- "environment": [
- "PIPEWIRE_RUNTIME_DIR=/var",
- "HOME=/home/root"
- ]
- },
- "fs": {
- "mount": [
- {
- "type": "filesystem",
- "from": "tmpfs",
- "to": "run",
- "fstype": "tmpfs",
- "option": "defaults 0 0"
- },
- {
- "type": "directory",
- "from": "/sys/kernel/security",
- "to": "sys/kernel/security",
- "fstype": "none",
- "option": "ro,bind,optional 0 0"
- },
- {
- "type": "directory",
- "from": "/run/udev/data",
- "to": "run/udev/data",
- "fstype": "none",
- "option": "ro,bind,optional,create=dir"
- },
- {
- "type": "directory",
- "from": "/run/drm-lease-manager/lease-ivi",
- "to": "var/display/drm-lease-manager/lease",
- "fstype": "none",
- "option": "bind,create=file"
- },
- {
- "type": "directory",
- "from": "/run/pipewire/pipewire-0",
- "to": "var/pipewire-0",
- "fstype": "none",
- "option": "bind,optional,create=file"
- },
- {
- "type": "directory",
- "from": "/run/dlt",
- "to": "run/dlt",
- "fstype": "none",
- "option": "bind,optional,create=dir"
- },
- {
- "type": "directory",
- "from": "/opt/container/guests/agl-html5-ivi-demo/system.conf",
- "to": "etc/systemd/system.conf.d/10-environment.conf",
- "fstype": "none",
- "option": "bind,optional,create=file"
- }
- ]
- },
- "device": {
- "static": [
- {
- "type": "devdir",
- "from": "/dev/dri",
- "to": "dev/dri",
- "devnode": "/dev/dri/card0",
- "optional": 0,
- "wideallow": 1,
- "exclusive": 0
- },
- {
- "type": "devdir",
- "from": "/dev/input",
- "to": "dev/input",
- "devnode": "/dev/input/event0",
- "optional": 1,
- "wideallow": 1,
- "exclusive": 0
- },
- {
- "type": "devnode",
- "from": "/dev/pvr_sync",
- "to": "dev/pvr_sync",
- "devnode": "/dev/pvr_sync",
- "optional": 0,
- "wideallow": 0,
- "exclusive": 0
- }
- ],
- "dynamic": [
- {
- "devpath": "/devices/platform/soc/ee0a0100.usb/usb2/",
- "items": [
- {
- "subsystem": "usb",
- "rule": {
- "devtype": ["usb_device","usb_interface"],
- "action": ["add", "remove"]
- },
- "behavior": {
- "injection": 1,
- "devnode": 0,
- "allow": 0,
- "permission": "rw"
- }
- },
- {
- "subsystem": "block",
- "rule": {
- "action": ["add", "remove","change"],
- "extra" : [
- {
- "checker": "exclude-fs",
- "value": "ext4"
- }
- ]
- },
- "behavior": {
- "injection": 1,
- "devnode": 0,
- "allow": 1,
- "permission": "rwm"
- }
- }
- ]
- },
- {
- "devpath": "/devices/platform/soc/ee0a0100.usb/usb2/",
- "items": [
- {
- "subsystem": "hid",
- "rule": {
- "action": ["add", "remove"]
- },
- "behavior": {
- "injection": 1,
- "devnode": 1,
- "allow": 1,
- "permission": "rw"
- }
- }
- ]
- }
- ]
- },
- "network": {
- "static": [
- {
- "type": "veth",
- "param": {
- "name": "veth0",
- "link": "lxcbr0",
- "flags": "up",
- "hwaddr": "00:16:3e:xx:xx:xx",
- "mode": "bridge"
- }
- }
- ]
- }
-}
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in
deleted file mode 100644
index 7605d25f..00000000
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[Manager]
-DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_1.0.bb
deleted file mode 100644
index 768ae614..00000000
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_1.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Container Manager config for meta-agl-demo based AGL HTML5 IVI demo"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-SRC_URI = "file://agl-html5-ivi-demo.json \
- file://system.conf.agl-html5-ivi-demo.in \
- "
-
-inherit cm-config
-
-do_install:append() {
- install -Dm644 ${WORKDIR}/agl-html5-ivi-demo.json ${D}/opt/container/conf/agl-html5-ivi-demo.json
- install -d ${D}/opt/container/guests/agl-html5-ivi-demo/rootfs
- install -d ${D}/opt/container/guests/agl-html5-ivi-demo/nv
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-FILES:${PN} += " \
- /opt/container/conf/* \
- /opt/container/guests/agl-html5-ivi-demo/* \
- "
diff --git a/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc b/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
index 0ffadeaf..8842d070 100644
--- a/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
+++ b/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
@@ -6,15 +6,13 @@ require recipes-platform/images/agl-lxc-multiconfig-build.inc
OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR ??= ""
OUT_OF_TREE_CONTAINER_IMAGES ??= " \
- agl-ivi-demo-platform \
- agl-ivi-demo-platform-flutter \
- agl-ivi-demo-platform-html5 \
+ agl-ivi-demo-qt \
+ agl-ivi-demo-flutter \
"
OUT_OF_TREE_CONTAINER_CONFIGS ??= " \
cm-config-agl-qt-ivi-demo \
cm-config-agl-flutter-ivi-demo \
- cm-config-agl-html5-ivi-demo \
"
CONTAINER_EXCHANGE_DEMO_UI ??= "momiweb momikey"
@@ -42,7 +40,7 @@ install_container_images() {
er=0
for image in ${OUT_OF_TREE_CONTAINER_IMAGES}; do
rm -f "${DEPLOY_DIR_IMAGE}/${image}.ext4"
- src="${OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR}/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}.ext4"
+ src="${OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR}/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}.ext4"
if [ ! -e ${src} ]; then
bberror "File not found at ${src}."
er=1
diff --git a/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid-demo.wks b/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid-demo.wks
index 5a81288d..05cefe5e 100644
--- a/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid-demo.wks
+++ b/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid-demo.wks
@@ -6,6 +6,5 @@ part /boot --source bootimg-partition --fstype=vfat --label boot --use-uuid --ac
part / --source rootfs --fstype=ext4 --label host --align 4096 --size 1024
part --source rawcopy --sourceparams="file=guest-image-cluster-demo.ext4"
part --source rawcopy --sourceparams="file=guest-image-ivi-demo.ext4"
-part --source rawcopy --sourceparams="file=agl-ivi-demo-platform.ext4"
-part --source rawcopy --sourceparams="file=agl-ivi-demo-platform-flutter.ext4"
-part --source rawcopy --sourceparams="file=agl-ivi-demo-platform-html5.ext4"
+part --source rawcopy --sourceparams="file=agl-ivi-demo-qt.ext4"
+part --source rawcopy --sourceparams="file=cm-config-agl-flutter-ivi-demo.ext4"
diff --git a/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks b/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks
index b56e80e4..94e88a8d 100644
--- a/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks
+++ b/meta-agl-ic-container/wic/agl-ic-container-bootpart-uuid.wks
@@ -8,4 +8,3 @@ part --source rawcopy --sourceparams="file=guest-image-cluster-demo.ext4"
part --source rawcopy --sourceparams="file=guest-image-ivi-demo.ext4"
part --fstype=ext4 --label agl-qt-ivi --align 4096 --size 3072
part --fstype=ext4 --label agl-flutter-ivi --align 4096 --size 3072
-part --fstype=ext4 --label agl-html5-ivi --align 4096 --size 3072
diff --git a/meta-agl-ic-container/wic/agl-ic-container-noloader-demo.wks b/meta-agl-ic-container/wic/agl-ic-container-noloader-demo.wks
index 77d1e33d..b343cc00 100644
--- a/meta-agl-ic-container/wic/agl-ic-container-noloader-demo.wks
+++ b/meta-agl-ic-container/wic/agl-ic-container-noloader-demo.wks
@@ -6,6 +6,5 @@ bootloader --ptable gpt
part / --source rootfs --fstype=ext4 --label host --align 4096 --size 1024
part --source rawcopy --sourceparams="file=guest-image-cluster-demo.ext4"
part --source rawcopy --sourceparams="file=guest-image-ivi-demo.ext4"
-part --source rawcopy --sourceparams="file=agl-ivi-demo-platform.ext4"
-part --source rawcopy --sourceparams="file=agl-ivi-demo-platform-flutter.ext4"
-part --source rawcopy --sourceparams="file=agl-ivi-demo-platform-html5.ext4"
+part --source rawcopy --sourceparams="file=agl-ivi-demo-qt.ext4"
+part --source rawcopy --sourceparams="file=agl-ivi-demo-flutter.ext4"
diff --git a/meta-agl-ic-container/wic/agl-ic-container-noloader.wks b/meta-agl-ic-container/wic/agl-ic-container-noloader.wks
index 4af949a0..d299ae66 100644
--- a/meta-agl-ic-container/wic/agl-ic-container-noloader.wks
+++ b/meta-agl-ic-container/wic/agl-ic-container-noloader.wks
@@ -8,4 +8,3 @@ part --source rawcopy --sourceparams="file=guest-image-cluster-demo.ext4"
part --source rawcopy --sourceparams="file=guest-image-ivi-demo.ext4"
part --fstype=ext4 --label agl-qt-ivi --align 4096 --size 3072
part --fstype=ext4 --label agl-flutter-ivi --align 4096 --size 3072
-part --fstype=ext4 --label agl-html5-ivi --align 4096 --size 3072