diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-05 10:55:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-05 10:55:55 -0700 |
| commit | 56291b271be032057c782e357ca728b27d89ff70 (patch) | |
| tree | 0c323bca76b54aeae3b1d93848ceebec961775a5 /scripts | |
| parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
| parent | d3e2773c4ede5c62d2a92dae20e3a09b1ca55b6e (diff) | |
| download | linux-56291b271be032057c782e357ca728b27d89ff70.tar.gz linux-56291b271be032057c782e357ca728b27d89ff70.tar.bz2 linux-56291b271be032057c782e357ca728b27d89ff70.zip | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fix from Michal Marek:
"Fix for 'make deb-pkg'. The bug got introduced in v4.8-rc1"
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
builddeb: Skip gcc-plugins when not configured
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/package/builddeb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index e1c09e2f9be7..8ea9fd2b6573 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -332,7 +332,9 @@ if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then (cd $objtree; find tools/objtool -type f -executable) >> "$objtree/debian/hdrobjfiles" fi (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" -(cd $objtree; find scripts/gcc-plugins -name \*.so -o -name gcc-common.h) >> "$objtree/debian/hdrobjfiles" +if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then + (cd $objtree; find scripts/gcc-plugins -name \*.so -o -name gcc-common.h) >> "$objtree/debian/hdrobjfiles" +fi destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -) |