Kill bad patch and fix single proc domU builds correctly (I think)

svn path=/overlay/; revision=17

7 files changed, 36 insertions, 169 deletions

diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
index 52bc5ee..fd736a9 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -1,3 +1,7 @@
+AUX xen-sources-2.6.18-always-enable-xen-genapic.patch 401 RMD160 14a580916379bf12ff9762b474baf9a77d0f32bc SHA1 86ade2875bc6098bf3ec413c0286011979a02fc2 SHA256 0970d462a0b7a3558eb881f14f03eb224aa22c912bd56fcf9974ada0c4c0cdd5
+MD5 4c699e40a11a22fc700416b4ee4039a1 files/xen-sources-2.6.18-always-enable-xen-genapic.patch 401
+RMD160 14a580916379bf12ff9762b474baf9a77d0f32bc files/xen-sources-2.6.18-always-enable-xen-genapic.patch 401
+SHA256 0970d462a0b7a3558eb881f14f03eb224aa22c912bd56fcf9974ada0c4c0cdd5 files/xen-sources-2.6.18-always-enable-xen-genapic.patch 401
 AUX xen-sources-2.6.18-make-install.patch 2654 RMD160 b711e16e5a09a8814059b43c2d7d7d1de07ed35d SHA1 ceb0ea3eeada61859cc227c6d80017f70b667f31 SHA256 e74c725f435394d2ab08b9537ea660afae166e2091045cbc2511899621454755
 MD5 026cd6940a1c9080c78adf9019a10f08 files/xen-sources-2.6.18-make-install.patch 2654
 RMD160 b711e16e5a09a8814059b43c2d7d7d1de07ed35d files/xen-sources-2.6.18-make-install.patch 2654
@@ -10,10 +14,6 @@ AUX xen-sources-2.6.20-quirks-no-smp-fix.patch 616 RMD160 325394a4c2ce7d292d40e4
 MD5 b7c3a11aa99ac926a2a78c96c7fa32c1 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
 RMD160 325394a4c2ce7d292d40e4e9548e41c78384ad72 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
 SHA256 f4e95b79460c5ace124ef57f8af936243d8dffed71f6c00816bdeb975c959132 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
-AUX xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch 4205 RMD160 0b947228e39fdcf03269c5041616eb75949be0fb SHA1 4c074aa8287586536854e7dab9d84dd116add479 SHA256 2592c67dbbebc29737ef6cf4a0960b8650e6e9504f7c60d5ea8f39eaeb8e5f39
-MD5 c48685d948ba1ea99cdb42d99ee01f9d files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch 4205
-RMD160 0b947228e39fdcf03269c5041616eb75949be0fb files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch 4205
-SHA256 2592c67dbbebc29737ef6cf4a0960b8650e6e9504f7c60d5ea8f39eaeb8e5f39 files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch 4205
 DIST debian-security-patches-2.6.18.1-12etch2.tar.bz2 8142 RMD160 5591a611ddf07f5ceb79694d0f388507bc6d1131 SHA1 c6fc99b9c8e412659e0f0eb86fad96622cba4319 SHA256 a2a8ddc7f0c74236af8862827520853868698aa24ed300949c59001a19c73318
 DIST fedora-xen-2.6.20-2925.11.fc7.tar.bz2 520695 RMD160 fe39a1f0e758d1e951e118ba4ac33ccf69163e40 SHA1 651a3bf6bcccb0d0e62d19b07d07605a89616689 SHA256 3ea3d3f316ab6315759efa5c8a754331f7792a3159c05c521db16d7ed97f20ed
 DIST fedora-xen-patches-2.6.20-2925.13.fc7.tar.bz2 4666 RMD160 13307c9a125d413b0b7520f03d98e5ce1b1ebe56 SHA1 e3d68cfe7352bf412cfcb2b613ddc9537bd9b00b SHA256 4ab97483af69732582f07640076e9d386212b544d479949f877e5f20df0abb89
