diff options
| author |   David Holm <dholm@gentoo.org> | 2003-10-26 12:44:53 +0000 |
|---|---|---|
| committer | David Holm <dholm@gentoo.org> | 2003-10-26 12:44:53 +0000 |
| commit | 1d1386c599e354cee27373f8570cb867d7c6f050 (patch) | |
| tree | ac6ac3085528aaa38bca743eacceffae44c1d900 /sys-kernel | |
| parent | First version in portage (diff) | |
| download | gentoo-2-1d1386c599e354cee27373f8570cb867d7c6f050.tar.gz gentoo-2-1d1386c599e354cee27373f8570cb867d7c6f050.tar.bz2 gentoo-2-1d1386c599e354cee27373f8570cb867d7c6f050.zip | |
Commited fix for bug #30092
Diffstat (limited to 'sys-kernel')
4 files changed, 42 insertions, 7 deletions
diff --git a/sys-kernel/ppc-sources-dev/ChangeLog b/sys-kernel/ppc-sources-dev/ChangeLog index fd51d718c3b5..01c35c1be83f 100644 --- a/sys-kernel/ppc-sources-dev/ChangeLog +++ b/sys-kernel/ppc-sources-dev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/ppc-sources-dev # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.12 2003/09/16 19:28:38 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.13 2003/10/26 12:44:38 dholm Exp $ + + 26 Oct 2003; David Holm <dholm@gentoo.org> ppc-sources-dev-2.4.22.ebuild, + files/ppc-sources-dev-2.4.22-r1.via-pmu.diff: + Added a patch to fix bug #30092. 16 Sep 2003; David Holm <dholm@gentoo.org> ppc-sources-dev-2.4.19.ebuild, ppc-sources-dev-2.4.20.ebuild: diff --git a/sys-kernel/ppc-sources-dev/Manifest b/sys-kernel/ppc-sources-dev/Manifest index e123bfbe411b..93151ee13ccf 100644 --- a/sys-kernel/ppc-sources-dev/Manifest +++ b/sys-kernel/ppc-sources-dev/Manifest @@ -1,10 +1,11 @@ -MD5 651c47130cbdcb499506bcae6f057c28 ChangeLog 1766 +MD5 b79808e8b7d16bb750257cd8ac6cb323 ChangeLog 1926 MD5 4b1f93b2fca55d2bfdd961a517eb5611 metadata.xml 347 MD5 e2f59a030362de30b2a6d52526510e97 ppc-sources-dev-2.4.19.ebuild 2249 MD5 5520a14adf9f0f89ff26e42db18c7ab6 ppc-sources-dev-2.4.20.ebuild 2491 MD5 4dedb221be5ebb37aa9d9f8557e0e379 ppc-sources-dev-2.4.21.ebuild 1719 -MD5 608bf7db848d6fbd20557fe3d71b1dd9 ppc-sources-dev-2.4.22.ebuild 1689 +MD5 b1466f18e8e8395947dd76796919f7ea ppc-sources-dev-2.4.22.ebuild 1911 MD5 660f16218c08735d9c1e9e0e5b292a23 files/digest-ppc-sources-dev-2.4.19 68 MD5 c45b2bb6026a8726c5932c0778879a21 files/digest-ppc-sources-dev-2.4.20 70 MD5 91cdf75820acd5ac4942bab12e5ceb5a files/digest-ppc-sources-dev-2.4.21 143 MD5 5b30d68e4f8019c1433bcb2a2f70adec files/digest-ppc-sources-dev-2.4.22 143 +MD5 990ae6b085cb09866bfbb7d44076b8ce files/ppc-sources-dev-2.4.22-r1.via-pmu.diff 907 diff --git a/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22-r1.via-pmu.diff b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22-r1.via-pmu.diff new file mode 100644 index 000000000000..7c760eab2ac3 --- /dev/null +++ b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22-r1.via-pmu.diff @@ -0,0 +1,23 @@ +diff -Naur linux-2.4.22.orig/drivers/macintosh/via-pmu.c linux-2.4.22/drivers/macintosh/via-pmu.c +--- linux-2.4.22.orig/drivers/macintosh/via-pmu.c 2003-10-26 13:11:39.000000000 +0100 ++++ linux-2.4.22/drivers/macintosh/via-pmu.c 2003-10-26 13:11:24.000000000 +0100 +@@ -477,7 +477,9 @@ + /* Create /proc/pmu */ + proc_pmu_root = proc_mkdir("pmu", 0); + if (proc_pmu_root) { ++#ifdef CONFIG_PMAC_PBOOK + int i; ++#endif + proc_pmu_info = create_proc_read_entry("info", 0, proc_pmu_root, + proc_get_info, NULL); + proc_pmu_irqstats = create_proc_read_entry("interrupts", 0, proc_pmu_root, +@@ -1373,8 +1375,8 @@ + #endif /* CONFIG_PMAC_BACKLIGHT */ + } + /* Tick interrupt */ +- else if ((1 << pirq) & PMU_INT_TICK) { + #ifdef CONFIG_PMAC_PBOOK ++ else if ((1 << pirq) & PMU_INT_TICK) { + /* Environement or tick interrupt, query batteries */ + if (pmu_battery_count) { + if ((--query_batt_timer) == 0) { diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild index 619532dd9219..7ea052faa8a2 100644 --- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild +++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild,v 1.1 2003/09/16 16:09:45 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild,v 1.2 2003/10/26 12:44:38 dholm Exp $ #OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -39,14 +39,18 @@ LICENSE="GPL-2" SLOT="${KV}" KEYWORDS="~ppc -x86 -sparc -mips -hppa -alpha -arm" IUSE="build crypt" +DEPEND=">=sys-devel/binutils-2.11.90.0.31" +RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make" -src_unpack() { +src_unpack() +{ unpack ${A} mv linux-${OKV} linux-${KV} || die "Unable to move kernel source tree to linux-${KV}" cd ${WORKDIR}/${KV} - # This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari} + # This is the crypt USE flag + # keeps {USAGI/superfreeswan/patch-int/loop-jari} if [ -z "`use crypt`" ]; then einfo "No Cryptographic support, dropping patches..." for file in 6* ;do @@ -58,9 +62,12 @@ src_unpack() { fi kernel_src_unpack + (cd ${S} && epatch ${FILESDIR}/ppc-sources-dev-2.4.22-r1.via-pmu.diff) || \ + die "patch failed" } -pkg_postinst() { +pkg_postinst() +{ kernel_pkg_postinst ewarn "Bootsplash currently does not work on Macs." |