[kernel] r6054 - in people/waldi/linux-2.6: . debian debian/patches

[Bastian Blank]

Author: waldi
Date: Sat Mar  4 09:52:03 2006
New Revision: 6054

Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/patches/powerpc-build-links.patch
   people/waldi/linux-2.6/debian/rules.real
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/patches/powerpc-build-links.patch
==============================================================================
--- people/waldi/linux-2.6/debian/patches/powerpc-build-links.patch	(original)
+++ people/waldi/linux-2.6/debian/patches/powerpc-build-links.patch	Sat Mar  4 09:52:03 2006
@@ -1,12 +1,11 @@
-diff -urN ../orig/linux-2.6-2.6.13+2.6.14-rc5/arch/ppc/Makefile linux-2.6-2.6.13+2.6.14-rc5/arch/ppc/Makefile
---- ../orig/linux-2.6-2.6.13+2.6.14-rc5/arch/ppc/Makefile	2005-10-22 18:17:48.000000000 +0000
-+++ linux-2.6-2.6.13+2.6.14-rc5/arch/ppc/Makefile	2005-10-23 13:27:47.000000000 +0000
-@@ -113,7 +113,7 @@
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -179,7 +179,7 @@ ifeq ($(CONFIG_PPC32),y)
  include/asm: arch/$(ARCH)/include/asm
- arch/$(ARCH)/include/asm:
+ arch/$(ARCH)/include/asm: FORCE
  	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
--	$(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm
-+	$(Q)ln -fsn $(if $(KBUILD_SRC),$(KBUILD_SRC),../../..)/include/asm-powerpc arch/$(ARCH)/include/asm
+-	$(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
++	$(Q)ln -fsn $(if $(KBUILD_SRC),$(KBUILD_SRC),../../..)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
+ endif
  
  # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
- # to stdout and these checks are run even on install targets.

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Sat Mar  4 09:52:03 2006
@@ -45,14 +45,14 @@
 setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION -u LOCALVERSION
 setup_makeflags =
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-  setup_makeflags += CROSS_COMPILE="$(DEB_HOST_GNU_TYPE)-"
+  setup_makeflags += CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
   ifdef COMPILER
-    setup_makeflags += CC="$(DEB_HOST_GNU_TYPE)-$(COMPILER)"
+    setup_makeflags += CC=$(DEB_HOST_GNU_TYPE)-$(COMPILER)
   endif
   kpkg_image += --cross-compile='$(DEB_HOST_GNU_TYPE)'
 else
   ifdef COMPILER
-    setup_makeflags += CC="$(COMPILER)"
+    setup_makeflags += CC=$(COMPILER)
   endif
 endif
 setup_env += MAKEFLAGS='$(setup_makeflags)'
@@ -299,6 +299,7 @@
 install-headers-all:
 	dh_testdir
 	dh_testroot
+	chmod a+x debian/modules/gencontrol.py
 	dh_install $(DH_OPTIONS) debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
 	dh_python $(DH_OPTIONS) -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
@@ -306,12 +307,9 @@
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/$@
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
-	rm -rf '$(DIR)'
-	cp -al '$(SOURCE_DIR)' '$(DIR)'
 ifdef IMAGE_POSTPROC
 #	Install the postproc script into the hook directory
 	install -d '$(DIR)/debian/image.d'
@@ -323,7 +321,6 @@
 	  echo "mv \"$(BUILD_DIR)/$$i\" ..";				\
 	  mv "$(BUILD_DIR)/$$i" ..;					\
 	done
-	rm -rf '$(DIR)'
 
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_DIR = $(CURDIR)/debian/$(MODULES_PACKAGE_NAME)
@@ -333,8 +330,8 @@
 	dh_testroot
 	dh_clean -d -k
 	dh_installdirs 'boot'
-	cp '$(SOURCE_DIR)/vmlinuz' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
-	cd '$(SOURCE_DIR)'; $(setup_env) make modules_install ARCH=$(KERNEL_ARCH) INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
+	cp '$(DIR)/vmlinuz' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
+	cd '$(DIR)'; $(setup_env) make modules_install ARCH=$(KERNEL_ARCH) INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
 
 install-patch: PACKAGE = linux-patch-debian-$(VERSION)