diff --git a/image/conf/local.conf b/image/conf/local.conf index f0f8a33..6e6565b 100644 --- a/image/conf/local.conf +++ b/image/conf/local.conf @@ -1,4 +1,3 @@ -#MACHINE = "genericx86-64" MACHINE = "intel-skylake-64" DISTRO = "poky" @@ -8,6 +7,5 @@ PARALLEL_MAKE = "-j 2" BB_SCHEDULER = "completion" INHERIT += "rm_work" -#VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" -PREFERRED_PROVIDER_virtual/kernel = "linux-intel-rt" -IMAGE_FSTYPES += "wic.vdi" \ No newline at end of file +# Select kernel +PREFERRED_PROVIDER_virtual/kernel = "linux-intel-rt" \ No newline at end of file diff --git a/image/docker-compose.yml b/image/docker-compose.yml index 442d480..b22752d 100644 --- a/image/docker-compose.yml +++ b/image/docker-compose.yml @@ -19,7 +19,7 @@ services: bash -c " source /workspace/yocto/poky/oe-init-build-env /workspace/build && cp /workspace/conf/* /workspace/build/conf/ && - bitbake core-image-rt && + bitbake fcb-looper-image && echo 'Build complete. Image files available in output directory.' " @@ -49,5 +49,5 @@ services: echo 'SSH will be available on localhost:2222' && echo 'QEMU monitor on localhost:4444' && cp /usr/share/OVMF/OVMF_VARS.fd /tmp/OVMF_VARS.fd && - qemu-system-x86_64 -accel kvm -cpu host -m 4096 -smp 4 -drive if=pflash,format=raw,readonly=on,file=/usr/share/OVMF/OVMF_CODE.fd -drive if=pflash,format=raw,file=/tmp/OVMF_VARS.fd -drive file=/workspace/build/tmp/deploy/images/intel-skylake-64/core-image-rt-intel-skylake-64.rootfs.wic,if=virtio,format=raw,cache=writeback -netdev user,id=net0,hostfwd=tcp:127.0.0.1:2222-:22,hostfwd=tcp:127.0.0.1:8080-:8080 -device virtio-net-pci,netdev=net0 -device virtio-vga -vnc 127.0.0.1:1 -monitor telnet:127.0.0.1:4444,server,nowait -serial stdio + qemu-system-x86_64 -accel kvm -cpu host -m 4096 -smp 4 -drive if=pflash,format=raw,readonly=on,file=/usr/share/OVMF/OVMF_CODE.fd -drive if=pflash,format=raw,file=/tmp/OVMF_VARS.fd -drive file=/workspace/build/tmp/deploy/images/intel-skylake-64/fcb-looper-image-intel-skylake-64.rootfs.wic,if=virtio,format=raw,cache=writeback -netdev user,id=net0,hostfwd=tcp:127.0.0.1:2222-:22,hostfwd=tcp:127.0.0.1:8080-:8080 -device virtio-net-pci,netdev=net0 -device virtio-vga -vnc 127.0.0.1:1 -monitor telnet:127.0.0.1:4444,server,nowait -serial stdio " \ No newline at end of file diff --git a/image/meta-layers/meta-fcb-looper/recipes-core/images/fcb-looper-image.bb b/image/meta-layers/meta-fcb-looper/recipes-core/images/fcb-looper-image.bb index ee6fc3d..7a1639e 100644 --- a/image/meta-layers/meta-fcb-looper/recipes-core/images/fcb-looper-image.bb +++ b/image/meta-layers/meta-fcb-looper/recipes-core/images/fcb-looper-image.bb @@ -1,10 +1,17 @@ SUMMARY = "FCB1010 Looper System Image" DESCRIPTION = "Embedded Linux system for FCB1010 looper" -require recipes-rt/images/core-image-rt.bb +require recipes-core/images/core-image-minimal.bb # Kernel selection -PREFERRED_PROVIDER_virtual/kernel = "linux-intel-rt" +DEPENDS += "linux-intel-rt" +# Skip processing of this recipe if linux-intel-rt is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers. +python () { + if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": + raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") +} # Image formats IMAGE_FSTYPES += "wic.vdi"