rs-sources-2.6.20.6 ~x86

svn path=/radek-portage/; revision=18

4 files changed, 171 insertions, 11 deletions

diff --git a/sys-kernel/rs-sources/Manifest b/sys-kernel/rs-sources/Manifest
index ee8242a..919cbf8 100644
--- a/sys-kernel/rs-sources/Manifest
+++ b/sys-kernel/rs-sources/Manifest
@@ -22,10 +22,10 @@ AUX rs-sources-2.6.19_config 76862 RMD160 d38316b56c666bb2c1a17a7df3efcc56211028
 MD5 89c2c747e68aab58d7765ae71409259a files/rs-sources-2.6.19_config 76862
 RMD160 d38316b56c666bb2c1a17a7df3efcc5621102889 files/rs-sources-2.6.19_config 76862
 SHA256 f6b45072e1eb803196eee35c3fb8d427f2c803ca47a2b3cda1f7e501cc0a93d5 files/rs-sources-2.6.19_config 76862
-AUX rs-sources-2.6.20_config 78343 RMD160 02e7b36ce8945e18921643ec30e84d8782c93504 SHA1 05400ba4a78c22d06f2d7ebc581d0b435eee04d2 SHA256 04f7a59cba0dc95e0217a83c4f0f6eaa38ebc7e89f4e0bef58fe5aeb746b981a
-MD5 7483352471825f8e90a67f1b1df438a0 files/rs-sources-2.6.20_config 78343
-RMD160 02e7b36ce8945e18921643ec30e84d8782c93504 files/rs-sources-2.6.20_config 78343
-SHA256 04f7a59cba0dc95e0217a83c4f0f6eaa38ebc7e89f4e0bef58fe5aeb746b981a files/rs-sources-2.6.20_config 78343
+AUX rs-sources-2.6.20_config 78597 RMD160 27b75cbc4da3f49b22f657f7b8ae4c2828f9cfdb SHA1 60d1eaeab5ca45b38b98a683a73cfd672f5ab753 SHA256 9983fff71585359459213645b86380a333954a31f175e537e9d630e216e5dc12
+MD5 dffda89448cf4574d4ffe264e85ac7a4 files/rs-sources-2.6.20_config 78597
+RMD160 27b75cbc4da3f49b22f657f7b8ae4c2828f9cfdb files/rs-sources-2.6.20_config 78597
+SHA256 9983fff71585359459213645b86380a333954a31f175e537e9d630e216e5dc12 files/rs-sources-2.6.20_config 78597
 DIST genpatches-2.6.13-4.base.tar.bz2 38217 RMD160 b96b7f05d6d15d933aa1d6128874c399b74833e8 SHA1 bebf5fe0bcd2296da94456b322645c24a55b0eda SHA256 aa98200f8f4e22504de485d2b99891710cab42238139352be59c9725fa08fa74
 DIST genpatches-2.6.13-4.extras.tar.bz2 160140 RMD160 1c3e55882a5843b78ada4410851a47a0d6929bb0 SHA1 417efb854a11f89e1475aaab13dee75beaa14460 SHA256 98e058512268aafbe9f4a964d90f0a69337a62b89015a60d334fa3bdb30cf227
 DIST genpatches-2.6.15-8.base.tar.bz2 37662 RMD160 e6a4706e95a36f41b71e97b4ab096f4c5c9400c0 SHA1 e9425a589742da5d1af8403ee1b6a521b6dbc1ca SHA256 054ada9947009896edbc1cf0943be5a355557496ee77fd5fe3c7e4b61aaa9a7c
@@ -38,6 +38,8 @@ DIST genpatches-2.6.19-3.base.tar.bz2 15941 RMD160 44db8c27990e978fe9116a49388ed
 DIST genpatches-2.6.19-3.extras.tar.bz2 139459 RMD160 9b3dd25b781854feab0d325cc4327e7035fef60b SHA1 1210eed0c0b4ee825e449349b3c7544d9c96721b SHA256 9900288ef68f9c9f93fab4659a4eb2c50d3a3b0ee64e457d9aafee642cd7be19
 DIST genpatches-2.6.20-1.base.tar.bz2 1152 RMD160 6b9711102f469e4f0db23fb7f3b3aec6a19ce4c3 SHA1 c7d462fea76381f7dcb90b0ec452ab97c0736682 SHA256 410c6bf55696c13833ed2d7b7745b6eb127d73ae8a9573e66df7169de3261ae5
 DIST genpatches-2.6.20-1.extras.tar.bz2 141473 RMD160 d4a7c593f44011a3104b06314510a6e36b1866f6 SHA1 66b7e693ba8ffb0b4cf357ef3a087c676ccba780 SHA256 4dc6dbaa64b34b3cfc1114e2ff602a66677d9f693b0da59ac849a9c1f0abf275
