commit: fa341ebe57929d6f971359d3446fbcaa78301d11 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Fri Jul 14 18:48:45 2017 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Fri Jul 14 18:48:45 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fa341ebe
Fix unbootable kernels due to overzealous strip. Manually stripping the kernel is obsolete, use kernel targets for it, and only pass in argument for Kernel to strip modules itself. Bug introduced in c2525c65b9f3d5849963bab6beb40817d7720218. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=622716 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> doc/genkernel.8.txt | 4 ++-- gen_cmdline.sh | 4 ++-- gen_determineargs.sh | 2 +- gen_funcs.sh | 6 ------ 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 944d596..a0c638e 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -388,8 +388,8 @@ OUTPUT SETTINGS on >=2.6 kernels *--strip*=<all|kernel|modules|none>:: - Strip debug symbols from the installed kernel, modules, all - (default) or none. + Strip debug symbols from none, all, installed kernel (obsolete) or + modules (default). *--no-strip*:: Alias for *--strip=none*. diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 7e8853b..83b3829 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -181,8 +181,8 @@ longusage() { echo " --compress-initramfs-type=<arg>" echo " Compression type for initramfs (best, xz, lzma, bzip2, gzip, lzop)" echo " --strip=(all|kernel|modules|none)" - echo " Strip debug symbols from the installed kernel, modules," - echo " all (default) or none" + echo " Strip debug symbols from none, all, installed kernel (obsolete) or" + echo " modules (default)." echo " --no-strip" echo " Don't strip installed kernel or modules, alias for --strip=none" echo diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 23084a1..41fbe63 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -144,7 +144,7 @@ determine_real_args() { set_config_with_override BOOL KEYMAP CMD_KEYMAP "yes" set_config_with_override BOOL DOKEYMAPAUTO CMD_DOKEYMAPAUTO set_config_with_override STRING BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG - set_config_with_override STRING STRIP_TYPE CMD_STRIP_TYPE "all" + set_config_with_override STRING STRIP_TYPE CMD_STRIP_TYPE "modules" set_config_with_override BOOL INSTALL CMD_INSTALL "yes" set_config_with_override BOOL DEBUGCLEANUP CMD_DEBUGCLEANUP "yes" diff --git a/gen_funcs.sh b/gen_funcs.sh index 0e22a86..6234189 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -388,12 +388,6 @@ copy_image_with_preserve() { cp "${newSrceImage}" "${BOOTDIR}/${currDestImage}" || gen_die "Could not copy the ${symlinkName} image to ${BOOTDIR}!" - if [ "${CMD_STRIP_TYPE}" = "all" -o "${CMD_STRIP_TYPE}" = "kernel" ] - then - print_info 5 " Stripping ${BOOTDIR}/${currDestImage}" - strip --strip-debug "${BOOTDIR}/${currDestImage}" >/dev/null 2>&1 - fi - if [ "${SYMLINK}" = '1' ] then print_info 5 " Make new symlink(s) (from ${BOOTDIR}):"
