[arch-commits] Commit in linux/trunk (PKGBUILD linux.install)

[Tobias Powalowski]

    Date: Monday, July 25, 2011 @ 12:20:27
  Author: tpowa
Revision: 132731

remove sublevel patch

Modified:
  linux/trunk/PKGBUILD
  linux/trunk/linux.install

---------------+
 PKGBUILD      |    4 ++--
 linux.install |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-25 15:55:32 UTC (rev 132730)
+++ PKGBUILD	2011-07-25 16:20:27 UTC (rev 132731)
@@ -48,11 +48,11 @@
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
 
-  # remove the extraversion from Makefile
+  # remove the sublevel from Makefile
   # this ensures our kernel version is always 3.X-ARCH
   # this way, minor kernel updates will not break external modules
   # we need to change this soon, see FS#16702
-  sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile
+  sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
 
   # get kernel version
   make prepare

Modified: linux.install
===================================================================
--- linux.install	2011-07-25 15:55:32 UTC (rev 132730)
+++ linux.install	2011-07-25 16:20:27 UTC (rev 132731)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.0.0-ARCH
+KERNEL_VERSION=3.0-ARCH
 
 post_install () {
   # updating module dependencies