From 7231d9e75a1c48b10af3814dd6f26541d6042e4f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 25 Aug 2016 01:29:57 +0100 Subject: [PATCH] usbip: Put all autotools-generated files in the build directory Currently the linux-source- package may or may not include these files, depending on the order things are built in. As autotools always modifies the source directory, copy (rsync) the source to the build directory and build in-place there. --- debian/changelog | 2 ++ debian/rules.d/tools/usb/usbip/Makefile | 8 ++++---- debian/templates/control.source.in | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 536fee3f0..085fa0fcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ linux (4.7.2-1) UNRELEASED; urgency=medium * linux-kbuild: Include headers_install.sh and unifdef (Closes: #832359) * udeb: Include cdc_ncm in nic-usb-modules (Closes: #833918) * usbip: Use the locally-installed + * Exclude redundant and unreproducible files from binary packages + - usbip: Put all autotools-generated files in the build directory [ Martin Michlmayr ] * [armhf] Enable MMC_SDHCI_IPROC and HW_RANDOM_BCM2835 for BCM2835. diff --git a/debian/rules.d/tools/usb/usbip/Makefile b/debian/rules.d/tools/usb/usbip/Makefile index 687812c00..f17ce5616 100644 --- a/debian/rules.d/tools/usb/usbip/Makefile +++ b/debian/rules.d/tools/usb/usbip/Makefile @@ -10,8 +10,9 @@ all: export CPPFLAGS := $(shell dpkg-buildflags --get CFLAGS) \ -isystem $(top_srcdir)/debian/build/build-tools/include all: export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) all: - cd $(srcdir) && ./autogen.sh - $(srcdir)/configure \ + rsync -a $(srcdir)/ . + ./autogen.sh + ./configure \ --prefix=/usr \ --with-tcp-wrappers \ --with-usbids-dir=/usr/share/misc \ @@ -26,5 +27,4 @@ ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) endif clean: - rm -rf $(addprefix $(srcdir)/,autom4te.cache aclocal.m4 compile config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing) - find $(srcdir)/ -name Makefile.in -delete + rm -rf * diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index c738c6d1f..21e93a347 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -46,6 +46,8 @@ Build-Depends: libglib2.0-dev , libudev-dev , libwrap0-dev , +# used by debian/rules.d/tools/usb/usbip to build usbip + rsync , # used by upstream to build cpupower libpci-dev , # used by debian/rules.real to build linux-perf and linux-support