rpms/kernel/devel kernel-2.6.spec, 1.2417, 1.2418 sources, 1.446, 1.447

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jul 19 07:57:43 UTC 2006


Author: jcm

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

Modified Files:
	kernel-2.6.spec sources 
Log Message:
Fixed kabideps



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2417
retrieving revision 1.2418
diff -u -r1.2417 -r1.2418
--- kernel-2.6.spec	19 Jul 2006 07:35:54 -0000	1.2417
+++ kernel-2.6.spec	19 Jul 2006 07:57:40 -0000	1.2418
@@ -439,7 +439,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}/kabideps
+%define __find_provides %_sourcedir/find-provides %{_tmppath}/kernel-%{KVERREL}-kabideps
 %define __find_requires /usr/lib/rpm/redhat/find-requires kernel
 
 %ifarch x86_64
@@ -1114,7 +1114,8 @@
     else
 	cp $RPM_SOURCE_DIR/kabi_whitelist $RPM_BUILD_ROOT/kabi_whitelist
     fi
-    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
+    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 $RPM_BUILD_ROOT/kabi_whitelist
 
     # And save the headers/makefiles etc for building modules against
@@ -1675,6 +1676,7 @@
 %changelog
 * Wed Jul 19 2006 Jon Masters <jcm at redhat.com>
 - Workaround upstream "make prepare" bug by adding an additional prepare stage.
+- Fix kabideps
 
 * Tue Jul 18 2006 Jon Masters <jcm at redhat.com>
 - Check in new version of kabitool for kernel deps.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- sources	19 Jul 2006 07:35:54 -0000	1.446
+++ sources	19 Jul 2006 07:57:41 -0000	1.447
@@ -3,4 +3,4 @@
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
-3bc5fbc46b52e23038fc7ef6bc87404c  kernel-2.6.spec
+82bc687e473c67e6d4d437878c219b5d  kernel-2.6.spec




More information about the fedora-cvs-commits mailing list