@@ -24,26 +24,26 @@ DIST linux-2.6.20.tar.bz2 43375937 RMD160 14657ade7be4363143dbd5593f5710d21eda7a
 DIST patch-2.6.18.2_to_xen-3.1.0.bz2 598933 RMD160 1c3ff9cafcc2168b6b738feee9d7ca74107b63ac SHA1 ede34a316083e8745ce7ad8fc11e63c97542bdb0 SHA256 05d97e029b8ca35794329a1c59c1d7fb84fbd7d68b6df0388bbe6d18e5bbdeda
 DIST patch-2.6.18_to_xen-3.1.0.bz2 598640 RMD160 2365a93cd056aa0829d00cff9a92a4368e3b0dba SHA1 a1ffbbb86bee0fbf2fc82a4afb27bc33aaf09ecc SHA256 ac3e4c165d4d77c7720be498133f4a5a999a7aaeb646c7b2c21c7aeedd809e83
 DIST patch-2.6.20_to_xen-3.1.0-fc7-2925.bz2 518262 RMD160 11bcbed63afe74d118772cd3b6200b7ed639dc59 SHA1 5cad1b92923667383ea6468964323801bba3b549 SHA256 abcdb5ba2dc7d1f3172434e3e244fac4b64fc7d281819b1e475da31470d4ca47
-EBUILD xen-sources-2.6.18-r1.ebuild 1034 RMD160 889752df84640a3b0e1a3e669cb71765c7108010 SHA1 16ccbe7ca88b91bf1b32dbb5f9bfc88f2c9a76fb SHA256 a0ac3c48fe2ce6ff6d2830140cb7d2a362394a976a4bd9a3ef2fb10567abd8ef
-MD5 f8a77d1449543475c5db7e8931183a0c xen-sources-2.6.18-r1.ebuild 1034
-RMD160 889752df84640a3b0e1a3e669cb71765c7108010 xen-sources-2.6.18-r1.ebuild 1034
-SHA256 a0ac3c48fe2ce6ff6d2830140cb7d2a362394a976a4bd9a3ef2fb10567abd8ef xen-sources-2.6.18-r1.ebuild 1034
-EBUILD xen-sources-2.6.18-r2.ebuild 1268 RMD160 fdac2e81ced3446e2ec40b25d6782c864b6cfbd6 SHA1 4274fbe037c43492c8936a5545ce0565d5f7d20e SHA256 04af19e6c6dc3514e1ca14bb16fb1b1a107b7fb549fb179f250e6d62c7715c64
-MD5 18eed1e3673277818e681822d58432ef xen-sources-2.6.18-r2.ebuild 1268
-RMD160 fdac2e81ced3446e2ec40b25d6782c864b6cfbd6 xen-sources-2.6.18-r2.ebuild 1268
-SHA256 04af19e6c6dc3514e1ca14bb16fb1b1a107b7fb549fb179f250e6d62c7715c64 xen-sources-2.6.18-r2.ebuild 1268
+EBUILD xen-sources-2.6.18-r1.ebuild 1086 RMD160 cab352d048236caa29c7d52cd9a720cdd71c4b84 SHA1 451700e2f6bb18b290669b955d1f0b3e6ec7ab92 SHA256 200ef1353eac35b3beab78267ff5425c6188083ce5c7a231c591bbc8d37d78f6
+MD5 b3a588a0f2527be1f27bfafd9a8f2f1e xen-sources-2.6.18-r1.ebuild 1086
+RMD160 cab352d048236caa29c7d52cd9a720cdd71c4b84 xen-sources-2.6.18-r1.ebuild 1086
+SHA256 200ef1353eac35b3beab78267ff5425c6188083ce5c7a231c591bbc8d37d78f6 xen-sources-2.6.18-r1.ebuild 1086
+EBUILD xen-sources-2.6.18-r2.ebuild 1320 RMD160 ddced427be7c396a773ee0d40b9e5436bd489a5a SHA1 e2f01c65288fe81fbed3eef103e787be3ce2bf88 SHA256 63dc38a44e61339aa5c6e9193039fc41796713f04d8764fdf944c6b0dae88c2b
+MD5 b8e28d9248e07b5c39649e1b53d6c613 xen-sources-2.6.18-r2.ebuild 1320
+RMD160 ddced427be7c396a773ee0d40b9e5436bd489a5a xen-sources-2.6.18-r2.ebuild 1320
+SHA256 63dc38a44e61339aa5c6e9193039fc41796713f04d8764fdf944c6b0dae88c2b xen-sources-2.6.18-r2.ebuild 1320
 EBUILD xen-sources-2.6.18.ebuild 967 RMD160 9c7030d41272192bffd453730fc1ea15aab6c782 SHA1 5a68f91daac27457fcfb856c02434068c1b28ae2 SHA256 55ee5773dcf3254d78677d29d09d0b8d8daea6afeb09993e6bfbf3d97716b133
 MD5 c029688996eb33695721d2edfe44dd2b xen-sources-2.6.18.ebuild 967
 RMD160 9c7030d41272192bffd453730fc1ea15aab6c782 xen-sources-2.6.18.ebuild 967
 SHA256 55ee5773dcf3254d78677d29d09d0b8d8daea6afeb09993e6bfbf3d97716b133 xen-sources-2.6.18.ebuild 967
