debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Fix the build-indep and binary-indep targets (fixes FTBFS for arch:all)

This commit is contained in:
Ben Hutchings 2015-10-14 02:08:31 +01:00
parent 5385ecc9a8
commit 198dbc7165
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/bin/gencontrol.py vendored
View File

@ -8,7 +8,7 @@ from debian_linux.gencontrol import PackagesList, Makefile, MakeFlags, Gencontro
from debian_linux.utils import *
class gencontrol(Gencontrol):
makefile_targets = ('binary-arch', 'build')
makefile_targets = ('binary-arch', 'binary-indep', 'build')
def __init__(self, underlay = None):
self.templates = Templates(['debian/templates'])

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
linux-tools (4.3~rc5-1~exp2) experimental; urgency=medium
* Fix the build-indep and binary-indep targets (fixes FTBFS for arch:all)
-- Ben Hutchings <ben@decadent.org.uk> Wed, 14 Oct 2015 02:08:09 +0100
linux-tools (4.3~rc5-1~exp1) experimental; urgency=medium
* New upstream release candidate

5
debian/rules vendored
View File

@ -13,7 +13,11 @@ build-arch: debian/control
dh_testdir
$(MAKE) -f debian/rules.gen build
# XXX All we really need to do is to generate the lockdep script,
# but for now we take the stupid option of building everything.
build-indep: debian/control
dh_testdir
$(MAKE) -f debian/rules.gen build
DIR_ORIG = ../orig/$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)
TAR_ORIG_NAME = $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.xz
@ -43,6 +47,7 @@ clean: debian/control
binary-indep:
dh_testdir
$(MAKE) -f debian/rules.gen binary-indep
binary-arch:
dh_testdir

28
debian/rules.real vendored
View File

@ -3,7 +3,7 @@ export KBUILD_BUILD_TIMESTAMP := $(shell dpkg-parsechangelog | sed -ne 's,^Date:
include debian/rules.defs
binary-arch: install-kbuild install-usbip install-lockdep
binary-arch: install-kbuild install-usbip install-liblockdep
ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
binary-arch: install-perf
endif
@ -11,6 +11,8 @@ ifneq ($(filter i386 amd64 x32,$(DEB_BUILD_ARCH)),)
binary-arch: install-hyperv-daemons
endif
binary-indep: install-lockdep
build: $(STAMPS_DIR)/build
$(STAMPS_DIR)/build:
@ -105,9 +107,9 @@ install-hyperv-daemons: $(STAMPS_DIR)/build
dh_md5sums
dh_builddeb
install-lockdep: DH_OPTIONS = -plockdep -pliblockdep$(VERSION) -pliblockdep-dev
install-lockdep: DIR = $(CURDIR)/debian/tmp
install-lockdep: $(STAMPS_DIR)/build
install-liblockdep: DH_OPTIONS = -pliblockdep$(VERSION) -pliblockdep-dev
install-liblockdep: DIR = $(CURDIR)/debian/tmp
install-liblockdep: $(STAMPS_DIR)/build
dh_testdir
dh_testroot
dh_prep
@ -128,3 +130,21 @@ install-lockdep: $(STAMPS_DIR)/build
dh_gencontrol
dh_md5sums
dh_builddeb
install-lockdep: DH_OPTIONS = -plockdep
install-lockdep: DIR = $(CURDIR)/debian/tmp
install-lockdep: $(STAMPS_DIR)/build
dh_testdir
dh_testroot
dh_prep
$(MAKE) -C $(BUILD_DIR)/tools/lib/lockdep install top_srcdir=$(CURDIR) \
DESTDIR=$(DIR)
dh_install
dh_installchangelogs
dh_installdocs
dh_compress
dh_fixperms
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb