module.bbclass: Create a new depmodwrapper to assist cross-installs
PATCH v3 2/2 module.bbclass: Create a new depmodwrapper to assist cross-installs
Previously the build path to STAGING_KERNEL_DIR was being embedded into the package post install scripts. We avoid this behavior by generating a special depmodwrapper script. This script contains that hard-coded path, ensuring that re-use of the sstate-cache (and/or packages) will always run through the wrapper generated by the current build with a checksum that includes STAGING_KERNEL_DIR.
[ YOCTO #3962 ]
Signed-off-by Mark Hatle <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
--- meta/classes/image.bbclass | 4 +- meta/classes/kernel.bbclass | 8 ++-- meta/classes/module.bbclass | 4 +- .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb | 43 ++++++++++++++++++++ 4 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
meta/classes/image.bbclass +2 -2
@@ -10,7 +10,7 @@ inherit gzipnative LICENSE = "MIT" PACKAGES = "" -DEPENDS += "${MLPREFIX}qemuwrapper-cross" +DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross" RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}" RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
@@ -283,7 +283,7 @@ fakeroot do_rootfs () { KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion` mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION - depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION + depmodwrapper -a -b ${IMAGE_ROOTFS} $KERNEL_VERSION fi ${IMAGE_PREPROCESS_COMMAND}
meta/classes/kernel.bbclass +4 -4
@@ -1,7 +1,7 @@ inherit linux-kernel-base module_strip PROVIDES += "virtual/kernel" -DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native" +DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross" # we include gcc above, we dont need virtual/libc INHIBIT_DEFAULT_DEPS = "1"
@@ -272,7 +272,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} fi if [ -n "$D" ]; then - depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + depmodwrapper -a -b $D ${KERNEL_VERSION} else depmod -a ${KERNEL_VERSION} fi
@@ -282,7 +282,7 @@ pkg_postinst_modules () { if [ -z "$D" ]; then depmod -a ${KERNEL_VERSION} else - depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + depmodwrapper -a -b $D ${KERNEL_VERSION} fi }
@@ -290,7 +290,7 @@ pkg_postrm_modules () { if [ -z "$D" ]; then depmod -a ${KERNEL_VERSION} else - depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + depmodwrapper -a -b $D ${KERNEL_VERSION} fi }
meta/classes/module.bbclass +2 -2
@@ -28,7 +28,7 @@ module_pkg_postinst () { if [ -z "$D" ]; then depmod -a ${KERNEL_VERSION} else - depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + depmodwrapper -a -b $D ${KERNEL_VERSION} fi }
@@ -36,7 +36,7 @@ module_pkg_postrm () { if [ -z "$D" ]; then depmod -a ${KERNEL_VERSION} else - depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + depmodwrapper -a -b $D ${KERNEL_VERSION} fi }
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.7.1