From: Alexey Shvetsov Date: Sun, 11 Sep 2011 15:03:25 +0000 (+0000) Subject: [app-emulation/xen-tools] Sync live ebuild with 4.1.1, drop acm since its deprecated... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6d67ae2834783fe511ed3fe750ad3b6e2ab3fd9f;p=gentoo.git [app-emulation/xen-tools] Sync live ebuild with 4.1.1, drop acm since its deprecated upstream. Make xend optional. Input from Ian Delaney aka idell4 Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index 85fd76243feb..8c4d84b52997 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.82 2011/09/10 17:22:46 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.83 2011/09/11 15:03:25 alexxy Exp $ + +*xen-tools-4.1.1-r3 (11 Sep 2011) + + 11 Sep 2011; Alexey Shvetsov -xen-tools-4.1.1-r2.ebuild, + +xen-tools-4.1.1-r3.ebuild, xen-tools-9999.ebuild, metadata.xml: + Sync live ebuild with 4.1.1, drop acm since its deprecated upstream. Make + xend optional. Input from Ian Delaney aka idell4 *xen-tools-4.1.1-r2 (10 Sep 2011) diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index f91c8c13771b..9e55edc82a55 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -19,24 +19,24 @@ AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 983 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14 -EBUILD xen-tools-4.1.1-r2.ebuild 8772 RMD160 9414f0ff4c8032644a62a5c89b54ab2a0eebd5ea SHA1 b0e8bcd57fb8cb70f5d3133f39810ac37af43f3f SHA256 159b4411038debefe53da4a42c27a352719b40602bdee130e346c3f599e785f7 -EBUILD xen-tools-9999.ebuild 8295 RMD160 08b25a6b7b416aa14e4774ddbb9200aac47b56a6 SHA1 bb097135becc1a0728cfff6c358265b1f8e2ffde SHA256 93794a383c65b89617110f41809ce72cfdbdc78a849ecdea384bb8db31669ad9 -MISC ChangeLog 20167 RMD160 eecf3f0e65da0cc90b3038086ae6d4ea548fac62 SHA1 312d337d0e038e776745c0c30ca5bf5d3db6f2c1 SHA256 68bc2a0464bc8f8f18846c00ce079b496da95f7987c67be0b086e4ebc8daa25a -MISC metadata.xml 793 RMD160 f11b22342cd9c0e09ec71c332dc82033d53c4a8e SHA1 f276e51986ee4f8e72dee3f68410ce46a3feef6b SHA256 405864f69371aca210b92bf04a6bead6f6b1f209d96b4f97a5b2b193f001893d +EBUILD xen-tools-4.1.1-r3.ebuild 9295 RMD160 ec18c7d445ca1ef4fbd7878f205f6f3e2a39d454 SHA1 5683fe9177c4968fd01ffbe07e7300a32c432e83 SHA256 7937bbf91982965e21a8b7a5c1d96ea617ccc5353128546b2c8ba2a87faf4466 +EBUILD xen-tools-9999.ebuild 9291 RMD160 5a7588c3ccff3987735322c340f0bfcff4f285c5 SHA1 6a72882388678e704e62f2636fcda9da29d6e869 SHA256 9d888b08d501c189503701dcf626f2847456c7676af12bb1e72683b0dd983aad +MISC ChangeLog 20476 RMD160 96e6d019cc1773f6debae4d70bc3068b94d55278 SHA1 4c4dd6d590610b655ce7c7b17f1bbd13777599ae SHA256 4c6d2d4d3705d21d3a0cc3576a6dbac72b3f9aebcc19773f64ade96c68cd77ac +MISC metadata.xml 865 RMD160 7188d730684d02d8bcf8dbce413c01ae50b84ad1 SHA1 4815bcf6d0c2c61c6186ecde52d984669c44ccfd SHA256 08f789d1d92184515d9360b20c7ec0f8554977c470c702c659e79aced68edf38 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCAAGBQJOa5y/AAoJEOf+E+/4L5LmyHgP/iaXurmq44aUIS/JNDecthhs -N+IdQT0FPqgE+WyWtea7qIaWbdFNVFHm5Ebq+4w6eKr4O0qYU47gjzKlDLa4RXGq -oEB18cw5w1QgSCezQBqfB+ew2afgWWWB4tOoHu/VVyVFH6w591/VwgmsTP9PxhuO -Og2wg+GNXqttFylbscrrmRZTKaS+xa2skO4Iz15fmJt2oTEhEj7wgVHqCqRAJJGW -MaQciazuh1ri7NjFdonaNlP84IzfuGHQ2VZx7ahXnPsPlzs9QqArlBf28eNuF/L1 -Zh7qY+FXMvLwKYBRmftE5L8TnhIOlMc1cFdBcHnLNw76NdumqUIjIvd46075A0aj -aZSqLSLbk0ES2NWje9e5cEb+KtzMbXl3JLI+IvcdPbEHpG1K3UioqmD/t1/+048b -J5vBd9cDvF1M0OFM11igWYDeI5AKXcQa81Jafdt/XBSd+sFR0T9ACvjqpKR2TMwP -BAgP1R36avAn05Vwkb0I06aNOYBOmYHlCXCT0LL4bwdSdx/BYSlYjPSSK+HNacqp -oQt2a+EOYRR29zMrnRMbMljSuGmVqh4g6A8wtVGbouZYdtY2WsvbDi3uFm9E6SD1 -wBLl46H65DYz64uXSEH0vq/kgA0OydQ3hD6fpBWXymbiThwpUw4xsz566+xm+pLu -fD/Z+c5YMZanhOvD2aQF -=NSOB +iQIcBAEBCAAGBQJObM2NAAoJEOf+E+/4L5Lm3fMQAIAABzlYM1cN8aqxAl/DpBNj +TUbD8ANwEJ9BbbGW6LtcvfbAfHgFUIwZRmIkXom85RohKgLDSnlGHi6hrvFEjsH3 +zO3sT6l3619PjvuLWW8cGRbKCttO26xC8dJXvr/hNUY0QNCHYlRAJyMABtc7SYfs +7/TUh/mb+zrpy3kHvKVfrQjfitlxYbzWEmrc0PccGXZYoA2KVB/ydoKDdd+yPIKg +MypbBB730/1D67P45aa58kNLp9QcCw28eoNnWPTeUrunYOuvRbaR6hqipQP6xYHT +S5KzMrGyS5vwFEyEGijnOl5Ud60tB6/dLJ4KVfIaw9qEGJo9qDND22Ehepwq6NXp +Y1Mufv0yCxv3zjhCrFUNw4qYdZBhzXa7vsPIfyYBvNzvwVZAwC8gAb0FO5Fgt6EY +F8pWyTsMFdA2gUKH8HZbf7GOLVJqTdCpJ/7FLz5XyHczIYtxBKfwHLnDLhWzvrSV +TY8k9yTq18hpXCCJtwS8usbutQQMqkyw/96eTyzt0s/0UnXiX83H4hGlXCFffwxe +7c5Aunn8YYMUT7EGAFkrREhAGnXZXcNPKjgNkhoUxVSA/X9F6+8pAiZ9LwILn6AK +yhNID4vwqoTAdVtHf65ECwd6ep2gNua+v+0co/iEoqf0YU6br+YXIp0lSC8B6vYe +yjkC6NfW8vc45kX1VnVA +=jLui -----END PGP SIGNATURE----- diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml index e0239c52966b..568adbf4c226 100644 --- a/app-emulation/xen-tools/metadata.xml +++ b/app-emulation/xen-tools/metadata.xml @@ -7,12 +7,13 @@ Ian Delaney aka idella4 proxy maintainer - Enable support for hardware based virtualization (VT-x,AMD-v - Install the pygrub boot loader - Enable support for running domain U console in an app-misc/screen session Enable the ACM/sHype XSM module from IBM - Enable the Flask XSM module from NSA Build the C libxenapi bindings + Enable the Flask XSM module from NSA + Enable support for hardware based virtualization (VT-x,AMD-v Enable IOEMU support + Install the pygrub boot loader + Enable support for running domain U console in an app-misc/screen session + Enable support the xend and xm to manage xen diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild similarity index 90% rename from app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild rename to app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild index 96211a37df24..2c2308064a9e 100644 --- a/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild @@ -1,20 +1,29 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild,v 1.1 2011/09/10 17:22:46 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild,v 1.1 2011/09/11 15:03:25 alexxy Exp $ EAPI="3" -inherit flag-o-matic eutils multilib python +if [[ $PV == *9999 ]]; then + KEYWORDS="" + REPO="xen-unstable.hg" + EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" + S="${WORKDIR}/${REPO}" + live_eclass="mercurial" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" + S="${WORKDIR}/xen-${PV}" +fi + +inherit flag-o-matic eutils multilib python ${live_eclass} DESCRIPTION="Xend daemon and tools" HOMEPAGE="http://xen.org/" -SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" -S="${WORKDIR}/xen-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc debug screen custom-cflags pygrub hvm api flask ioemu" +IUSE="api custom-cflags debug doc flask hvm ioemu pygrub screen xend" CDEPEND="dev-lang/python dev-python/lxml @@ -111,7 +120,6 @@ pkg_setup() { fi use api && export "LIBXENAPI_BINDINGS=y" - use acm && export "ACM_SECURITY=y" use flask && export "FLASK_ENABLE=y" } @@ -119,6 +127,13 @@ src_prepare() { sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS" # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + # Xend + if ! use xend; then + sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ + -i tools/misc/Makefile || die "Disabling xend failed" + sed -e 's:^XEND_INITD:#XEND_INITD:' \ + -i tools/examples/Makefile || "Disabling xend failed" + fi # 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" @@ -208,7 +223,7 @@ src_install() { doman docs/man?/* - newinitd "${FILESDIR}"/xend.initd-r2 xend \ + use xend && newinitd "${FILESDIR}"/xend.initd-r2 xend \ || die "Couldn't install xen.initd" newconfd "${FILESDIR}"/xendomains.confd xendomains \ || die "Couldn't install xendomains.confd" @@ -268,7 +283,10 @@ pkg_postinst() { echo elog "The ioemu use flag has been removed and replaced with hvm." fi - + if use xend; then + echo + elog "xend capability has been enabled and installed" + 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-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild index d518be480029..c0d6727a6c17 100644 --- a/app-emulation/xen-tools/xen-tools-9999.ebuild +++ b/app-emulation/xen-tools/xen-tools-9999.ebuild @@ -1,28 +1,35 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.3 2011/08/09 18:54:32 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.4 2011/09/11 15:03:25 alexxy Exp $ EAPI="3" -inherit flag-o-matic eutils multilib python mercurial +if [[ $PV == *9999 ]]; then + KEYWORDS="" + REPO="xen-unstable.hg" + EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" + S="${WORKDIR}/${REPO}" + live_eclass="mercurial" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" + S="${WORKDIR}/xen-${PV}" +fi + +inherit flag-o-matic eutils multilib python ${live_eclass} DESCRIPTION="Xend daemon and tools" HOMEPAGE="http://xen.org/" -REPO="xen-unstable.hg" -EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" -S="${WORKDIR}/${REPO}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="doc debug screen custom-cflags pygrub hvm api acm flask ioemu" +IUSE="api custom-cflags debug doc flask hvm ioemu pygrub screen xend" CDEPEND="dev-lang/python dev-python/lxml sys-libs/zlib hvm? ( media-libs/libsdl sys-power/iasl ) - acm? ( dev-libs/libxml2 ) api? ( dev-libs/libxml2 net-misc/curl )" DEPEND="${CDEPEND} @@ -35,6 +42,13 @@ DEPEND="${CDEPEND} dev-tex/latex2html media-gfx/transfig media-gfx/graphviz + dev-tex/xcolor + dev-texlive/texlive-latexextra + virtual/latex-base + dev-tex/latexmk + dev-texlive/texlive-latex + dev-texlive/texlive-pictures + dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto @@ -45,6 +59,7 @@ RDEPEND="${CDEPEND} sys-apps/iproute2 net-misc/bridge-utils dev-python/pyxml + >=dev-lang/ocaml-3.12.0 screen? ( app-misc/screen app-admin/logrotate @@ -105,7 +120,6 @@ pkg_setup() { fi use api && export "LIBXENAPI_BINDINGS=y" - use acm && export "ACM_SECURITY=y" use flask && export "FLASK_ENABLE=y" } @@ -113,6 +127,13 @@ src_prepare() { sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS" # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + # Xend + if ! use xend; then + sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \ + -i tools/misc/Makefile || die "Disabling xend failed" + sed -e 's:^XEND_INITD:#XEND_INITD:' \ + -i tools/examples/Makefile || "Disabling xend failed" + fi # 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" @@ -147,6 +168,9 @@ src_prepare() { sed -e "s:-Werror::g" -i tools/xenstat/xentop/Makefile # Fix network broadcast on bridged networks epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" + + # Do not strip binaries + epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch" } src_compile() { @@ -176,7 +200,13 @@ src_install() { || die "install failed" # Remove RedHat-specific stuff - rm -r "${D}"/etc/default "${D}"/etc/init.d/xen* || die + rm -r "${D}"/etc/init.d/xen* || die + + # uncomment lines in xl.conf + sed -e 's:^#autoballoon=1:autoballoon=1:' \ + -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \ + -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ + -i tools/examples/xl.conf || die dodoc README docs/README.xen-bugtool docs/ChangeLog if use doc; then @@ -193,7 +223,7 @@ src_install() { doman docs/man?/* - newinitd "${FILESDIR}"/xend.initd-r2 xend \ + use xend && newinitd "${FILESDIR}"/xend.initd-r2 xend \ || die "Couldn't install xen.initd" newconfd "${FILESDIR}"/xendomains.confd xendomains \ || die "Couldn't install xendomains.confd" @@ -253,7 +283,10 @@ pkg_postinst() { echo elog "The ioemu use flag has been removed and replaced with hvm." fi - + if use xend; then + echo + elog "xend capability has been enabled and installed" + fi if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then echo elog "xensv is broken upstream (Gentoo bug #142011)."