diff options
author | Michael Marineau <marineam@gentoo.org> | 2007-07-10 21:26:21 +0000 |
---|---|---|
committer | Michael Marineau <marineam@gentoo.org> | 2007-07-10 21:26:21 +0000 |
commit | 23a0208875ca127e21929ad7451e870c7d5e3915 (patch) | |
tree | 3400138084b6a509c7568e2527116b1a59edb966 /app-emulation | |
parent | Set xen-3.0.2 to depend on xen-sources-2.6.16.28 (diff) | |
download | xen-23a0208875ca127e21929ad7451e870c7d5e3915.tar.gz xen-23a0208875ca127e21929ad7451e870c7d5e3915.tar.bz2 xen-23a0208875ca127e21929ad7451e870c7d5e3915.zip |
Initial commit of xen 3.1.0, includes some tweeks from bug #179412 and rbu's overlay
svn path=/xen/; revision=31
Diffstat (limited to 'app-emulation')
18 files changed, 91 insertions, 624 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index ee03bbc..cbe6243 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -2,30 +2,6 @@ AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SH MD5 9df68ac65dc3f372f5d61183abdc83ff files/xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 files/xen-consoles.logrotate 63 SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 files/xen-consoles.logrotate 63 -AUX xen-tools-3.0.2--as-needed.patch 283 RMD160 852e850b72b9860420f5f2132c2e071474bc87ba SHA1 cb33bd39091a7ddca2a97a3e80d673adcec77895 SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919 -MD5 7c8f508f547c0e1f78b185fd9f980b1b files/xen-tools-3.0.2--as-needed.patch 283 -RMD160 852e850b72b9860420f5f2132c2e071474bc87ba files/xen-tools-3.0.2--as-needed.patch 283 -SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919 files/xen-tools-3.0.2--as-needed.patch 283 -AUX xen-tools-3.0.2-bxclobber.patch 734 RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 SHA1 438b38917239aa4e40d65b2378ca44f2c2aaca5f SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191 -MD5 fc279066e82ced30850c046be2642ee1 files/xen-tools-3.0.2-bxclobber.patch 734 -RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 files/xen-tools-3.0.2-bxclobber.patch 734 -SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191 files/xen-tools-3.0.2-bxclobber.patch 734 -AUX xen-tools-3.0.2-pushpop.patch 796 RMD160 d15cb8ed948f4706912da53d9406852103438895 SHA1 1fc228381bfcbfa5c0203cd37352d912e66f7b37 SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96 -MD5 d77478e538be4f38ca70f3b3ead939f4 files/xen-tools-3.0.2-pushpop.patch 796 -RMD160 d15cb8ed948f4706912da53d9406852103438895 files/xen-tools-3.0.2-pushpop.patch 796 -SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96 files/xen-tools-3.0.2-pushpop.patch 796 -AUX xen-tools-3.0.2-test-uuid.patch 777 RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 SHA1 2c60427e1dcc7995a25e38295297a2c7ae620893 SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c -MD5 3b1e6f226e33f6d583cd1a6b6760c9f4 files/xen-tools-3.0.2-test-uuid.patch 777 -RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 files/xen-tools-3.0.2-test-uuid.patch 777 -SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c files/xen-tools-3.0.2-test-uuid.patch 777 -AUX xen-tools-3.0.2-test-xauthority.patch 2362 RMD160 4974965318e02b151c0ba2cb516b4f246388e465 SHA1 45ad2861132d7dda81788cc2854cf8be33afb7d6 SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452 -MD5 0f94816ea4743531f5919592ce077c00 files/xen-tools-3.0.2-test-xauthority.patch 2362 -RMD160 4974965318e02b151c0ba2cb516b4f246388e465 files/xen-tools-3.0.2-test-xauthority.patch 2362 -SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452 files/xen-tools-3.0.2-test-xauthority.patch 2362 -AUX xen-tools-3.0.2-xc_ptrace.patch 661 RMD160 926f246fcc65c707bf4bb822749e81cd844a0966 SHA1 5e059cbf266944cc9fb5eb62ea9cbbdd967a5a23 SHA256 62aabe6052ae89aec55d79582df16a3302e6aedbea86dc5ad44c657ad2f7a4b8 -MD5 7f74bc1ef57300624b22bd6409106e99 files/xen-tools-3.0.2-xc_ptrace.patch 661 -RMD160 926f246fcc65c707bf4bb822749e81cd844a0966 files/xen-tools-3.0.2-xc_ptrace.patch 661 -SHA256 62aabe6052ae89aec55d79582df16a3302e6aedbea86dc5ad44c657ad2f7a4b8 files/xen-tools-3.0.2-xc_ptrace.patch 661 AUX xen-tools-3.0.4_p1--as-needed.patch 517 RMD160 579721dff853f9762c649f17af86ef920b5e98eb SHA1 2cbf34f6daa27ff09a2d0e23396c775f0d2eb3e0 SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a MD5 79a4dfd90d23e1a01a334c3c2ee29bb2 files/xen-tools-3.0.4_p1--as-needed.patch 517 RMD160 579721dff853f9762c649f17af86ef920b5e98eb files/xen-tools-3.0.4_p1--as-needed.patch 517 @@ -34,14 +10,10 @@ AUX xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb MD5 2812525317e8827f626962738e4643d4 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 -AUX xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch 592 RMD160 a7b29d6563c2124d218658d56083c2847a9a287a SHA1 a92ed78cfc1dd04f7342a58e725f5279af84a14d SHA256 de0a6bcc6461f49c7ee32b843fcf4deee157c980db5b164aeb7b8859e3614389 -MD5 8cefd2566392cb8a27190b54dfaa0620 files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch 592 -RMD160 a7b29d6563c2124d218658d56083c2847a9a287a files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch 592 -SHA256 de0a6bcc6461f49c7ee32b843fcf4deee157c980db5b164aeb7b8859e3614389 files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch 592 -AUX xen-tools-3.0.4_p1-vnclisten.patch 519 RMD160 96a88fcd593bbc4461d87fb50b3ecaf06bab8729 SHA1 95e37aa7d92fcd87616a39be032bc91c18077881 SHA256 4f368dada2c7c5538ac6c2a2e23693828dea18a4b27e54c3d4a65e5603812dcb -MD5 423ad930eef2e40ee30b6f648f0340f2 files/xen-tools-3.0.4_p1-vnclisten.patch 519 -RMD160 96a88fcd593bbc4461d87fb50b3ecaf06bab8729 files/xen-tools-3.0.4_p1-vnclisten.patch 519 -SHA256 4f368dada2c7c5538ac6c2a2e23693828dea18a4b27e54c3d4a65e5603812dcb files/xen-tools-3.0.4_p1-vnclisten.patch 519 +AUX xen-tools-3.1.0-python-site-packages.patch 1205 RMD160 319e95a53b9860358849fef1eea6454a088f3b33 SHA1 8b850508f6caf189d04d5f2938599b5f2efacce4 SHA256 ff26da54fad7ac66b17774963220f265950d28ad167808bf41f9084425eb07d6 +MD5 e95f0b1dfd034e510237b90e9601c095 files/xen-tools-3.1.0-python-site-packages.patch 1205 +RMD160 319e95a53b9860358849fef1eea6454a088f3b33 files/xen-tools-3.1.0-python-site-packages.patch 1205 +SHA256 ff26da54fad7ac66b17774963220f265950d28ad167808bf41f9084425eb07d6 files/xen-tools-3.1.0-python-site-packages.patch 1205 AUX xend.initd 1187 RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 SHA1 f16d2d5e014c91b6bc0ff63da717e79b4faada1d SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd MD5 e62f964336e77b320dcff0321d6166cf files/xend.initd 1187 RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 files/xend.initd 1187 @@ -58,19 +30,11 @@ AUX xendomains.initd 2168 RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 SHA1 a MD5 a3b477fa44710894c47b0aeca7d6a57a files/xendomains.initd 2168 RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 files/xendomains.initd 2168 SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0 files/xendomains.initd 2168 -DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 -DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb -EBUILD xen-tools-3.0.2-r4.ebuild 5849 RMD160 8e19634534edbc9e091582e6448115a543b8c7e6 SHA1 352b36045865b58a088d48a50bfaa65902fd2176 SHA256 95d6a5bee0439d711e900471e164961d7664a0a8d382317625d217735245b39b -MD5 d25b10dae46ccc264d4f9cb58bafbcb0 xen-tools-3.0.2-r4.ebuild 5849 -RMD160 8e19634534edbc9e091582e6448115a543b8c7e6 xen-tools-3.0.2-r4.ebuild 5849 -SHA256 95d6a5bee0439d711e900471e164961d7664a0a8d382317625d217735245b39b xen-tools-3.0.2-r4.ebuild 5849 -EBUILD xen-tools-3.0.4_p1.ebuild 5578 RMD160 3e43d07e7326cf73933859ef5ce512b5f4c59ef6 SHA1 ed0d184406f908d157c9435cd3c09163ae126efd SHA256 9ab55a91a4df37591adfc68a4fe275b9fdc3bc2fffd431448a0432974bdfa258 -MD5 7e8dd8e637cd190607a3cfd6494e462a xen-tools-3.0.4_p1.ebuild 5578 -RMD160 3e43d07e7326cf73933859ef5ce512b5f4c59ef6 xen-tools-3.0.4_p1.ebuild 5578 -SHA256 9ab55a91a4df37591adfc68a4fe275b9fdc3bc2fffd431448a0432974bdfa258 xen-tools-3.0.4_p1.ebuild 5578 -MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r4 235 -RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r4 235 -SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r4 235 -MD5 de126addfd4101f35f8880ab0817ab03 files/digest-xen-tools-3.0.4_p1 241 -RMD160 b65ff6928079bc0ee81b68ab27f3f4c9e1d36856 files/digest-xen-tools-3.0.4_p1 241 -SHA256 66cfb008cc25de8a507359e492d6896908bc619901d901ae018fb135d2d91345 files/digest-xen-tools-3.0.4_p1 241 +DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7 +EBUILD xen-tools-3.1.0.ebuild 5753 RMD160 a0a474e6d06dd5fd05f54762c8c2ea82172f6ed7 SHA1 c97f16f51a1acb503dfa009b80190593cbc58331 SHA256 866ef333c12a8c5ab593d489f7d358b4a10125bc4567125c0fd3a3022b3647fa +MD5 59346209a9fcc7ed46b43550322dfd7b xen-tools-3.1.0.ebuild 5753 +RMD160 a0a474e6d06dd5fd05f54762c8c2ea82172f6ed7 xen-tools-3.1.0.ebuild 5753 +SHA256 866ef333c12a8c5ab593d489f7d358b4a10125bc4567125c0fd3a3022b3647fa xen-tools-3.1.0.ebuild 5753 +MD5 b2e86effae6681cbbecdbf864b193b4a files/digest-xen-tools-3.1.0 235 +RMD160 2366b7298f0125f11d41aca0c6088c20863dbed1 files/digest-xen-tools-3.1.0 235 +SHA256 12c130912c624791e6855ebeb932368fc8889371876db396055b02ac9a3b9892 files/digest-xen-tools-3.1.0 235 diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4 deleted file mode 100644 index 724d092..0000000 --- a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 544eab940a0734a55459d648e5c3b224 xen-3.0.2-src.tgz 4933621 -RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af xen-3.0.2-src.tgz 4933621 -SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 xen-3.0.2-src.tgz 4933621 diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.1.0 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.0 new file mode 100644 index 0000000..e436de9 --- /dev/null +++ b/app-emulation/xen-tools/files/digest-xen-tools-3.1.0 @@ -0,0 +1,3 @@ +MD5 b7ae1f652b071862ae4c90b72d549627 xen-3.1.0-src.tgz 6831094 +RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 xen-3.1.0-src.tgz 6831094 +SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7 xen-3.1.0-src.tgz 6831094 diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch deleted file mode 100644 index 362e495..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xen-3.0.2/tools/xenmon/Makefile 2006-06-01 13:40:40.468687762 +0100 -+++ xen-3.0.2/tools/xenmon/Makefile 2006-06-01 13:41:04.000000000 +0100 -@@ -43,6 +43,6 @@ - - - %: %.c Makefile -- $(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $< -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl - - diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch deleted file mode 100644 index 8f0b561..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# User vhanquez@kneesa.uk.xensource.com -# Date Mon Apr 10 14:51:10 2006 +0000 -# Node ID bdec77028194e6f51872b66b0575ed86ad542333 -# parent: 07af1b34d4c49ac52faaff6cb315231655212316 -fix bug #609 - error: PIC register `bx' clobbered in `asm' - -Signed-off-by: Vincent Hanquez <vincent@xensource.com> - - ---- a/tools/ioemu/hw/vga.c Mon Apr 10 14:47:51 2006 +0100 -+++ b/tools/ioemu/hw/vga.c Mon Apr 10 14:51:10 2006 +0000 -@@ -1369,10 +1369,10 @@ static inline unsigned int cpuid_edx(uns - { - unsigned int eax, edx; - -- __asm__("cpuid" -+ __asm__("pushl %%ebx; cpuid; popl %%ebx" - : "=a" (eax), "=d" (edx) - : "0" (op) -- : "bx", "cx"); -+ : "cx"); - - return edx; - } - diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch deleted file mode 100644 index 807e007..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch +++ /dev/null @@ -1,32 +0,0 @@ -# HG changeset patch -# User kaf24@firebug.cl.cam.ac.uk -# Date Mon Apr 10 17:25:42 2006 +0100 -# Node ID c89d62e7015a25a48225daa929616a5ed44205b4 -# parent: 4088dd0856a9cbc7ef050d7272e81666b7dfbcc7 -Fix push/pop usage in tools/ioemu for x86/64. - -Signed-off-by: Keir Fraser <keir@xensource.com> - - - ---- a/tools/ioemu/hw/vga.c Mon Apr 10 17:16:25 2006 +0100 -+++ b/tools/ioemu/hw/vga.c Mon Apr 10 17:25:42 2006 +0100 -@@ -1369,10 +1369,16 @@ static inline unsigned int cpuid_edx(uns - { - unsigned int eax, edx; - -- __asm__("pushl %%ebx; cpuid; popl %%ebx" -+#ifdef __x86_64__ -+#define __bx "rbx" -+#else -+#define __bx "ebx" -+#endif -+ __asm__("push %%"__bx"; cpuid; pop %%"__bx - : "=a" (eax), "=d" (edx) - : "0" (op) - : "cx"); -+#undef __ebx - - return edx; - } - diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch deleted file mode 100644 index b4829e4..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch +++ /dev/null @@ -1,17 +0,0 @@ -# Backported from -# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00086.html - ---- tools/python/xen/xend/tests/test_uuid.py 2006-07-22 12:10:00.000000000 +1000 -+++ tools/python/xen/xend/tests/test_uuid.py 2006-07-22 12:11:01.000000000 +1000 -@@ -21,9 +21,9 @@ - self.assertEqual(uuid.toString(inp), expected) - self.assertEqual(uuid.fromString(expected), inp) - -- t([0 for _ in range(0, 16)], "00000000-00000000-00000000-00000000") -+ t([0 for _ in range(0, 16)], "00000000-0000-0000-0000-000000000000") - t([185, 158, 125, 206, 250, 178, 125, 57, 2, 6, 162, 74, 178, 236, -- 196, 5], "b99e7dce-fab27d39-0206a24a-b2ecc405") -+ 196, 5], "b99e7dce-fab2-7d39-0206-a24ab2ecc405") - - - def test_suite(): diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch deleted file mode 100644 index c462c59..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch +++ /dev/null @@ -1,72 +0,0 @@ -# Backported from -# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00087.html - ---- tools/python/xen/xm/create.py 2006-07-22 12:50:35.000000000 +1000 -+++ tools/python/xen/xm/create.py 2006-07-22 12:52:52.000000000 +1000 -@@ -850,6 +850,16 @@ - opts.info("Started domain %s" % (dom)) - return int(sxp.child_value(dominfo, 'domid')) - -+def get_xauthority(): -+ xauth = os.getenv("XAUTHORITY") -+ if not xauth: -+ home = os.getenv("HOME") -+ if not home: -+ import posix, pwd -+ home = pwd.getpwuid(posix.getuid())[5] -+ xauth = home + "/.Xauthority" -+ return xauth -+ - def parseCommandLine(argv): - gopts.reset() - args = gopts.parse(argv) -@@ -864,14 +874,7 @@ - gopts.vals.display = os.getenv("DISPLAY") - - if not gopts.vals.xauthority: -- xauth = os.getenv("XAUTHORITY") -- if not xauth: -- home = os.getenv("HOME") -- if not home: -- import posix, pwd -- home = pwd.getpwuid(posix.getuid())[5] -- xauth = home + "/.Xauthority" -- gopts.vals.xauthority = xauth -+ gopts.vals.xauthority = get_xauthority() - - # Process remaining args as config variables. - for arg in args: ---- tools/python/xen/xm/tests/test_create.py 2006-07-22 12:59:13.000000000 +1000 -+++ tools/python/xen/xm/tests/test_create.py 2006-07-22 12:59:13.000000000 +1000 -@@ -51,6 +51,7 @@ - 'path' : '.:/etc/xen', - 'builder' : 'linux', - 'nics' : -1, -+ 'xauthority': xen.xm.create.get_xauthority(), - }) - - -@@ -99,6 +100,7 @@ - 'interface' : 'eth0', - 'path' : '.:/etc/xen', - 'builder' : 'linux', -+ 'xauthority': xen.xm.create.get_xauthority(), - }) - - -@@ -138,6 +140,7 @@ - 'path' : '.:/etc/xen', - 'builder' : 'linux', - 'nics' : -1, -+ 'xauthority': xen.xm.create.get_xauthority(), - }) - - -@@ -188,6 +191,7 @@ - 'dhcp' : 'off', - 'interface' : 'eth0', - 'path' : '.:/etc/xen', -+ 'xauthority': xen.xm.create.get_xauthority(), - }) - - diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch deleted file mode 100644 index af51c3d..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- tools/libxc/xc_ptrace.c-orig 2006-10-13 15:53:29.000000000 +1000 -+++ tools/libxc/xc_ptrace.c 2006-10-13 15:54:06.000000000 +1000 -@@ -597,17 +597,13 @@ - online_vcpus_changed(cpumap); - break; - -- case PTRACE_SETFPREGS: -- case PTRACE_SETFPXREGS: -- case PTRACE_PEEKUSER: -- case PTRACE_POKEUSER: -- case PTRACE_SYSCALL: -- case PTRACE_KILL: -- goto out_unspported; /* XXX not yet supported */ -- - case PTRACE_TRACEME: - printf("PTRACE_TRACEME is an invalid request under Xen\n"); - goto out_error; -+ -+ default: -+ goto out_unspported; /* XXX not yet supported */ -+ - } - - return retval; diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch deleted file mode 100644 index 07e9735..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c -index 6d7cc31..9e2d535 100644 ---- a/tools/ioemu/vnc.c -+++ b/tools/ioemu/vnc.c -@@ -962,18 +962,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym) - case XK_Num_Lock: - vs->numlock = !vs->numlock; - break; -- -- case XK_1 ... XK_9: -- if ((vs->ctl_keys & 3) != 3) -- break; -- -- console_select(sym - XK_1); -- if (is_graphic_console()) { -- /* tell the vga console to redisplay itself */ -- vga_hw_invalidate(); -- vnc_dpy_update(vs->ds, 0, 0, vs->ds->width, vs->ds->height); -- } -- break; - } - } - } diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch deleted file mode 100644 index a22bebe..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rpuN xen-3.0.4_1-src.orig/tools/python/xen/xend/XendConfig.py xen-3.0.4_1-src/tools/python/xen/xend/XendConfig.py ---- xen-3.0.4_1-src.orig/tools/python/xen/xend/XendConfig.py Mon Dec 11 15:06:53 2006 +0000 -+++ xen-3.0.4_1-src/tools/python/xen/xend/XendConfig.py Tue Jan 30 13:36:15 2007 -0500 -@@ -229,7 +229,8 @@ LEGACY_IMAGE_CFG = [ - ('sdl', int), - ('vncdisplay', int), - ('vncunused', int), -- ('vncpasswd', str), -+ ('vncpasswd', str), -+ ('vnclisten', str), - ] - - LEGACY_IMAGE_HVM_CFG = [ diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch new file mode 100644 index 0000000..ea5a217 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch @@ -0,0 +1,31 @@ +With xen-3.1.0 on Pardus 2007, "/usr/sbin/xend start" returns "Cannot find Xen +Python modules." cause Xen Python modules installed +into "/usr/lib/python2.4/site-packages/" + +Following patch adds site-packages into search path + +Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr> + +diff -r aee991c7723a tools/misc/xen-python-path +--- a/tools/misc/xen-python-path Wed May 09 16:34:47 2007 +0100 ++++ b/tools/misc/xen-python-path Sat May 19 02:24:24 2007 +0300 +@@ -30,12 +30,13 @@ import sys + + for p in ['python%s' % sys.version[:3], 'python']: + for l in ['/usr/lib64', '/usr/lib']: +- d = os.path.join(l, p) +- if os.path.exists(os.path.join(d, AUXBIN)): +- sys.path.append(d) +- import xen.util.auxbin +- print os.path.join(xen.util.auxbin.libpath(), p) +- sys.exit(0) ++ for k in ['', 'site-packages/']: ++ d = os.path.join(l, p, k) ++ if os.path.exists(os.path.join(d, AUXBIN)): ++ sys.path.append(d) ++ import xen.util.auxbin ++ print os.path.join(xen.util.auxbin.libpath(), p) ++ sys.exit(0) + + print >>sys.stderr, "Cannot find Xen Python modules." + sys.exit(1) diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild deleted file mode 100644 index bcd95f3..0000000 --- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild,v 1.3 2007/03/13 06:26:34 aross Exp $ - -inherit mount-boot flag-o-matic distutils eutils multilib - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.sourceforge.net" -SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${PV}-src.tgz" -S="${WORKDIR}/xen-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc debug screen custom-cflags pygrub vnc sdl" - -CDEPEND="dev-lang/python - sys-libs/zlib - sdl? ( media-libs/libsdl ) - vnc? ( media-libs/libsdl ) - pygrub? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )" - -DEPEND="${CDEPEND} - sys-devel/gcc - dev-lang/perl - app-misc/pax-utils - doc? ( - dev-tex/latex2html - media-gfx/transfig - ) - vnc? ( net-libs/libvncserver )" - -RDEPEND="${CDEPEND} - ~app-emulation/xen-${PV} - sys-apps/iproute2 - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( sys-fs/udev sys-apps/hotplug )" - -PYTHON_MODNAME="xen grub" - -pkg_setup() { - if use vnc && ! use sdl ; then - ewarn "You have the 'vnc' USE flag set, but not 'sdl'." - ewarn "VNC functionality requires SDL support, so it" - ewarn "will be enabled anyway." - fi - - if [[ "$(scanelf -s __guard -q `type -P python`)" ]] ; then - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 ; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - # xen tries to be smart and filter out CFLAGs not supported by gcc. - # It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does. - for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do - test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}" - done - sed -i "s/^CFLAGS :=$/& ${HARDFLAGS}/" \ - "${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile - - - # Disable the 32bit-only vmxassist if we are not on x86 - # and we don't support the x86 ABI - if ! use x86 && ! has x86 $(get_all_abis); then - sed -i -e "/SUBDIRS += vmxassist/d" "${S}"tools/firmware/Makefile - fi - - if use pygrub; then - # Upstream use Debian and hence progsreiserfs-0.3.0, - # which has a different API to 0.3.1 - epatch "${FILESDIR}/${P}"-pygrub-progsreiserfs-0.3.1.patch - else - sed -i -e "/^SUBDIRS += pygrub$/d" "${S}"/tools/Makefile - fi - - # Fixes for hardened and amd64 - epatch "${FILESDIR}"/${P}-bxclobber.patch - epatch "${FILESDIR}"/${P}-pushpop.patch - - # Allow --as-needed LDFLAGS - epatch "${FILESDIR}/${P}"--as-needed.patch - - # Allow building with python-2.5 (bug #149138) - # Backported from upstream - should be in 3.0.3 - sed -i 's/\.2|^2\.3|^2\.4/.[2345]/' "${S}"/tools/check/check_python - - # Fix upstream's broken test cases (bug #141233) - epatch "${FILESDIR}/${P}"-test-uuid.patch - epatch "${FILESDIR}/${P}"-test-xauthority.patch - - # Fix compilation error with newer glibc (bug #151014) - # Backported from upstream - should be in 3.0.3 - epatch "${FILESDIR}/${P}"-xc_ptrace.patch -} - -src_compile() { - local myopt myconf - use debug && myopt="${myopt} debug=y" - - myconf="${myconf} $(use_enable vnc)" - if use vnc ; then - myconf="${myconf} --enable-sdl" - else - myconf="${myconf} $(use_enable sdl)" - fi - - use custom-cflags || unset CFLAGS - gcc-specs-ssp && append-flags -fno-stack-protector -fno-stack-protector-all - - (cd tools/ioemu && econf ${myconf}) || die "configure failured" - emake -C tools ${myopt} || die "compile failed" - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake -C docs || die "compiling docs failed" - fi - - emake -C docs man-pages || die "make man-pages failed" -} - -src_install() { - local myopt="XEN_PYTHON_NATIVE_INSTALL=1" - - make DESTDIR="${D}" ${myopt} install-tools \ - || die "install failed" - - # Remove RedHat-specific stuff - rm -rf "${D}"/etc/sysconfig - - if use doc; then - make DESTDIR="${D}" -C docs install || die "install docs failed" - # Rename doc/xen to the Gentoo-style doc/xen-x.y - mv "${D}"/usr/share/doc/{${PN},${PF}} - fi - - doman docs/man?/* - - newinitd "${FILESDIR}"/xend.initd xend - newconfd "${FILESDIR}"/xendomains.confd xendomains - newinitd "${FILESDIR}"/xendomains.initd xendomains - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ - keepdir /var/log/xen-consoles - fi - - # xend expects these to exist - keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump -} - -pkg_postinst() { - elog "Please visit the Xen and Gentoo wiki:" - elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - if ! built_with_use dev-lang/python ncurses; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild b/app-emulation/xen-tools/xen-tools-3.1.0.ebuild index b20f8c4..a6b7b89 100644 --- a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild +++ b/app-emulation/xen-tools/xen-tools-3.1.0.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild,v 1.2 2007/05/16 00:57:34 marineam Exp $ inherit flag-o-matic distutils eutils multilib DESCRIPTION="Xend daemon and tools" HOMEPAGE="http://www.xensource.com/xen/xen/" -MY_PV=${PV/_p/_} -SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz" -S="${WORKDIR}/xen-${MY_PV}-src" +SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/src.tgz/xen-${PV}-src.tgz" +S="${WORKDIR}/xen-${PV}-src" LICENSE="GPL-2" SLOT="0" @@ -24,12 +23,12 @@ DEPEND="${CDEPEND} dev-lang/perl sys-devel/dev86 app-misc/pax-utils - x11-proto/xproto doc? ( dev-tex/latex2html media-gfx/transfig ) ioemu? ( + x11-proto/xproto net-libs/libvncserver )" @@ -82,15 +81,6 @@ src_unpack() { -i {} \; fi - # xen tries to be smart and filter out CFLAGs not supported by gcc. - # It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does. - for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do - test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}" - done - sed -i "s/^CFLAGS :=$/& ${HARDFLAGS}/" \ - "${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile - - # Disable the 32bit-only vmxassist if we are not on x86 and we don't # support the x86 ABI. Also disable hvmloader, since it requires vmxassist. if ! use x86 && ! has x86 $(get_all_abis); then @@ -104,20 +94,18 @@ src_unpack() { # Don't bother with ioemu, only needed for fully virtualised guests if ! use ioemu; then + chmod 644 tools/check/check_x11_devel sed -i -e "/^CONFIG_IOEMU := y$/d" "${S}"/config/*.mk fi # Allow --as-needed LDFLAGS - epatch "${FILESDIR}/${P}"--as-needed.patch - - # Fix vnclisten - epatch "${FILESDIR}/${P}"-vnclisten.patch + epatch "${FILESDIR}/${PN}-3.0.4_p1--as-needed.patch" # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${P}"-network-bridge-broadcast.patch - - # Disable QEMU monitor mode in VNC, bug #170917 - epatch "${FILESDIR}/${P}"-remove-monitor-mode-from-vnc.patch + epatch "${FILESDIR}/${PN}-3.0.4_p1-network-bridge-broadcast.patch" + + # Also look in python's site packages for xen, as it installs there + epatch "${FILESDIR}/${PN}-3.1.0-python-site-packages.patch" } src_compile() { @@ -125,7 +113,7 @@ src_compile() { use debug && myopt="${myopt} debug=y" use custom-cflags || unset CFLAGS - gcc-specs-ssp && append-flags -fno-stack-protector -fno-stack-protector-all + #gcc-specs-ssp && append-flags -fno-stack-protector -fno-stack-protector-all if use ioemu; then myconf="${myconf} --disable-system --disable-user" @@ -145,7 +133,7 @@ src_compile() { src_install() { local myopt="XEN_PYTHON_NATIVE_INSTALL=1" - make DESTDIR="${D}" ${myopt} install-tools \ + make DESTDIR="${D}" -C tools ${myopt} install \ || die "install failed" # Remove RedHat-specific stuff @@ -180,12 +168,23 @@ pkg_postinst() { elog "Please visit the Xen and Gentoo wiki:" elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" + if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then + ewarn "xend may not work when python is built with stack smashing protection (ssp)." + ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" + fi + if ! built_with_use dev-lang/python ncurses; then echo ewarn "NB: Your dev-lang/python is built without USE=ncurses." ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." fi + if ! use x86 && ! has x86 $(get_all_abis); then + echo + elog "Your system does not support building x86 binaries (amd64 no-multilib)" + elog "hvmloader has not been built, which is required for HVM guests." + fi + if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then echo elog "xensv is broken upstream (Gentoo bug #142011)." diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index d2baa66..e92d970 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,20 +1,8 @@ -AUX xen-3.0.2-nopiessp.patch 443 RMD160 6143efc84069b1d66c9b3fcc625e7c44b27dbce6 SHA1 d838ea87de1cbf13f3984cc05502a2491acd5c26 SHA256 b206dbb8bf55ece33a851f8c9de511d5abd031825b339df9446ef5689f05c088 -MD5 eb2960e0572c35e38e37d9f16282cfed files/xen-3.0.2-nopiessp.patch 443 -RMD160 6143efc84069b1d66c9b3fcc625e7c44b27dbce6 files/xen-3.0.2-nopiessp.patch 443 -SHA256 b206dbb8bf55ece33a851f8c9de511d5abd031825b339df9446ef5689f05c088 files/xen-3.0.2-nopiessp.patch 443 -DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 -DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb -EBUILD xen-3.0.2.ebuild 2368 RMD160 9939c026dd9a562d47e751dd946fa7caf7f305ad SHA1 aae1825a0febaa514497f05909db95285f5cb04c SHA256 6342a5fea3c1e86a75f1dc1f8ae06836265e3364935584ef37cb148b6d944e0f -MD5 8c78fc5c90e6c3eb433e700ab305be25 xen-3.0.2.ebuild 2368 -RMD160 9939c026dd9a562d47e751dd946fa7caf7f305ad xen-3.0.2.ebuild 2368 -SHA256 6342a5fea3c1e86a75f1dc1f8ae06836265e3364935584ef37cb148b6d944e0f xen-3.0.2.ebuild 2368 -EBUILD xen-3.0.4_p1.ebuild 2695 RMD160 afbc380a50e71cec4a4340a55e8b893c3907fe65 SHA1 454f03ca8d14058a7c4b900f1f1ffd2bb4dc5411 SHA256 aeab0f9363ad35eb648dafbb8adf3850cce315e3aaa99975a25e392c1c58d89f -MD5 d87b5d08e7f61c66219d1b434935f0b9 xen-3.0.4_p1.ebuild 2695 -RMD160 afbc380a50e71cec4a4340a55e8b893c3907fe65 xen-3.0.4_p1.ebuild 2695 -SHA256 aeab0f9363ad35eb648dafbb8adf3850cce315e3aaa99975a25e392c1c58d89f xen-3.0.4_p1.ebuild 2695 -MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-3.0.2 235 -RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-3.0.2 235 -SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-3.0.2 235 -MD5 de126addfd4101f35f8880ab0817ab03 files/digest-xen-3.0.4_p1 241 -RMD160 b65ff6928079bc0ee81b68ab27f3f4c9e1d36856 files/digest-xen-3.0.4_p1 241 -SHA256 66cfb008cc25de8a507359e492d6896908bc619901d901ae018fb135d2d91345 files/digest-xen-3.0.4_p1 241 +DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7 +EBUILD xen-3.1.0.ebuild 2327 RMD160 779eaee0c838ab46457190488f0ec0645bf8accf SHA1 91fbe6bb81e970cd68b90a489722cbc6a2b25406 SHA256 42f7bdf7e61a8fb7cc505fb447eab1d286735df1601f75fc361092b340f6ee25 +MD5 dad50dea588e2f44f043444cbf737874 xen-3.1.0.ebuild 2327 +RMD160 779eaee0c838ab46457190488f0ec0645bf8accf xen-3.1.0.ebuild 2327 +SHA256 42f7bdf7e61a8fb7cc505fb447eab1d286735df1601f75fc361092b340f6ee25 xen-3.1.0.ebuild 2327 +MD5 b2e86effae6681cbbecdbf864b193b4a files/digest-xen-3.1.0 235 +RMD160 2366b7298f0125f11d41aca0c6088c20863dbed1 files/digest-xen-3.1.0 235 +SHA256 12c130912c624791e6855ebeb932368fc8889371876db396055b02ac9a3b9892 files/digest-xen-3.1.0 235 diff --git a/app-emulation/xen/files/digest-xen-3.1.0 b/app-emulation/xen/files/digest-xen-3.1.0 new file mode 100644 index 0000000..e436de9 --- /dev/null +++ b/app-emulation/xen/files/digest-xen-3.1.0 @@ -0,0 +1,3 @@ +MD5 b7ae1f652b071862ae4c90b72d549627 xen-3.1.0-src.tgz 6831094 +RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 xen-3.1.0-src.tgz 6831094 +SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7 xen-3.1.0-src.tgz 6831094 diff --git a/app-emulation/xen/xen-3.0.4_p1.ebuild b/app-emulation/xen/xen-3.0.4_p1.ebuild deleted file mode 100644 index de6457f..0000000 --- a/app-emulation/xen/xen-3.0.4_p1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit mount-boot flag-o-matic - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://www.xensource.com/xen/xen/" -MY_PV=${PV/_p/_} -SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz" -S="${WORKDIR}/xen-${MY_PV}-src" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug custom-cflags pae" - -RDEPEND="|| ( sys-boot/grub - sys-boot/grub-static ) - >=sys-kernel/xen-sources-2.6.16.33" -PDEPEND="~app-emulation/xen-tools-${PV}" - -RESTRICT="test" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${MY_PV/_/-}" - -pkg_setup() { - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - -src_unpack() { - unpack ${A} - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - # xen tries to be smart and filter out CFLAGs not supported by gcc. - # It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does. - for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do - test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}" - done - sed -i "s/^CFLAGS-y.*__XEN__.*$/& ${HARDFLAGS}/" \ - "${S}"/xen/Rules.mk -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - else - unset CFLAGS - fi - - # Send raw LDFLAGS so that --as-needed works - emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed" -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - make DESTDIR="${D}" ${myopt} install-xen || die "install failed" -} - -pkg_postinst() { - elog "Please visit the Xen and Gentoo wiki:" - elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - echo - elog "Note: xen tools have been moved to app-emulation/xen-tools" - - if use pae; then - echo - ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" - fi -} diff --git a/app-emulation/xen/xen-3.0.2.ebuild b/app-emulation/xen/xen-3.1.0.ebuild index 5eca785..01d3ff2 100644 --- a/app-emulation/xen/xen-3.0.2.ebuild +++ b/app-emulation/xen/xen-3.1.0.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ inherit mount-boot flag-o-matic DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.sourceforge.net" -MY_PV=${PV/_p/_} -SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz" +HOMEPAGE="http://www.xensource.com/xen/xen/" +SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/src.tgz/xen-${PV}-src.tgz" +S="${WORKDIR}/xen-${PV}-src" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug custom-cflags pae hardened" +IUSE="debug custom-cflags pae" -RDEPEND="sys-boot/grub - ~sys-kernel/xen-sources-2.6.16.28" +RDEPEND="|| ( sys-boot/grub + sys-boot/grub-static ) + >=sys-kernel/xen-sources-2.6.18" PDEPEND="~app-emulation/xen-tools-${PV}" RESTRICT="test" # Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${MY_PV/_/-}" +QA_WX_LOAD="boot/xen-syms-${PV}" pkg_setup() { if [[ -z ${XEN_TARGET_ARCH} ]]; then @@ -35,7 +36,6 @@ pkg_setup() { fi } - src_unpack() { unpack ${A} # if the user *really* wants to use their own custom-cflags, let them @@ -50,10 +50,6 @@ src_unpack() { -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ -i {} \; fi - if use hardened; then - cd "${S}" - epatch "${FILESDIR}/${PN}"-3.0.2-nopiessp.patch - fi } src_compile() { @@ -76,7 +72,7 @@ src_install() { use debug && myopt="${myopt} debug=y" use pae && myopt="${myopt} pae=y" - make DESTDIR="${D}" install-xen ${myopt} || die "install failed" + emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed" } pkg_postinst() { |