[arch-commits] Commit in kernel26-lts/trunk (4 files)

[Tobias Powalowski]

    Date: Friday, November 11, 2011 @ 11:55:30
  Author: tpowa
Revision: 142525

upgpkg: kernel26-lts 2.6.32.48-1

bump to latest version, add real version like the 3.x series

Modified:
  kernel26-lts/trunk/PKGBUILD
  kernel26-lts/trunk/config
  kernel26-lts/trunk/config.x86_64
  kernel26-lts/trunk/kernel26-lts.install

----------------------+
 PKGBUILD             |   23 ++++++++++++++---------
 config               |    2 +-
 config.x86_64        |    2 +-
 kernel26-lts.install |    7 +++----
 4 files changed, 19 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-11 14:47:40 UTC (rev 142524)
+++ PKGBUILD	2011-11-11 16:55:30 UTC (rev 142525)
@@ -5,7 +5,7 @@
 pkgname=('kernel26-lts' 'kernel26-lts-headers') # Build stock -lts kernel 
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.32
-pkgver=${_basekernel}.47
+pkgver=${_basekernel}.48
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -18,9 +18,9 @@
         ${pkgname}.preset)
 options=(!strip)
 md5sums=('260551284ac224c3a43c4adac7df4879'
-         'ceeeacc7743f3c097a74fe1275c0bae1'
-         '654348dff2640538acc37e3a5133ab48'
-         '53c4210913f7c8a1c13e73522b5ca1f0'
+         '1031515858a61f14118418792d73d59c'
+         '25ef924aa12c38c222df99ae2c186625'
+         '710d6a8a31aa38f6a673e74ed1c15b0a'
          '2cbfeb3e2a18d45f82f613e97fc23355')
 
 build() {
@@ -38,10 +38,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
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 ${pkgver#$_basekernel}-${pkgrel}|" Makefile
+
+
   # get kernel version
   make prepare
   # load configuration
@@ -96,8 +96,13 @@
   rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
   # remove the firmware
   rm -rf ${pkgdir}/lib/firmware
-  # gzip -9 all modules to safe 100MB of space
+  # gzip -9 all modules to save 100MB of space
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building the kernel
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
 }
 
 package_kernel26-lts-headers() {

Modified: config
===================================================================
--- config	2011-11-11 14:47:40 UTC (rev 142524)
+++ config	2011-11-11 16:55:30 UTC (rev 142525)
@@ -195,7 +195,7 @@
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y

Modified: config.x86_64
===================================================================
--- config.x86_64	2011-11-11 14:47:40 UTC (rev 142524)
+++ config.x86_64	2011-11-11 16:55:30 UTC (rev 142525)
@@ -196,7 +196,7 @@
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y

Modified: kernel26-lts.install
===================================================================
--- kernel26-lts.install	2011-11-11 14:47:40 UTC (rev 142524)
+++ kernel26-lts.install	2011-11-11 16:55:30 UTC (rev 142525)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=2.6.32-lts
+KERNEL_VERSION=2.6.32.48-1-lts
 
 post_install () {
   # updating module dependencies
@@ -41,9 +41,8 @@
 
   if grep "/boot" /etc/fstab 2>&1 >/dev/null; then
     if ! grep "/boot" /etc/mtab 2>&1 >/dev/null; then
-      echo "WARNING: /boot appears to be a seperate partition but is not mounted"
-      echo "         This is most likely not what you want.  Please mount your /boot"
-      echo "         partition and reinstall the kernel unless you are sure this is OK"
+      echo "WARNING: /boot appears to be a seperate partition but is not mounted."
+      echo "         You probably just broke your system. Congratulations."
     fi
   fi