rpms/kernel/devel kernel.spec,1.543,1.544
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Wed Mar 26 20:02:12 UTC 2008
- Previous message (by thread): rpms/gcc/devel gcc43-libgomp-speedup.patch, NONE, 1.1 gcc43-pr35440.patch, NONE, 1.1 gcc43-pr35546.patch, NONE, 1.1 .cvsignore, 1.229, 1.230 gcc43.spec, 1.24, 1.25 sources, 1.231, 1.232
- Next message (by thread): rpms/openvrml/devel 437611.patch,NONE,1.1 openvrml.spec,1.38,1.39
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14141
Modified Files:
kernel.spec
Log Message:
* Wed Mar 26 2008 Jarod Wilson <jwilson at redhat.com>
- Fix buglet in posttrans hooks (#439036)
- Tweak arch-in-uname setup to use dot delimiter for flavoured
kernels, eliminates a needless symlink and reads cleaner.
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -r1.543 -r1.544
--- kernel.spec 26 Mar 2008 19:05:29 -0000 1.543
+++ kernel.spec 26 Mar 2008 20:01:21 -0000 1.544
@@ -649,7 +649,7 @@
%endif
-BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
+BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
%description
The kernel package contains the Linux kernel (vmlinuz), the core of any
@@ -1235,15 +1235,8 @@
InstallName=${4:-vmlinuz}
# Pick the right config file for the kernel we're building
- if [ -n "$Flavour" ] ; then
- Config=kernel-%{version}-%{_target_cpu}-$Flavour.config
- DevelDir=/usr/src/kernels/%{KVERREL}-$Flavour
- DevelLink=/usr/src/kernels/%{KVERREL}$Flavour
- else
- Config=kernel-%{version}-%{_target_cpu}.config
- DevelDir=/usr/src/kernels/%{KVERREL}
- DevelLink=
- fi
+ Config=kernel-%{version}-%{_target_cpu}${Flavour:+-${Flavour}}.config
+ DevelDir=/usr/src/kernels/%{KVERREL}${Flavour:+.${Flavour}}
# When the bootable image is just the ELF kernel, strip it.
# We already copy the unstripped file into the debuginfo package.
@@ -1253,11 +1246,11 @@
CopyKernel=cp
fi
- KernelVer=%{version}-%{release}.%{_target_cpu}$Flavour
- echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
+ KernelVer=%{version}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}
+ echo BUILDING A KERNEL FOR ${Flavour} %{_target_cpu}...
# make sure EXTRAVERSION says what we want it to say
- perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}$Flavour/" Makefile
+ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
# if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
%if !0%{?rcrev}
@@ -1415,7 +1408,6 @@
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` $RPM_BUILD_ROOT/$DevelLink
}
###
@@ -1579,9 +1571,9 @@
fi\
if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ]\
then\
- (cd /usr/src/kernels/%{KVERREL}%{?1:-%{1}} &&\
+ (cd /usr/src/kernels/%{KVERREL}%{?1:.%{1}} &&\
/usr/bin/find . -type f | while read f; do\
- hardlink -c /usr/src/kernels/*.fc*-*/$f $f\
+ hardlink -c /usr/src/kernels/*.fc*.*/$f $f\
done)\
fi\
%{nil}
@@ -1592,7 +1584,7 @@
#
%define kernel_variant_posttrans(s:r:v:) \
%{expand:%%posttrans %{?-v*}}\
-/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{?1} %{KVERREL}%{?-v*} || exit $?\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{KVERREL}%{?-v*} || exit $?\
%{nil}
#
@@ -1691,30 +1683,30 @@
%if %{1}\
%{expand:%%files %{?2}}\
%defattr(-,root,root)\
-/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2}\
-/boot/System.map-%{KVERREL}%{?2}\
-#/boot/symvers-%{KVERREL}%{?2}.gz\
-/boot/config-%{KVERREL}%{?2}\
+/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
+/boot/System.map-%{KVERREL}%{?2:.%{2}}\
+#/boot/symvers-%{KVERREL}%{?2:.%{2}}.gz\
+/boot/config-%{KVERREL}%{?2:.%{2}}\
%{?-a:%{-a*}}\
-%dir /lib/modules/%{KVERREL}%{?2}\
-/lib/modules/%{KVERREL}%{?2}/kernel\
-/lib/modules/%{KVERREL}%{?2}/build\
-/lib/modules/%{KVERREL}%{?2}/source\
-/lib/modules/%{KVERREL}%{?2}/extra\
-/lib/modules/%{KVERREL}%{?2}/updates\
-/lib/modules/%{KVERREL}%{?2}/weak-updates\
+%dir /lib/modules/%{KVERREL}%{?2:.%{2}}\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/kernel\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/build\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/source\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/extra\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/updates\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/weak-updates\
%ifarch %{vdso_arches}\
-/lib/modules/%{KVERREL}%{?2}/vdso\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/vdso\
%endif\
-/lib/modules/%{KVERREL}%{?2}/modules.block\
-/lib/modules/%{KVERREL}%{?2}/modules.networking\
-/lib/modules/%{KVERREL}%{?2}/modules.order\
-%ghost /boot/initrd-%{KVERREL}%{?2}.img\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/modules.block\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/modules.networking\
+/lib/modules/%{KVERREL}%{?2:.%{2}}/modules.order\
+%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
%{?-e:%{-e*}}\
%{expand:%%files %{?2:%{2}-}devel}\
%defattr(-,root,root)\
-%verify(not mtime) /usr/src/kernels/%{KVERREL}%{?2:-%{2}}\
-/usr/src/kernels/%{KVERREL}%{?2}\
+%verify(not mtime) /usr/src/kernels/%{KVERREL}%{?2:.%{2}}\
+/usr/src/kernels/%{KVERREL}%{?2:.%{2}}\
%if %{with_debuginfo}\
%ifnarch noarch\
%if %{fancy_debuginfo}\
@@ -1725,10 +1717,10 @@
%defattr(-,root,root)\
%if !%{fancy_debuginfo}\
%if "%{elf_image_install_path}" != ""\
-%{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}%{?2}.debug\
+%{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}%{?2:.%{2}}.debug\
%endif\
-%{debuginfodir}/lib/modules/%{KVERREL}%{?2}\
-%{debuginfodir}/usr/src/kernels/%{KVERREL}%{?2:-%{2}}\
+%{debuginfodir}/lib/modules/%{KVERREL}%{?2:.%{2}}\
+%{debuginfodir}/usr/src/kernels/%{KVERREL}%{?2:.%{2}}\
%endif\
%endif\
%endif\
@@ -1745,6 +1737,11 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Wed Mar 26 2008 Jarod Wilson <jwilson at redhat.com>
+- Fix buglet in posttrans hooks (#439036)
+- Tweak arch-in-uname setup to use dot delimiter for flavoured
+ kernels, eliminates a needless symlink and reads cleaner.
+
* Wed Mar 26 2008 Chuck Ebbert <cebbert at redhat.com>
- Remove a now unnecessary gcc43 compile fix.
- Apply compile fixes to vanilla kernels.
- Previous message (by thread): rpms/gcc/devel gcc43-libgomp-speedup.patch, NONE, 1.1 gcc43-pr35440.patch, NONE, 1.1 gcc43-pr35546.patch, NONE, 1.1 .cvsignore, 1.229, 1.230 gcc43.spec, 1.24, 1.25 sources, 1.231, 1.232
- Next message (by thread): rpms/openvrml/devel 437611.patch,NONE,1.1 openvrml.spec,1.38,1.39
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list