From cb5f0668aea5586d3af3cbf93f4792dc01470404 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Wed, 3 Nov 2010 21:16:48 +0000
Subject: [PATCH] sys-kernel/genkernel: add genkernel stip patch

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2655 6952d904-891a-0410-993b-d76249ca496b
---
 sys-kernel/genkernel/ChangeLog                |   4 +
 sys-kernel/genkernel/Manifest                 |   3 +-
 .../genkernel/files/3.4.11/cmd_strip_v2.patch | 101 ++++++++++++++++++
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 sys-kernel/genkernel/files/3.4.11/cmd_strip_v2.patch

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 2d9b5dd..4bc381b 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Nov 2010; Mario Fetka <mario.fetka@gmail.com>
+  +files/3.4.11/cmd_strip_v2.patch:
+  add genkernel stip patch
+
   30 Oct 2010; Mario Fetka <mario.fetka@gmail.com>
   files/3.4.11/genkernel-3.4.10.907-mdev_chroot_dev-1.patch:
   correct typo in patch
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 9b182c8..af71130 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,4 +1,5 @@
 AUX 3.4.11/0001-use-mdadm-instead-of-bundled-stripped-down-mdassembl.patch 5450 RMD160 03c674f453a3256181db93346856ae05fec3c52c SHA1 acf12ec07e152bd367c511a2d01747b6d2bb0f00 SHA256 3b32865584756e053be14358286de9246621e14b6c135e2fc03e2d99279bb7be
+AUX 3.4.11/cmd_strip_v2.patch 3483 RMD160 a26d74f0fe38330e7a809aea8f416fdd2ba719a8 SHA1 d36fdf9b98ae42162ce6a1f6e4641c5a1878c166 SHA256 3534d726f577566bee0615b0984e7f89a45f3e95c5308e9e6af5491a9fedb671
 AUX 3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch 38833 RMD160 5dda7e0d16a0c6d238f0bb8622c96816f7751d81 SHA1 d21aa64341c53d59381bfb442260c8195e6f32ca SHA256 dd947c6fa94274a30723b1a085431e4e01adff30b1616aa2766ae4a5f07ddca5
 AUX 3.4.11/genkernel-3.4.10.907-mdev_chroot_dev-1.patch 3294 RMD160 232bb132f94561d74dfc44839cafb2347e117905 SHA1 8efe0da2f9aeb9f7e816f40cf2b9cb0f7302f730 SHA256 42c3a776924c124e074f17fa403e7f37a5f5902db448eeeeb0d69eac3a8d887f
 AUX 3.4.11/genkernel-3.4.11-aufs-slowusb.patch 3425 RMD160 74add9c16143240da14ad307a25d5cccba58e893 SHA1 ffeee71f9e2146e0533591e62c0b3d1e0f77efd7 SHA256 8a131caf94253c0799daa18e0146b13b96f0667552ad6f97ce246c13f403a900
@@ -18,5 +19,5 @@ DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad
 DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
 DIST unionfs-fuse-0.24.tar.bz2 30381 RMD160 27934c23472f6e9d71e622f13aa9fd51a1f8018e SHA1 26f281e4e5f1e82194b430956b94cd7745d5bd97 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937
 EBUILD genkernel-3.4.10.907-r13.ebuild 4985 RMD160 1a90d8144c12e8f67cb04502d8e3b24aa5200c08 SHA1 d4694c5355c462501f1334f1fcade0dcfccaa3f3 SHA256 37a17572d4846cd69c2d2d224d91917452b362e41c79e7275e9f545d0a8ab41d
