Skip to contentSkip to conversation

kbuild: let make O=dir rpm-pkg fail

PATCH In review Akinobu Mita 2 participants 3 messages Nov 4, 2009 – Nov 5, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: let make O=dir rpm-pkg fail

make rpm-pkg with setting KBUILD_OUTPUT is not possible and it will print the good message since the commit db9038c89d129383a9db2afcb72b504fe54f6edf

$ KBUILD_OUTPUT=dir make rpm-pkg
...
Building source + binary RPM is not possible outside the
kernel source tree. Don't set KBUILD_OUTPUT, or use the
binrpm-pkg target instead.
...

make O=dir should have the same effect of KBUILD_OUTPUT, but it won't print that message.

This fixes it by exporting KBUILD_OUTPUT if O= is set so that the rpm-pkg target in scripts/package/Makefile can find it.

Cc Sam Ravnborg <[email protected]>
Cc Frans Pop <[email protected]>
---
 Makefile                 |    2 +-
 scripts/package/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Makefile +1 -1
index b4c04f7..cfee468 100644
@@ -93,7 +93,7 @@ ifeq ($(KBUILD_SRC),)
 # OK, Make called in directory where kernel src resides
 # Do we want to locate output files in a separate directory?
 ifeq ("$(origin O)", "command line")
-  KBUILD_OUTPUT := $(O)
+  export KBUILD_OUTPUT := $(O)
 endif
 
 # That's our default target when none is given on the command line
scripts/package/Makefile +1 -1
index f67cc88..5db03d7 100644
@@ -19,7 +19,7 @@
 # - Use /. to avoid tar packing just the symlink
 
 # Note that the rpm-pkg target cannot be used with KBUILD_OUTPUT,
-# but the binrpm-pkg target can; for some reason O= gets ignored.
+# but the binrpm-pkg target can.
 
 # Do we have rpmbuild, otherwise fall back to the older rpm
 RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
Signature · 1 line
1.6.5.1
#1 lore raw
Quoted 11 lines · Akinobu Mita

make rpm-pkg with setting KBUILD_OUTPUT is not possible and it will print the good message since the commit db9038c89d129383a9db2afcb72b504fe54f6edf

$ KBUILD_OUTPUT=dir make rpm-pkg
...
Building source + binary RPM is not possible outside the
kernel source tree. Don't set KBUILD_OUTPUT, or use the
binrpm-pkg target instead.
...
Quoted 5 lines

make O=dir should have the same effect of KBUILD_OUTPUT, but it won't print that message.

This fixes it by exporting KBUILD_OUTPUT if O= is set so that the rpm-pkg target in scripts/package/Makefile can find it.

Looks good to me. I suspect this will also fix the open question that I had when I submitted the patch you refer to:
<quote>
One open issue is that the following commands should IIUC be identical, but the second one does not work:
- KBUILD_OUTPUT=../builds/amd64 make -j4 binrpm-pkg
- make -j4 O=../builds/amd64 binrpm-pkg

AFAICT the root Makefile is supposed to set KBUILD_OUTPUT based on O=, but that is not visible when the lines within the binrpm-pkg target are executed.
My make foo was not strong enough to debug this.
</quote>

I also suspect that the use of O= is currently equally broken for the deb-pkg target (I know setting KBUILD_OUTPUT does work) and that this patch will fix that as well.

Cheers,
FJP

#2 lore raw

2009/11/5 Frans Pop <[email protected]>:

Quoted 26 lines · Akinobu Mita
Quoted 11 lines

make rpm-pkg with setting KBUILD_OUTPUT is not possible and it will print the good message since the commit db9038c89d129383a9db2afcb72b504fe54f6edf

$ KBUILD_OUTPUT=dir make rpm-pkg
...
Building source + binary RPM is not possible outside the
kernel source tree. Don't set KBUILD_OUTPUT, or use the
binrpm-pkg target instead.
...
Quoted 5 lines

make O=dir should have the same effect of KBUILD_OUTPUT, but it won't print that message.

This fixes it by exporting KBUILD_OUTPUT if O= is set so that the rpm-pkg target in scripts/package/Makefile can find it.

Looks good to me. I suspect this will also fix the open question that I had when I submitted the patch you refer to:
<quote>
One open issue is that the following commands should IIUC be identical, but the second one does not work:
- KBUILD_OUTPUT=../builds/amd64 make -j4 binrpm-pkg
- make -j4 O=../builds/amd64 binrpm-pkg

Quoted 5 lines

AFAICT the root Makefile is supposed to set KBUILD_OUTPUT based on O=, but that is not visible when the lines within the binrpm-pkg target are executed.
My make foo was not strong enough to debug this.
</quote>

make binrpm-pkg with O= works without this patch on my system (CentOS5 i386). So I did not mention about it in the patch description.

Quoted 3 lines

I also suspect that the use of O= is currently equally broken for the deb-pkg target (I know setting KBUILD_OUTPUT does work) and that this patch will fix that as well.

I don't have debian based system and I can't test deb-pkg now. But I hope it works, too.