diff mbox

kbuild/builddeb: Fix !CONFIG_GCC_PLUGINS build

Message ID 1472932730-1098-1-git-send-email-bp@alien8.de (mailing list archive)
State New, archived
Headers show

Commit Message

Borislav Petkov Sept. 3, 2016, 7:58 p.m. UTC 
From: Borislav Petkov <bp@suse.de>

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.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Emese Revfy <re.emese@gmail.com>
Cc: Michal Marek <mmarek@suse.com>
---
 scripts/package/builddeb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Michal Marek Sept. 5, 2016, 6:38 a.m. UTC | #1 
Dne 3.9.2016 v 21:58 Borislav Petkov napsal(a):
> From: Borislav Petkov <bp@suse.de>
> 
> 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.

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

--
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
Borislav Petkov Sept. 5, 2016, 7:45 a.m. UTC | #2 
On Mon, Sep 05, 2016 at 08:38:13AM +0200, Michal Marek wrote:
> 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 :-)
diff mbox

Patch

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index e1c09e2f9be7..2e5b5f582365 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -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 -)