[arch-commits] Commit in kernel26-lts/repos (3 files)

[Tobias Powalowski]

    Date: Sunday, December 13, 2009 @ 14:57:16
  Author: tpowa
Revision: 61239

Merged revisions 61238 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kernel26-lts/trunk

........
  r61238 | tpowa | 2009-12-13 19:56:34 +0000 (So, 13 Dez 2009) | 2 lines
  
  upgpkg: kernel26-lts 2.6.27.41-1
      bump to latest version
........

Modified:
  kernel26-lts/repos/testing-x86_64/	(properties)
  kernel26-lts/repos/testing-x86_64/PKGBUILD
  kernel26-lts/repos/testing-x86_64/kernel26-lts.install

----------------------+
 PKGBUILD             |   10 +++++++---
 kernel26-lts.install |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)


Property changes on: kernel26-lts/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kernel26-lts/trunk:1-59862
   + /kernel26-lts/trunk:1-61238

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-12-13 19:56:34 UTC (rev 61238)
+++ testing-x86_64/PKGBUILD	2009-12-13 19:57:16 UTC (rev 61239)
@@ -4,8 +4,8 @@
 pkgname=kernel26-lts
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.27
-pkgver=${_basekernel}.39
-pkgrel=2
+pkgver=${_basekernel}.41
+pkgrel=1
 pkgdesc="The Linux Kernel and modules - stable longtime supported kernel package suitable for servers"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -24,7 +24,7 @@
 	linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
 	linux-2.6.27.9-ext4-cap-check-delay.patch)
 md5sums=('b3e78977aa79d3754cb7f8143d7ddabd'
-         '9ce07344e2d9e5fe77ca474e8f5bd83a'
+         'a431f1f68badcfa5a6cecc6b4d52d319'
          '1ab067cf0534e3fe16578cf10c020b1b'
          '20534542a14fe041f392abe377dc746a'
          'a13338958d1b241f8dfd4c6014cad3d4'
@@ -52,6 +52,10 @@
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
+  # remove the extraversion from Makefile
+  # this ensures our kernel version is always 2.6.XX-lts
+  # this way, minor kernel updates will not break external modules
+  sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile
   # get kernel version  
   make prepare
   _kernver="$(make kernelrelease)"

Modified: testing-x86_64/kernel26-lts.install
===================================================================
--- testing-x86_64/kernel26-lts.install	2009-12-13 19:56:34 UTC (rev 61238)
+++ testing-x86_64/kernel26-lts.install	2009-12-13 19:57:16 UTC (rev 61239)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=2.6.27.39-lts
+KERNEL_VERSION=2.6.27-lts
 
 post_install () {
   # updating module dependencies