* [PATCH] kbuild/builddeb: Fix !CONFIG_GCC_PLUGINS build
@ 2016-09-03 19:58 Borislav Petkov
2016-09-05 6:38 ` Michal Marek
0 siblings, 1 reply; 3+ messages in thread
From: Borislav Petkov @ 2016-09-03 19:58 UTC (permalink / raw)
To: LKML; +Cc: linux-kbuild, Emese Revfy, Michal Marek
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(-)
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 -)
--
2.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] kbuild/builddeb: Fix !CONFIG_GCC_PLUGINS build
2016-09-03 19:58 [PATCH] kbuild/builddeb: Fix !CONFIG_GCC_PLUGINS build Borislav Petkov
@ 2016-09-05 6:38 ` Michal Marek
2016-09-05 7:45 ` Borislav Petkov
0 siblings, 1 reply; 3+ messages in thread
From: Michal Marek @ 2016-09-05 6:38 UTC (permalink / raw)
To: Borislav Petkov; +Cc: LKML, linux-kbuild, Emese Revfy
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] kbuild/builddeb: Fix !CONFIG_GCC_PLUGINS build
2016-09-05 6:38 ` Michal Marek
@ 2016-09-05 7:45 ` Borislav Petkov
0 siblings, 0 replies; 3+ messages in thread
From: Borislav Petkov @ 2016-09-05 7:45 UTC (permalink / raw)
To: Michal Marek; +Cc: LKML, linux-kbuild, Emese Revfy
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 :-)
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-05 7:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-03 19:58 [PATCH] kbuild/builddeb: Fix !CONFIG_GCC_PLUGINS build Borislav Petkov
2016-09-05 6:38 ` Michal Marek
2016-09-05 7:45 ` Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).