From 694030776139c474d570d41534d50c036089a801 Mon Sep 17 00:00:00 2001
From: Jurij Smakov <jurij@wooyd.org>
Date: Sat, 21 May 2005 04:53:25 +0000
Subject: [PATCH] "All systems go" commit. Everybody is encouraged to give it a
 try.

svn path=/branches/kernel-image-2.6.11/; revision=3205
---
 README               | 16 +++++-----------
 TODO                 |  5 +----
 debian/rules.subarch | 21 +++++++++------------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/README b/README
index 00253759c..8455f759d 100644
--- a/README
+++ b/README
@@ -176,19 +176,13 @@ initrd_modules
 
   initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko
 
-image_postproc [NOT IMPLEMENTED YET]
+image_postproc
 
-  A command to be run on the kernel image after it's built. Location of
-  the image will be appended to this command as the last argument. One
-  usage is stripping the image on sparc, otherwise it is too big to be
-  booted:
+  A command to be run after the kernel image is built. As far as I know,
+  it only required on sparc for stripping of the kernel which is too big
+  to be booted otherwise. Typical use is too ugly to be presented here.
 
-  image_postproc := strip -R .comment -R .note -K sun4u_init -K _end -K _start
- 
-  Note that for cross-compiling a proper strip command should be used
-  (such as sparc-linux-strip, or something like this).
-
-image_prefix [NOT IMPLEMENTED YET]
+image_prefix
 
   This variable may contain an expression, which will be used as a wrapper
   for the make-kpkg when its target is kernel_image. This option is a kludge,
diff --git a/TODO b/TODO
index e52add13d..54f5fb055 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,7 @@
-Major TODO items remaining:
+Some things to think about:
 
 * Looks like it would be optimal to have a common kernel-headers package
   which would contain common headers for all arches without unmerged patches.
 
-* Various remaining kludges (stripping and sparc32/sparc64 stuff on sparc,
-  for example).
-
 * Generate the control file for individual files dynamically, so that we
   do not have that ridiculous master control file.
diff --git a/debian/rules.subarch b/debian/rules.subarch
index d5966c322..0b905f3af 100755
--- a/debian/rules.subarch
+++ b/debian/rules.subarch
@@ -70,7 +70,8 @@ endif
 ifdef build_makeflags
   kpkg_build_cmd := MAKEFLAGS=$(build_makeflags) $(kpkg_build_cmd)
 endif
-kpkg_image_cmd  := $(kpkg_build_cmd) --initrd kernel_image
+kpkg_image_cmd  := $(if $(image_prefix),$(image_prefix))
+kpkg_image_cmd  += $(kpkg_build_cmd) --initrd kernel_image
 kpkg_build_cmd  += build
 kpkg_headers_cmd += kernel-headers
 ifndef headers_dirs
@@ -93,21 +94,17 @@ unpack-stamp-$(subarch): $(configs) header-install-$(subarch) $(bdirs)
 	rm -f $(configs)
 	touch unpack-stamp-$(subarch)
 #
-# TODO:
-#   * Implement optional stripping of the kernel
-#     (for sparc). 
-#   * Check that it is really ok to call --subarch
-#     with the name of the flavour. For mips which
-#     is another --subarch user it should be fine.
+#
 #
 build: build-stamp-$(subarch)
 build-stamp-$(subarch): unpack-stamp-$(subarch)
 	dh_testdir
-	PATH=$$PWD/bin:$$PATH;		\
-	for i in $(flavours); do	\
-	  cd build-$(subarch)-$$i;	\
-	  $(kpkg_build_cmd);		\
-	  cd ..;			\
+	PATH=$$PWD/bin:$$PATH;					\
+	for i in $(flavours); do				\
+	  cd build-$(subarch)-$$i;				\
+	  $(kpkg_build_cmd);					\
+	  $(if $(image_postproc),$(image_postproc),true);	\
+	  cd ..;						\
 	done
 	touch build-stamp-$(subarch)