| Message ID | 20220330221139.54366-2-saul.wold@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] kmod: Add an exclude directive to depmod | expand |
On Wed, 2022-03-30 at 15:11 -0700, Saul Wold wrote: > Use the native staging dir so that we can get the correct depmod.d configuration > files. When depmod runs we want to ensure that the newly supported exclude.conf > is read so that .debug/<module>.ko files are excluded. > > Signed-off-by: Saul Wold <saul.wold@windriver.com> > --- > meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb > index aa23ba41276..9921b7e8ad7 100644 > --- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb > +++ b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb > @@ -35,9 +35,9 @@ fi > > if [ ! -r ${PKGDATA_DIR}/kernel-depmod/System.map-\$4 ] || [ "\$kernelabi" != "\$4" ]; then > echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/System.map-\$4" >&2 > - exec env depmod -C "\$3${sysconfdir}/depmod.d" "\$1" "\$2" "\$3" "\$4" > + exec env depmod -C "\${STAGING_BASE_LIBDIR_NATIVE}/depmod.d" "\$1" "\$2" "\$3" "\$4" > else > - exec env depmod -C "\$3${sysconfdir}/depmod.d" "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4" > + exec env depmod -C "\${STAGING_BASE_LIBDIR_NATIVE}/depmod.d" "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4" > fi > EOF > chmod +x ${D}${bindir_crossscripts}/depmodwrapper This doesn't look/feel right to me. Shouldn't we be putting this configuration into the target depmod.d directories and using it from there? What happens if the depmod configuration is machine/target specific? Cheers, Richard
diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb index aa23ba41276..9921b7e8ad7 100644 --- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb +++ b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb @@ -35,9 +35,9 @@ fi if [ ! -r ${PKGDATA_DIR}/kernel-depmod/System.map-\$4 ] || [ "\$kernelabi" != "\$4" ]; then echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/System.map-\$4" >&2 - exec env depmod -C "\$3${sysconfdir}/depmod.d" "\$1" "\$2" "\$3" "\$4" + exec env depmod -C "\${STAGING_BASE_LIBDIR_NATIVE}/depmod.d" "\$1" "\$2" "\$3" "\$4" else - exec env depmod -C "\$3${sysconfdir}/depmod.d" "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4" + exec env depmod -C "\${STAGING_BASE_LIBDIR_NATIVE}/depmod.d" "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4" fi EOF chmod +x ${D}${bindir_crossscripts}/depmodwrapper
Use the native staging dir so that we can get the correct depmod.d configuration files. When depmod runs we want to ensure that the newly supported exclude.conf is read so that .debug/<module>.ko files are excluded. Signed-off-by: Saul Wold <saul.wold@windriver.com> --- meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)