Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1401270 > unrolled thread
| Started by | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
|---|---|
| First post | 2016-05-16 04:10 +0200 |
| Last post | 2016-05-16 14:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] scripts/package/Makefile: rpmbuild add support of RPMOPTS Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> - 2016-05-16 04:10 +0200
Re: [PATCH] scripts/package/Makefile: rpmbuild add support of RPMOPTS Michal Marek <mmarek@suse.com> - 2016-05-16 14:10 +0200
| From | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
|---|---|
| Date | 2016-05-16 04:10 +0200 |
| Subject | [PATCH] scripts/package/Makefile: rpmbuild add support of RPMOPTS |
| Message-ID | <rzg90-u7-329@gated-at.bofh.it> |
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(-)
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
--
2.5.5
[toc] | [next] | [standalone]
| From | Michal Marek <mmarek@suse.com> |
|---|---|
| Date | 2016-05-16 14:10 +0200 |
| Message-ID | <rzpvs-6SY-15@gated-at.bofh.it> |
| In reply to | #1401270 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web