rpms/kernel/devel kernel-2.6.spec,1.1211,1.1212
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 29 19:33:01 UTC 2005
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26377
Modified Files:
kernel-2.6.spec
Log Message:
Use uname in kernel-devel directories (#145914)
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1211
retrieving revision 1.1212
diff -u -r1.1211 -r1.1212
--- kernel-2.6.spec 29 Mar 2005 19:29:10 -0000 1.1211
+++ kernel-2.6.spec 29 Mar 2005 19:32:59 -0000 1.1212
@@ -759,9 +759,11 @@
if [ -n "$1" ] ; then
Config=kernel-%{kversion}-%{_target_cpu}-$1.config
DevelDir=/usr/src/kernels/%{KVERREL}-$1-%{_target_cpu}
+ DevelLink=/usr/src/kernels/%{KVERREL}$1-%{_target_cpu}
else
Config=kernel-%{kversion}-%{_target_cpu}.config
DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu}
+ DevelLink=
fi
KernelVer=%{version}-%{release}$1
@@ -873,6 +875,7 @@
mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
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` $DevelLink
}
###
@@ -1031,6 +1034,7 @@
%files smp-devel
%defattr(-,root,root)
%verify(not mtime) /usr/src/kernels/%{KVERREL}-smp-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}smp-%{_target_cpu}
%endif
%if %{buildxen}
@@ -1047,6 +1051,7 @@
%files xen0-devel
%defattr(-,root,root)
%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen0-%{_target_cpu}
%files xenU
%defattr(-,root,root)
@@ -1061,6 +1066,7 @@
%files xenU-devel
%defattr(-,root,root)
%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
%endif
@@ -1073,6 +1079,10 @@
%endif
%changelog
+* Tue Mar 29 2005 Rik van Riel <riel at redhat.com>
+- apply Xen patches again (they don't compile yet, though)
+- Use uname in kernel-devel directories (#145914)
+
* Mon Mar 28 2005 Dave Jones <davej at redhat.com>
- Don't generate debuginfo files if %_enable_debug_packages isnt set. (#152268)
More information about the fedora-cvs-commits
mailing list