Author: hawk Date: Sun Apr 20 14:14:38 2008 GMT
Module: SPECS Tag: Titanium
---- Log message:
- /boot symlinks fix, dropped creating *.old files
- use linux-%{alt_kernel}-%{version} instead of linux-%{version}_%{alt_kernel}
- cleanup
---- Files affected:
SPECS:
kernel-vanilla.spec (1.43.2.11.2.32 -> 1.43.2.11.2.33)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.32
SPECS/kernel-vanilla.spec:1.43.2.11.2.33
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.32 Sat Apr 19 17:15:27 2008
+++ SPECS/kernel-vanilla.spec Sun Apr 20 16:14:33 2008
@@ -22,12 +22,10 @@
%define _postver %{nil}
%define _rel 0.1
-# for rc kernels basever is the version patch (source1) should be applied to
#%define _ver 2.6.20
-#%define _rc rc4
-# for non rc-kernels these should be %{nil}
+#%define _rc rc4
%define _ver %{nil}
-%define _rc %{nil}
+%define _rc %{nil}
Summary: The Linux kernel (the core of the Linux operating system)
Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -60,7 +58,6 @@
BuildRequires: binutils >= 3:2.14.90.0.7
BuildRequires: gcc >= 5:3.2
BuildRequires: module-init-tools
-# for hostname command
BuildRequires: net-tools
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.217
@@ -105,8 +102,8 @@
# modules will be looked from /lib/modules/%{kernel_release}
# _localversion is just that without version for "> localversion"
%define _localversion %{release}
-%define kernel_release %{version}_%{alt_kernel}-%{_localversion}
-%define _kernelsrcdir /usr/src/linux-%{version}_%{alt_kernel}
+%define kernel_release %{alt_kernel}-%{version}-%{_localversion}
+%define _kernelsrcdir /usr/src/linux-%{alt_kernel}-%{version}
%define CommonOpts HOSTCC="%{__cc}" HOSTCFLAGS="-Wall
-Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
%if "%{_target_base_arch}" != "%{_arch}"
@@ -126,7 +123,6 @@
%define __features Enabled features:\
%{?debug: - DEBUG}\
%define Features %(echo "%{__features}" | sed '/^$/d')
-# vim: "
%description
This package contains the Linux kernel that is used to boot and run
@@ -360,7 +356,7 @@
%endif
# Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}_%{alt_kernel}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
@@ -584,23 +580,12 @@
fi
%post
-mv -f /boot/vmlinuz-%{alt_kernel} /boot/vmlinuz-%{alt_kernel}.old 2> /dev/null
> /dev/null
-mv -f /boot/System.map-%{alt_kernel} /boot/System.map-%{alt_kernel}.old 2>
/dev/null > /dev/null
ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz-%{alt_kernel}
ln -sf System.map-%{kernel_release} /boot/System.map-%{alt_kernel}
-if [ ! -e /boot/vmlinuz ]; then
- mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
- mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
- ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
- ln -sf System.map-%{alt_kernel} /boot/System.map
- mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2> /dev/null >
/dev/null
- ln -sf initrd-%{alt_kernel} %{initrd_dir}/initrd
-fi
%depmod %{kernel_release}
/sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz
%{kernel_release}
-mv -f %{initrd_dir}/initrd-%{alt_kernel}
%{initrd_dir}/initrd-%{alt_kernel}.old 2> /dev/null > /dev/null
ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
if [ -x /sbin/new-kernel-pkg ]; then
@@ -618,7 +603,6 @@
fi
%post vmlinux
-mv -f /boot/vmlinux-%{alt_kernel} /boot/vmlinux-%{alt_kernel}.old 2> /dev/null
> /dev/null
ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}
%post drm
@@ -652,7 +636,7 @@
%postun headers
if [ "$1" = "0" ]; then
if [ -L %{_prefix}/src/linux-%{alt_kernel} ]; then
- if [ "$(readlink %{_prefix}/src/linux-%{alt_kernel})" =
"linux-%{version}_%{alt_kernel}" ]; then
+ if [ "$(readlink %{_prefix}/src/linux-%{alt_kernel})" =
"linux-%{alt_kernel}-%{version}" ]; then
rm -f %{_prefix}/src/linux-%{alt_kernel}
fi
fi
@@ -668,14 +652,10 @@
/lib/modules/%{kernel_release}/kernel/arch
/lib/modules/%{kernel_release}/kernel/crypto
/lib/modules/%{kernel_release}/kernel/drivers
-#%if %{have_oss} && %{have_isa}
-#%exclude
/lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20*.ko*
-#%endif
/lib/modules/%{kernel_release}/kernel/fs
/lib/modules/%{kernel_release}/kernel/kernel
/lib/modules/%{kernel_release}/kernel/lib
/lib/modules/%{kernel_release}/kernel/net
-#/lib/modules/%{kernel_release}/kernel/security
%dir /lib/modules/%{kernel_release}/kernel/sound
/lib/modules/%{kernel_release}/kernel/sound/soundcore.*
%if %{have_sound}
@@ -742,9 +722,6 @@
%files sound-oss
%defattr(644,root,root,755)
/lib/modules/%{kernel_release}/kernel/sound/oss
-#%if %{have_isa}
-#/lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20*.ko*
-#%endif
%endif # %{have_oss}
%endif # %{have_sound}
@@ -823,6 +800,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.43.2.11.2.33 2008-04-20 14:14:33 hawk
+- /boot symlinks fix, dropped creating *.old files
+- use linux-%{alt_kernel}-%{version} instead of linux-%{version}_%{alt_kernel}
+- cleanup
+
Revision 1.43.2.11.2.32 2008-04-19 15:15:27 hawk
- killed version macros
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.43.2.11.2.32&r2=1.43.2.11.2.33&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