-EBUILD xen-sources-2.6.20-r1.ebuild 1395 RMD160 df2e700f4f948458c76065f8a3322516dddf71ba SHA1 0e60c7cd44fa1dbea5a0bcafacc7c2cec05766eb SHA256 9e4b5ed572dd34679bd32f8f39e08fb9edf0bfdf57564b946fc2a644ff80c37a
-MD5 2edea904174e35ea7cf30dc7522ea43e xen-sources-2.6.20-r1.ebuild 1395
-RMD160 df2e700f4f948458c76065f8a3322516dddf71ba xen-sources-2.6.20-r1.ebuild 1395
-SHA256 9e4b5ed572dd34679bd32f8f39e08fb9edf0bfdf57564b946fc2a644ff80c37a xen-sources-2.6.20-r1.ebuild 1395
-EBUILD xen-sources-2.6.20.ebuild 1106 RMD160 815313d4a535a37fb809712d2adc316cc2acbf4a SHA1 27894c9f0511a84fde0254c7bd2b70334baf7e95 SHA256 24df969d18678dc55535dccd4a32af6e2593b73b02c91cace14cdded0194cb66
-MD5 cb334f2857e00e506a2746e9b1cd6f89 xen-sources-2.6.20.ebuild 1106
-RMD160 815313d4a535a37fb809712d2adc316cc2acbf4a xen-sources-2.6.20.ebuild 1106
-SHA256 24df969d18678dc55535dccd4a32af6e2593b73b02c91cace14cdded0194cb66 xen-sources-2.6.20.ebuild 1106
+EBUILD xen-sources-2.6.20-r1.ebuild 1399 RMD160 75d819989b832d134ca5dc3428df932a6b826a4f SHA1 95a898449b24761d77d4f92593596cd5ed49876d SHA256 7473d93d252056ec025bc02bbdd113b054e9803f1c7e1d1ccdf28f7505b188d6
+MD5 a69f57142816629d281b0007cd3b5f21 xen-sources-2.6.20-r1.ebuild 1399
+RMD160 75d819989b832d134ca5dc3428df932a6b826a4f xen-sources-2.6.20-r1.ebuild 1399
+SHA256 7473d93d252056ec025bc02bbdd113b054e9803f1c7e1d1ccdf28f7505b188d6 xen-sources-2.6.20-r1.ebuild 1399
+EBUILD xen-sources-2.6.20.ebuild 1110 RMD160 9c12ec5843b58c4d50546326252948ab1de0374a SHA1 f25ef085db1aed52122842bd155dbb67bcd3ea63 SHA256 424730013b065c0b1d00c3f65e15ca605b90fa27fd2bee69c762d5a9e54bc066
+MD5 c1cff6a7103a1c73ca5ea1218b1a1f32 xen-sources-2.6.20.ebuild 1110
+RMD160 9c12ec5843b58c4d50546326252948ab1de0374a xen-sources-2.6.20.ebuild 1110
+SHA256 424730013b065c0b1d00c3f65e15ca605b90fa27fd2bee69c762d5a9e54bc066 xen-sources-2.6.20.ebuild 1110
 MISC ChangeLog 1430 RMD160 b360303e4b1591c98cca20fce40fa85cee150376 SHA1 f5c1ebed3415d34bf2ba3b89df284fe53f724acc SHA256 888eed2b5ab014195eb4cf9c8a481a252b73c1f2cf80c9d6cb4a4d6eacb705cb
 MD5 98f34d0f7115f43b73a9ffbc80966334 ChangeLog 1430
 RMD160 b360303e4b1591c98cca20fce40fa85cee150376 ChangeLog 1430
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.18-always-enable-xen-genapic.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.18-always-enable-xen-genapic.patch
new file mode 100644
index 0000000..a9b8b77
--- /dev/null
+++ b/sys-kernel/xen-sources/files/xen-sources-2.6.18-always-enable-xen-genapic.patch
@@ -0,0 +1,12 @@
+diff -ru linux-2.6.18-xen.orig/arch/x86_64/Kconfig linux-2.6.18-xen/arch/x86_64/Kconfig
+--- linux-2.6.18-xen.orig/arch/x86_64/Kconfig	2007-08-07 17:37:58.000000000 -0700
++++ linux-2.6.18-xen/arch/x86_64/Kconfig	2007-08-07 17:39:32.000000000 -0700
+@@ -234,7 +234,7 @@
+ config X86_XEN_GENAPIC
+ 	bool
+ 	depends X86_64_XEN
+-	default XEN_PRIVILEGED_GUEST || SMP
++	default y
+ 
+ config X86_LOCAL_APIC
+ 	bool
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch
deleted file mode 100644
index 0178e92..0000000
--- a/sys-kernel/xen-sources/files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -rupN linux-2.6.20-xen.orig/arch/x86_64/kernel/genapic-xen.c linux-2.6.20-xen/arch/x86_64/kernel/genapic-xen.c
---- linux-2.6.20-xen.orig/arch/x86_64/kernel/genapic-xen.c	2007-07-24 16:12:55.000000000 -0700
-+++ linux-2.6.20-xen/arch/x86_64/kernel/genapic-xen.c	1969-12-31 16:00:00.000000000 -0800
-@@ -1,143 +0,0 @@
--/*
-- * Copyright 2004 James Cleverdon, IBM.
-- * Subject to the GNU Public License, v.2
-- *
-- * Generic APIC sub-arch probe layer.
-- *
-- * Hacked for x86-64 by James Cleverdon from i386 architecture code by
-- * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and
-- * James Cleverdon.
-- */
--#include <linux/threads.h>
--#include <linux/cpumask.h>
--#include <linux/string.h>
--#include <linux/kernel.h>
--#include <linux/ctype.h>
--#include <linux/init.h>
--#include <linux/module.h>
--
--#include <asm/smp.h>
--#include <asm/ipi.h>
--
--#if defined(CONFIG_ACPI)
--#include <acpi/acpi_bus.h>
--#endif
--
--/* which logical CPU number maps to which CPU (physical APIC ID) */
--u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };
--EXPORT_SYMBOL(x86_cpu_to_apicid);
--u8 x86_cpu_to_log_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
--
--extern struct genapic apic_cluster;
--extern struct genapic apic_flat;
--extern struct genapic apic_physflat;
--
--#ifndef CONFIG_XEN
--struct genapic *genapic = &apic_flat;
--#else
--extern struct genapic apic_xen;
--struct genapic *genapic = &apic_xen;
--#endif
--
--
--/*
-- * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
-- */
--void __init clustered_apic_check(void)
--{
--#ifndef CONFIG_XEN
--	long i;
--	u8 clusters, max_cluster;
--	u8 id;
--	u8 cluster_cnt[NUM_APIC_CLUSTERS];
--	int max_apic = 0;
--
--#if defined(CONFIG_ACPI)
--	/*
--	 * Some x86_64 machines use physical APIC mode regardless of how many
--	 * procs/clusters are present (x86_64 ES7000 is an example).
--	 */
--	if (acpi_fadt.revision > FADT2_REVISION_ID)
--		if (acpi_fadt.force_apic_physical_destination_mode) {
--			genapic = &apic_cluster;
--			goto print;
--		}
--#endif
--
--	memset(cluster_cnt, 0, sizeof(cluster_cnt));
--	for (i = 0; i < NR_CPUS; i++) {
--		id = bios_cpu_apicid[i];
--		if (id == BAD_APICID)
--			continue;
--		if (id > max_apic)
--			max_apic = id;
--		cluster_cnt[APIC_CLUSTERID(id)]++;
--	}
--
--	/* Don't use clustered mode on AMD platforms. */
-- 	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
--		genapic = &apic_physflat;
--#ifndef CONFIG_HOTPLUG_CPU
--		/* In the CPU hotplug case we cannot use broadcast mode
--		   because that opens a race when a CPU is removed.
--		   Stay at physflat mode in this case.
--		   It is bad to do this unconditionally though. Once
--		   we have ACPI platform support for CPU hotplug
--		   we should detect hotplug capablity from ACPI tables and
--		   only do this when really needed. -AK */
--		if (max_apic <= 8)
--			genapic = &apic_flat;
--#endif
-- 		goto print;
-- 	}
--
--	clusters = 0;
--	max_cluster = 0;
--
--	for (i = 0; i < NUM_APIC_CLUSTERS; i++) {
--		if (cluster_cnt[i] > 0) {
--			++clusters;
--			if (cluster_cnt[i] > max_cluster)
--				max_cluster = cluster_cnt[i];
--		}
--	}
--
--	/*
--	 * If we have clusters <= 1 and CPUs <= 8 in cluster 0, then flat mode,
--	 * else if max_cluster <= 4 and cluster_cnt[15] == 0, clustered logical
--	 * else physical mode.
--	 * (We don't use lowest priority delivery + HW APIC IRQ steering, so
--	 * can ignore the clustered logical case and go straight to physical.)
--	 */
--	if (clusters <= 1 && max_cluster <= 8 && cluster_cnt[0] == max_cluster) {
--#ifdef CONFIG_HOTPLUG_CPU
--		/* Don't use APIC shortcuts in CPU hotplug to avoid races */
--		genapic = &apic_physflat;
--#else
--		genapic = &apic_flat;
--#endif
--	} else
--		genapic = &apic_cluster;
--
--print:
--#else
--	/* hardcode to xen apic functions */
--	genapic = &apic_xen;
--#endif
--	printk(KERN_INFO "Setting APIC routing to %s\n", genapic->name);
--}
--
--/* Same for both flat and clustered. */
--
--#ifdef CONFIG_XEN
--extern void xen_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest);
--#endif
--
--void send_IPI_self(int vector)
--{
--#ifndef CONFIG_XEN
--	__send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
--#else
--	xen_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
--#endif
--}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.18-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18-r1.ebuild
index a6192f0..01029b5 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.18-r1.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.18-r1.ebuild
@@ -20,6 +20,7 @@ PATCH_URI="http://dev.gentoo.org/~marineam/files/xen/${XEN_PATCH}"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${PATCH_URI}"
 
 UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
