From c77df872e65b717cfc6b5467eddf3a33e5bcb012 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 21 Jun 2011 09:32:58 +0200
Subject: [PATCH] kernel-snapshot: update to 3.0.0-rc4.

---
 srcpkgs/kernel-snapshot/INSTALL                    |  2 +-
 srcpkgs/kernel-snapshot/REMOVE                     |  2 +-
 srcpkgs/kernel-snapshot/files/x86_64-dotconfig     | 10 +++++-----
 .../kernel-snapshot-headers.template               |  4 +++-
 srcpkgs/kernel-snapshot/template                   | 14 ++++++++++++--
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/kernel-snapshot/INSTALL b/srcpkgs/kernel-snapshot/INSTALL
index 029e5c8477b..1b18ce2ff68 100644
--- a/srcpkgs/kernel-snapshot/INSTALL
+++ b/srcpkgs/kernel-snapshot/INSTALL
@@ -1,7 +1,7 @@
 #
 # This script builds the required initramfs.
 #
-_KVER="3.0.0-rc3"
+_KVER="3.0.0-rc4"
 
 case "${ACTION}" in
 post)
diff --git a/srcpkgs/kernel-snapshot/REMOVE b/srcpkgs/kernel-snapshot/REMOVE
index f6cba7a1437..5ac369ede05 100644
--- a/srcpkgs/kernel-snapshot/REMOVE
+++ b/srcpkgs/kernel-snapshot/REMOVE
@@ -1,7 +1,7 @@
 #
 # This script removes the initramfs.
 #
-_KVER="3.0.0-rc3"
+_KVER="3.0.0-rc4"
 
 case "${ACTION}" in
 post)
diff --git a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
index 60ec947c05a..fa74a6ecd4b 100644
--- a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
+++ b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc2 Kernel Configuration
+# Linux/x86_64 3.0.0-rc4 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -53,7 +53,6 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 
@@ -75,6 +74,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_LZMA is not set
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -1729,7 +1729,6 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
-CONFIG_BCM63XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -2068,6 +2067,7 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_CDC_PHONET=m
@@ -3603,6 +3603,7 @@ CONFIG_BACKLIGHT_CARILLO_RANCH=m
 CONFIG_BACKLIGHT_APPLE=m
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
 CONFIG_BACKLIGHT_PCF50633=m
 
 #
@@ -4304,7 +4305,6 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
 CONFIG_DIGIEPCA=m
 CONFIG_RISCOM8=m
 CONFIG_SPECIALIX=m
@@ -4995,7 +4995,7 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
diff --git a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
index 78ff851fdab..5415fa6dd52 100644
--- a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
+++ b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
@@ -14,6 +14,8 @@ noverifyrdeps=yes
 
 do_install()
 {
-	mkdir -p ${DESTDIR}
+	mkdir -p ${DESTDIR}/lib/modules/${_kernver}
 	mv ${SRCPKGDESTDIR}/usr ${DESTDIR}
+	mv ${SRCPKGDESTDIR}/lib/modules/${_kernver}/build \
+		${DESTDIR}/lib/modules/${_kernver}
 }
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 8b72189542f..a149af53f74 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -12,15 +12,25 @@ _kernel_headers_revision=${revision}
 _kernel_snapshot=yes
 _kernel_ver=3.0
 _kernel_ver_minor=0
-_kernel_patch_ver=rc3
+_kernel_patch_ver=rc4
 version=${_kernel_ver}.${_kernel_ver_minor}${_kernel_patch_ver}
 short_desc="The Linux kernel and modules"
 wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
 distfiles="${KERNEL_SITE}/kernel/v3.0/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2"
-checksum=346e008b0043b1275ce4fa67ffdeb872136c0e8a5d6ddfe9855928646756cbbd
+checksum=b3b0aa31f6a461562157aefefcb2b6651a9d0550da96996cfb1b8c87ac77c3ac
 subpackages="$pkgname-headers"
 noverifyrdeps=yes
 
+if [ -n "${_kernel_snapshot}" ]; then
+	_kernver="${_kernel_ver}.${_kernel_ver_minor}-${_kernel_patch_ver}"
+else
+	_kernver=${version}
+fi
+
+if [ -n "$revision" ]; then
+	_kernver="${_kernver}_${revision}"
+fi
+
 Add_dependency run linux-firmware
 Add_dependency run initramfs-tools
 Add_dependency build perl		">=0"