diff mbox

builddeb: Skip gcc-plugins when not configured

Message ID 20160815173622.GA24820@www.outflux.net (mailing list archive)
State New, archived
Headers show

Commit Message

Kees Cook Aug. 15, 2016, 5:36 p.m. UTC 
When attempting to build a Debian kernel package, the "scripts/gcc-plugins"
directory does not exist in the output tree unless CONFIG_GCC_PLUGINS=y.
To avoid errors when not defined, this wraps the failing "find" in a config
test.

Reported-by: Frank Paulsen <frobnic+lkml@gmail.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
This should go into v4.8...
---
 scripts/package/builddeb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Michal Marek Aug. 16, 2016, 8:34 a.m. UTC | #1 
Dne 15.8.2016 v 19:36 Kees Cook napsal(a):
> When attempting to build a Debian kernel package, the "scripts/gcc-plugins"
> directory does not exist in the output tree unless CONFIG_GCC_PLUGINS=y.
> To avoid errors when not defined, this wraps the failing "find" in a config
> test.
> 
> Reported-by: Frank Paulsen <frobnic+lkml@gmail.com>
> Tested-by: Christian Kujau <lists@nerdbynature.de>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> This should go into v4.8...

Applied to kbuild.git#rc-fixes.

Thanks,
Michal

--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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