diff options
author | Guy Martin <gmsoft@gentoo.org> | 2005-12-05 19:06:25 +0000 |
---|---|---|
committer | Guy Martin <gmsoft@gentoo.org> | 2005-12-05 19:06:25 +0000 |
commit | fb5e27a4f912cd5b0084f912201a81b540a1a401 (patch) | |
tree | e013b8e2503616bf2f075ecfb61cf7123f6ca59d /sys-kernel | |
parent | 0.10 Release (diff) | |
download | historical-fb5e27a4f912cd5b0084f912201a81b540a1a401.tar.gz historical-fb5e27a4f912cd5b0084f912201a81b540a1a401.tar.bz2 historical-fb5e27a4f912cd5b0084f912201a81b540a1a401.zip |
New revision + fix for nbd kernel panic (#105414).
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/hardened-sources/Manifest | 18 | ||||
-rw-r--r-- | sys-kernel/hppa-sources/ChangeLog | 8 | ||||
-rw-r--r-- | sys-kernel/hppa-sources/Manifest | 5 | ||||
-rw-r--r-- | sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.14.3_p0 | 4 | ||||
-rw-r--r-- | sys-kernel/hppa-sources/files/nbd-no-panic.diff | 17 | ||||
-rw-r--r-- | sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild | 55 |
6 files changed, 90 insertions, 17 deletions
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest index 28be98ddbc2e..db0105e06f40 100644 --- a/sys-kernel/hardened-sources/Manifest +++ b/sys-kernel/hardened-sources/Manifest @@ -1,24 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8c59b3fdab22754a421515e62b2fb1ce ChangeLog 17335 +MD5 711705cb9b78f487e4c5554cfb707e39 ChangeLog 17579 MD5 31b0edc023e247961a1743f3661da443 files/digest-hardened-sources-2.4.30-r1 145 MD5 4c68ccd8c0fb38ead3d209ef4b0d03d6 files/digest-hardened-sources-2.4.31 145 MD5 c2bcd0a74245bc60987ce63c3d39e3bb files/digest-hardened-sources-2.4.32 145 MD5 dd9860be46684ce346eb3979cd1ce668 files/digest-hardened-sources-2.6.11-r15 230 -MD5 dfa5457f84c04a6b7800e9a7b7e60f95 files/digest-hardened-sources-2.6.14 228 +MD5 3e291ae2c9a1f5f01ab7e0121707d1f2 files/digest-hardened-sources-2.6.14-r1 228 MD5 93a4d00db58486dd65300eedce38b154 hardened-sources-2.4.30-r1.ebuild 780 MD5 441c0d8e71fbd8b34be5c5482190376a hardened-sources-2.4.31.ebuild 777 MD5 f6a0b9ae27df3b10a8a26cecfb387e29 hardened-sources-2.4.32.ebuild 932 MD5 d63b70be4c4c070ce524bf69824563db hardened-sources-2.6.11-r15.ebuild 838 -MD5 e62409432d4b8ba92ae0a5f5b3586b3a hardened-sources-2.6.14.ebuild 695 +MD5 55409206fef3c4b6a935334264cf7c44 hardened-sources-2.6.14-r1.ebuild 698 MD5 ea581939769338f7f2905ba91ed91c6f metadata.xml 979 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iQCVAwUBQ5Lyap4WFLgrx1GWAQJyCQQApPlkvsRLqfm8JUDkIrhBI6c2ExdOP39W -Zux7Zu21rHoniCI2lKM2+jmdOtboSIVcwv7YoALsqLDfhRfA0MnnStj93nGZPSHC -ANOQRawQYCxKYv5iWGXleylhlrERau8n6jGCYVTo1yHRSWdLL6wl54UO5mguPtaD -Fd025AHoA1w= -=A+pG ------END PGP SIGNATURE----- diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog index 274eb269f8ee..a643f88d5b95 100644 --- a/sys-kernel/hppa-sources/ChangeLog +++ b/sys-kernel/hppa-sources/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-kernel/hppa-sources # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.60 2005/11/18 07:06:17 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.61 2005/12/05 19:06:25 gmsoft Exp $ + +*hppa-sources-2.6.14.3_p0 (05 Dec 2005) + + 05 Dec 2005; Guy Martin <gmsoft@gentoo.org> +files/nbd-no-panic.diff, + +hppa-sources-2.6.14.3_p0.ebuild: + New revision + fix for nbd kernel panic (#105414). *hppa-sources-2.6.14.2_p0 (18 Nov 2005) diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest index 91793c3ea1bd..e48540de5c2f 100644 --- a/sys-kernel/hppa-sources/Manifest +++ b/sys-kernel/hppa-sources/Manifest @@ -1,4 +1,4 @@ -MD5 2f0af1ead3c15a2b485af32823df1ff9 ChangeLog 10804 +MD5 a9b4e1d83db0788cf4c808fef3cab484 ChangeLog 11007 MD5 dcf6adc464035c767d3183e5f7774b26 hppa-sources-2.6.10_p1.ebuild 692 MD5 f176b7d1c3f6ed8055e2d49209e0fa90 hppa-sources-2.6.10_p10.ebuild 781 MD5 b3f3f3026234e3e4e09eb594357f2883 hppa-sources-2.6.10_p11.ebuild 755 @@ -10,6 +10,7 @@ MD5 05ed5731534e9423f109cbec1aa7e993 metadata.xml 223 MD5 977a9ee8ce7aa71db60103b17b323e99 hppa-sources-2.6.13_p1.ebuild 1411 MD5 dfb6127d9409cff2c8890e6a9d58a720 hppa-sources-2.6.12.2_p2.ebuild 1242 MD5 67d537d90ccdb5149d39cf9c90d9283b hppa-sources-2.6.12.4_p2.ebuild 1339 +MD5 5cf0512c173e95178039ef3adba7808a hppa-sources-2.6.14.3_p0.ebuild 1442 MD5 a77ee0efb03702047e015e1bb3bb3b86 hppa-sources-2.6.14.2_p0.ebuild 1412 MD5 001b0a631c9fc28133013a1f8f78f74c files/CAN-2004-1056.patch 8458 MD5 cd0a7533c43364e377348613c6d76bb7 files/CAN-2004-1235.patch 9736 @@ -26,4 +27,6 @@ MD5 25fcc554ea19ef82392e5f920ec83539 files/digest-hppa-sources-2.6.13_p1 201 MD5 54105c5c37033ed1472d7a747c522e3e files/digest-hppa-sources-2.6.12.2_p2 262 MD5 fde206859ab9582a5c727d7ccea34305 files/digest-hppa-sources-2.6.12.4_p2 263 MD5 7b46dd1f32324db5bdffc2b0b822c546 files/ide-cdrom-fix.patch 480 +MD5 5045d497eb971d4951bc71b5757db05c files/digest-hppa-sources-2.6.14.3_p0 264 MD5 8a0a82472bf0759088942e4203633946 files/digest-hppa-sources-2.6.14.2_p0 263 +MD5 ff248bdc7134617427d8a239643e26d5 files/nbd-no-panic.diff 710 diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.14.3_p0 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.14.3_p0 new file mode 100644 index 000000000000..c48a9da3b816 --- /dev/null +++ b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.14.3_p0 @@ -0,0 +1,4 @@ +MD5 01261df81e15424320f3883ec09d6b0e patch-2.6.14.3.bz2 13172 +MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 +MD5 4be10c00527e9bd3532aaf97c39209de patch-2.6.14-pa0.gz 113555 +MD5 33af93f8f34ec2437fb41091176f7b14 4705_squashfs-2.1.patch.bz2 14357 diff --git a/sys-kernel/hppa-sources/files/nbd-no-panic.diff b/sys-kernel/hppa-sources/files/nbd-no-panic.diff new file mode 100644 index 000000000000..a0580a3e1aa0 --- /dev/null +++ b/sys-kernel/hppa-sources/files/nbd-no-panic.diff @@ -0,0 +1,17 @@ +diff -uNr linux-2.6.14.3-pa0.orig/arch/parisc/mm/init.c linux-2.6.14.3-pa0/arch/parisc/mm/init.c +--- linux-2.6.14.3-pa0.orig/arch/parisc/mm/init.c 2005-12-05 13:07:38.000000000 +0100 ++++ linux-2.6.14.3-pa0/arch/parisc/mm/init.c 2005-12-05 13:08:55.000000000 +0100 +@@ -300,6 +300,13 @@ + max_pfn = start_pfn + npages; + } + ++ /* IOMMU is always used to access "high mem" on those boxes ++ * that can support enough mem that a PCI device couldn't ++ * directly DMA to any physical addresses. ++ * ISA DMA support will need to revisit this. ++ */ ++ max_low_pfn = max_pfn; ++ + if ((bootmap_pfn - bootmap_start_pfn) != bootmap_pages) { + printk(KERN_WARNING "WARNING! bootmap sizing is messed up!\n"); + BUG(); diff --git a/sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild new file mode 100644 index 000000000000..917278391a7f --- /dev/null +++ b/sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild,v 1.1 2005/12/05 19:06:25 gmsoft Exp $ + +ETYPE="sources" + +CKV="${PV/_*}" +K_NOUSENAME=true +inherit kernel-2 + +KV_FULL=${CKV}-pa${PATCH_LEVEL} +detect_version + + +DESCRIPTION="Full sources for the Linux kernel with patch for hppa" +PATCH_LEVEL="${PV/${CKV}_p/}" +SRC_URI="${KERNEL_URI} +http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz +http://dev.gentoo.org/~dertobi123/hppa/4705_squashfs-2.1.patch.bz2" +UNIPATCH_LIST="${T}/patch-${OKV}-pa${PATCH_LEVEL}.patch +${FILESDIR}/nbd-no-panic.diff +${DISTDIR}/4705_squashfs-2.1.patch.bz2" +HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org" +KEYWORDS="-* hppa" + + +src_unpack() { + + if [[ -n ${KV_EXTRA} ]] + then + + KV_EXTRA=".${KV_EXTRA}" + + zcat ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz | \ + sed -e "/+EXTRAVERSION/s/=.*\$/=/" > \ + ${T}/patch-${OKV}-pa${PATCH_LEVEL}.patch + else + zcat ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz > \ + ${T}/patch-${OKV}-pa${PATCH_LEVEL}.patch + fi + + EXTRAVERSION=${KV_EXTRA}-pa${PATCH_LEVEL} + + universal_unpack + + + # We force the order of patching. kernel-2.eclass does weird stuff + unipatch ${UNIPATCH_LIST} + unipatch ${UNIPATCH_LIST_DEFAULT} + + unpack_set_extraversion + unpack_fix_docbook + unpack_fix_install_path + +} |