From: Shawn Starr <shawn.starr@rogers.com>
To: linux-kernel@vger.kernel.org
Subject: resend [PATCH][BUILD] Force check for rpm-build where package is not installed
Date: Sat, 12 Oct 2013 15:42:05 -0400
Message-ID: <5058738.GtqTL1pBjr@segfault.sh0n.net>
Organization: sh0n.net
User-Agent: KMail/4.11.2 (Linux/3.12.0-0.rc4.git1.2.fc21.x86_64; KDE/4.11.2; x86_64; ; )
In-Reply-To: <13301057.7X5ko0dHEr@segfault.sh0n.net>
References: <2492370.jKSlzuQ6pe@segfault.sh0n.net> <13301057.7X5ko0dHEr@segfault.sh0n.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 4049
Lines: 64

On Saturday, October 12, 2013 03:39:05 PM Shawn Starr wrote:
> On Saturday, October 12, 2013 03:03:32 PM Shawn Starr wrote:
> > Hello folks,
> > 
> > My usual approach to testing git snapshots of Linus's tree (with custom
> > patches applied on top) is to make rpm and install this into my system for
> > a clean add/remove of test kernels.
> > 
> > However,  the developers of rpm removed the --target and -ta options, so I
> > can't take tarball and build into RPM anymore.
> > 
> > Since I last built custom RPM builds of Linus's tree was likely Fedora 18,
> > it seems the option target got removed by 19.
> > 
> > Any ideas, fixes?
> > 
> > Thanks,
> > Shawn
> 
> Sorry for noise,  I was missing rpm-build. That said, here's a patch to
> force check for rpm-build as any modern RPM distribution should be be using
> a newer rpm release.
> 
> Thanks,
> Shawn
>

Signed-off-by: Shawn Starr <shawn.starr@rogers.com>
---
 scripts/package/Makefile               | 8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/package/Makefile b/scripts/package/Makefile                                                                                  
index a4f31c9..aac24de 100644                                                                                                                     
--- a/scripts/package/Makefile                                                                                                                    
+++ b/scripts/package/Makefile                                                                                                                    
@@ -23,7 +23,7 @@                                                                                                                                 
                                                                                                                                                  
 # Do we have rpmbuild, otherwise fall back to the older rpm                                                                                      
 RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \                                                                              
-                  else echo rpm; fi)                                                                                                             
+                  else echo none; fi)                                                                                                           
                                                                                                                                                  
 # Remove hyphens since they have special meaning in RPM filenames                                                                                
 KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))                                                                                               
@@ -51,6 +51,12 @@ rpm-pkg rpm: FORCE                                                                                                             
        rm -f $(objtree)/.scmversion                                                                                                              
        $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version                                                                    
        mv -f $(objtree)/.tmp_version $(objtree)/.version
+       @if test "$(RPM)" != "rpmbuild"; then \
+               echo "To build the kernel you must install the rpm-build 
package from your distribution" ;\
+               echo "aborting package creation." ; \
+               false; \
+       fi
+
        $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz
        rm $(KERNELPATH).tar.gz kernel.spec
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/