[kernel] r15733 - in dists/sid/linux-kbuild-2.6: . arch debian
Ben Hutchings
benh at alioth.debian.org
Tue May 18 01:11:53 UTC 2010
Author: benh
Date: Tue May 18 01:11:51 2010
New Revision: 15733
Log:
Revert r15241 "Include ia64-specific scripts (Closes: #392592)"
Deleted:
dists/sid/linux-kbuild-2.6/arch/
Modified:
dists/sid/linux-kbuild-2.6/Makefile
dists/sid/linux-kbuild-2.6/debian/changelog
dists/sid/linux-kbuild-2.6/debian/rules.real
Modified: dists/sid/linux-kbuild-2.6/Makefile
==============================================================================
--- dists/sid/linux-kbuild-2.6/Makefile Mon May 17 23:32:48 2010 (r15732)
+++ dists/sid/linux-kbuild-2.6/Makefile Tue May 18 01:11:51 2010 (r15733)
@@ -3,8 +3,7 @@
Makefile \
SUBDIRS = \
- scripts \
- $(wildcard arch/$(SRCARCH)/scripts)
+ scripts
OUTDIR = .
Modified: dists/sid/linux-kbuild-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-kbuild-2.6/debian/changelog Mon May 17 23:32:48 2010 (r15732)
+++ dists/sid/linux-kbuild-2.6/debian/changelog Tue May 18 01:11:51 2010 (r15733)
@@ -1,9 +1,3 @@
-linux-kbuild-2.6 (2.6.32-2) UNRELEASED; urgency=low
-
- * Include ia64-specific scripts (Closes: #392592)
-
- -- Ben Hutchings <ben at decadent.org.uk> Sat, 20 Feb 2010 05:07:48 +0000
-
linux-kbuild-2.6 (2.6.32-1) unstable; urgency=low
[ Ben Hutchings ]
Modified: dists/sid/linux-kbuild-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-kbuild-2.6/debian/rules.real Mon May 17 23:32:48 2010 (r15732)
+++ dists/sid/linux-kbuild-2.6/debian/rules.real Tue May 18 01:11:51 2010 (r15733)
@@ -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
More information about the Kernel-svn-changes
mailing list