module_strip.bbclass: look for modules in right directory
PATCH 1/2 module_strip.bbclass: look for modules in right directory
* After 29c7d3351f43678c6e93b707b301832009f64b31 modules are not in install directory but in package, packages-split
* modules*.tgz is created BEFORE this, so it contains non stripped modules
* for modules*.tgz with stripped modules see following patch
--- classes/module_strip.bbclass | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
classes/module_strip.bbclass +3 -3
@@ -2,11 +2,11 @@ do_strip_modules () { for p in ${PACKAGES}; do - if test -e ${WORKDIR}/install/$p/lib/modules; then + if test -e ${PKGDEST}/$p/lib/modules; then if [ "${KERNEL_MAJOR_VERSION}" == "2.6" ]; then - modules="`find ${WORKDIR}/install/$p/lib/modules -name \*.ko`" + modules="`find ${PKGDEST}/${p}/lib/modules -name \*.ko`" else - modules="`find ${WORKDIR}/install/$p/lib/modules -name \*.o`" + modules="`find ${PKGDEST}/${p}/lib/modules -name \*.o`" fi if [ -n "$modules" ]; then for module in $modules ; do
Signature · 1 line
1.6.5.3
PATCH 2/2 kernel.bbclass: deploy both stripped and non-stripped modules in tgz
* Change name of old modules*.tgz file to modules*-dbg.tgz
* Run do_strip_modules in PKGDEST for every package and then in PKGD, from where .tgz will be created, just because I haven't found where do_strip_modules can be hooked, to be run only in PKGD before files are copied to PKGDEST, or are they moved directly from source?
* After do_strip_modules create modules*.tgz with stripped modules
--- classes/kernel.bbclass | 2 +- classes/module_strip.bbclass | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-)
classes/kernel.bbclass +1 -1
@@ -528,7 +528,7 @@ do_deploy() { package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin if [ -d "${D}/lib" ]; then - fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib + fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}-dbg.tgz -C ${D} lib fi cd ${DEPLOY_DIR_IMAGE}
classes/module_strip.bbclass +24 -2
@@ -13,14 +13,36 @@ do_strip_modules () { if ! [ -d "$module" ] ; then ${STRIP} -v -g $module fi - done -# NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules + done +# NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules fi fi done + if test -e ${PKGD}/lib/modules; then + if [ "${KERNEL_MAJOR_VERSION}" == "2.6" ]; then + modules="`find ${PKGD}/lib/modules -name \*.ko`" + else + modules="`find ${PKGD}/lib/modules -name \*.o`" + fi + if [ -n "$modules" ]; then + for module in $modules ; do + if ! [ -d "$module" ] ; then + ${STRIP} -v -g $module + fi + done +# NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules + fi + fi +} + +do_deploy_stripped_modules () { + if [ -d "${PKGD}/lib" ]; then + fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${PKGD} lib + fi } python do_package_append () { if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'): bb.build.exec_func('do_strip_modules', d) + bb.build.exec_func('do_deploy_stripped_modules', d) }
Signature · 1 line
1.6.5.3
Quoted 8 lines · Martin Jansa
* After
29c7d3351f43678c6e93b707b301832009f64b31modules are not in install directory but in package, packages-split
* modules*.tgz is created BEFORE this, so it contains non stripped modules
* for modules*.tgz with stripped modules see following patch--- classes/module_strip.bbclass | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)