core/kernel26-raspberrypi to 2.6.35.7-2

core/kernel26-raspberrypi/PKGBUILD

@@ -1,38 +1,36 @@
-# Maintainer: Mike Staszel <mikestaszel@plugapps.com>
+# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
 
 # Rasberry Pi kernel and headers
 
 noautobuild=1
 plugrel=2
-#ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.7.tar.bz2
+
 pkgbase="kernel26-raspberrypi"
 pkgname=('kernel26-raspberrypi' 'kernel26-headers-raspberrypi')
 #_kernelname=${pkgname#kernel26}
 _kernelname=""
 _basekernel=2.6.35
 pkgver=${_basekernel}.7
-_pkgrel=1
-pkgrel=${_pkgrel}
-#pkgrel=${_pkgrel}.${plugrel}
+pkgrel=2
 makedepends=('xmlto' 'docbook-xsl' 'make' 'python2')
-_patchname="patch-${pkgver}-${_pkgrel}-ARCH"
 arch=(arm)
 KARCH=arm
-LDFLAGS=""
 license=('GPL2')
 url="http://www.kernel.org"
-source=('armdma.patch'
+source=('ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.7.tar.bz2'
+        'config'
+        'armdma.patch'
         'args-uncompressed.txt'
         'boot-uncompressed.txt'
         'imagetool-uncompressed.py'
-        'ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.7.tar.bz2'
         'rp-patches.tar.gz'
         'sys_accept4.patch')
-md5sums=('6e7667c6c6348bfeca22eaaa05462d62'
+md5sums=('f741879bcd3a5366a1bbe0ad5cdb7935'
+         'b5ef3218f0a0db43e0ad35f9eb0bce7e'
+         '6e7667c6c6348bfeca22eaaa05462d62'
          '9335d1263fd426215db69841a380ea26'
          'a00e424e2fbb8c5a5f77ba2c4871bed4'
          '2f82dbe5752af65ff409d737caf11954'
-         'f741879bcd3a5366a1bbe0ad5cdb7935'
          '968a3a9468b90a8a50dae8cafb276760'
          'fdbbc3c4f34d5959504f027bdc1e7a73')
 
@@ -44,12 +42,17 @@ build() {
   cp ${srcdir}/boot-uncompressed.txt arch/arm/boot/
   cp ${srcdir}/imagetool-uncompressed.py arch/arm/boot/
 
-  # ALARM: add dma_coherent_write_sync calls to USB EHCI driver
+  # ALARM patches
   patch -Np2 -i "${srcdir}/rp-patches/rpdh1.patch"
   patch -Np1 -i "${srcdir}/rp-patches/smsc95xx.patch"
   patch -Np1 -i "${srcdir}/armdma.patch"
   patch -Np1 -i "${srcdir}/sys_accept4.patch"
 
+  cat "${srcdir}/config" > ./.config
+
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+
   # Prepare sources
   make prepare
   #make clean # sometimes git isn't clean
@@ -59,9 +62,6 @@ build() {
   #make nconfig # new CLI menu for configuration
   #make oldconfig # using old config from previous kernel version
 
-  # Make the config compatible with Arch Linux's naming scheme
-  sed 's|CONFIG_LOCALVERSION=""|CONFIG_LOCALVERSION="-ARCH"|g' -i .config
-
   # Copy back our configuration (use with new kernel version)
   #cp ./.config ../${_basekernel}.config
   
@@ -74,7 +74,7 @@ build() {
 
 package_kernel26-raspberrypi() {
   pkgdesc="The Linux Kernel and modules - Raspberry Pi"
-  #groups=('base')
+  groups=('base')
   depends=('coreutils' 'module-init-tools>=3.12-2')
   replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi'
             'alsa-driver' 'ieee80211' 'hostap-driver26'

core/kernel26-raspberrypi/kernel26.install

@@ -1,5 +1,5 @@
 KERNEL_NAME=
-KERNEL_VERSION=2.6.35.7
+KERNEL_VERSION=2.6.35-2
 
 post_install() {
 # ARM doesn't use mkinitcpio or anything like that