From b3735e3b742fb07d540707ed488316192bff6b2f Mon Sep 17 00:00:00 2001
From: shtrom <shtrom@df209809-8e4a-0410-9a64-c169741eb0fc>
Date: Wed, 10 Feb 2010 23:07:42 +0000
Subject: [PATCH] [kernel26-mipl] Properly building as a split package.

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@214 df209809-8e4a-0410-9a64-c169741eb0fc
---
 PKGBUILD      | 34 +++++++++++++++++++---------------
 config        |  8 +++++---
 config.x86_64 | 10 ++++++----
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index f9992f07de23..c85d5d98b628 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-pkgbase="kernel26"
-pkgname=('kernel26-mipl' 'kernel26-mipl-headers') # Build stock -ARCH kernel
+pkgbase="kernel26-mipl"
+pkgname=('kernel26-mipl' 'kernel26-mipl-headers')
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.32
-pkgver=${_basekernel}.7
+pkgver=${_basekernel}.8
 pkgrel=1
 _patchname="patch-${pkgver}-${pkgrel}-ARCH"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ license=('GPL2')
 url="http://www.kernel.org"
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
-	dsmip-patches/dsmip-2.6.30_01_dsmip-encap-udp.patch
+	dsmip-patches/dsmip-2.6.32_01_dsmip-encap-udp.patch
 	dsmip-patches/dsmip-2.6.30_02_TLV.patch
 	dsmip-patches/dsmip-2.6.30_03_Autoload-Module.patch
 	dsmip-patches/dsmip-2.6.30_04_NATT-report-UDP-info-on-raw-socket.patch
@@ -23,17 +23,6 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         config config.x86_64
         # standard config files for mkinitcpio ramdisk
         kernel26.preset)
-md5sums=('260551284ac224c3a43c4adac7df4879'
-         'b746d6d8f3609f9dfb73803ea22d7983'
-         'fdff6ecf6121135f9ff257ba5313873d'
-         'aa9c294063c5e9d421546d4e035ee34e'
-         'bcd54286aec43c70d3b57f06394a9c7a'
-         '5d9c139a34e316f7c77eb3f856ffe406'
-         'd765b6ec7feba168064ac87d39f80749'
-         '45ed8db1f31591924f0db38f54d2a3a2'
-         'c114c5d89622a93165bb948d62d966b5'
-         '5c91374d56f115ba4324978d5b002711'
-         '25584700a0a679542929c4bed31433b6')
 
 build() {
   cd ${srcdir}/linux-$_basekernel
@@ -41,6 +30,9 @@ build() {
   # See http://projects.archlinux.org/linux-2.6-ARCH.git/
   patch -Np1 -i ${srcdir}/${_patchname} || return 1
 
+  ln -s ${startdir}/dsmip-patches patches
+  quilt push -a || exit 1
+
   if [ "$CARCH" = "x86_64" ]; then
     cat ../config.x86_64 >./.config
   else
@@ -214,3 +206,15 @@ package_kernel26-mipl-headers() {
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
+
+md5sums=('260551284ac224c3a43c4adac7df4879'
+         '908f38fc5ba77b9bf691ae83e501b8e4'
+         '3de4853fee795c240688a035f3e561d0'
+         'aa9c294063c5e9d421546d4e035ee34e'
+         'bcd54286aec43c70d3b57f06394a9c7a'
+         '5d9c139a34e316f7c77eb3f856ffe406'
+         'd765b6ec7feba168064ac87d39f80749'
+         '13834128986ee7f5163f44084d1d708a'
+         '6458065646494471f4ed7e1428b683be'
+         '6daf672e34889e2194f3b5dffd873f2e'
+         '25584700a0a679542929c4bed31433b6')
diff --git a/config b/config
index 57c536f8277b..b9ea3b009ed9 100644
--- a/config
+++ b/config
@@ -62,7 +62,7 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-ARCH"
+CONFIG_LOCALVERSION="-mipl"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -584,8 +584,10 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_UDP_ENCAP=y
+CONFIG_INET_XFRM_UDP_ENCAP_NATT=y
+CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
diff --git a/config.x86_64 b/config.x86_64
index 84e06fe86cd6..c36b902ae175 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Thu Dec  3 22:10:28 2009
+# Wed Feb 10 13:44:37 2010
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -62,7 +62,7 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-ARCH"
+CONFIG_LOCALVERSION="-mipl"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -556,8 +556,10 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_UDP_ENCAP=y
+CONFIG_INET_XFRM_UDP_ENCAP_NATT=y
+CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m