Skip to contentSkip to conversation

kbuild/builddeb: Fix !CONFIG_GCC_PLUGINS build

PATCH In review Borislav Petkov 2 participants 3 messages Sep 3, 2016 – Sep 5, 2016 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild/builddeb: Fix !CONFIG_GCC_PLUGINS build

From: Borislav Petkov <[email protected]>

When building a bindeb-pkg target into an object output dir, i.e., O=, I get:

find: `scripts/gcc-plugins': No such file or directory /mnt/kernel/kernel/linux-2.6/scripts/package/Makefile:97: recipe for target 'bindeb-pkg' failed make[3]: *** [bindeb-pkg] Error 1
/mnt/kernel/kernel/linux-2.6/Makefile:1310: recipe for target 'bindeb-pkg' failed
...

Check whether CONFIG_GCC_PLUGINS is enabled before collecting .so plugin names.

Cc Emese Revfy <[email protected]>
Cc Michal Marek <[email protected]>
---
 scripts/package/builddeb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
scripts/package/builddeb +5 -1
index e1c09e2f9be7..2e5b5f582365 100755
@@ -332,7 +332,11 @@ 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 -)
Signature · 1 line
2.7.3
#1 lore raw

Dne 3.9.2016 v 21:58 Borislav Petkov napsal(a):

Quoted 5 lines

From: Borislav Petkov <[email protected]>

When building a bindeb-pkg target into an object output dir, i.e., O=, I get:

Quoted 8 lines

find: `scripts/gcc-plugins': No such file or directory /mnt/kernel/kernel/linux-2.6/scripts/package/Makefile:97: recipe for target 'bindeb-pkg' failed make[3]: *** [bindeb-pkg] Error 1
/mnt/kernel/kernel/linux-2.6/Makefile:1310: recipe for target 'bindeb-pkg' failed
...

Check whether CONFIG_GCC_PLUGINS is enabled before collecting .so plugin names.

A fix has already been submitted by Kees Cook. I took your patch as a reminder to submit my rc-fixes branch to Linus :).

Thanks,
Michal

#2 lore raw
Quoted 2 lines · Michal Marek

A fix has already been submitted by Kees Cook. I took your patch as a reminder to submit my rc-fixes branch to Linus :).

So it wasn't for nothing after all :-)

Signature · 4 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.