kernel-snapshot: update to 2.6.33, improve config for x86_64.

--HG--
extra : convert_revision : ae60d6dcd1c1299420a69768340bc032d5e8cba5

srcpkgs/kernel-snapshot/kernel-snapshot-headers.template

@@ -5,8 +5,6 @@ long_desc="
  This package contains the required source headers to be able to build
  external 3rd party binary modules."
 
-revision=1
-
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr

srcpkgs/kernel-snapshot/template

@@ -4,18 +4,21 @@
 
 # Override required vars.
 pkgname=kernel-snapshot
-revision=1
+#revision=1
 _kernel_snapshot=yes
 _kernel_ver=2.6.33
-_kernel_patch_ver=rc8
-version=${_kernel_ver}${_kernel_patch_ver}
-wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
-distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2"
-checksum=9b5feeb8cf473838d34bd66c6ce9549c654817755559b6a6050d4930cca6d0fc
+#_kernel_patch_ver=rc8
+#version=${_kernel_ver}${_kernel_patch_ver}
+#wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
+#distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2"
+version=${_kernel_ver}
+wrksrc=linux-${version}
+distfiles="${KERNEL_SITE}/kernel/v2.6/linux-${_kernel_ver}.tar.bz2"
+checksum=63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6
 subpackages="$pkgname-firmware $pkgname-headers"
 
 # Reset some stuff.
-unset build_depends run_depends
+unset _kernel_patch_ver build_depends run_depends
 
 Add_dependency run ${pkgname}-firmware	">=${version}"
 Add_dependency run initramfs-tools
@@ -25,13 +28,13 @@ Add_dependency full module-init-tools
 
 post_install()
 {
-	if [ -n "${revision}" ]; then
-		lver="${_kernel_ver}-${_kernel_patch_ver}_${revision}"
-	else
-		lver="${_kernel_ver}-${_kernel_patch_ver}"
-	fi
+	#if [ -n "${revision}" ]; then
+	#	lver="${_kernel_ver}-${_kernel_patch_ver}_${revision}"
+	#else
+	#	lver="${_kernel_ver}-${_kernel_patch_ver}"
+	#fi
 
 	mv ${DESTDIR}/lib/firmware ${DESTDIR}/firmware
 	mkdir -p ${DESTDIR}/lib/firmware
-	mv ${DESTDIR}/firmware ${DESTDIR}/lib/firmware/${lver}
+	mv ${DESTDIR}/firmware ${DESTDIR}/lib/firmware/${version}
 }

srcpkgs/kernel/template

@@ -78,7 +78,7 @@ do_install()
 	install -d ${DESTDIR}/lib ${DESTDIR}/boot
 	make INSTALL_MOD_PATH=${DESTDIR} modules_install || return 1
 
-	if [ -n "${_kernel_snapshot}" ]; then
+	if [ -n "${_kernel_snapshot}" -a -n "${_kernel_patch_ver}" ]; then
 		myver="${_kernel_ver}-${_kernel_patch_ver}"
 	else
 		myver=${version}
@@ -116,7 +116,7 @@ do_install()
 
 	for i in acpi asm-generic asm-x86 config linux math-emu media net \
 		pcmcia scsi sound trace video; do
-		cp -a include/$i ${hdrdest}/include
+		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
 	mkdir -p ${hdrdest}/arch/x86