diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-08 16:46:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-18 21:20:25 +0000 |
commit | c92107bda7b6c22e72c10f574b053f163e7092c2 (patch) | |
tree | 40f09e21bd677e8a2e608442e4a2e5dc45408edd /meta/recipes-core | |
parent | 9c1bb78d8b214f722c3f3b1824c375b300c31717 (diff) | |
download | poky-c92107bda7b6c22e72c10f574b053f163e7092c2.tar.gz |
build-appliance-image: Drop kernel module handling
kernel-devsrc is a dependency of the image so we no longer need the symlink
creation code or the module-base inherit/dependency as it is included in
that recipe. The KERNEL_VERSION usage was broken anyway as the module
usage would have needed a:
do_image[depends] += "build-appliance-image:do_configure"
which wasn't present so it was indeterminate if KERNEL_VERSION was set
correctly.
(From OE-Core rev: b5bcbe1835ad95a65c2c01212a35f9388ac0dffc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a46b43bb67b2f87ec370480e50a2e2d111555b75)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/images/build-appliance-image_15.0.0.bb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index f5cc20fa6d..086e20023f 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb | |||
@@ -22,7 +22,7 @@ APPEND += "rootfstype=ext4 quiet" | |||
22 | DEPENDS = "zip-native python3-pip-native" | 22 | DEPENDS = "zip-native python3-pip-native" |
23 | IMAGE_FSTYPES = "wic.vmdk" | 23 | IMAGE_FSTYPES = "wic.vmdk" |
24 | 24 | ||
25 | inherit core-image module-base setuptools3 | 25 | inherit core-image setuptools3 |
26 | 26 | ||
27 | SRCREV ?= "fadf7d3343305337c38a5243797723c68e88276a" | 27 | SRCREV ?= "fadf7d3343305337c38a5243797723c68e88276a" |
28 | SRC_URI = "git://git.yoctoproject.org/poky;branch=dunfell \ | 28 | SRC_URI = "git://git.yoctoproject.org/poky;branch=dunfell \ |
@@ -61,12 +61,6 @@ fakeroot do_populate_poky_src () { | |||
61 | # Place the README_VirtualBox_Toaster file in builders home folder. | 61 | # Place the README_VirtualBox_Toaster file in builders home folder. |
62 | cp ${WORKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/ | 62 | cp ${WORKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/ |
63 | 63 | ||
64 | # Create a symlink, needed for out-of-tree kernel modules build | ||
65 | if [ ! -e ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build ]; then | ||
66 | rm -f ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build | ||
67 | lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build | ||
68 | fi | ||
69 | |||
70 | echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf | 64 | echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf |
71 | echo "export LC_ALL=en_US.utf8" >> ${IMAGE_ROOTFS}/home/builder/.bashrc | 65 | echo "export LC_ALL=en_US.utf8" >> ${IMAGE_ROOTFS}/home/builder/.bashrc |
72 | 66 | ||