+DIST genpatches-2.6.20-6.base.tar.bz2 71742 RMD160 d391512a7263b93603c16d8ac175119602e4d1a2 SHA1 521a683e3ad761d9e4e4499f9b0ca7f8bcbb2766 SHA256 64d148d972d87f5aadaa6fc3b155c6743ac6bc8c375ffaddcad17f06183b4776
+DIST genpatches-2.6.20-6.extras.tar.bz2 143454 RMD160 cc2385995956eca95b968394f71c128bc2944881 SHA1 180dcd3f60bfa01ed380726fcf37ef0d9b31837a SHA256 85045253ca5b72d20e95816c2ce29d4a6f1a3255b18ca4ea38c7bb5c20aec629
 DIST linux-2.6.13.tar.bz2 38372729 RMD160 bed1db170af007d174ca81b65be0b8acbd17b393 SHA1 62a42196f4d13452c8acbd39461e1b7faa445380 SHA256 a44e8aa8544159bb2c7e1b58d155298d202c555dc8844fa9c28e981e686b06b8
 DIST linux-2.6.15.tar.bz2 39832836 RMD160 e65904bf253b3515f8dd2a480c7e99ec7117cf60 SHA1 6cfa28ef48c385948c6859cfb9f60840720a1d30 SHA256 066ec56ce5f57c79a526b6bb3541d32dbf796c11c26c32073fc64b93f09825db
 DIST linux-2.6.17.tar.bz2 41272919 RMD160 26aad30c9a6610665c6c7d62401d79bf56a6a699 SHA1 0605c975b9dead2af31a3decf09dd4138fadaf2b SHA256 ab0f647d52f124958439517df9e1ae0efda90cdb851f59f522fa1749f1d87d58
@@ -49,9 +51,11 @@ DIST patch-2.6.15.4.bz2 18466 RMD160 d395dc600802f17ac6e6a13adde34b72319288ab SH
 DIST patch-2.6.17.11.bz2 36809 RMD160 f6835cfde1b43cd7eeeacb1009598847fca0befe SHA1 e03adc1ec5e9cc9ed81c5f7de294cc904c8eb66d SHA256 f418589458a4780b109a05f374cd06d71cb11b2589acebdb715d01546e1265c3
 DIST patch-2.6.18.3.bz2 84830 RMD160 f20ac828ffffc78b9334f86aae57c66631350ef0 SHA1 732ebbd0edaf0660cf0da992b5320ec8ec6a5513 SHA256 193e220396ab8ceb89deaac14db0d3a103b396be5ca8b967ccb68d6b173a4c2c
 DIST patch-2.6.19.1.bz2 12674 RMD160 536b09c1a0914ddc4858771daec70e472810866c SHA1 cf1d7777cee5bcc1f2e6a5c3a996dfe8162aed6b SHA256 9bb91caf1aba0e4986bff70b54e085f41b86a9d1a94fd857e7beecbcba63bd66
+DIST patch-2.6.20.6.bz2 69390 RMD160 890c545794fea21c13a0886fd2ccbca4a8cc9e0b SHA1 c31e15b59fb9dd16292e15278bb992aaee98053b SHA256 808ca62a66d7cfe40123301c2f51fc0dcd817ee3bb0df96d1e9e97cc3bad6a9c
 DIST rspatches-2.6.18-1.tar.bz2 169522 RMD160 d36e64237adfb36fd2763a3cf5e74a685432f3f7 SHA1 d98d78540e6b71daf03fa63c1222992c1f078154 SHA256 427a76074a55de748d7a3194ce2784db056d20915cf0ee81eaf09f4f0fb179ab
 DIST rspatches-2.6.19-1.tar.bz2 170197 RMD160 8d1b82d2d990a141115cfff7f7d46f88067f04ef SHA1 fd8bc0444d03b6e100ebf17e60f3bb3fc5efd2f7 SHA256 43dc569772838158f4980ac1a3d635dd64ec93269a95b8bcad19c34b691a8f9f
 DIST rspatches-2.6.20-1.tar.bz2 638244 RMD160 6d70a1acf68692481af498c90856dfa5362c2afa SHA1 d5d8cf99234240190004d6f95af772c866af7690 SHA256 89fdd460fd7191efd4136d429e36a19df75085281a6362f26db19358b1e793c4
