Skip to contentSkip to conversation

scripts/package/Makefile: remove useless KBUILD_OUTPUT test

PATCH In review Bin Wang 2 participants 2 messages Jan 21, 2013 – Feb 22, 2013 Kbuild

lore
Share & tools
lore

Bin Wang

author
#0 lore raw

PATCH 1/1 scripts/package/Makefile: remove useless KBUILD_OUTPUT test

The test of KBUILD_OUTPUT in "rpm-pkg rpm" target is useless. KBUILD_OUTPUT is always empty here.

---
 scripts/package/Makefile | 6 ------
 1 file changed, 6 deletions(-)
scripts/package/Makefile +0 -6
index 87bf080..ba073a6 100644
@@ -36,12 +36,6 @@ $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
 	$(CONFIG_SHELL) $(MKSPEC) > $@
 
 rpm-pkg rpm: $(objtree)/kernel.spec FORCE
-	@if test -n "$(KBUILD_OUTPUT)"; then \
-		echo "Building source + binary RPM is not possible outside the"; \
-		echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \
-		echo "binrpm-pkg target instead."; \
-		false; \
-	fi
 	$(MAKE) clean
 	$(PREV) ln -sf $(srctree) $(KERNELPATH)
 	$(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
Signature · 1 line
1.7.11.7
#1 lore raw
Quoted 2 lines · Bin Wang

The test of KBUILD_OUTPUT in "rpm-pkg rpm" target is useless. KBUILD_OUTPUT is always empty here.

Right, but the error message is valid, make rpm-pkg does not work with O=. So I suggest to either fix make O=... rpm-pkg, or fix the test to compare $(srctree) and $(objtree) instead.

Michal