kernel: update to 2.6.36.

srcpkgs/kernel/common-vars

@@ -1,10 +1,10 @@
 # Common vars shared by the 'kernel' and 'kernel-libc-headers'
 # build templates.
-_kernel_ver=2.6.34
+_kernel_ver=2.6.36
 version=${_kernel_ver}
 #_kernel_patch_ver=4
 #version=${_kernel_ver}.${_kernel_patch_ver}
 wrksrc="linux-$version"
 distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
+checksum=15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04

srcpkgs/kernel/kernel-firmware.template

@@ -1,14 +0,0 @@
-# Template file for 'kernel-firmware'.
-#
-short_desc="${pkgname} firmware binary files"
-long_desc="
- This package contains the binary firmware files required
- for some hardware, built from the Linux kernel."
-
-noarch=yes
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/lib/firmware ${DESTDIR}/lib
-}

srcpkgs/kernel/template

@@ -4,16 +4,16 @@
 # ATTENTION:
 # kernel-headers revision is set here, not on its template!
 #
-revision=2
+#revision=1
 #_kernel_headers_revision=1
 
 pkgname=kernel
 build_style=custom-install
-short_desc="The Linux kernel and associated stuff (2.6 branch)"
+short_desc="The Linux kernel and modules (2.6 branch)"
 long_desc="
  This package provides the linux kernel image and associated modules."
 
-subpackages="kernel-manpages kernel-firmware kernel-headers"
+subpackages="kernel-manpages kernel-headers"
 triggers="initramfs-tools"
 nostrip=yes
 preserve=yes
@@ -22,7 +22,7 @@ Add_dependency run glibc
 Add_dependency full coreutils
 Add_dependency full module-init-tools
 Add_dependency run initramfs-tools
-Add_dependency run kernel-firmware ">=${_kernel_ver}"
+Add_dependency run linux-firmware
 Add_dependency build perl
 Add_dependency build libxslt
 Add_dependency build docbook-xsl
@@ -120,6 +120,8 @@ do_install()
 	install -D -m644 kernel/Makefile ${hdrdest}/kernel/Makefile || return 1
 	install -D -m644 .config ${hdrdest}/.config || return 1
 	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/lib/firmware
 
 	for i in acpi asm-generic config generated linux math-emu media net \
 		pcmcia scsi sound trace video; do
@@ -152,7 +154,7 @@ do_install()
 	cp drivers/media/video/*.h \
 		${hdrdest}/drivers/media/video || return 1
 	for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 \
-		 sn9c102 usbvideo zc0301; do
+		 sn9c102 usbvideo; do
 		mkdir -p ${hdrdest}/drivers/media/video/$i
 		cp -a drivers/media/video/$i/*.h \
 			${hdrdest}/drivers/media/video/$i || return 1
@@ -194,6 +196,15 @@ do_install()
 	cp drivers/media/video/msp3400-driver.h \
 		${hdrdest}/drivers/media/dvb/frontends || return 1
 
+	# Add dvb headers in reference to: 
+	# http://bugs.archlinux.org/task/20402
+	mkdir -p ${hdrdest}/drivers/media/dvb/dvb-usb
+	cp drivers/media/dvb/dvb-usb/*.h ${hdrdest}/drivers/media/dvb/dvb-usb
+	mkdir -p ${hdrdest}/drivers/media/dvb/frontends
+	cp drivers/media/dvb/frontends/*.h ${hdrdest}/drivers/media/dvb/frontends
+	mkdir -p ${hdrdest}/drivers/media/common/tuners
+	cp drivers/media/common/tuners/*.h ${hdrdest}/drivers/media/common/tuners
+
 	# Add xfs and shmem for aufs building
 	mkdir -p ${hdrdest}/fs/xfs
 	mkdir -p ${hdrdest}/mm