[kernel] r15246 - in dists/trunk/linux-kbuild-2.6: . arch debian

[Bastian Blank]

Author: waldi
Date: Sat Feb 20 13:32:25 2010
New Revision: 15246

Log:
Remove arch specific workaround.

Deleted:
   dists/trunk/linux-kbuild-2.6/arch/
Modified:
   dists/trunk/linux-kbuild-2.6/Makefile
   dists/trunk/linux-kbuild-2.6/debian/changelog
   dists/trunk/linux-kbuild-2.6/debian/rules.real

Modified: dists/trunk/linux-kbuild-2.6/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/Makefile	Sat Feb 20 13:32:00 2010	(r15245)
+++ dists/trunk/linux-kbuild-2.6/Makefile	Sat Feb 20 13:32:25 2010	(r15246)
@@ -3,8 +3,7 @@
 	Makefile \
 
 SUBDIRS = \
-	scripts \
-	$(wildcard arch/$(SRCARCH)/scripts)
+	scripts
 
 OUTDIR = .
 

Modified: dists/trunk/linux-kbuild-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-kbuild-2.6/debian/changelog	Sat Feb 20 13:32:00 2010	(r15245)
+++ dists/trunk/linux-kbuild-2.6/debian/changelog	Sat Feb 20 13:32:25 2010	(r15246)
@@ -1,11 +1,3 @@
-linux-kbuild-2.6 (2.6.33~rc8-1) UNRELEASED; urgency=low
-
-  [ Ben Hutchings ]
-  * New upstream release candidate
-  * Include ia64-specific scripts (Closes: #392592)
-
- -- Ben Hutchings <ben at decadent.org.uk>  Sat, 20 Feb 2010 04:19:45 +0000
-
 linux-kbuild-2.6 (2.6.32-1) unstable; urgency=low
 
   [ Ben Hutchings ]

Modified: dists/trunk/linux-kbuild-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-kbuild-2.6/debian/rules.real	Sat Feb 20 13:32:00 2010	(r15245)
+++ dists/trunk/linux-kbuild-2.6/debian/rules.real	Sat Feb 20 13:32:25 2010	(r15246)
@@ -1,20 +1,5 @@
 export DH_OPTIONS
 
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-KERNEL_ARCH := $(DEB_BUILD_ARCH)
-ifneq ($(filter amd64 i386,$(DEB_BUILD_ARCH)),)
-	KERNEL_ARCH := x86
-endif
-ifneq ($(filter armeb armel,$(DEB_BUILD_ARCH)),)
-	KERNEL_ARCH := arm
-endif
-ifeq (hppa,$(DEB_BUILD_ARCH))
-	KERNEL_ARCH := parisc
-endif
-ifeq (mipsel,$(DEB_BUILD_ARCH))
-	KERNEL_ARCH := mips
-endif
-
 include debian/rules.defs
 
 binary-arch: install-kbuild
@@ -27,7 +12,7 @@
 	rm -rf '$(DIR)'
 	mkdir -p '$(DIR)'
 	cp -al $(SOURCE_FILES) '$(DIR)'
-	$(MAKE) -C $(DIR) top_srcdir=$(CURDIR) SRCARCH=$(KERNEL_ARCH)
+	$(MAKE) -C $(DIR) top_srcdir=$(CURDIR)
 	touch '$@'
 
 install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
@@ -39,7 +24,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k -d
-	$(MAKE) -C $(SOURCE_DIR) install prefix=$(DIR) top_srcdir=$(CURDIR) SRCARCH=$(KERNEL_ARCH)
+	$(MAKE) -C $(SOURCE_DIR) install prefix=$(DIR) top_srcdir=$(CURDIR)
 	dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
 	dh_installchangelogs
 	dh_installdocs