From c9bbadcda946ba2b217e60fb6b64061aec77804a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 27 May 2013 23:05:10 +0200
Subject: [PATCH] kernel-rpi: update to today's commit of 3.6.y branch; enable
 some options.

---
 srcpkgs/kernel-rpi/files/config | 29 +++++++++++++++++++++--------
 srcpkgs/kernel-rpi/template     | 31 +++++++++++++++++++------------
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/kernel-rpi/files/config b/srcpkgs/kernel-rpi/files/config
index c8d19794d26..b68b22e1286 100644
--- a/srcpkgs/kernel-rpi/files/config
+++ b/srcpkgs/kernel-rpi/files/config
@@ -122,10 +122,10 @@ CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -3084,14 +3084,23 @@ CONFIG_CLKDEV_LOOKUP=y
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -3591,7 +3600,7 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_XZ_DEC=m
+CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_IA64=y
@@ -3601,6 +3610,10 @@ CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
diff --git a/srcpkgs/kernel-rpi/template b/srcpkgs/kernel-rpi/template
index a86605118cb..1cfa0498f20 100644
--- a/srcpkgs/kernel-rpi/template
+++ b/srcpkgs/kernel-rpi/template
@@ -2,23 +2,31 @@
 #
 pkgname=kernel-rpi
 version=3.6.11
-revision=1
-wrksrc="linux-95009dbb77849634cefea237dc952881406b0119"
+revision=2
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
-short_desc="The Linux kernel and modules for the Raspberry Pi"
-distfiles="http://xbps.nopcode.org/distfiles/linux-rpi-20130219.tar.xz"
-checksum=930176da46b88ebff880ae6f0b397b78a60e23670edcbc821e82e19bcada4c56
+short_desc="The Linux kernel and modules for the Raspberry Pi (3.6 series)"
 
 _kernver="${version}_${revision}"
 hostmakedepends="perl python kmod>=11_2 uboot-mkimage"
 makedepends="ncurses-devel"
 only_for_archs="armv6l"
+nofetch=yes
+noextract=yes
+
+do_fetch() {
+	url="git://github.com/raspberrypi/linux.git"
+	msg_normal "Cloning from $url ...\n"
+	git clone --depth 1 $url ${pkgname}-${version}
+	# Latest commit as of 20130527.
+	cd ${pkgname}-${version}
+	git checkout af85236f4cf87945c
+}
 
 do_configure() {
-	if [ -n "$CROSS_BUILD" ]; then
-		_args="CCPREFIX=${XBPS_CROSS_TRIPLET}- CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
 	fi
 
 	# Copy required files to create the bootable image.
@@ -35,8 +43,8 @@ do_configure() {
 }
 
 do_build() {
-	if [ -n "$CROSS_BUILD" ]; then
-		_args="CCPREFIX=${XBPS_CROSS_TRIPLET}- CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
 	fi
 	make ${makejobs} ${_args} ARCH=arm prepare
 	make ${makejobs} ${_args} ARCH=arm uImage modules
@@ -155,7 +163,7 @@ do_install() {
 kernel-headers-rpi_package() {
 	nostrip=yes
 	noverifyrdeps=yes
-	short_desc="Linux kernel source headers for the RaspberryPI"
+	short_desc="Linux kernel headers for the RaspberryPI (3.6 series)"
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules/${_kernver}/build
@@ -178,7 +186,6 @@ kernel-rpi_package() {
 		/usr/lib/modules/${_kernver}/modules.alias.bin
 		/usr/lib/modules/${_kernver}/modules.devname"
 	pkg_install() {
-		vmove boot
-		vmove usr
+		vmove all
 	}
 }