linux-cpupower: Use dh-exec architecture filtering for x86-specific files
Listing usr/sbin in linux-cpupower.install caused FTBFS on !x86 as cpupower itself doesn't install anything there. Do the architecture filtering in the debhelper lists instead of complicating debian/rules.real further.
This commit is contained in:
parent
8c4510fb2e
commit
ceaee3f154
|
@ -17,6 +17,8 @@
|
||||||
/liblockdep*/
|
/liblockdep*/
|
||||||
/libusbip-dev/
|
/libusbip-dev/
|
||||||
/linux-*
|
/linux-*
|
||||||
|
!/linux-cpupower.install
|
||||||
|
!/linux-cpupower.manpages
|
||||||
/lockdep/
|
/lockdep/
|
||||||
/po/
|
/po/
|
||||||
/rules.gen
|
/rules.gen
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
linux (4.9.6-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
* linux-cpupower: Use dh-exec architecture filtering for x86-specific files
|
||||||
|
(fixes FTBFS on !x86)
|
||||||
|
|
||||||
|
-- Ben Hutchings <ben@decadent.org.uk> Fri, 27 Jan 2017 22:09:50 +0000
|
||||||
|
|
||||||
linux (4.9.6-1) unstable; urgency=medium
|
linux (4.9.6-1) unstable; urgency=medium
|
||||||
|
|
||||||
* New upstream stable update:
|
* New upstream stable update:
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#!/usr/bin/dh-exec
|
||||||
usr/bin
|
usr/bin
|
||||||
usr/sbin
|
[i386 amd64 x32] usr/sbin
|
||||||
usr/share/
|
usr/share/
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
#!/usr/bin/dh-exec
|
||||||
|
[i386 amd64 x32] tools/power/x86/turbostat/turbostat.8
|
||||||
|
[i386 amd64 x32] tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8
|
|
@ -579,10 +579,7 @@ endif
|
||||||
dh_installchangelogs
|
dh_installchangelogs
|
||||||
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
|
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
|
||||||
dh_installdocs
|
dh_installdocs
|
||||||
ifneq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),)
|
dh_installman
|
||||||
dh_installman tools/power/x86/turbostat/turbostat.8 \
|
|
||||||
tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
dh_strip
|
dh_strip
|
||||||
dh_compress
|
dh_compress
|
||||||
|
|
|
@ -4,7 +4,7 @@ Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
|
||||||
Uploaders: Bastian Blank <waldi@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Salvatore Bonaccorso <carnil@debian.org>
|
Uploaders: Bastian Blank <waldi@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Salvatore Bonaccorso <carnil@debian.org>
|
||||||
Standards-Version: 3.9.8
|
Standards-Version: 3.9.8
|
||||||
Build-Depends:
|
Build-Depends:
|
||||||
debhelper (>= 10.1~),
|
debhelper (>= 10.1~), dh-exec,
|
||||||
# used to run debian/bin/*.py
|
# used to run debian/bin/*.py
|
||||||
python3:any,
|
python3:any,
|
||||||
# used by debian/rules.real to prepare the source
|
# used by debian/rules.real to prepare the source
|
||||||
|
|
Loading…
Reference in New Issue