packages (Titanium): kernel-desktop/kernel-desktop.spec - fix EXTRAVERSION ...

shadzik shadzik at pld-linux.org
Sun Oct 24 17:20:02 CEST 2010


Author: shadzik                      Date: Sun Oct 24 15:20:02 2010 GMT
Module: packages                      Tag: Titanium
---- Log message:
- fix EXTRAVERSION discarding CKVERSION
- rel up

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.140 -> 1.204.2.141) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.140 packages/kernel-desktop/kernel-desktop.spec:1.204.2.141
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.140	Sun Oct 24 16:05:02 2010
+++ packages/kernel-desktop/kernel-desktop.spec	Sun Oct 24 17:19:56 2010
@@ -46,7 +46,7 @@
 
 %define		_basever		2.6.36
 %define		_postver		%{nil}
-%define		_rel			0.2718
+%define		_rel			0.27182
 
 %define		_enable_debug_packages			0
 
@@ -438,10 +438,7 @@
 %patch5 -p1
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
-
-# on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build
-sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
+sed -i 's#EXTRAVERSION :=.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -967,6 +964,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.141  2010/10/24 15:19:56  shadzik
+- fix EXTRAVERSION discarding CKVERSION
+- rel up
+
 Revision 1.204.2.140  2010/10/24 14:05:02  shadzik
 - CONFIG_BFS=y already in .config
 - cleanup old bfs stuff
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop.spec?r1=1.204.2.140&r2=1.204.2.141&f=u



More information about the pld-cvs-commit mailing list