From e3dad1344fee65f54b639f541c7f10352088462b Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 26 Apr 2024 10:44:44 -0400 Subject: Rework demo image naming Rename the demo images to align with the following scheme: agl---(-) The intent is to make the naming more consistent in preparation for switching to preconfigured images as a replacement for the existing agl-demo-preload, agl-demo-cluster-support, agl-kvm-host-* aglsetup.sh features. Additionally, the prototype LXC demo image support has been removed as it is unused and would need updating for these and upcoming changes. Bug-AGL: SPEC-5138 Change-Id: I8d907713b09eb47c3cb0ebd5326ab063b2684ea2 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29903 Reviewed-by: Naoto YAMAGUCHI Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../qemu-config/files/agl-cluster-demo-flutter.conf | 5 +++++ .../qemu-config/files/agl-cluster-demo-platform-flutter.conf | 5 ----- .../qemu-config/files/agl-cluster-demo-platform.conf | 5 ----- recipes-config/qemu-config/files/agl-cluster-demo-qt.conf | 5 +++++ recipes-config/qemu-config/files/agl-demo-platform.conf | 12 ------------ recipes-config/qemu-config/files/agl-ivi-demo-flutter.conf | 12 ++++++++++++ .../qemu-config/files/agl-ivi-demo-platform-flutter.conf | 12 ------------ recipes-config/qemu-config/files/agl-ivi-demo-qt.conf | 12 ++++++++++++ 8 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 recipes-config/qemu-config/files/agl-cluster-demo-flutter.conf delete mode 100644 recipes-config/qemu-config/files/agl-cluster-demo-platform-flutter.conf delete mode 100644 recipes-config/qemu-config/files/agl-cluster-demo-platform.conf create mode 100644 recipes-config/qemu-config/files/agl-cluster-demo-qt.conf delete mode 100644 recipes-config/qemu-config/files/agl-demo-platform.conf create mode 100644 recipes-config/qemu-config/files/agl-ivi-demo-flutter.conf delete mode 100644 recipes-config/qemu-config/files/agl-ivi-demo-platform-flutter.conf create mode 100644 recipes-config/qemu-config/files/agl-ivi-demo-qt.conf (limited to 'recipes-config/qemu-config/files') diff --git a/recipes-config/qemu-config/files/agl-cluster-demo-flutter.conf b/recipes-config/qemu-config/files/agl-cluster-demo-flutter.conf new file mode 100644 index 000000000..99d1f10c9 --- /dev/null +++ b/recipes-config/qemu-config/files/agl-cluster-demo-flutter.conf @@ -0,0 +1,5 @@ +QEMU_TASKSET_CPUS="4-7" +QEMU_SMP_OPT="-smp 2" +QEMU_MEM_OPT="-m 1G" +QEMU_NET_OPT="-netdev bridge,br=vmnet0,id=net0 -device virtio-net-device,mac=52:54:00:12:00:03,netdev=net0" +QEMU_KERNEL_CMDLINE_APPEND="root=/dev/vda rw mem=2048M video=Virtual-1:1920x1080" diff --git a/recipes-config/qemu-config/files/agl-cluster-demo-platform-flutter.conf b/recipes-config/qemu-config/files/agl-cluster-demo-platform-flutter.conf deleted file mode 100644 index 99d1f10c9..000000000 --- a/recipes-config/qemu-config/files/agl-cluster-demo-platform-flutter.conf +++ /dev/null @@ -1,5 +0,0 @@ -QEMU_TASKSET_CPUS="4-7" -QEMU_SMP_OPT="-smp 2" -QEMU_MEM_OPT="-m 1G" -QEMU_NET_OPT="-netdev bridge,br=vmnet0,id=net0 -device virtio-net-device,mac=52:54:00:12:00:03,netdev=net0" -QEMU_KERNEL_CMDLINE_APPEND="root=/dev/vda rw mem=2048M video=Virtual-1:1920x1080" diff --git a/recipes-config/qemu-config/files/agl-cluster-demo-platform.conf b/recipes-config/qemu-config/files/agl-cluster-demo-platform.conf deleted file mode 100644 index 1ecefc477..000000000 --- a/recipes-config/qemu-config/files/agl-cluster-demo-platform.conf +++ /dev/null @@ -1,5 +0,0 @@ -QEMU_TASKSET_CPUS="4-7" -QEMU_SMP_OPT="-smp 4" -QEMU_MEM_OPT="-m 2G" -QEMU_NET_OPT="-netdev bridge,br=vmnet0,id=net0 -device virtio-net-device,mac=52:54:00:12:00:03,netdev=net0" -QEMU_KERNEL_CMDLINE_APPEND="root=/dev/vda rw mem=2048M video=Virtual-1:1920x1080" diff --git a/recipes-config/qemu-config/files/agl-cluster-demo-qt.conf b/recipes-config/qemu-config/files/agl-cluster-demo-qt.conf new file mode 100644 index 000000000..1ecefc477 --- /dev/null +++ b/recipes-config/qemu-config/files/agl-cluster-demo-qt.conf @@ -0,0 +1,5 @@ +QEMU_TASKSET_CPUS="4-7" +QEMU_SMP_OPT="-smp 4" +QEMU_MEM_OPT="-m 2G" +QEMU_NET_OPT="-netdev bridge,br=vmnet0,id=net0 -device virtio-net-device,mac=52:54:00:12:00:03,netdev=net0" +QEMU_KERNEL_CMDLINE_APPEND="root=/dev/vda rw mem=2048M video=Virtual-1:1920x1080" diff --git a/recipes-config/qemu-config/files/agl-demo-platform.conf b/recipes-config/qemu-config/files/agl-demo-platform.conf deleted file mode 100644 index 7ff32bc18..000000000 --- a/recipes-config/qemu-config/files/agl-demo-platform.conf +++ /dev/null @@ -1,12 +0,0 @@ -QEMU_TASKSET_CPUS="0-3" -QEMU_SMP_OPT="-smp 4" -QEMU_MEM_OPT="-m 4G" -# With touchscreen plugged into the bottom connector of the 2x USB 2.0 -# on the reference hardware -QEMU_INPUT_OPT="-device qemu-xhci -usb -device usb-host,hostbus=5,hostport=1" -# Fallback for touchscreen or other pointing device plugged in elsewhere -#QEMU_INPUT_OPT="-device virtio-tablet-device" -QEMU_AUDIO_OPT="-audiodev alsa,id=agl -device intel-hda -device hda-duplex,audiodev=agl" -QEMU_NET_OPT="-netdev bridge,br=vmnet0,id=net0 -device virtio-net-device,mac=52:54:00:12:00:02,netdev=net0" -QEMU_CAN_OPT="-object can-bus,id=canbus0 -object can-host-socketcan,id=canhost0,if=can0,canbus=canbus0 -device kvaser_pci,canbus=canbus0" -QEMU_KERNEL_CMDLINE_APPEND="root=/dev/vda rw mem=4196M video=Virtual-1:1920x1080" diff --git a/recipes-config/qemu-config/files/agl-ivi-demo-flutter.conf b/recipes-config/qemu-config/files/agl-ivi-demo-flutter.conf new file mode 100644 index 000000000..7ff32bc18 --- /dev/null +++ b/recipes-config/qemu-config/files/agl-ivi-demo-flutter.conf @@ -0,0 +1,12 @@ +QEMU_TASKSET_CPUS="0-3" +QEMU_SMP_OPT="-smp 4" +QEMU_MEM_OPT="-m 4G" +# With touchscreen plugged into the bottom connector of the 2x USB 2.0 +# on the reference hardware +QEMU_INPUT_OPT="-device qemu-xhci -usb -device usb-host,hostbus=5,hostport=1" +# Fallback for touchscreen or other pointing device plugged in elsewhere +#QEMU_INPUT_OPT="-device virtio-tablet-device" +QEMU_AUDIO_OPT="-audiodev alsa,id=agl -device intel-hda -device hda-duplex,audiodev=agl" +QEMU_NET_OPT="-netdev bridge,br=vmnet0,id=net0 -device virtio-net-device,mac=52:54:00:12:00:02,netdev=net0" +QEMU_CAN_OPT="-object can-bus,id=canbus0 -object can-host-socketcan,id=canhost0,if=can0,canbus=canbus0 -device kvaser_pci,canbus=canbus0" +QEMU_KERNEL_CMDLINE_APPEND="root=/dev/vda rw mem=4196M video=Virtual-1:1920x1080" diff --git a/recipes-config/qemu-config/files/agl-ivi-demo-platform-flutter.conf b/recipes-config/qemu-config/files/agl-ivi-demo-platform-flutter.conf deleted file mode 100644 index 7ff32bc18..000000000 --- a/recipes-config/qemu-config/files/agl-ivi-demo-platform-flutter.conf +++ /dev/null @@ -1,12 +0,0 @@ -QEMU_TASKSET_CPUS="0-3" -QEMU_SMP_OPT="-smp 4" -QEMU_MEM_OPT="-m 4G" -# With touchscreen plugged into the bottom connector of the 2x USB 2.0 -# on the reference hardware -QEMU_INPUT_OPT="-device qemu-xhci -usb -device usb-host,hostbus=5,hostport=1" -# Fallback for touchscreen or other pointing device plugged in elsewhere -#QEMU_INPUT_OPT="-device virtio-tablet-device" -QEMU_AUDIO_OPT="-audiodev alsa,id=agl -device intel-hda -device hda-duplex,audiodev=agl" -QEMU_NET_OPT="-netdev bridge,br=vmnet0,id=net0 -device virtio-net-device,mac=52:54:00:12:00:02,netdev=net0" -QEMU_CAN_OPT="-object can-bus,id=canbus0 -object can-host-socketcan,id=canhost0,if=can0,canbus=canbus0 -device kvaser_pci,canbus=canbus0" -QEMU_KERNEL_CMDLINE_APPEND="root=/dev/vda rw mem=4196M video=Virtual-1:1920x1080" diff --git a/recipes-config/qemu-config/files/agl-ivi-demo-qt.conf b/recipes-config/qemu-config/files/agl-ivi-demo-qt.conf new file mode 100644 index 000000000..7ff32bc18 --- /dev/null +++ b/recipes-config/qemu-config/files/agl-ivi-demo-qt.conf @@ -0,0 +1,12 @@ +QEMU_TASKSET_CPUS="0-3" +QEMU_SMP_OPT="-smp 4" +QEMU_MEM_OPT="-m 4G" +# With touchscreen plugged into the bottom connector of the 2x USB 2.0 +# on the reference hardware +QEMU_INPUT_OPT="-device qemu-xhci -usb -device usb-host,hostbus=5,hostport=1" +# Fallback for touchscreen or other pointing device plugged in elsewhere +#QEMU_INPUT_OPT="-device virtio-tablet-device" +QEMU_AUDIO_OPT="-audiodev alsa,id=agl -device intel-hda -device hda-duplex,audiodev=agl" +QEMU_NET_OPT="-netdev bridge,br=vmnet0,id=net0 -device virtio-net-device,mac=52:54:00:12:00:02,netdev=net0" +QEMU_CAN_OPT="-object can-bus,id=canbus0 -object can-host-socketcan,id=canhost0,if=can0,canbus=canbus0 -device kvaser_pci,canbus=canbus0" +QEMU_KERNEL_CMDLINE_APPEND="root=/dev/vda rw mem=4196M video=Virtual-1:1920x1080" -- cgit 1.2.3-korg