+DIST rspatches-2.6.20-2.tar.bz2 638294 RMD160 16ead301f3f5bc018efd95e50fb26c1c38ad4467 SHA1 6ac4a7e66c93b1dfeb042d7e73490f783d2f11ef SHA256 3b3b7f3bdb66bf3f5a49c3adafe216992c81d2764d370eb9fce43b7c5a87c416
 EBUILD rs-sources-2.6.13.2.ebuild 3224 RMD160 de64a8661366017b81febc15d09d114486b5db0b SHA1 0722a4b2e7e93583325cbbbe0d73743d72377c84 SHA256 d5670b0ca929a0755c7501afb9f2a39f0b6735b8d65124df765b192d62118412
 MD5 8c801823fc308052300100160a146a29 rs-sources-2.6.13.2.ebuild 3224
 RMD160 de64a8661366017b81febc15d09d114486b5db0b rs-sources-2.6.13.2.ebuild 3224
@@ -72,6 +76,10 @@ EBUILD rs-sources-2.6.19.1.ebuild 3349 RMD160 06e6c19801ea014f220b8a95ac8d4530ed
 MD5 e25440f1668f061af8b1647a151f73f1 rs-sources-2.6.19.1.ebuild 3349
 RMD160 06e6c19801ea014f220b8a95ac8d4530edf2ba3b rs-sources-2.6.19.1.ebuild 3349
 SHA256 fcfdc4d601eb990bc9e631e374d819f65d51e8ec76372f727cee9856ad5437d8 rs-sources-2.6.19.1.ebuild 3349
+EBUILD rs-sources-2.6.20.6.ebuild 3176 RMD160 d0f32b70e4c524efb6f453d9630bdb10893dac8f SHA1 bb53ebffbdc92442b2fc06a2e3f2f871fcd3520c SHA256 3ed59cdc0284666b602f357eddf487f77708bd268105bb392f7be7d77225c1aa
+MD5 a87db9f3af5f987b70f118963997b686 rs-sources-2.6.20.6.ebuild 3176
+RMD160 d0f32b70e4c524efb6f453d9630bdb10893dac8f rs-sources-2.6.20.6.ebuild 3176
+SHA256 3ed59cdc0284666b602f357eddf487f77708bd268105bb392f7be7d77225c1aa rs-sources-2.6.20.6.ebuild 3176
 EBUILD rs-sources-2.6.20.ebuild 3346 RMD160 ccedbdde20c2c2ea93432804dc3f36c4d9c3a0b9 SHA1 8838923c43cf88568efd8406a691872831371497 SHA256 48275cd8b328c1afb8d79adb9dc66cd84d006252865e99efa486be02c927d8e8
 MD5 0f484455f866e4cf08e681c5af050a8c rs-sources-2.6.20.ebuild 3346
 RMD160 ccedbdde20c2c2ea93432804dc3f36c4d9c3a0b9 rs-sources-2.6.20.ebuild 3346
@@ -102,3 +110,6 @@ SHA256 6e42aa720bc61b71f175b5a80e31a484fb0cde05cecc467229e6ebf4572ef972 files/di
 MD5 66b738375782726b5fd4a20eba386b17 files/digest-rs-sources-2.6.20 1060
 RMD160 6fb086531a899d5623cd2ff2545dac6b0470e1d5 files/digest-rs-sources-2.6.20 1060
 SHA256 872542112a074f77fe59e69b259e157d4d676621fb478373742dbd7d158eb3b7 files/digest-rs-sources-2.6.20 1060
