From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA5D8139694 for ; Fri, 14 Jul 2017 18:50:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE663E0DC9; Fri, 14 Jul 2017 18:50:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E7DCE0DC9 for ; Fri, 14 Jul 2017 18:50:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8A8A34167D for ; Fri, 14 Jul 2017 18:50:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37EDA7497 for ; Fri, 14 Jul 2017 18:50:02 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1500058125.fa341ebe57929d6f971359d3446fbcaa78301d11.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, doc/ X-VCS-Repository: proj/genkernel X-VCS-Files: doc/genkernel.8.txt gen_cmdline.sh gen_determineargs.sh gen_funcs.sh X-VCS-Directories: / doc/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: fa341ebe57929d6f971359d3446fbcaa78301d11 X-VCS-Branch: master Date: Fri, 14 Jul 2017 18:50:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 47309647-a197-4e7f-9a24-038e5af67329 X-Archives-Hash: 47d9adcbd01ad1b7e72c4492f5a2b542 commit: fa341ebe57929d6f971359d3446fbcaa78301d11 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Jul 14 18:48:45 2017 +0000 Commit: Robin H. Johnson gentoo 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 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*=:: - 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=" 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}):"