From db0f14f73beac0771fdc48632243f4f87e535306 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sat, 20 Feb 2010 13:32:25 +0000
Subject: [PATCH] Remove arch specific workaround.

svn path=/dists/trunk/linux-kbuild-2.6/; revision=15246
---
 Makefile                   |  3 +--
 arch/ia64/scripts/Makefile | 21 ---------------------
 debian/changelog           |  8 --------
 debian/rules.real          | 19 ++-----------------
 4 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 arch/ia64/scripts/Makefile

diff --git a/Makefile b/Makefile
index 02e980c48..1ca911f3a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@ DATA = \
 	Makefile \
 
 SUBDIRS = \
-	scripts \
-	$(wildcard arch/$(SRCARCH)/scripts)
+	scripts
 
 OUTDIR = .
 
diff --git a/arch/ia64/scripts/Makefile b/arch/ia64/scripts/Makefile
deleted file mode 100644
index 772d5ed3b..000000000
--- a/arch/ia64/scripts/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPTS = \
-	check-gas \
-	pvcheck.sed \
-	toolchain-flags \
-	unwcheck.py
-
-DATA = \
-	check-gas-asm.S \
-	check-model.c \
-	check-segrel.S \
-	check-segrel.lds \
-	check-serialize.S \
-	check-text-align.S
-
-OUTDIR = arch/ia64/scripts
-
-top_srcdir = ../../..
-
-VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
-
-include $(top_srcdir)/Makefile.inc
diff --git a/debian/changelog b/debian/changelog
index 2e2611002..423296f86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@decadent.org.uk>  Sat, 20 Feb 2010 04:19:45 +0000
-
 linux-kbuild-2.6 (2.6.32-1) unstable; urgency=low
 
   [ Ben Hutchings ]
diff --git a/debian/rules.real b/debian/rules.real
index f55c36f03..053ac80dd 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -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 @@ $(STAMPS_DIR)/build:
 	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 @@ install-kbuild: $(STAMPS_DIR)/build
 	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