[linux-tools] 03/03: Fix the build-indep and binary-indep targets (fixes FTBFS for arch:all)
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Wed Oct 14 01:33:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux-tools.
commit 198dbc71653231ba788c084c75eff4888b256264
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Wed Oct 14 02:08:31 2015 +0100
Fix the build-indep and binary-indep targets (fixes FTBFS for arch:all)
---
debian/bin/gencontrol.py | 2 +-
debian/changelog | 6 ++++++
debian/rules | 5 +++++
debian/rules.real | 28 ++++++++++++++++++++++++----
4 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index a26d0ee..64fbcf2 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -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'])
diff --git a/debian/changelog b/debian/changelog
index 8414425..3b453a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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
diff --git a/debian/rules b/debian/rules
index 4572e23..ee262a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
diff --git a/debian/rules.real b/debian/rules.real
index a75feb4..303e165 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git
More information about the Kernel-svn-changes
mailing list