Commit 56291b27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c6935931 d3e2773c

scripts/package/builddeb

+3 −1
Original line number Diff line number Diff line
@@ -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"

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 -)