[kernel] r5730 - in dists/exp/linux-2.6/debian: . arch/sparc bin

[Frederik Schüler]

Author: fs
Date: Tue Feb  7 14:38:28 2006
New Revision: 5730

Added:
   dists/exp/linux-2.6/debian/arch/sparc/config.sparc32
      - copied unchanged from r5724, dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32
Modified:
   dists/exp/linux-2.6/debian/arch/sparc/defines
   dists/exp/linux-2.6/debian/bin/gencontrol.py
   dists/exp/linux-2.6/debian/rules.real
Log:
Merge experimental sparc32 changes from Jurij: r5717 r5718 r5721 r5722 r5723 r5724


Modified: dists/exp/linux-2.6/debian/arch/sparc/defines
==============================================================================
--- dists/exp/linux-2.6/debian/arch/sparc/defines	(original)
+++ dists/exp/linux-2.6/debian/arch/sparc/defines	Tue Feb  7 14:38:28 2006
@@ -1,16 +1,27 @@
 [base]
 depends: initramfs-tools | yaird | linux-initramfs-tool
 flavours:
+ sparc32
  sparc64
  sparc64-smp
-kernel-arch: sparc64
-kpkg-subarch: sparc64
-kernel-header-dirs: sparc64
 suggests: silo, fdutils
 
+[sparc32]
+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
+class: uniprocessor sparc32 (sun4m) machines
+
 [sparc64]
+kernel-arch: sparc64
+kpkg-subarch: sparc64
+kernel-header-dirs: sparc64
 class: uniprocessor 64-bit UltraSPARC class
 
 [sparc64-smp]
+kernel-arch: sparc64
+kpkg-subarch: sparc64
+kernel-header-dirs: sparc64
 class: multi-processor 64-bit UltraSPARC class
 

Modified: dists/exp/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/exp/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/exp/linux-2.6/debian/bin/gencontrol.py	Tue Feb  7 14:38:28 2006
@@ -83,6 +83,7 @@
             ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
+            ('image-postproc', 'IMAGE_POSTPROC'),
             ('type', 'TYPE'),
         ):
             if config_entry.has_key(i[0]):

Modified: dists/exp/linux-2.6/debian/rules.real
==============================================================================
--- dists/exp/linux-2.6/debian/rules.real	(original)
+++ dists/exp/linux-2.6/debian/rules.real	Tue Feb  7 14:38:28 2006
@@ -128,9 +128,6 @@
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 	ln -fs "$$(command -v touch)" debian/build/touch.orig
 	cd '$(DIR)'; $(setup_env) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
-ifdef image_postproc
-	cd '$(DIR)'; $(image_postproc)
-endif
 	touch '$@'
 
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
@@ -165,6 +162,9 @@
 	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" ..;					\
@@ -187,6 +187,9 @@
 	install debian/bin/install-image '$(DIR)/debian/post-install'
 	cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
 	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" ..;					\