lkml.org 
[lkml]   [2002]   [Dec]   [17]   [last100]   RSS-feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Complete thread (EXPERIMENTAL)
/
From"Henning P. Schmiedehausen" <>
SubjectRe: [PATCH] fix for RPM build target under newer versions
DateTue, 17 Dec 2002 10:44:54 +0000 (UTC)
Digg This
peter <pvant67@wnyip.net> writes:

--- /usr/src/linux-2.4.19/Makefile 2002-12-15 19:04:20.000000000 -0500 +++ /home/pete/Makefile.new 2002-12-17 04:36:49.000000000 -0500 @@ -567,5 +567,16 @@
rm $(KERNELPATH) ; \
cd $(TOPDIR) ; \
. scripts/mkversion > .version ; \
- rpmbuild -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ +
+# RedHat split the RPM build process into a separate +# utility called "rpmbuild", leading to a broken +# "make rpm" target in the kernel Makefile; +# this patch fixes that.
+
+ if [ `rpm --version | cut -b 12-15 | tr -d .` -ge '41' ] ; + then
+ rpmbuild -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ + else
+ rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
+ fi ; \

Ugh. How about

--- cut ---
RPM=`which rpmbuild`
if [ -z "$RPM" ]; then
  RPM=rpm
fi
$RPM -ta $(TOPDIR)/../$(KERNELPATH).tar.gz
--- cut ---
Looks less fragile. On RH 7.3 (and RH 6.x with upgrades) you also have a rpmbuild binary (but rpm still does building, this got deprecated and later removed on 8.0).

Regards
Henning

-- 
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen       -- Geschaeftsfuehrer
INTERMETA - Gesellschaft fuer Mehrwertdienste mbH     hps@intermeta.de

Am Schwabachgrund 22  Fon.: 09131 / 50654-0   info@intermeta.de
D-91054 Buckenhof     Fax.: 09131 / 50654-20   
\
ISP Services
Valid XHTML 1.0!\ /
Valid CSS! Last update: 2005-03-22 12:31    [W:0.489 / U:0.030 seconds]
©2003-2005 Jasper Spaans