Added patch from Maciej J. Woloszyk, closing bug #41668

4 files changed, 27 insertions, 5 deletions

diff --git a/sys-kernel/ppc-sources-dev/ChangeLog b/sys-kernel/ppc-sources-dev/ChangeLog
index 8fcbbdc45f01..567864040297 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.18 2004/02/15 11:12:53 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.19 2004/02/15 18:37:17 dholm Exp $
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> ppc-sources-dev-2.4.24-r1.ebuild,
+  files/ppc-sources-dev-2.4.24.pmac_pmu.patch:
+  Added patch from Maciej J. Woloszyk, closing bug #41668.
 
 *ppc-sources-dev-2.4.24-r1 (15 Feb 2004)
 
diff --git a/sys-kernel/ppc-sources-dev/Manifest b/sys-kernel/ppc-sources-dev/Manifest
index 1f07995e6496..8eff936d606b 100644
--- a/sys-kernel/ppc-sources-dev/Manifest
+++ b/sys-kernel/ppc-sources-dev/Manifest
@@ -1,4 +1,4 @@
-MD5 267a403510e146e960492b063c97bbf0 ChangeLog 3168
+MD5 4371ee1fe963afdb0f1e1d327af2c501 ChangeLog 3354
 MD5 4b1f93b2fca55d2bfdd961a517eb5611 metadata.xml 347
 MD5 2e1532c1dbff17ab96ea76d189a9b7ba ppc-sources-dev-2.4.19.ebuild 2253
 MD5 e08b80d2fa5bbcf80068d557458ffe59 ppc-sources-dev-2.4.20.ebuild 2495
@@ -6,7 +6,7 @@ MD5 d5bd00e9a574a24b019566b389e342c7 ppc-sources-dev-2.4.21.ebuild 1872
 MD5 46093868a7b9b6455e6a0917baaada76 ppc-sources-dev-2.4.22.ebuild 2064
 MD5 b147268040a040e1923b4e9ac12b4190 ppc-sources-dev-2.4.24.ebuild 1932
 MD5 53c928a80615f43ab56d3927b66ef69c ppc-sources-dev-2.4.22-r1.ebuild 2326
-MD5 ebc08d72695238fa8dbbc457cb91edeb ppc-sources-dev-2.4.24-r1.ebuild 2065
+MD5 2b2966e23e09fa7e4f3041ab064bde73 ppc-sources-dev-2.4.24-r1.ebuild 2151
 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
@@ -18,3 +18,4 @@ MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/ppc-sources-dev-2.4.22.do_brk.patch 2
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ppc-sources-dev-2.4.22.rtc_fix.patch 7073
 MD5 6c1a91839ac295ee40fa04ac57da456b files/digest-ppc-sources-dev-2.4.24 142
 MD5 f2d2c30d68a939687046482249f6565e files/digest-ppc-sources-dev-2.4.24-r1 146
+MD5 6fc2167c8361b6d596b4f3e733cb1a91 files/ppc-sources-dev-2.4.24.pmac_pmu.patch 803
diff --git a/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.24.pmac_pmu.patch b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.24.pmac_pmu.patch
new file mode 100644
index 000000000000..53a64a0b8cd8
--- /dev/null
+++ b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.24.pmac_pmu.patch
@@ -0,0 +1,16 @@
+diff -Naur linux-2.4.24.orig/arch/ppc/platforms/pmac_nvram.c linux-2.4.24/arch/ppc/platforms/pmac_nvram.c
+--- linux-2.4.24.orig/arch/ppc/platforms/pmac_nvram.c	2004-02-15 19:28:33.000000000 +0100
++++ linux-2.4.24/arch/ppc/platforms/pmac_nvram.c	2004-02-15 19:29:56.000000000 +0100
+@@ -526,10 +526,12 @@
+ 		nvram_data = ioremap(dp->addrs[1].address, dp->addrs[1].size);
+ 		ppc_md.nvram_read_val	= indirect_nvram_read_byte;
+ 		ppc_md.nvram_write_val	= indirect_nvram_write_byte;
++#ifdef CONFIG_ADB_PMU
+ 	} else if (nvram_naddrs == 0 && sys_ctrler == SYS_CTRLER_PMU) {
+ 		nvram_naddrs = -1;
+ 		ppc_md.nvram_read_val	= pmu_nvram_read_byte;
+ 		ppc_md.nvram_write_val	= pmu_nvram_write_byte;
++#endif
+ 	} else {
+ 		printk(KERN_ERR "Don't know how to access NVRAM with %d addresses\n",
+ 		       nvram_naddrs);
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild
index 91c415ac6780..f02285877901 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.24-r1.ebuild,v 1.1 2004/02/15 11:12:53 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.24-r1.ebuild,v 1.2 2004/02/15 18:37:17 dholm Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 # Included patches:
@@ -48,6 +48,8 @@ src_unpack() {
 	mv linux-${OKV} ${PF}
 	cd ${PF}
 	bzcat ${DISTDIR}/patch-${KV}.patch.bz2 | patch -p1 || die "patch failed"
+	patch -p1 < ${FILESDIR}/${P}.pmac_pmu.patch || \
+		die "Failed to apply pmac_pmu fix"
 	find . -iname "*~" | xargs rm 2> /dev/null
 
 	# Gentoo Linux uses /boot, so fix 'make install' to work properly
@@ -64,7 +66,6 @@ src_unpack() {
 	#sometimes we have icky kernel symbols; this seems to get rid of them
 	make mrproper || die "make mrproper died"
 	ARCH=${MY_ARCH}
-
 }
 
 src_install() {