SPECS (Titanium): kernel-vanilla.spec, kernel-bare-grsecurity.spec...
hawk
hawk at pld-linux.org
Mon Apr 21 20:56:47 CEST 2008
Author: hawk Date: Mon Apr 21 18:56:47 2008 GMT
Module: SPECS Tag: Titanium
---- Log message:
- use 'make archclean' instead of hacking Makefile with sed
---- Files affected:
SPECS:
kernel-vanilla.spec (1.43.2.11.2.36 -> 1.43.2.11.2.37) , kernel-bare-grsecurity.spec (1.1.2.24 -> 1.1.2.25) , kernel-bare-vserver.spec (1.1.2.24 -> 1.1.2.25)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.36 SPECS/kernel-vanilla.spec:1.43.2.11.2.37
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.36 Mon Apr 21 11:06:14 2008
+++ SPECS/kernel-vanilla.spec Mon Apr 21 20:56:41 2008
@@ -360,10 +360,6 @@
sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
-# Kill creating obsolete arch/{i386,x86_64}/boot directories
-# and bzImage symlinks, breaks rpm directory deps
-sed -i -e '/\/arch\/\$(UTS_MACHINE)\/boot/d' arch/x86/Makefile
-
# remove unwanted files after patching (if any)
find . '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -474,7 +470,7 @@
mkdir -p $KERNEL_INSTALL_DIR/boot
install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
%ifarch %{ix86} %{x8664}
- install arch/%{x86_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+ install arch/x86/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
%endif
install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
@@ -536,7 +532,7 @@
cd $RPM_BUILD_ROOT%{_kernelsrcdir}
-%{__make} %{MakeOpts} mrproper \
+%{__make} %{MakeOpts} mrproper archclean \
RCS_FIND_IGNORE='-name build-done -prune -o'
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -799,6 +795,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.43.2.11.2.37 2008-04-21 18:56:41 hawk
+- use 'make archclean' instead of hacking Makefile with sed
+
Revision 1.43.2.11.2.36 2008-04-21 09:06:14 hawk
- lets go with release 1
================================================================
Index: SPECS/kernel-bare-grsecurity.spec
diff -u SPECS/kernel-bare-grsecurity.spec:1.1.2.24 SPECS/kernel-bare-grsecurity.spec:1.1.2.25
--- SPECS/kernel-bare-grsecurity.spec:1.1.2.24 Mon Apr 21 08:49:36 2008
+++ SPECS/kernel-bare-grsecurity.spec Mon Apr 21 20:56:42 2008
@@ -379,11 +379,6 @@
sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
-# Kill creating obsolete arch/{i386,x86_64}/boot directories
-# and bzImage symlinks, breaks rpm directory deps
-sed -i -e '/\/arch\/i386\/boot/d' arch/x86/Makefile_32
-sed -i -e '/\/arch\/x86_64\/boot/d' arch/x86/Makefile_64
-
# remove unwanted files after patching (if any)
find . '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -510,7 +505,7 @@
mkdir -p $KERNEL_INSTALL_DIR/boot
install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
%ifarch %{ix86} %{x8664}
- install arch/%{x86_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+ install arch/x86/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
%endif
install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
@@ -572,7 +567,7 @@
cd $RPM_BUILD_ROOT%{_kernelsrcdir}
-%{__make} %{MakeOpts} mrproper \
+%{__make} %{MakeOpts} mrproper archclean \
RCS_FIND_IGNORE='-name build-done -prune -o'
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -835,6 +830,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.1.2.25 2008-04-21 18:56:42 hawk
+- use 'make archclean' instead of hacking Makefile with sed
+
Revision 1.1.2.24 2008-04-21 06:49:36 hawk
- /boot symlinks fix, dropped creating *.old file
- cleanup, cosmetics
================================================================
Index: SPECS/kernel-bare-vserver.spec
diff -u SPECS/kernel-bare-vserver.spec:1.1.2.24 SPECS/kernel-bare-vserver.spec:1.1.2.25
--- SPECS/kernel-bare-vserver.spec:1.1.2.24 Mon Apr 21 11:05:36 2008
+++ SPECS/kernel-bare-vserver.spec Mon Apr 21 20:56:42 2008
@@ -376,11 +376,6 @@
sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
-# Kill creating obsolete arch/{i386,x86_64}/boot directories
-# and bzImage symlinks, breaks rpm directory deps
-sed -i -e '/\/arch\/i386\/boot/d' arch/x86/Makefile_32
-sed -i -e '/\/arch\/x86_64\/boot/d' arch/x86/Makefile_64
-
# remove unwanted files after patching (if any)
find . '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -491,7 +486,7 @@
mkdir -p $KERNEL_INSTALL_DIR/boot
install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
%ifarch %{ix86} %{x8664}
- install arch/%{x86_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+ install arch/x86/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
%endif
install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
@@ -553,7 +548,7 @@
cd $RPM_BUILD_ROOT%{_kernelsrcdir}
-%{__make} %{MakeOpts} mrproper \
+%{__make} %{MakeOpts} mrproper archclean \
RCS_FIND_IGNORE='-name build-done -prune -o'
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -816,6 +811,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.1.2.25 2008-04-21 18:56:42 hawk
+- use 'make archclean' instead of hacking Makefile with sed
+
Revision 1.1.2.24 2008-04-21 09:05:36 hawk
- - arch dir and %files adjustements for 2.6.24
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.43.2.11.2.36&r2=1.43.2.11.2.37&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-grsecurity.spec?r1=1.1.2.24&r2=1.1.2.25&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-vserver.spec?r1=1.1.2.24&r2=1.1.2.25&f=u
More information about the pld-cvs-commit
mailing list