+			${FILESDIR}/${P}-always-enable-xen-genapic.patch
 			${FILESDIR}/${P}-make-install.patch"
 
 KEYWORDS="~x86 ~amd64"
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.18-r2.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18-r2.ebuild
index 39c4666..41fd18e 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.18-r2.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.18-r2.ebuild
@@ -26,6 +26,7 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${PATCH_URI} ${SECURITY_URI}"
 
 UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
 			${DISTDIR}/${SECURITY_BUGFIXES}
+			${FILESDIR}/${P}-always-enable-xen-genapic.patch
 			${FILESDIR}/${P}-make-install.patch"
 
 KEYWORDS="~x86 ~amd64"
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild
index 76817c4..94e976a 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild
@@ -29,7 +29,7 @@ UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
 			${DISTDIR}/${XEN_BUGFIXES}
 			${FILESDIR}/${P}-console-tty-fix.patch
 			${FILESDIR}/${P}-quirks-no-smp-fix.patch
-			${FILESDIR}/${P}-remove-orphaned-genapic-xen.c.patch
+			${FILESDIR}/${PN}-2.6.18-always-enable-xen-genapic.patch
 			${FILESDIR}/${PN}-2.6.18-make-install.patch"
 
 KEYWORDS="~x86 ~amd64"
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild
index b3e8a69..ba67465 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild
@@ -20,7 +20,7 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${PATCH_URI}"
 UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
 			${FILESDIR}/${P}-console-tty-fix.patch
 			${FILESDIR}/${P}-quirks-no-smp-fix.patch
-			${FILESDIR}/${P}-remove-orphaned-genapic-xen.c.patch
+			${FILESDIR}/${PN}-2.6.18-always-enable-xen-genapic.patch
 			${FILESDIR}/${PN}-2.6.18-make-install.patch"
 
 KEYWORDS="~x86 ~amd64"