diff options
Diffstat (limited to 'poky/meta/recipes-core/images')
3 files changed, 8 insertions, 8 deletions
diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 8ab59a9dd..f03ef969a 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -22,8 +22,8 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "1566ecdb01216ece73864c15c781fdefe9af5e37" -SRC_URI = "git://git.yoctoproject.org/poky;branch=sumo \ +SRCREV ?= "53332c9f1bd270f34a290fea68fde1d3ff41f86e" +SRC_URI = "git://git.yoctoproject.org/poky;branch=thud \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ file://README_VirtualBox_Guest_Additions.txt \ @@ -59,8 +59,10 @@ fakeroot do_populate_poky_src () { cp ${WORKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/ # Create a symlink, needed for out-of-tree kernel modules build - rm -f ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build - lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build + if [ ! -e ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build ]; then + rm -f ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build + lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build + fi echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf echo "export LC_ALL=en_US.utf8" >> ${IMAGE_ROOTFS}/home/builder/.bashrc diff --git a/poky/meta/recipes-core/images/core-image-minimal-initramfs.bb b/poky/meta/recipes-core/images/core-image-minimal-initramfs.bb index 6de860e43..7df8ab1eb 100644 --- a/poky/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/poky/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -27,7 +27,5 @@ inherit core-image IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" -BAD_RECOMMENDATIONS += "busybox-syslog" - # Use the same restriction as initramfs-live-install COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb b/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb index 51d08a0cd..0eca6d994 100644 --- a/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb +++ b/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb @@ -5,6 +5,8 @@ first 'init' program more efficiently. core-image-tiny-initramfs doesn't \ actually generate an image but rather generates boot and rootfs artifacts \ that can subsequently be picked up by external image generation tools such as wic." +VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" + PACKAGE_INSTALL = "initramfs-live-boot-tiny packagegroup-core-boot dropbear ${VIRTUAL-RUNTIME_base-utils} ${VIRTUAL-RUNTIME_dev_manager} base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" # Do not pollute the initrd image with rootfs features @@ -23,8 +25,6 @@ inherit core-image IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" -BAD_RECOMMENDATIONS += "busybox-syslog" - # Use the same restriction as initramfs-live-install COMPATIBLE_HOST = "(i.86|x86_64).*-linux" |