Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QEMU x86-64 bootable #6

Merged
merged 1 commit into from
Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meta-leda-bsp/conf/machine/qemux86-64-extra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion meta-leda-bsp/recipes-bsp/grub/files/grub.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)}"
9 changes: 9 additions & 0 deletions meta-leda-distro/conf/distro/leda.conf
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,12 @@ MAINTAINER = "Eclipse Leda Committers <leda-dev@eclipse.org>"
# 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"
5 changes: 5 additions & 0 deletions meta-leda-distro/recipes-sdv-distro/images/sdv-image-all.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions meta-leda-distro/recipes-sdv-distro/images/sdv-image-full.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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"