* kmod: bump to 6

- depmod-search: fix path in header comment
* linux: 3.2.9 (UNRELEASE)
  - adopt PATCHCFG
* linux-lts: 3.0.23 (UNRELEASE)
  - adopt PATCHCFG

kmod/PKGBUILD

@@ -5,38 +5,27 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=kmod
-pkgver=5
+pkgver=6
-pkgrel=4
+pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
-url="http://git.profusion.mobi/cgit.cgi/kmod.git"
+url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
 license=('GPL2')
 depends=('glibc' 'zlib')
 options=('!libtool')
 provides=('module-init-tools=3.16')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
-source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
+source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
-        '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch'
-        '0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch'
         "depmod-search.conf")
-md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
+md5sums=('bad08102fad212cd34405136d9a7eb94'
-         '81545a1509b43008f85c03fb980f0e86'
+         '285fc738c220ff84419995fc8c6d6ca1')
-         '662a85dbe420f04c1ef24f9cd4e4c990'
-         '4b8cbcbc54b9029c99fd730e257d4436')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # fix modprobe --show-depends failures on loaded modules
-  patch -Np1 <"$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch"
-
-  # fix infinite loop with softdeps
-  patch -Np1 <"$srcdir/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch"
-
   ./configure \
     --sysconfdir=/etc \
-    --with-rootprefix= \
     --with-zlib
 
   make
@@ -52,13 +41,6 @@ package() {
   ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
   ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod"
 
-  # add compatible symlinks
-  ln -s ../usr/bin/insmod "$pkgdir/sbin/insmod"
-  ln -s ../usr/bin/lsmod "$pkgdir/sbin/lsmod"
-  ln -s ../usr/bin/modinfo "$pkgdir/sbin/modinfo"
-  ln -s ../usr/bin/rmmod "$pkgdir/sbin/rmmod"
-
-
   for tool in {ins,ls,rm}mod modinfo; do
     ln -s kmod "$pkgdir/usr/bin/$tool"
   done
@@ -66,3 +48,5 @@ package() {
   # install depmod.d file for search/ dir
   install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf"
 }
+
+# vim: ft=sh syn=sh et

kmod/depmod-search.conf

@@ -1,5 +1,5 @@
 #
-# /etc/depmod.d/depmod.conf
+# /lib/depmod.d/depmod.conf
 #
 
 search updates extramodules built-in

linux-3-CHAKRA-LTS/PATCHCFG

@@ -1,8 +1,8 @@
 # Source env-settings
 source ../_buildscripts/`pwd | cut -d/ -f3`-${_arch}-makepkg.conf
 # Pre-Patch settings
-_patch="3.0.22"
+_patch="3.0.23"
-_prepatch="3.0.23-rc1"
+_prepatch="3.0.24-pre1"
 _queue="3.0"
 # Aufs
 _aufs="3.0-20120109"
@@ -24,8 +24,8 @@ PATCHES=(
 
          # add latest fixes from stable queue, if needed
          # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-         #http://chakra.sourceforge.net/sources/linux/patches/3.0/candidate/$_prepatch.patch%1
+         http://chakra.sourceforge.net/sources/linux/patches/3.0/candidate/$_prepatch.patch%1
-         ftp://ftp.kernel.org/pub/linux/kernel/v3.x/stable-review/patch-$_prepatch.gz%1
+         #ftp://ftp.kernel.org/pub/linux/kernel/v3.x/stable-review/patch-$_prepatch.gz%1
 
          # Archlinux patches
 
@@ -116,7 +116,7 @@ PATCHES=(
 
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-3.0.22-1-CHAKRA-LTS"
+PATCHNAME="patch-3.0.23-1-CHAKRA-LTS"
 
 # Run this before applying patches
 pre_apply() {

linux-3-CHAKRA/PATCHCFG

@@ -1,8 +1,8 @@
 # Source env-settings
 source ../_buildscripts/`pwd | cut -d/ -f3`-${_arch}-makepkg.conf
 # Pre-Patch settings
-_patch="3.2.8"
+_patch="3.2.9"
-_prepatch="3.2.9-rc1"
+_prepatch="3.2.10-pre1"
 _queue="3.2"
 # Aufs
 _aufs="3.2-20120109"
@@ -24,8 +24,8 @@ PATCHES=(
 
          # add latest fixes from stable queue, if needed
          # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-         #http://chakra.sourceforge.net/sources/linux/patches/3.2/candidate/$_prepatch.patch%1
+         http://chakra.sourceforge.net/sources/linux/patches/3.2/candidate/$_prepatch.patch%1
-         ftp://ftp.kernel.org/pub/linux/kernel/v3.x/stable-review/patch-$_prepatch.gz%1
+         #ftp://ftp.kernel.org/pub/linux/kernel/v3.x/stable-review/patch-$_prepatch.gz%1
 
          # Archlinux patches
 
@@ -153,7 +153,7 @@ PATCHES=(
 
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-3.2.8-1-CHAKRA"
+PATCHNAME="patch-3.2.9-1-CHAKRA"
 
 # Run this before applying patches
 pre_apply() {

linux-lts/PKGBUILD

@@ -9,7 +9,7 @@ pkgname=('linux-lts' 'linux-lts-headers' 'linux-lts-docs') # Build stock -CHAKRA
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-lts}
 _basekernel=3.0
-pkgver=${_basekernel}.22
+pkgver=${_basekernel}.23
 pkgrel=1
 _aufs="3.0-20120109"
 makedepends=('xmlto' 'docbook-xsl')

linux/PKGBUILD

@@ -9,7 +9,7 @@ pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -CHAKRA kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux}
 _basekernel=3.2
-pkgver=${_basekernel}.8
+pkgver=${_basekernel}.9
 pkgrel=1
 _aufs="3.2-20120109"
 makedepends=('xmlto' 'docbook-xsl')
@@ -25,7 +25,7 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_basekernel.tar.bz2
         # standard config files for mkinitcpio ramdisk
         linux.preset)
 md5sums=('7ceb61f87c097fc17509844b71268935'
-         'a74570e2b4c32572a0295d192c142582'
+         '9b578efd9f7e85079c00de521b629114'
          'e8238d2f3dee0234a8a55cdaba9e91e4'
          '91525d8106c580d3dedc44a9d5e8d092'
          'b019872ce926de3ec82985fc399832c6')