| Message ID | 1463281792-19129-1-git-send-email-srinivas.pandruvada@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, May 14, 2016 at 08:09:52PM -0700, Srinivas Pandruvada wrote: > After commit 21a59991ce0c ("scripts/package/Makefile: rpmbuild is needed > for rpm targets"), it is no longer possible to specify RPMOPTS. > For example, we can no longer able to control _topdir using the following > make command. > make RPMOPTS="--define '_topdir /home/xyz/workspace/'" binrpm-pkg > > Fixes: 21a59991ce0c ("scripts/package/Makefile: rpmbuild is needed > for rpm targets") > Cc: <stable@vger.kernel.org> # 4.3+ > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > --- > scripts/package/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to kbuild.git#misc. 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
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index c2c7389..71b4a8a 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -52,7 +52,7 @@ rpm-pkg rpm: FORCE $(call cmd,src_tar,$(KERNELPATH),kernel.spec) $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version mv -f $(objtree)/.tmp_version $(objtree)/.version - rpmbuild --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz + rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz rm $(KERNELPATH).tar.gz kernel.spec # binrpm-pkg @@ -63,7 +63,7 @@ binrpm-pkg: FORCE $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version mv -f $(objtree)/.tmp_version $(objtree)/.version - rpmbuild --define "_builddir $(objtree)" --target \ + rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ $(UTS_MACHINE) -bb $(objtree)/binkernel.spec rm binkernel.spec
After commit 21a59991ce0c ("scripts/package/Makefile: rpmbuild is needed for rpm targets"), it is no longer possible to specify RPMOPTS. For example, we can no longer able to control _topdir using the following make command. make RPMOPTS="--define '_topdir /home/xyz/workspace/'" binrpm-pkg Fixes: 21a59991ce0c ("scripts/package/Makefile: rpmbuild is needed for rpm targets") Cc: <stable@vger.kernel.org> # 4.3+ Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> --- scripts/package/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)