From 690c9abf86d5368cb4f0fa2844596ddb8d5707ab Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Thu, 6 Oct 2022 16:46:31 +0000 Subject: [PATCH] QEMU x86-64 Signed-off-by: Stoyan Lachev --- meta-leda-bsp/conf/machine/qemux86-64-extra.conf | 2 +- meta-leda-bsp/recipes-bsp/grub/files/grub.cfg | 2 +- .../packagegroups/packagegroup-sdv-core-direct.bb | 6 +++--- meta-leda-distro/conf/distro/leda.conf | 9 +++++++++ .../recipes-sdv-distro/images/sdv-image-all.bb | 5 +++++ .../recipes-sdv-distro/images/sdv-image-full.bb | 2 -- .../recipes-sdv-distro/images/sdv-image-minimal.bb | 2 -- .../recipes-sdv-distro/images/sdv-image-rescue.bb | 2 -- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/meta-leda-bsp/conf/machine/qemux86-64-extra.conf b/meta-leda-bsp/conf/machine/qemux86-64-extra.conf index faafc9fa..fc7c47bb 100644 --- a/meta-leda-bsp/conf/machine/qemux86-64-extra.conf +++ b/meta-leda-bsp/conf/machine/qemux86-64-extra.conf @@ -8,7 +8,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" MACHINE_FEATURES += "x86 pci" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -WKS_FILE ?= "qemux86-grub-efi.wks" +WKS_FILE = "qemux86-grub-efi.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" MACHINE_FEATURES:append = " pcbios efi" diff --git a/meta-leda-bsp/recipes-bsp/grub/files/grub.cfg b/meta-leda-bsp/recipes-bsp/grub/files/grub.cfg index f7554810..1556a01f 100644 --- a/meta-leda-bsp/recipes-bsp/grub/files/grub.cfg +++ b/meta-leda-bsp/recipes-bsp/grub/files/grub.cfg @@ -95,7 +95,7 @@ terminal_output serial terminal_input serial # Default Kernel command line options -CMDLINE="console=ttyS0,115200 net.ifnames=0 panic=5 ip=dhcp ip=192.168.7.2::192.168.7.1:255.255.255.0 rootwait" +CMDLINE="console=ttyS0,115200 rootwait" # A full-features SDV image including convenient tools # Index 0 diff --git a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-core-direct.bb b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-core-direct.bb index fb9f30a8..e19ec6c7 100644 --- a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-core-direct.bb +++ b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-core-direct.bb @@ -16,13 +16,13 @@ DESCRIPTION = "Packages required to set up a basic working SDV system without Ku inherit packagegroup SDV_EXTERNAL_DEPENDS = "\ - sdv-cloud-connector \ " +# TODO: Not done yet +# sdv-cloud-connector + RDEPENDS:${PN} = "\ ca-certificates \ - kernel-modules \ - kernel-image \ rauc " RDEPENDS:${PN} += "${@bb.utils.contains("DISTRO_FEATURES", "sdv", "${SDV_EXTERNAL_DEPENDS}", "", d)}" diff --git a/meta-leda-distro/conf/distro/leda.conf b/meta-leda-distro/conf/distro/leda.conf index 81503a01..bb25d4c7 100644 --- a/meta-leda-distro/conf/distro/leda.conf +++ b/meta-leda-distro/conf/distro/leda.conf @@ -34,3 +34,12 @@ MAINTAINER = "Eclipse Leda Committers " # Ensure timestamp of rootfs and kernel are updated (non-reproducable-build) BUILD_REPRODUCIBLE_BINARIES = "0" REPRODUCIBLE_TIMESTAMP_ROOTFS = "" + +# Exluding - not to delete images. They are needed by wic +RM_WORK_EXCLUDE += " sdv-image-full" +RM_WORK_EXCLUDE += " sdv-image-minimal" +RM_WORK_EXCLUDE += " sdv-image-rescue" +RM_WORK_EXCLUDE += " sdv-image-all" +RM_WORK_EXCLUDE += " sdv-rauc-bundle" + +QB_KERNEL_CMDLINE_APPEND = "net.ifnames=0 panic=5 ip=dhcp ip=192.168.7.2::192.168.7.1:255.255.255.0 rootwait" \ No newline at end of file diff --git a/meta-leda-distro/recipes-sdv-distro/images/sdv-image-all.bb b/meta-leda-distro/recipes-sdv-distro/images/sdv-image-all.bb index 85df390f..ff2bfd70 100644 --- a/meta-leda-distro/recipes-sdv-distro/images/sdv-image-all.bb +++ b/meta-leda-distro/recipes-sdv-distro/images/sdv-image-all.bb @@ -14,6 +14,11 @@ SUMMARY = "A full quickstart image with all features and convenience tools enabled." LICENSE = "EPL" +# Debug tweaks +IMAGE_FEATURES:append = " debug-tweaks" +IMAGE_FEATURES:append = " allow-empty-password" +IMAGE_FEATURES:append = " empty-root-password" + # The image dependencies are actually both types: build-time and run-time dependency RDEPENDS:${PN} = "sdv-image-full sdv-image-minimal sdv-image-rescue sdv-rauc-bundle" DEPENDS = "sdv-image-full sdv-image-minimal sdv-image-rescue sdv-rauc-bundle" diff --git a/meta-leda-distro/recipes-sdv-distro/images/sdv-image-full.bb b/meta-leda-distro/recipes-sdv-distro/images/sdv-image-full.bb index 79acf4e1..d8a2430c 100644 --- a/meta-leda-distro/recipes-sdv-distro/images/sdv-image-full.bb +++ b/meta-leda-distro/recipes-sdv-distro/images/sdv-image-full.bb @@ -47,5 +47,3 @@ QB_FSINFO = "wic:no-kernel-in-fs" QB_KERNEL_ROOT = "/dev/vda" QB_DRIVE_TYPE="/dev/vd" - -QB_KERNEL_CMDLINE_APPEND = "console=ttyS0,115200 net.ifnames=0 panic=5 ip=dhcp ip=192.168.7.2::192.168.7.1:255.255.255.0 rootwait" diff --git a/meta-leda-distro/recipes-sdv-distro/images/sdv-image-minimal.bb b/meta-leda-distro/recipes-sdv-distro/images/sdv-image-minimal.bb index acfd8993..58cde1c1 100644 --- a/meta-leda-distro/recipes-sdv-distro/images/sdv-image-minimal.bb +++ b/meta-leda-distro/recipes-sdv-distro/images/sdv-image-minimal.bb @@ -39,5 +39,3 @@ QB_FSINFO = "wic:no-kernel-in-fs" QB_KERNEL_ROOT = "/dev/vda" QB_DRIVE_TYPE="/dev/vd" - -QB_KERNEL_CMDLINE_APPEND = "console=ttyS0,115200 net.ifnames=0 panic=5 ip=dhcp ip=192.168.7.2::192.168.7.1:255.255.255.0 rootwait" diff --git a/meta-leda-distro/recipes-sdv-distro/images/sdv-image-rescue.bb b/meta-leda-distro/recipes-sdv-distro/images/sdv-image-rescue.bb index 0682af96..c1bdd298 100644 --- a/meta-leda-distro/recipes-sdv-distro/images/sdv-image-rescue.bb +++ b/meta-leda-distro/recipes-sdv-distro/images/sdv-image-rescue.bb @@ -41,5 +41,3 @@ QB_FSINFO = "wic:no-kernel-in-fs" QB_KERNEL_ROOT = "/dev/vda" QB_DRIVE_TYPE="/dev/vd" - -QB_KERNEL_CMDLINE_APPEND = "console=ttyS0,115200 net.ifnames=0 panic=5 ip=dhcp ip=192.168.7.2::192.168.7.1:255.255.255.0 rootwait"