+MD5 52b17868dfdb6672860822688335a2f6 files/digest-rs-sources-2.6.20.6 1295
+RMD160 41bf84ae6586e1fb601a65ffab4333562f10d00b files/digest-rs-sources-2.6.20.6 1295
+SHA256 92c03cadbe3a0741837f4279f5c91928567917e4f03a6eb5f44094c6bb9739df files/digest-rs-sources-2.6.20.6 1295
diff --git a/sys-kernel/rs-sources/files/digest-rs-sources-2.6.20.6 b/sys-kernel/rs-sources/files/digest-rs-sources-2.6.20.6
new file mode 100644
index 0000000..38a4aa9
--- /dev/null
+++ b/sys-kernel/rs-sources/files/digest-rs-sources-2.6.20.6
@@ -0,0 +1,15 @@
+MD5 870be1360a3eaebb75827500c4ba8bfa genpatches-2.6.20-6.base.tar.bz2 71742
+RMD160 d391512a7263b93603c16d8ac175119602e4d1a2 genpatches-2.6.20-6.base.tar.bz2 71742
+SHA256 64d148d972d87f5aadaa6fc3b155c6743ac6bc8c375ffaddcad17f06183b4776 genpatches-2.6.20-6.base.tar.bz2 71742
+MD5 d151502989cf8060387125795e50f433 genpatches-2.6.20-6.extras.tar.bz2 143454
+RMD160 cc2385995956eca95b968394f71c128bc2944881 genpatches-2.6.20-6.extras.tar.bz2 143454
+SHA256 85045253ca5b72d20e95816c2ce29d4a6f1a3255b18ca4ea38c7bb5c20aec629 genpatches-2.6.20-6.extras.tar.bz2 143454
+MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
+RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
+SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
+MD5 a42300de8720552d70470dd3e4afc75f patch-2.6.20.6.bz2 69390
+RMD160 890c545794fea21c13a0886fd2ccbca4a8cc9e0b patch-2.6.20.6.bz2 69390
+SHA256 808ca62a66d7cfe40123301c2f51fc0dcd817ee3bb0df96d1e9e97cc3bad6a9c patch-2.6.20.6.bz2 69390
+MD5 a9e7a607347e348cc706c6c1688db8d2 rspatches-2.6.20-2.tar.bz2 638294
+RMD160 16ead301f3f5bc018efd95e50fb26c1c38ad4467 rspatches-2.6.20-2.tar.bz2 638294
+SHA256 3b3b7f3bdb66bf3f5a49c3adafe216992c81d2764d370eb9fce43b7c5a87c416 rspatches-2.6.20-2.tar.bz2 638294
diff --git a/sys-kernel/rs-sources/files/rs-sources-2.6.20_config b/sys-kernel/rs-sources/files/rs-sources-2.6.20_config
index 0418dc4..efabcdb 100644
--- a/sys-kernel/rs-sources/files/rs-sources-2.6.20_config
+++ b/sys-kernel/rs-sources/files/rs-sources-2.6.20_config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rs
-# Sat Feb 10 19:56:04 2007
+# Linux kernel version: 2.6.20.6-rs
+# Sun Apr  8 01:12:20 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -187,10 +187,11 @@ CONFIG_EDD=y
 CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
-CONFIG_NOHIGHMEM=y
-# CONFIG_HIGHMEM4G is not set
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -204,6 +205,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
+# CONFIG_HIGHPTE is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_EFI=y
@@ -216,10 +218,12 @@ CONFIG_HZ_300=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=300
 CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_HOTPLUG_CPU=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
 # Power management options (ACPI, APM)
@@ -1550,6 +1554,11 @@ CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
 
 #
