Code Review
/
AGL
/
meta-agl-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove systemd user session and clean up packagegroups and images
[AGL/meta-agl-demo.git]
/
recipes-platform
/
images
/
agl-kvm-demo-platform.bb
diff --git
a/recipes-platform/images/agl-kvm-demo-platform.bb
b/recipes-platform/images/agl-kvm-demo-platform.bb
index
e2f5fd2
..
4337ec0
100644
(file)
--- a/
recipes-platform/images/agl-kvm-demo-platform.bb
+++ b/
recipes-platform/images/agl-kvm-demo-platform.bb
@@
-2,13
+2,12
@@
DESCRIPTION = "AGL KVM+QEMU Demo Platform image."
LICENSE = "MIT"
LICENSE = "MIT"
-require recipes-platform/images/agl-image-
weston.inc
+require recipes-platform/images/agl-image-
compositor.bb
IMAGE_FEATURES += "splash package-management ssh-server-openssh"
# Add packages for KVM+QEMU demo platform here
IMAGE_FEATURES += "splash package-management ssh-server-openssh"
# Add packages for KVM+QEMU demo platform here
-IMAGE_INSTALL:append = " \
- packagegroup-agl-image-minimal \
+IMAGE_INSTALL += " \
packagegroup-agl-core-connectivity \
kernel-image \
agl-compositor \
packagegroup-agl-core-connectivity \
kernel-image \
agl-compositor \
@@
-19,6
+18,7
@@
IMAGE_INSTALL:append = " \
${QEMU_GUEST_CONFIGS} \
util-linux-taskset \
screen \
${QEMU_GUEST_CONFIGS} \
util-linux-taskset \
screen \
+ simple-can-simulator \
alsa-utils \
"
alsa-utils \
"
@@
-28,16
+28,13
@@
IMAGE_INSTALL:append = " \
GUEST_MACHINE ?= "virtio-${TUNE_ARCH}"
GUEST_MACHINE ?= "virtio-${TUNE_ARCH}"
-GUEST_VM1_IMAGE ?= "agl-
demo-platform
"
-GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform"
+GUEST_VM1_IMAGE ?= "agl-
ivi-demo-platform-flutter
"
+GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform
-flutter
"
GUEST_IMAGES ?= "agl-kvm-guest:${GUEST_VM1_IMAGE} agl-kvm-guest:${GUEST_VM2_IMAGE}"
QEMU_GUEST_CONFIGS ?= ""
GUEST_IMAGES ?= "agl-kvm-guest:${GUEST_VM1_IMAGE} agl-kvm-guest:${GUEST_VM2_IMAGE}"
QEMU_GUEST_CONFIGS ?= ""
-# Handle modification of IMAGE_LINK_NAME done by ULCB builds with Kingfisher support
-MACHINE_SUFFIX = "${@bb.utils.contains('AGL_FEATURES', 'kingfisher', '-kf', '', d)}"
-
python __anonymous() {
for c in (d.getVar('GUEST_IMAGES') or "").split():
(mc, image) = c.split(':')
python __anonymous() {
for c in (d.getVar('GUEST_IMAGES') or "").split():
(mc, image) = c.split(':')
@@
-55,7
+52,7
@@
install_guest_images() {
name=${image}
rm -rf ${IMAGE_ROOTFS}/var/lib/machines/${name}
install -m 0755 -d ${IMAGE_ROOTFS}/var/lib/machines/${name}
name=${image}
rm -rf ${IMAGE_ROOTFS}/var/lib/machines/${name}
install -m 0755 -d ${IMAGE_ROOTFS}/var/lib/machines/${name}
- src="${TOPDIR}/tmp-${config}/deploy/images/${GUEST_MACHINE}/${image}-${GUEST_MACHINE}
${MACHINE_SUFFIX}
.ext4"
+ src="${TOPDIR}/tmp-${config}/deploy/images/${GUEST_MACHINE}/${image}-${GUEST_MACHINE}.ext4"
bbnote "Installing ${src}"
install -m 0600 ${src} ${IMAGE_ROOTFS}/var/lib/machines/${name}/
# Placeholder until booting from kernel in VM image is worked out
bbnote "Installing ${src}"
install -m 0600 ${src} ${IMAGE_ROOTFS}/var/lib/machines/${name}/
# Placeholder until booting from kernel in VM image is worked out