rpms/kernel/devel kernel-2.6.spec, 1.2416, 1.2417 sources, 1.445, 1.446

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


Author: jcm

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

Modified Files:
	kernel-2.6.spec sources 
Log Message:
Add extra prepare stage for external modules to build again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2416
retrieving revision 1.2417
diff -u -r1.2416 -r1.2417
--- kernel-2.6.spec	18 Jul 2006 21:05:54 -0000	1.2416
+++ kernel-2.6.spec	19 Jul 2006 07:35:54 -0000	1.2417
@@ -1226,6 +1226,11 @@
     mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir
     ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
+
+    # Temporary fix for upstream "make prepare" bug.
+    pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+    make prepare
+    popd > /dev/null
 }
 
 ###
@@ -1668,6 +1673,9 @@
 %endif
 
 %changelog
+* Wed Jul 19 2006 Jon Masters <jcm at redhat.com>
+- Workaround upstream "make prepare" bug by adding an additional prepare stage.
+
 * Tue Jul 18 2006 Jon Masters <jcm at redhat.com>
 - Check in new version of kabitool for kernel deps.
 - Fix kabitool for correct location of symvers.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- sources	18 Jul 2006 21:05:58 -0000	1.445
+++ sources	19 Jul 2006 07:35:54 -0000	1.446
@@ -2,5 +2,5 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 0b9dc750399fac03d77fe89907652518  find-provides
-41c93c884989fd2c2e4d9c33902730c4  kernel-2.6.spec
 9d18e6231257537219ea5228e353c6ae  kabitool
+3bc5fbc46b52e23038fc7ef6bc87404c  kernel-2.6.spec




More information about the fedora-cvs-commits mailing list