[kernel] r5875 - in dists/trunk/linux-2.6/debian: . arch/sparc bin

[Jurij Smakov]

Author: jurij-guest
Date: Tue Feb 14 04:00:44 2006
New Revision: 5875

Added:
   dists/trunk/linux-2.6/debian/bin/sparc32-image-postproc
      - copied unchanged from r5874, dists/exp/linux-2.6/debian/bin/sparc32-image-postproc
Modified:
   dists/trunk/linux-2.6/debian/arch/sparc/defines
   dists/trunk/linux-2.6/debian/rules.real
Log:
Test build finished successfully, merge changes
(sparc32 image stripping) into trunk.


Modified: dists/trunk/linux-2.6/debian/arch/sparc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/defines	Tue Feb 14 04:00:44 2006
@@ -10,7 +10,7 @@
 kernel-arch: sparc
 kernel-subarch: sparc
 kernel-headers-dirs: sparc
-image-postproc: strip -R .comment -R .note -K sun4u_init -K _end -K _start arch/sparc/boot/image
+image-postproc: sparc32-image-postproc
 class: uniprocessor sparc32 (sun4m) machines
 
 [sparc64]

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Tue Feb 14 04:00:44 2006
@@ -163,9 +163,6 @@
 	cd '$(DIR)' && $(setup_env) make-kpkg --stem linux 		\
 		--config defconfig kernel-manual
 	cat '$(DIR)/debian/files' >> debian/files
-ifdef IMAGE_POSTPROC
-	cd '$(DIR)'; $(IMAGE_POSTPROC)
-endif
 	@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do	\
 	  echo "mv \"$(BUILD_DIR)/$$i\" ..";				\
 	  mv "$(BUILD_DIR)/$$i" ..;					\
@@ -185,11 +182,13 @@
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
-	cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
-	cat '$(DIR)/debian/files' >> debian/files
 ifdef IMAGE_POSTPROC
-	cd '$(DIR)'; $(IMAGE_POSTPROC)
+#	Install the postproc script into the hook directory
+	install -d '$(DIR)/debian/image.d'
+	install 'debian/bin/$(IMAGE_POSTPROC)' '$(DIR)/debian/image.d'
 endif
+	cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
+	cat '$(DIR)/debian/files' >> debian/files
 	@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do	\
 	  echo "mv \"$(BUILD_DIR)/$$i\" ..";				\
 	  mv "$(BUILD_DIR)/$$i" ..;					\