In previously patch, I created new guest image for ivi demo.
As a trial result using initial patch, I think so need to common
OVERRIDES keyword and specific OVERRIDES keyword.
This patch create cluster specific config and modify OVERRIDES keyword.
Bug-AGL: SPEC-4099
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Change-Id: I8c39f2a1fade2e0cc920a2efe9625678b07fb37b
--- /dev/null
+# The aglcontainerguest is a common keyword for agl container.
+OVERRIDES:append = ":aglcontainerguest"
+
+# The aglcontainercluster is specific keyword for cluster guest.
+OVERRIDES:append = ":aglcontainercluster"
+
+TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}"
+
+# Can be blank as container image type results in a .tar.bz2
+AGL_DEFAULT_IMAGE_FSTYPES = ""
+AGL_EXTRA_IMAGE_FSTYPES = ""
+
+IMAGE_FSTYPES:aglcontainerguest = "container"
+
+IMAGE_LINGUAS:append:aglcontainercluster = " en-us"
+
+PREFERRED_PROVIDER_virtual/kernel:aglcontainerguest = "linux-dummy"
+KERNEL_DEVICETREE:aglcontainercluster = ""
+
+# Disable serial consoles
+SERIAL_CONSOLES:aglcontainerguest = ""
+
+# Remove unneeded firmware packages
+EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-boot"
+
+# We assume rngd is running on the host, so unnecessary in container
+VIRTUAL-RUNTIME_rngd = ""
+
+hostname:append:aglcontainercluster = "-cluster"
+# The aglcontainerguest is a common keyword for agl container.
+OVERRIDES_append = ":aglcontainerguest"
+
+# The aglcontainerivi is specific keyword for ivi guest.
OVERRIDES:append = ":aglcontainerivi"
TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}"
AGL_DEFAULT_IMAGE_FSTYPES:aglcontainerivi = ""
AGL_EXTRA_IMAGE_FSTYPES:aglcontainerivi = ""
-IMAGE_FSTYPES:aglcontainerivi = "container"
+IMAGE_FSTYPES:aglcontainerguest = "container"
IMAGE_LINGUAS:append:aglcontainerivi = " en-us"
-PREFERRED_PROVIDER_virtual/kernel_aglcontainerguest = "linux-dummy"
+PREFERRED_PROVIDER_virtual/kernel:aglcontainerguest = "linux-dummy"
KERNEL_DEVICETREE:aglcontainerivi = ""
# Disable serial consoles
-SERIAL_CONSOLES:aglcontainerivi = ""
+SERIAL_CONSOLES:aglcontainerguest = ""
# Remove unneeded firmware packages
-EXTRA_IMAGEDEPENDS:remove:aglcontainerivi = "arm-trusted-firmware optee-os u-boot"
+EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-boot"
# We assume rngd is running on the host, so unnecessary in container
VIRTUAL-RUNTIME_rngd = ""
+
+hostname:append:aglcontainerivi = "-ivi"
require lxc-host-image-minimal.bb
-CONTAINER_IMAGES ?= "agl-container-guest:guest-image-cluster-demo \
+CONTAINER_IMAGES ?= "agl-container-cluster:guest-image-cluster-demo \
agl-container-ivi:guest-image-ivi-demo \
"
-BBMULTICONFIG = "agl-container-guest agl-container-ivi"
+BBMULTICONFIG = "agl-container-cluster agl-container-ivi"
# Disable the meta-virtualization configuration support enabled by
# agl-virt. This should be revisited when upgrading past dunfell,