Remove arch specific workaround.
svn path=/dists/trunk/linux-kbuild-2.6/; revision=15246
This commit is contained in:
parent
3ee6600623
commit
db0f14f73b
3
Makefile
3
Makefile
|
@ -3,8 +3,7 @@ DATA = \
|
||||||
Makefile \
|
Makefile \
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
scripts \
|
scripts
|
||||||
$(wildcard arch/$(SRCARCH)/scripts)
|
|
||||||
|
|
||||||
OUTDIR = .
|
OUTDIR = .
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
|
@ -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
|
linux-kbuild-2.6 (2.6.32-1) unstable; urgency=low
|
||||||
|
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
|
|
|
@ -1,20 +1,5 @@
|
||||||
export DH_OPTIONS
|
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
|
include debian/rules.defs
|
||||||
|
|
||||||
binary-arch: install-kbuild
|
binary-arch: install-kbuild
|
||||||
|
@ -27,7 +12,7 @@ $(STAMPS_DIR)/build:
|
||||||
rm -rf '$(DIR)'
|
rm -rf '$(DIR)'
|
||||||
mkdir -p '$(DIR)'
|
mkdir -p '$(DIR)'
|
||||||
cp -al $(SOURCE_FILES) '$(DIR)'
|
cp -al $(SOURCE_FILES) '$(DIR)'
|
||||||
$(MAKE) -C $(DIR) top_srcdir=$(CURDIR) SRCARCH=$(KERNEL_ARCH)
|
$(MAKE) -C $(DIR) top_srcdir=$(CURDIR)
|
||||||
touch '$@'
|
touch '$@'
|
||||||
|
|
||||||
install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
|
install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
|
||||||
|
@ -39,7 +24,7 @@ install-kbuild: $(STAMPS_DIR)/build
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
dh_clean -k -d
|
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_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
|
||||||
dh_installchangelogs
|
dh_installchangelogs
|
||||||
dh_installdocs
|
dh_installdocs
|
||||||
|
|
Loading…
Reference in New Issue