From 360fe207c26c98c0f54bef839aab1f063590ff11 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Sun, 7 Mar 2010 03:15:31 +0000 Subject: [PATCH] Added a patch to fix the support for --sysconfdir and updated src_configure to prevent the default $prefix/etc. Package-Manager: portage-2.2_rc65/cvs/Linux x86_64 --- app-emulation/qemu-kvm/ChangeLog | 7 ++++++- app-emulation/qemu-kvm/Manifest | 15 +++------------ .../files/qemu-kvm-9999-sysconfigdir.patch | 11 +++++++++++ app-emulation/qemu-kvm/qemu-kvm-9999.ebuild | 6 +++++- 4 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index 6db46bca9856..7fc96dcbc78e 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/qemu-kvm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.20 2010/03/02 16:56:34 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.21 2010/03/07 03:15:30 jmbsvicetto Exp $ + + 07 Mar 2010; Jorge Manuel B. S. Vicetto + qemu-kvm-9999.ebuild, +files/qemu-kvm-9999-sysconfigdir.patch: + Added a patch to fix the support for --sysconfdir and updated + src_configure to prevent the default $prefix/etc. *qemu-kvm-0.12.3 (02 Mar 2010) diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index 240a785e8a4f..f5834e1bbf58 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -1,10 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29 AUX qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch 622 RMD160 d3add3022d9eba3ec07ccade6f169b4d758d23e8 SHA1 b41e9516d69c179701906f157750e72a82c650ca SHA256 f51a7b3ea49f814a5f7726daeac08e5ab641d2e0ea72e90b4b83dd914ca742ff AUX qemu-kvm-0.12.2-virtio-large-iovecs.patch 987 RMD160 b16ae8ffd7a4b2d32c32d0ae56c707958344b3eb SHA1 65cd9b99929e5057d636d9676f5a3435db24695f SHA256 e4ca83f65c4deb16e2c22d728e547012aa6110a00ced92a9590990307ab9f7df +AUX qemu-kvm-9999-sysconfigdir.patch 297 RMD160 7b9d6c404e4e5bea44625b92b1956816519ca7c3 SHA1 bf7c7b7af0997100595e641fd7aee0c5ba9e9b2f SHA256 53c6f861df73e2183f373e464fdfefc55af885dc0b7d1c52d6ad9e853eead92b DIST qemu-kvm-0.11.1.tar.gz 4384334 RMD160 0f945f1812b3a42a5642698d2f15bd8f456612f8 SHA1 291d0b771feb4c67bce71d393868a6d1a1db345b SHA256 7df5b589fabb1f0f35a06abce7e34c81574e09ade538ba883ef5b43ccbd8458b DIST qemu-kvm-0.12.1.1.tar.gz 4712192 RMD160 bb457854c79951bdb0db90da30bd31ac6a033d02 SHA1 0383219e824dff766821444c42c962d21e56a63f SHA256 38b3e272704bf53c1198ccc2d1492df656bcc1da53f1e04c56d9ee4063e2286f DIST qemu-kvm-0.12.1.2.tar.gz 4712236 RMD160 55052450668310d6e167fe12e6a7a933cee62a3a SHA1 dee7359094757af77ea839bbfd9dca8826edcbd2 SHA256 472ddba26c30390dfcb3eb5f7925b442f6152062e919badf0a61586073eabdcc @@ -20,13 +18,6 @@ EBUILD qemu-kvm-0.12.2-r1.ebuild 6705 RMD160 9861eb69394ed00cfa6f06519f381e6d292 EBUILD qemu-kvm-0.12.2-r2.ebuild 6839 RMD160 a9ace9aa4478ce9ed74fa61c0cecb80d0f22611a SHA1 8904c62ce54d589d9b8d817da793ddc559f2cb5c SHA256 cb39e309822fe468b362b316ad05428f7038b0c56a61a6da14334eca21f7ea8d EBUILD qemu-kvm-0.12.2.ebuild 6648 RMD160 333447896ae44355399f39b23e32ef2138a46741 SHA1 bac4ff49097b10afac1448d5939c5aa11e5b6567 SHA256 bdd45631910028f65be2664cf19572a78f9671504809d73f2760c52c23a44a1b EBUILD qemu-kvm-0.12.3.ebuild 6837 RMD160 40424585af908c62a46f331f7af75624247f9108 SHA1 2393e010d31cca98046b845ae4e4b636de640f8f SHA256 84a47c6ce72de72688e2de5f4771c5a589936648195b4fc5c82f75d2b7fd97cb -EBUILD qemu-kvm-9999.ebuild 6835 RMD160 4f00534058c3abffb099032c54a27594b8017886 SHA1 3dc8a2b8339fc3ec5cd117b165beee07345f6b4d SHA256 597191c77c46853d593db212c59ca0244387dc4d0a80f55dcb236418401ac01f -MISC ChangeLog 4214 RMD160 59f22e911fbe2804713f6b65fa477c56342de785 SHA1 1b5e0400c76b737e771b803a09083c718a9032f6 SHA256 5556b0d247ae54bc96d2a988154b6a564aad0565249b5f372bb02cb2f139e31b +EBUILD qemu-kvm-9999.ebuild 6966 RMD160 ccddfa0584684e8a08a52656aa704afc59ba3da4 SHA1 abf1581414776ab93b44a69989f2502160b0cfbd SHA256 cc6d1bffac166fefe6832f7d465d6e9945df86d5de000a52105a24d44e7c43bb +MISC ChangeLog 4468 RMD160 08123f162fd0353909aabdafe444e7aad1a331c9 SHA1 549b64fd9861360ded024c6fb429f201df608437 SHA256 d157bc564b7a3f1c2f7160e0a7f8e527aa2c09d5e0e8dbaba508b74b35f69ade MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuNQ00ACgkQoeSe8B0zEfyGvwCfUV4/CoQ1gDTdoqo6wHUUPM9Z -pGQAnjivpjO9p5xv9n64IEwvTAhOmJMS -=Ivr5 ------END PGP SIGNATURE----- diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch b/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch new file mode 100644 index 000000000000..a42a0efb2e16 --- /dev/null +++ b/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch @@ -0,0 +1,11 @@ +--- configure-old 2010-03-07 00:49:33.889297264 -0100 ++++ configure 2010-03-07 00:54:12.681171878 -0100 +@@ -517,7 +517,7 @@ + static="yes" + LDFLAGS="-static $LDFLAGS" + ;; +- --sysconfdir) sysconfdir="$optarg" ++ --sysconfdir=*) sysconfdir="$optarg" + ;; + --disable-sdl) sdl="no" + ;; diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild index 43f487cacce2..c6345286daae 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.4 2010/03/02 16:56:34 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.5 2010/03/07 03:15:30 jmbsvicetto Exp $ EAPI="2" @@ -108,6 +108,7 @@ src_prepare() { sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" + epatch "${FILESDIR}/${P}-sysconfigdir.patch" } src_configure() { @@ -140,6 +141,9 @@ src_configure() { # Add support for static builds use static && conf_opts="${conf_opts} --static" + # Fix the $(prefix)/etc issue + conf_opts="${conf_opts} --sysconfdir=${D}/etc" + #config options conf_opts="${conf_opts} $(use_enable aio linux-aio)" use bluetooth || conf_opts="${conf_opts} --disable-bluez" -- 2.26.2