r3205 - in branches/kernel-image-2.6.11: . debian

[Jurij Smakov]

Author: jurij-guest
Date: 2005-05-21 04:53:25 +0000 (Sat, 21 May 2005)
New Revision: 3205

Modified:
   branches/kernel-image-2.6.11/README
   branches/kernel-image-2.6.11/TODO
   branches/kernel-image-2.6.11/debian/rules.subarch
Log:
"All systems go" commit. Everybody is
encouraged to give it a try.


Modified: branches/kernel-image-2.6.11/README
===================================================================
--- branches/kernel-image-2.6.11/README	2005-05-21 01:32:51 UTC (rev 3204)
+++ branches/kernel-image-2.6.11/README	2005-05-21 04:53:25 UTC (rev 3205)
@@ -176,20 +176,14 @@
 
   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
 
-image_prefix [NOT IMPLEMENTED YET]
-
   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,
   needed for sparc, which has to prepend this call with either 'sparc32' or

Modified: branches/kernel-image-2.6.11/TODO
===================================================================
--- branches/kernel-image-2.6.11/TODO	2005-05-21 01:32:51 UTC (rev 3204)
+++ branches/kernel-image-2.6.11/TODO	2005-05-21 04:53:25 UTC (rev 3205)
@@ -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.

Modified: branches/kernel-image-2.6.11/debian/rules.subarch
===================================================================
--- branches/kernel-image-2.6.11/debian/rules.subarch	2005-05-21 01:32:51 UTC (rev 3204)
+++ branches/kernel-image-2.6.11/debian/rules.subarch	2005-05-21 04:53:25 UTC (rev 3205)
@@ -70,7 +70,8 @@
 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 @@
 	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)