diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2012-10-20 21:35:23 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2012-10-20 21:35:23 +0000 |
commit | d792929b99baa387a8d25a2dcfc7914ea6ada611 (patch) | |
tree | ca6e2699991cb0d9f3f902c31687820abc828f51 /app-emulation | |
parent | mask games-emulation/snes9express for removal (diff) | |
download | historical-d792929b99baa387a8d25a2dcfc7914ea6ada611.tar.gz historical-d792929b99baa387a8d25a2dcfc7914ea6ada611.tar.bz2 historical-d792929b99baa387a8d25a2dcfc7914ea6ada611.zip |
Remove ebuild that doesn't have the Gentoo patchset. Remove old files that are not used.
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/qemu/ChangeLog | 12 | ||||
-rw-r--r-- | app-emulation/qemu/Manifest | 12 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch | 11 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch | 35 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch | 28 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch | 66 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch | 24 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-1.0.1-siginfo.patch | 72 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-ifdown | 20 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-ifup | 22 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch | 37 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-1.1.2.ebuild | 368 |
12 files changed, 12 insertions, 695 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index 2963bdf001dd..c96e6128a56a 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.131 2012/10/20 16:40:31 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.132 2012/10/20 21:35:22 cardoe Exp $ + + 20 Oct 2012; Doug Goldstein <cardoe@gentoo.org> + -files/qemu-0.11.0-mips64-user-fix.patch, + -files/qemu-0.11.1-CVE-2012-0029-backport.patch, + -files/qemu-0.11.1-cfg-pulse.patch, -files/qemu-1.0.1-siginfo.patch, + -files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch, + -files/qemu-1.0-unmagic-debug.patch, -files/qemu-1.0-unmagic-xfsctl.patch, + -qemu-1.1.2.ebuild, -files/qemu-ifdown, -files/qemu-ifup: + Remove ebuild that doesn't have the Gentoo patchset. Remove old files that + are not used. 20 Oct 2012; Doug Goldstein <cardoe@gentoo.org> -qemu-0.11.1.ebuild, -qemu-0.11.1-r1.ebuild: diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 93abb2fcae62..ec12742ed59e 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -1,16 +1,7 @@ AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920 -AUX qemu-0.11.0-mips64-user-fix.patch 313 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f SHA512 ca7f92b7d094ed62c15e539ac760aab50255699edfd6faf2bc017e13fb73da66f455c07999c6ee6a1f2196b7c0a2e2caa6c7a584be22d04717d1abea08781dbf WHIRLPOOL 2eb95b7dd79e30ecd4b50a4901553866180c0022760cb1e425bb23f14411ef84356db00eca593230d8fc204f5f5b724567d051fad299a8d6bdb81a346bfa7436 -AUX qemu-0.11.1-CVE-2012-0029-backport.patch 1448 SHA256 fb739ca478977f17b73489823b92d8964da1bb308db997596e1160900f2c9236 SHA512 d143a497af349aa58a4542754c757a73bc9ab89ed54498c6d22a18452634f81a8d009aaa3aa4a9a06888af4461987390b8ccae7b2e4c9f5095b38bcb108c608a WHIRLPOOL ae30b58043818d0643d04b689105fb19ded7220152b838305d1db30ad6d47a0230acbeaae788a833246d5c0b975a2106421ba561332c2c5aa7c9e4bf05e9dea0 -AUX qemu-0.11.1-cfg-pulse.patch 622 SHA256 22ee9c11fad4f1360dff7dfddf0776db72efee19cb5409fbefc995277cd2d134 SHA512 8228ab3fb5c8d111498588ec75f9b9376580a4953f627f19b9b1412129db7fc6f83a821ad122d3b59636a97edb11ada4393a2fbcdae8f7d9c337711db9e2a2ba WHIRLPOOL 86e5a9fbe311dde602785ffb2c2e0d8c13fc199f9d7eeea4051daa1b18c0571590b8098842205c55b68d32d32f7835aba6b6b91481be3a92a436fc463ff742f2 -AUX qemu-1.0-unmagic-debug.patch 1929 SHA256 dd68fa1abc9e7c9d17bb2407c5a5b80b1302a9c1b24805abe61537b068347659 SHA512 12aad340c8357ca42b7fb7fe27e455f6386d99ac904912b60751721cbd32dc0a7068653650271bdcc0a539c72d73e9ede7cd07a598d8a4b4f6e1ea5d639b4c13 WHIRLPOOL d31da466acc21cc2d9b9920ac51f0eece475a2d76163fd185a9585b249da348bef115b1f9dbb35407a4718ea9cdbf5a0a82ae10e497d5d50ff417841df7c7097 -AUX qemu-1.0-unmagic-xfsctl.patch 654 SHA256 b69f5fac63fdd61a314373359dc20b1bf0d4eb6bc0e66105032d28c107a81090 SHA512 a9f8c20b03dad360b1a1cdfcb30109755319582dad3f2c376084a776e55c437af58c55d682b958b11f378c78aff517accd4d93e5d3907c52a9fdfb2ca214d119 WHIRLPOOL 2aabacaf42a496e9fd1fb492c3a8e515fea719eda596d5713502810a24d189dabb16a0b2f9ef46c484af84d276f5b8eea76e3f1c3c8ccf0c38416cca5ef53cdb -AUX qemu-1.0.1-siginfo.patch 2268 SHA256 b5d8ddf3469b72ac3c82847c7b35df5f84ab2b0f2924e7cdaacaaae173f69846 SHA512 10d27fe413fc5fb3de941a2b00d6504ce766d6246c481c811263617f2cf88f5dda318ecc78b681f0f84c3e8d954527c84d5c21712c908cbfc89b6d5f4a49e6b9 WHIRLPOOL 591645f4e453126b98f055a96fe06e115d7c8821bc7b2be13e329aeeac61d7694ae4df9c62a7eb5d67e5a78d3ab9defdd01db36a2567d7acfc86c69373bb29db AUX qemu-1.2.0-cflags.patch 359 SHA256 8917142633d32497d63dd2f2934e17d86a2e2ab11be2c8551e7218c9251b66a1 SHA512 f60ecc9a0e6969436a77444193cdba4f3028db683de0963870cbac5bf3a1b47da815926236f127a5f56333efc21efc52eb732cfce6393b764bfa1b9f569df645 WHIRLPOOL e0b3b8e1e68a3b42ce7727f7fa2029dd382fe9c8f7260c29e52368a1cd3b29efcfc134cf9908b3590ed6fe57c785bd05bf676e61736dc321a7a4899dd8b0a861 AUX qemu-9999-fix-mipsen.patch 684 SHA256 e4e9695c091d3b8ffc1afb24c3d59fc61bb08bdb3e25b7be5a36d0b327ba4b55 SHA512 25c3b6ce6140cca2ed76ca75d623730c78873f8e5b53d9f80362df376effd7755b41420d55ec19dd652b47f2c6aea01e2cae9dc75952a4ffae871841ba27142c WHIRLPOOL 99d2e15c00d24db9fd7765290efaa6f69bb42f828227e3b5bfe68027b25ddae173c9cdf49b8d84facd8372d911e32a8bd0ed2aa6bdbb083c67d467d93bd29f67 -AUX qemu-ifdown 478 SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d SHA512 6aeffcd1cd38ce0468fb280d52de402429d8d88b97b215e6e3727bc7f58f63e60a84ed351becc854436fdcd33d00c0e4ee7b1f5f31b225a009e8af6decab0e4d WHIRLPOOL de2be76d26c28bf5dca213106be824836b682e47f9cfbefe51d515fb4ae5a090624bb7050f13a0340a1305925473043ac5316172b33a197359cd7d89d414174c -AUX qemu-ifup 554 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d SHA512 dd1fab3db7fa6e8b8ce3ef27e09996629c0eea9e3d4f6489523af71f25eb0f801d30614a5e0f191b6977b34d13b588e64a5cec8fcc731e6ff7dbfdebc759f028 WHIRLPOOL fb665f63982a47fe47c5186036524981c848ad22902886bc10425e2ea7d06dafdd9b4fe86027e4d9ae3847d81b0fc9c2d6fe7dcf63e55cd943cd0a63503b7450 AUX qemu-kvm 60 SHA256 ded08eb1c74a9581912a9ca7876de6f33d1c545ed2a7d275f9b1749539feb7ee SHA512 d973d70ffeb7f4cdc61b25a30bf7174ac05b8c136234478782367a16668ff617756e9862a9cd94acd4b6636fda36410762e069a2eccca99410aa6e3b4294e363 WHIRLPOOL 41937bf752a2f643085fbd04643fb7a5cb898fabe8625d80b730c9e930f48f8d63245d5acdffbe31ecede1e1eb83fd3a73aad925f020e5c016f1b6559e7426d3 -AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 SHA256 9a06665c47b76b2501f148713c46f8ce0b14ed03da5e6cb03c0d141f5d91900a SHA512 ce0cb894819ff4a97de54a0f8935a8311f563c3ef4f7b71f15d83f333481febce947697430db92bf3fe95fbbc921312cb163bc6f214d1cf7c4275d4c4d331587 WHIRLPOOL a526113ef51e6d65ba01db9a8310a161f857b80672a588b52d468540d4ee715b378164ca6c1b7eac68b359895a7b938df67f2a68fc7f2d44ac9d804f7e0afa1d DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596f7c7d3c0e18fb216cb2b2026af40 SHA512 781eae1fdc1cb7482d3d6fd1cf81e0d565588e3987fc4cab92abc06741b1b57d999b0de1fffce7270f50033b53c5707e4ef477ca3b7ddfca3dc1a432c1e15cc7 WHIRLPOOL 3f80b4cc9902021686bea823a41af136d21dd5a6b8aa59913aeb8697c3a38acc02d92ee59b9d052b6d161830a72d709fe684beb95f756a92216fe79cce4c5d9a DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105 DIST qemu-kvm-1.1.2-2612b38e.tar.xz 4736 SHA256 c1a00380591b1b2b902c2aa1ea881c216997f18e33b466108b8c52178a829258 SHA512 f27e52bbb8f7c8c5a6f3b3de2966d7000d77178c6522a6311abd366913fc40582106b27fb7b37620c0a2a39346b6edd8827a2a4f31c654bd32adadb023ff325d WHIRLPOOL a5aefd25af0dccf177e7897690433841aaba8629ef6bf8e40a22176508ef4fec5a0f65a9b618b74bb8ab3420f36604b9a736a1a5ba665dee52e6a471693b88f3 @@ -18,8 +9,7 @@ DIST qemu-kvm-1.1.2.tar.gz 6605075 SHA256 2be9cb9986c0b67ef97a2d21a51a945e91c403 DIST qemu-kvm-1.2.0.tar.gz 6839420 SHA256 e98ab96c24337e312864f2341016695ac11cb9a04be83548a8da89596d591b05 SHA512 c21354127d4585397ab400600ab1ac9aac80cc0431bbf615c8e906819075b00373f382954fbd9fa39bf6479126d8d8e3321b3713346d04abe2c249edfa4eb6fd WHIRLPOOL 3d0662b39174eee0cd8750f6bea5baf57e2dfa82b490c3f1e54f44720ddd05ad029c3011425f651e745973ddb03aaca310bc8acf9f8e656bbb8390a262f7013c EBUILD qemu-1.1.1-r1.ebuild 12073 SHA256 7f408c7425a3e34d31e48a6c886d4a415a970e7d2fb4ffaf58b44f9d9e88f50c SHA512 efd0c757fab7fa7e06b86e32fcedd0347f8728a7ea0bf67718b34b3b0c0135450276fc13ec02755d173626a5e69f09d5382afe2e901c310f3b50efb2e3e2f21a WHIRLPOOL 63949afad70876a426db6808a60d09d0fcf98e221afc24005181114203bb6586509620dee18b9009cf602c57cc0429cb8e718fc89c44a1d64ac2d7309f9ddb67 EBUILD qemu-1.1.2-r1.ebuild 12070 SHA256 5f3b8052bebdbf6eb27755fb7635c363b0639f54aa2bfa2e5c1bbb054cf0f46f SHA512 0eeca6486a6906ba7a90431f3b4177ae220efde83cb6b6857a058d5fd98f1bcac4cdfa9af4f891dfc167387ef5c456784bcd563e8ff1db89df552f69cfe4fbf8 WHIRLPOOL 430b799979dc5d9412fab9a7f6a5d342081d7a3f1b8264d70d8b09ce99c719ef742c55f176209dc7b60390fb58c5c310bb53059178ab4e0f3c4e2c89484a5114 -EBUILD qemu-1.1.2.ebuild 12064 SHA256 5943cf3394891d8fd046f6e8e350af67417ee648c97935fcd44efd3e17d713a4 SHA512 245e913027ab3dda208582f36d35258d3fc0bbb44edf8de13eb31f5e04f289364ae814ee39c12f271fc9d501038838d3377df605044bc4a595a62f6b11fd47fe WHIRLPOOL a5a43d4660bebac1e257d1fed3bcf6aecca53dbba45fb50c77ea1200334cb677d6867be1e05b3a15414f87472332bab2e43a75247ac162894fa475e65fceebdc EBUILD qemu-1.2.0.ebuild 12864 SHA256 d87928c65e9d4c0156b4a044c94b577f519935dc1e6ed2e714ee5c65588c1bd5 SHA512 dd0c3c42c65def32f147d4ad02424e385da488a9ec43dec9365c5e30ea88d764996035a530e0ad4927d367a464f014b77b56a37c4545e56ec00c9abedc330146 WHIRLPOOL 75ad3ca36bbbcc7a7c41c5b448a02520dbbdbe8fa70492762b2ecd5de327de760cf21b1646f5179e23ee2c05ed8205f2db9ddca13395f0a7b01d4bdf6761fdc2 EBUILD qemu-9999.ebuild 12834 SHA256 f0e9ef23ebe1b7d16269620237cc12fd6c2158dad5bd001c4c6d3007dc2cbd88 SHA512 ee609002815e041ee022ac3aa738ba7bfb38a40457fc99724c9f155f51a0a2b760f5346ddb42c5da051a375a6206c178f5db197e5c3d4f109f177d0105d1f306 WHIRLPOOL a09d752353ed41e437916525d38a70848c29fe8f7b93b234e71dd84c829967ed3158dba4e6f1c08ae9538d50e2d0107a5d3048986f56db91db477db3a0275e66 -MISC ChangeLog 20153 SHA256 3d65ac91cbbd832d83f1099078c09a0a839a50430b66eeef9dad84761fecc848 SHA512 3343cc0e642be60ca6dff5dc1ff47fa60b94b4562b08eb9fefc085b868ef3065a65207a392d47c0f1d395268005bfad8bddc4b753783d8a0781b1431021a1bfc WHIRLPOOL d992ef33dc35ace805548ef42cbd5cae2a734a9a1e3b03e84044e21ff8ec4f60bfae20d227bc10f418d4e18df4621c1476f9db269c8b3552c845a0513643ddc1 +MISC ChangeLog 20674 SHA256 c6183402df11b9ecda26af6b11a049d94e91e41b1526e09f71bc24a0640db034 SHA512 b691f15c781b0da884968f04a1332a3fe582286303470d635640218bc7d10251ddccfce1efd466b336ac670ea04bae3a9e0d2dbdff34181c4b814ee78e696343 WHIRLPOOL bc8d652dae7b5e693775e2a3add8be11453b964351e7de91178533b09621b709251a6100dc748c4970d4aacbdb5a61ce2b8573a1670d70a675d68feaf2a34dbe MISC metadata.xml 2701 SHA256 81a75acd430e88c1527edcdd3c7fa223e6fbc762fd8c6ace2f3d82e265aff961 SHA512 fe3eabbda1268be8f8921e5808616429429955d4273dbd2ac19a754e90c5d595f0e8b9f7f071f0399250bfe6569f3b490d8a5fd0d904064e35d3bdc41fcb7eed WHIRLPOOL 1f60aad74213f1151f9df98e302286f674e2fd845a9515b4ece176cc9486d0df7c93b50446180fe5b7d7b552901e9b263d9930579b8b51919e992619ce0d5e07 diff --git a/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch b/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch deleted file mode 100644 index c069f898c12d..000000000000 --- a/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qemu-0.11.0.orig/linux-user/main.c 2009-10-23 02:19:57.000000000 +0200 -+++ qemu-0.11.0/linux-user/main.c 2009-10-23 02:47:09.000000000 +0200 -@@ -1469,6 +1469,8 @@ - - #ifdef TARGET_MIPS - -+#define TARGET_QEMU_ESIGRETURN 255 -+ - #define MIPS_SYS(name, args) args, - - static const uint8_t mips_syscall_args[] = { diff --git a/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch b/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch deleted file mode 100644 index d8935e31c3b5..000000000000 --- a/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch +++ /dev/null @@ -1,35 +0,0 @@ -Backported upstream patch: -> From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001 -> From: Anthony Liguori <aliguori@us.ibm.com> -> Date: Mon, 23 Jan 2012 07:30:43 -0600 -> Subject: [PATCH 26/26] e1000: bounds packet size against buffer size -> -> Otherwise we can write beyond the buffer and corrupt memory. This is tracked -> as CVE-2012-0029. -> -> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> ---- - hw/e1000.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/hw/e1000.c b/hw/e1000.c -index b0542d7..54ade40 100644 ---- a/hw/e1000.c -+++ b/hw/e1000.c -@@ -447,6 +447,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) - bytes = split_size; - if (tp->size + bytes > msh) - bytes = msh - tp->size; -+ -+ bytes = MIN(sizeof(tp->data) - tp->size, bytes); - cpu_physical_memory_read(addr, tp->data + tp->size, bytes); - if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) - memmove(tp->header, tp->data, hdr); -@@ -462,6 +464,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) - // context descriptor TSE is not set, while data descriptor TSE is set - DBGOUT(TXERR, "TCP segmentaion Error\n"); - } else { -+ split_size = MIN(sizeof(tp->data) - tp->size, split_size); - cpu_physical_memory_read(addr, tp->data + tp->size, split_size); - tp->size += split_size; - } diff --git a/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch b/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch deleted file mode 100644 index 767038357cf4..000000000000 --- a/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Nathan Phillip Brink <binki@gentoo.org> - -Fix detection of pulseaudio caused by not including the headers which -define NULL. - ---- a/configure -+++ b/configure -@@ -1004,7 +1004,9 @@ - lib=$3 - exp=$4 - cfl=$5 -+ prologue=${6} - cat > $TMPC << EOF -+${prologue} - #include <$hdr> - int main(void) { $exp } - EOF -@@ -1044,7 +1046,8 @@ - - pa) - audio_drv_probe $drv pulse/simple.h -lpulse-simple \ -- "pa_simple *s = NULL; pa_simple_free(s); return 0;" -+ "pa_simple *s = NULL; pa_simple_free(s); return 0;" \ -+ '' '#include <stddef.h> /* NULL */' - ;; - - oss|sdl|core|wav|dsound) - diff --git a/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch b/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch deleted file mode 100644 index 9ad232a778be..000000000000 --- a/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch +++ /dev/null @@ -1,66 +0,0 @@ -commit 5bc62e01cd22ea1f56bde94b0616c46f8af2676e -Author: Gerd Hoffmann <kraxel@redhat.com> -Date: Wed Feb 8 13:54:13 2012 +0100 - - build: allow turning off debuginfo - - This patch adds --{enable,disable}-debug-info switches to configure - which allows to include/exclude the '-g' switch on the gcc & ld - command lines. Not building debug info reduces ressource usage - (especially disk) alot and is quite useful for test builds. - - Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> - Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> - -diff --git a/configure b/configure -index a1f4a6b..b22fcda 100755 ---- a/configure -+++ b/configure -@@ -98,6 +98,7 @@ audio_pt_int="" - audio_win_int="" - cc_i386=i386-pc-linux-gnu-gcc - libs_qga="" -+debug_info="yes" - - target_list="" - -@@ -207,6 +208,10 @@ for opt do - ;; - --extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS" - ;; -+ --enable-debug-info) debug_info="yes" -+ ;; -+ --disable-debug-info) debug_info="no" -+ ;; - --sparc_cpu=*) - sparc_cpu="$optarg" - case $sparc_cpu in -@@ -244,13 +249,15 @@ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}" - - # default flags for all hosts - QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" --CFLAGS="-g $CFLAGS" - QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" - QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" - QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" - QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" - QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu" --LDFLAGS="-g $LDFLAGS" -+if test "$debug_info" = "yes"; then -+ CFLAGS="-g $CFLAGS" -+ LDFLAGS="-g $LDFLAGS" -+fi - - # make source path absolute - source_path=`cd "$source_path"; pwd` -@@ -545,6 +552,10 @@ for opt do - ;; - --extra-ldflags=*) - ;; -+ --enable-debug-info) -+ ;; -+ --disable-debug-info) -+ ;; - --cpu=*) - ;; - --target-list=*) target_list="$optarg" diff --git a/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch b/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch deleted file mode 100644 index df8aacbc4f36..000000000000 --- a/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 8c84cf11660322489f839bc29db79bad31b4ecde -Author: Sergei Trofimovich <slyfox@gentoo.org> -Date: Tue Jan 24 20:42:40 2012 +0300 - - ./configure: export xfs config via --{enable, disable}-xfsctl - - Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> - Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> - -diff --git a/configure b/configure -index 9d5175b..69fb239 100755 ---- a/configure -+++ b/configure -@@ -766,6 +766,10 @@ for opt do - ;; - --enable-rbd) rbd="yes" - ;; -+ --disable-xfsctl) xfs="no" -+ ;; -+ --enable-xfsctl) xfs="yes" -+ ;; - --disable-smartcard) smartcard="no" - ;; - --enable-smartcard) smartcard="yes" diff --git a/app-emulation/qemu/files/qemu-1.0.1-siginfo.patch b/app-emulation/qemu/files/qemu-1.0.1-siginfo.patch deleted file mode 100644 index 571dd295159b..000000000000 --- a/app-emulation/qemu/files/qemu-1.0.1-siginfo.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 02d2bd5d57812154cfb978bc2098cf49d551583d Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" <rjones@redhat.com> -Date: Thu, 5 Jul 2012 03:32:44 +0000 -Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'. - -glibc 2.16 will remove the undocumented definition of 'struct siginfo' -from <bits/siginfo.h>. - -This change is already present in glibc 2.15.90, so qemu compilation -of certain targets (eg. cris-user) breaks. - -This struct was always typedef'd to be the same as 'siginfo_t' which -is what POSIX documents, so use that instead. - -Signed-off-by: Richard W.M. Jones <rjones@redhat.com> -Reviewed-by: Peter Maydell <peter.maydell@linaro.org> -Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> ---- - linux-user/signal.c | 8 ++++---- - user-exec.c | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/linux-user/signal.c b/linux-user/signal.c -index 97f30d9..9be5ac0 100644 ---- a/linux-user/signal.c -+++ b/linux-user/signal.c -@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, - * Arguments to signal handler: - * - * a0 = signal number -- * a1 = pointer to struct siginfo -+ * a1 = pointer to siginfo_t - * a2 = pointer to struct ucontext - * - * $25 and PC point to the signal handler, $29 points to the -@@ -3255,7 +3255,7 @@ struct target_signal_frame { - }; - - struct rt_signal_frame { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - uint32_t tramp[2]; - }; -@@ -3474,9 +3474,9 @@ struct target_signal_frame { - }; - - struct rt_signal_frame { -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - uint8_t retcode[8]; /* Trampoline code. */ - }; -diff --git a/user-exec.c b/user-exec.c -index b2a4261..1a9c276 100644 ---- a/user-exec.c -+++ b/user-exec.c -@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, - int cpu_signal_handler(int host_signum, void *pinfo, - void *puc) - { -- struct siginfo *info = pinfo; -+ siginfo_t *info = pinfo; - struct ucontext *uc = puc; - unsigned long pc = uc->uc_mcontext.sc_iaoq[0]; - uint32_t insn = *(uint32_t *)pc; --- -1.7.9.7 - diff --git a/app-emulation/qemu/files/qemu-ifdown b/app-emulation/qemu/files/qemu-ifdown deleted file mode 100644 index c173e43a9813..000000000000 --- a/app-emulation/qemu/files/qemu-ifdown +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if [ -x /sbin/brctl ]; then - BRCTL="/sbin/brctl" -elif [ -x /usr/sbin/brctl ]; then - BRCTL="/usr/sbin/brctl" -else - echo "no bridge utils installed" - exit 1 -fi - -if [ -x /sbin/ip ]; then - switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') ) - ${BRCTL} delif ${switch} $1 - /sbin/ip link set $1 down -else - switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') ) - ${BRCTL} delif ${switch} $1 - /sbin/ifconfig $1 down -fi diff --git a/app-emulation/qemu/files/qemu-ifup b/app-emulation/qemu/files/qemu-ifup deleted file mode 100644 index 4a30e7d5645f..000000000000 --- a/app-emulation/qemu/files/qemu-ifup +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -if [ -x /sbin/brctl ]; then - BRCTL="/sbin/brctl" -elif [ -x /usr/sbin/brctl ]; then - BRCTL="/usr/sbin/brctl" -else - echo "no bridge utils installed" - exit 1 -fi - -if [ -x /sbin/ip ]; then - switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') ) - /sbin/ip link set $1 up -else - switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') ) - /sbin/ifconfig $1 0.0.0.0 up -fi - -[[ ${switch#} -ne "1" ]] && logger -t qemu "$0 found more than one bridge connecting $1 to ${switch}" -${BRCTL} addif ${switch} $1 - diff --git a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch b/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch deleted file mode 100644 index bd2bdc7425df..000000000000 --- a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001 -From: Anthony Liguori <aliguori@us.ibm.com> -Date: Mon, 23 Jan 2012 07:30:43 -0600 -Subject: [PATCH 26/26] e1000: bounds packet size against buffer size - -Otherwise we can write beyond the buffer and corrupt memory. This is tracked -as CVE-2012-0029. - -Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> ---- - hw/e1000.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/hw/e1000.c b/hw/e1000.c -index 986ed9c..e164d79 100644 ---- a/hw/e1000.c -+++ b/hw/e1000.c -@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) - bytes = split_size; - if (tp->size + bytes > msh) - bytes = msh - tp->size; -+ -+ bytes = MIN(sizeof(tp->data) - tp->size, bytes); - pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes); - if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) - memmove(tp->header, tp->data, hdr); -@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) - // context descriptor TSE is not set, while data descriptor TSE is set - DBGOUT(TXERR, "TCP segmentaion Error\n"); - } else { -+ split_size = MIN(sizeof(tp->data) - tp->size, split_size); - pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size); - tp->size += split_size; - } --- -1.7.7.6 - diff --git a/app-emulation/qemu/qemu-1.1.2.ebuild b/app-emulation/qemu/qemu-1.1.2.ebuild deleted file mode 100644 index f11b84946c03..000000000000 --- a/app-emulation/qemu/qemu-1.1.2.ebuild +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.5 2012/10/10 19:29:27 vapier Exp $ - -EAPI="4" - -MY_PN="qemu-kvm" -MY_P=${MY_PN}-${PV} - -PYTHON_DEPEND="2" -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user -#BACKPORTS=2 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" - inherit git-2 - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz - ${BACKPORTS:+ - http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.xz}" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" -IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \ -kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl \ -smartcard spice static systemtap tci +threads tls usbredir +uuid vde +vhost-net \ -virtfs +vnc xattr xen xfs" - -COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb" -IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32" - -# Setup the default SoftMMU targets, while using the loops -# below to setup the other targets. -IUSE="${IUSE}" -REQUIRED_USE="|| (" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - IUSE="${IUSE} qemu_softmmu_targets_${target}" - REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}" -done -REQUIRED_USE="${REQUIRED_USE} )" - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} qemu_user_targets_${target}" -done - -REQUIRED_USE="${REQUIRED_USE} - static? ( !alsa !pulseaudio ) - virtfs? ( xattr )" - -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] - sys-apps/pciutils[static-libs(+)] - sys-libs/zlib[static-libs(+)] - aio? ( dev-libs/libaio[static-libs(+)] ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) - jpeg? ( virtual/jpeg[static-libs(+)] ) - ncurses? ( sys-libs/ncurses[static-libs(+)] ) - png? ( media-libs/libpng[static-libs(+)] ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) - spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] ) - tls? ( net-libs/gnutls[static-libs(+)] ) - uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - xattr? ( sys-apps/attr[static-libs(+)] ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !app-emulation/kqemu - !app-emulation/qemu - !<app-emulation/qemu-1.0 - >=sys-firmware/seabios-1.7.0 - sys-firmware/sgabios - sys-firmware/vgabios - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - brltty? ( app-accessibility/brltty ) - opengl? ( virtual/opengl ) - pulseaudio? ( media-sound/pulseaudio ) - python? ( =dev-lang/python-2*[ncurses] ) - sdl? ( media-libs/libsdl[X] ) - smartcard? ( dev-libs/nss ) - spice? ( >=app-emulation/spice-protocol-0.8.1 ) - systemtap? ( dev-util/systemtap ) - usbredir? ( sys-apps/usbredir ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-text/texi2html ) - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - static? ( ${LIB_DEPEND} )" - -S="${WORKDIR}/${MY_P}" - -STRIP_MASK="/usr/share/qemu/palcode-clipper" - -QA_PREBUILT=" - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/palcode-clipper" - -QA_WX_LOAD="${QA_PRESTRIPPED} - usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requres a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CHECK_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL" - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if use static; then - ewarn "USE=static is very much a moving target because of the packages" - ewarn "we depend on will have their static libs ripped out or wrapped" - ewarn "with USE=static-libs or USE=static due to continued dicsussion" - ewarn "on the mailing list about USE=static's place in Gentoo. As a" - ewarn "result what worked today may not work tomorrow." - fi -} - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup - - enewgroup kvm 78 -} - -src_prepare() { - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - - python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat" - - [[ -n ${BACKPORTS} ]] && \ - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ - epatch - - epatch_user -} - -src_configure() { - local conf_opts audio_opts user_targets - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - einfo "Building the following softmmu targets: ${softmmu_targets}" - - if [[ -n ${user_targets} ]]; then - einfo "Building the following user targets: ${user_targets}" - conf_opts="${conf_opts} --enable-linux-user" - else - conf_opts="${conf_opts} --disable-linux-user" - fi - - # Add support for SystemTAP - use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace" - - # Fix QA issues. QEMU needs executable heaps and we need to mark it as such - #conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap" - - # Add support for static builds - use static && conf_opts="${conf_opts} --static --disable-pie" - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if ! use static && gcc-specs-pie; then - conf_opts="${conf_opts} --enable-pie" - fi - - # audio options - audio_opts="oss" - use alsa && audio_opts="alsa,${audio_opts}" - use sdl && audio_opts="sdl,${audio_opts}" - use pulseaudio && audio_opts="pa,${audio_opts}" - use mixemu && conf_opts="${conf_opts} --enable-mixemu" - - # --enable-vnc-thread will go away in 1.2 - # $(use_enable xen xen-pci-passthrough) for 1.2 - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-bsd-user \ - --disable-guest-agent \ - --disable-libiscsi \ - --disable-strip \ - --disable-werror \ - --python=python2 \ - $(use_enable aio linux-aio) \ - $(use_enable bluetooth bluez) \ - $(use_enable brltty brlapi) \ - $(use_enable caps cap-ng) \ - $(use_enable curl) \ - $(use_enable debug debug-info) \ - $(use_enable debug debug-mon) \ - $(use_enable debug debug-tcg) \ - $(use_enable doc docs) \ - $(use_enable fdt) \ - $(use_enable jpeg vnc-jpeg) \ - $(use_enable kernel_linux kvm) \ - $(use_enable kernel_linux kvm-device-assignment) \ - $(use_enable kernel_linux nptl) \ - $(use_enable ncurses curses) \ - $(use_enable opengl) \ - $(use_enable png vnc-png) \ - $(use_enable rbd) \ - $(use_enable sasl vnc-sasl) \ - $(use_enable sdl) \ - $(use_enable smartcard smartcard) \ - $(use_enable smartcard smartcard-nss) \ - $(use_enable spice) \ - $(use_enable tci tcg-interpreter) \ - $(use_enable threads vnc-thread) \ - $(use_enable tls vnc-tls) \ - $(use_enable usbredir usb-redir) \ - $(use_enable uuid) \ - $(use_enable vde) \ - $(use_enable vhost-net) \ - $(use_enable virtfs) \ - $(use_enable vnc) \ - $(use_enable xattr attr) \ - $(use_enable xen) \ - $(use_enable xfs xfsctl) \ - --audio-drv-list=${audio_opts} \ - --target-list="${softmmu_targets} ${user_targets}" \ - --cc="$(tc-getCC)" \ - --host-cc="$(tc-getBUILD_CC)" \ - ${conf_opts} \ - || die "configure failed" - - # FreeBSD's kernel does not support QEMU assigning/grabbing - # host USB devices yet - use kernel_FreeBSD && \ - sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak -} - -src_install() { - emake DESTDIR="${ED}" install - - if [[ -n ${softmmu_targets} ]]; then - if use kernel_linux; then - insinto /lib/udev/rules.d/ - doins "${FILESDIR}"/65-kvm.rules - fi - - if use qemu_softmmu_targets_x86_64 ; then - dobin "${FILESDIR}"/qemu-kvm - ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed" - ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" - ewarn "your libvirt configs or other wrappers for ${PN}" - else - elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" - elog "of /usr/bin/qemu-kvm" - fi - fi - - dodoc Changelog MAINTAINERS TODO pci-ids.txt - newdoc pc-bios/README README.pc-bios - - if use doc; then - dohtml qemu-doc.html qemu-tech.html || die - fi - - use python & dobin scripts/kvm/kvm_stat - - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - - # Remove vgabios since we're using the vgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin - dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - - # Remove sgabios since we're using the sgabios packaged one - rm "${ED}/usr/share/qemu/sgabios.bin" - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]]; then - elog "If you don't have kvm compiled into the kernel, make sure you have" - elog "the kernel module loaded before running kvm. The easiest way to" - elog "ensure that the kernel module is loaded is to load it on boot." - elog "For AMD CPUs the module is called 'kvm-amd'" - elog "For Intel CPUs the module is called 'kvm-intel'" - elog "Please review /etc/conf.d/modules for how to load these" - elog - elog "Make sure your user is in the 'kvm' group" - elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login." - elog - elog "The ssl USE flag was renamed to tls, so adjust your USE flags." - elog "The nss USE flag was renamed to smartcard, so adjust your USE flags." - fi -} |