-MISC ChangeLog 1909 RMD160 3bda200118cae5b3fb8cbbef13be72f60487f726 SHA1 9d6ea7e410047e3f2a13a783d67c2f5ba936d32d SHA256 41873ebafa9fb5f8fbaadbe8d47f60590b5e24599c4af220c449a6e0ca68dba9
+MISC ChangeLog 2024 RMD160 38ee8a36848e43ba11a27ac5dca1f7a2f032f543 SHA1 20cc53763a940581ac41dad6ce32d97d3f366600 SHA256 6669f5cccfd27bde49810032858e315754e71e160e53fd80a66c84f44d0737ad
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/sys-kernel/genkernel/files/3.4.11/cmd_strip_v2.patch b/sys-kernel/genkernel/files/3.4.11/cmd_strip_v2.patch
new file mode 100644
index 0000000..43b1595
--- /dev/null
+++ b/sys-kernel/genkernel/files/3.4.11/cmd_strip_v2.patch
@@ -0,0 +1,101 @@
+diff --git a/gen_cmdline.sh b/gen_cmdline.sh
+index 20380ac..cec496e 100755
+--- a/gen_cmdline.sh
++++ b/gen_cmdline.sh
+@@ -133,6 +133,11 @@ longusage() {
+   echo "	--integrated-initramfs"
+   echo "				Build the generated initramfs into the kernel instead of"
+   echo "				keeping it as a separate file"
++  echo "	--strip=(all|kernel|modules|none)"
++  echo "				Strip debug symbols from the installed kernel, modules,"
++  echo "				all (default) or none"
++  echo "	--no-strip"
++  echo "				Don't strip installed kernel or modules (alias for --strip=none)"
+ }
+ 
+ usage() {
+@@ -536,6 +541,14 @@ parse_cmdline() {
+ 		--config=*)
+ 			print_info 2 "CMD_GK_CONFIG: `parse_opt "$*"`"
+ 			;;
++		--strip=*)
++			CMD_STRIP_TYPE=`parse_opt "$*"`
++			print_info 2 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}"
++			;;
++		--no-strip)
++			CMD_STRIP_TYPE=none
++			print_info 2 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}"
++			;;
+ 		all)
+ 			BUILD_KERNEL=1
+ 			BUILD_MODULES=1
+diff --git a/gen_compile.sh b/gen_compile.sh
+index d87d2f4..e7c3d41 100755
+--- a/gen_compile.sh
++++ b/gen_compile.sh
+@@ -284,7 +284,16 @@ compile_modules() {
+ 	compile_generic modules kernel
+ 	export UNAME_MACHINE="${ARCH}"
+ 	[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
++	if [ "${CMD_STRIP_TYPE}" == "all" -o "${CMD_STRIP_TYPE}" == "modules" ]
++	then
++		print_info 1 "        >> Installing ${KV} modules (and stripping)"
++		INSTALL_MOD_STRIP=1
++		export INSTALL_MOD_STRIP
++	else
++		print_info 1 "        >> Installing ${KV} modules"
++	fi
+ 	compile_generic "modules_install" kernel
++	unset INSTALL_MOD_STRIP
+ 	unset UNAME_MACHINE
+ }
+ 
+diff --git a/gen_determineargs.sh b/gen_determineargs.sh
+index ed84798..7fb8a66 100755
+--- a/gen_determineargs.sh
++++ b/gen_determineargs.sh
+@@ -119,6 +119,7 @@ determine_real_args() {
+ 	set_config_with_override 1 KEYMAP               CMD_KEYMAP               "yes"
+ 	set_config_with_override 1 DOKEYMAPAUTO         CMD_DOKEYMAPAUTO
+ 	set_config_with_override 2 BUSYBOX_CONFIG       CMD_BUSYBOX_CONFIG
++	set_config_with_override 1 STRIP_TYPE           CMD_STRIP_TYPE           "all"
+ 
+ 	BOOTDIR=`arch_replace "${BOOTDIR}"`
+ 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash
+diff --git a/gen_funcs.sh b/gen_funcs.sh
+index 07a7f5f..010f5bd 100755
+--- a/gen_funcs.sh
++++ b/gen_funcs.sh
+@@ -393,7 +393,13 @@ copy_image_with_preserve() {
+ 	print_info 5 "  Copying ${symlinkName}: ${newSrceImage}"
+ 	print_info 5 "    to ${BOOTDIR}/${currDestImage}"
+ 	cp "${newSrceImage}" "${BOOTDIR}/${currDestImage}" ||
+-	    gen_die "Could not copy the ${symlinkName} image to ${BOOTDIR}!"
++		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}" -eq '1' ]
+ 	then
+diff --git a/genkernel.8 b/genkernel.8
+index 4dba331..2c498a8 100644
+--- a/genkernel.8
++++ b/genkernel.8
+@@ -243,6 +243,13 @@ against a kernel source tree.
+ \fB\-\-initramfs\-overlay=\fR<dir>
+ Directory structure to include in the initramfs,
+ only available on 2.6 kernels
++.TP
++\fB\-\-strip=\fR<all|kernel|modules|none>
++Strip debug symbols from the installed kernel, modules, all (default)
++or none.
++.TP
++\fB\-\-no\-\fBstrip
++Alias for \fB\-\-strip=none\fR
+ .SH RAMDISK OPTIONS
+ The following options can be passed as kernel parameters from the
+ bootloader, which the ramdisk scripts would recognize.