rpms/kernel/devel kernel-2.6.spec, 1.2438, 1.2439 sources, 1.449, 1.450

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jul 24 01:57:26 UTC 2006


Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29918

Modified Files:
	kernel-2.6.spec sources 
Log Message:
Make kabitool store interim kabi deps per $KernelVer



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2438
retrieving revision 1.2439
diff -u -r1.2438 -r1.2439
--- kernel-2.6.spec	24 Jul 2006 00:43:28 -0000	1.2438
+++ kernel-2.6.spec	24 Jul 2006 01:57:23 -0000	1.2439
@@ -458,7 +458,7 @@
 
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %{_tmppath}/kernel-%{KVERREL}-kabideps
+%define __find_provides %_sourcedir/find-provides %{_tmppath}/kernel-$KernelVer-kabideps
 %define __find_requires /usr/lib/rpm/redhat/find-requires kernel
 
 %ifarch x86_64
@@ -1114,8 +1114,8 @@
     else
 	cp $RPM_SOURCE_DIR/kabi_whitelist $RPM_BUILD_ROOT/kabi_whitelist
     fi
-    rm -f %{_tmppath}/kernel-%{KVERREL}-kabideps
-    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kernel-%{KVERREL}-kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
+    rm -f %{_tmppath}/kernel-$KernelVer-kabideps
+    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kernel-$KernelVer-kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
     rm -f $RPM_BUILD_ROOT/kabi_whitelist
 
     # And save the headers/makefiles etc for building modules against
@@ -1629,6 +1629,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Jon Masters <jcm at redhat.com>
+- Change kabideps location.
+
 * Mon Jul 24 2006 Juan Quintela <quintela at redhat.com>
 - New xen patch, fixes gso, xenoprof, vDSO.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- sources	22 Jul 2006 19:17:38 -0000	1.449
+++ sources	24 Jul 2006 01:57:23 -0000	1.450
@@ -3,6 +3,5 @@
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
-82bc687e473c67e6d4d437878c219b5d  kernel-2.6.spec
 d42bd8204e87f318eef05c847484205b  xen-20060719.tar.bz2
 44918b4fc778fa0439672e9f788a4ff2  patch-2.6.18-rc2-git1.bz2




More information about the fedora-cvs-commits mailing list