+# Macintosh device drivers
+#
+CONFIG_MAC_EMUMOUSEBTN=y
+
+#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -2238,8 +2247,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_FOURPORT=m
@@ -3754,13 +3763,15 @@ CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FRAME_POINTER is not set
-CONFIG_FORCED_INLINING=y
+# CONFIG_FORCED_INLINING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/sys-kernel/rs-sources/rs-sources-2.6.20.6.ebuild b/sys-kernel/rs-sources/rs-sources-2.6.20.6.ebuild
new file mode 100644
index 0000000..d1aee5e
--- /dev/null
+++ b/sys-kernel/rs-sources/rs-sources-2.6.20.6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2005-2006 Radoslaw Stachowiak <radek@alter.pl>
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+ETYPE="sources"
+inherit eutils kernel-2
+detect_version
+detect_arch
+
+PROVIDE="virtual/alsa
+		 virtual/linux-sources"
+
+IUSE="rspentium2 rskerni"
+
+# hack to change versions
+MY_PR=${PR/r0/r}
+MY_PR=${MY_PR/r/}
+
+# MODIFYHERE: extraversion is used in kernel Makefile (results in uname -r)
+# set to empty on full releases and .digit (e.g. ".6") on sub releases
+KV_EXTRA=".6"
+# /modifyhere
+
+EXTRAVERSION=${KV_EXTRA}-rs${MY_PR}
+
+# okv is simply orginal kernel version
+OKV=$KV_MAJOR.$KV_MINOR.$KV_PATCH
+# kv_full is used as dir name
+KV_FULL=${OKV}${EXTRAVERSION}
+
+S=${WORKDIR}/linux-${KV_FULL}
+
+# MODIFYHERE: version of gentoo patchset
+GPV="20-6"
+# /modifyhere
+GPV_URL="http://dev.gentoo.org/~dsd/gentoo-sources/tarballs/"
+GPV_SRC="${GPV_URL}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2
+	     ${GPV_URL}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.extras.tar.bz2"
+
+# MODIFYHERE: Version of my patchset
+RSV="20-2"
+# /modifyhere
+RSV_URL="http://dev.gentoo.org/~radek/kernel"
+RSV_SRC="${RSV_URL}/rspatches-${KV_MAJOR}.${KV_MINOR}.${RSV}.tar.bz2"
+
+# MODIFYHERE: set correct arch
+KEYWORDS="~x86"
+# /modifyhere
+
+UNIPATCH_LIST="${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2
+	       ${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.extras.tar.bz2
+		   ${DISTDIR}/rspatches-${KV_MAJOR}.${KV_MINOR}.${RSV}.tar.bz2"
+
+UNIPATCH_DOCS="${WORKDIR}/patches/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}/0000_README"
+
+DESCRIPTION="RS kernel sources including the gentoo patchset v$GPV"
+SRC_URI="${KERNEL_URI} ${GPV_SRC} ${RSV_SRC} ${ARCH_URI}"
+
+src_unpack() {
+
+	if [[ -n "$UNIPATCH_LIST_DEFAULT" ]]
+	then
+		# this is needed for KV_EXTRA != releases
+		ewarn " Skipping patch: $UNIPATCH_LIST_DEFAULT"
+		UNIPATCH_LIST_DEFAULT=""
+	fi
+	kernel-2_src_unpack
+}
+
+# this patching is done in compile stage to avoid lengthy unpack reruns on
+# potential errors during patching phase
+#
+src_compile() {
+	
+	cp ${FILESDIR}/${PN}-${OKV}_config ${S}/.config || die "can initialize .config"
+
+	if use rspentium2
+	then
+		epatch ${FILESDIR}/${PN}-2.6.12_config_pentium2.patch
+	fi
+
+	# prepare oldconfig
+	K_DEFCONFIG=oldconfig
+	compile_headers
+
+	# need to save it to survive upgrade (merge -> unmerge)
+	cp ${S}/.config ${S}/.config.rs
+}
+
+pkg_postinst() {
+	postinst_sources
+
+	# rskerni useflags means build kernel and install
+	if use rskerni 
+	then
+		einfo
+		einfo "building kernel $KV_FULL (please wait..)"
+		einfo
+		cd /usr/src/linux-$KV_FULL || return
+
+		# this cp is needed because at replace (merge/unmerge) its being deleted
+		cp .config.rs .config
+
+		# this is stupid patch for gentoo-sources mistake
+		# sed -i -e "s:KERN_ERROR:KERN_ERR:" drivers/pcmcia/yenta_socket.c
+
+		unset ARCH
+		make || return
+		make modules_install || return
+		cp System.map /boot/System.map-${KV_FULL}
+		cp arch/i386/boot/bzImage /boot/vmlinuz-${KV_FULL}
+		cp .config /boot/config-${KV_FULL}
+	fi
+	einfo
+	einfo "Kernel installed, to update modules:"
+	einfo 'Please do: emerge -av $(equery b /lib/modules | sed -e "s:^:>=:")'
+	einfo
+}
+
+pkg_config() {
+	einfo "Not used currently."
+}
+