diff options
author | 2014-03-17 23:08:38 +0800 | |
---|---|---|
committer | 2014-03-17 23:08:38 +0800 | |
commit | e40d2a75af5444933a71535ed859f882896f6ced (patch) | |
tree | 16c795f09cbcc70bdbba5ace19e207909138ce47 | |
parent | app-emulation/xen-tools: bump 4.4.0_rc6 (diff) | |
download | virtualization-e40d2a75af5444933a71535ed859f882896f6ced.tar.gz virtualization-e40d2a75af5444933a71535ed859f882896f6ced.tar.bz2 virtualization-e40d2a75af5444933a71535ed859f882896f6ced.zip |
xen: bump to 4.4.0
Signed-off-by: Yixun Lan <dlan@gentoo.org>
-rw-r--r-- | app-emulation/xen-tools/Manifest | 2 | ||||
-rw-r--r-- | app-emulation/xen-tools/xen-tools-4.4.0.ebuild (renamed from app-emulation/xen-tools/xen-tools-4.4.0_rc6.ebuild) | 23 | ||||
-rw-r--r-- | app-emulation/xen/Manifest | 2 | ||||
-rw-r--r-- | app-emulation/xen/xen-4.4.0.ebuild (renamed from app-emulation/xen/xen-4.4.0_rc6.ebuild) | 13 |
4 files changed, 28 insertions, 12 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 18f3b2a..568b0d7 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -3,4 +3,4 @@ DIST seabios-0-20121121.tar.bz2 2199282 SHA256 f7f67181c6c0b4cea3a9db48e2569fdcb DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942eea1490a9e7e01f478541577025f6eef76e0c76de SHA512 e9ebe3711e3f678d3632f8e8e645f8be4fb65608aff04aeeb0e1152521bf571bc4d879f136d23bb0aa8bd4c4ec20f294b472cf54dc70916e52d330328aadd357 WHIRLPOOL 6138271f72fd96fabe3cffc07a6efcb9c0e195ed96f4ad708d00e85e0a84a03900dc41389cd4f26d533a3aa42142a9e17708d7b87d722f1c9348f61a5db3e59d DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea DIST xen-4.3.0.tar.gz 16425975 SHA256 e1e9faabe4886e2227aacdbde74410653b233d66642ca1972a860cbec6439961 SHA512 e6b8f64e15e48704ea5cee5585cd6151fe6a5a62bc4670caf0b762c1aa71c9598db236c637ac34c42c92c6e8a5001acdd3d9d4b9305401a26273279358f481d6 WHIRLPOOL a91f14bc6535127ab17d3867b92fb3e008089453d5ba7996fd1d0b5c6d32a881c07df320f018c928e919f28de7b4ab4757c6bdb020e0cdb7d67960d4cab9dda0 -DIST xen-4.4.0-rc6.tar.gz 18116817 SHA256 0949d3d5c79312e3f053e6456216206e0c062d4f6962545521e972bc09a290dc SHA512 84d499ca725fd12fefb0cb345a5fd3ad52245863ca1700d90739a317349ea130418dc1bb83063b1c89378a862f4501847684e76363a338962ed64504ad935d6b WHIRLPOOL 20ff9d1f5317c228cf6d0bd01fab85864be49b3d3e72c928d6245363854693f9808c1bc002e99340592ed187d40f5257397505b5ec7547ef814774f9fe787292 +DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406 diff --git a/app-emulation/xen-tools/xen-tools-4.4.0_rc6.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0.ebuild index 29af48a..323a07c 100644 --- a/app-emulation/xen-tools/xen-tools-4.4.0_rc6.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.3.1-r3.ebuild,v 1.4 2013/12/22 12:01:08 idella4 Exp $ @@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm -x86" UPSTREAM_VER= GENTOO_VER= @@ -39,7 +39,7 @@ DOCS=( README docs/README.xen-bugtool ) LICENSE="GPL-2" SLOT="0" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make +# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make # >=dev-lang/ocaml-4 stable # Masked in profiles/eapi-5-files instead IUSE="api custom-cflags debug doc xsm flask hvm qemu ocaml +pam python pygrub screen static-libs xend" @@ -55,7 +55,6 @@ DEPEND="dev-libs/lzo:2 dev-python/lxml[${PYTHON_USEDEP}] pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) sys-libs/zlib - sys-power/iasl sys-firmware/seabios sys-firmware/ipxe hvm? ( media-libs/libsdl ) @@ -63,8 +62,10 @@ DEPEND="dev-libs/lzo:2 api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) - sys-devel/bin86 - sys-devel/dev86 + arm? ( >=sys-apps/dtc-1.4.0 ) + !arm? ( sys-devel/bin86 + sys-devel/dev86 + sys-power/iasl ) dev-lang/perl app-misc/pax-utils dev-python/markdown @@ -142,6 +143,8 @@ pkg_setup() { export XEN_TARGET_ARCH="x86_32" elif use amd64 ; then export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" else die "Unsupported architecture!" fi @@ -262,6 +265,11 @@ src_prepare() { sed -i -e "/\/var\/lock\/subsys/d" \ tools/Makefile || die + if use arm; then + rm -rf "${S}"/tools/libaio/ || die + mv "${WORKDIR}"/libaio-0.3.109 "${S}"/tools/libaio || die + fi + epatch_user } @@ -270,6 +278,9 @@ src_configure() { --libdir=/usr/$(get_libdir) \ --disable-werror \ --with-system-seabios=/usr/share/seabios/bios.bin \ + --disable-xen \ + --enable-tools \ + $(use_enable doc docs) \ $(use_enable pam) \ $(use_enable api xenapi) \ $(use_enable ocaml ocamltools) \ diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 1933814..5033931 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,3 +1,3 @@ DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea DIST xen-4.3.0.tar.gz 16425975 SHA256 e1e9faabe4886e2227aacdbde74410653b233d66642ca1972a860cbec6439961 SHA512 e6b8f64e15e48704ea5cee5585cd6151fe6a5a62bc4670caf0b762c1aa71c9598db236c637ac34c42c92c6e8a5001acdd3d9d4b9305401a26273279358f481d6 WHIRLPOOL a91f14bc6535127ab17d3867b92fb3e008089453d5ba7996fd1d0b5c6d32a881c07df320f018c928e919f28de7b4ab4757c6bdb020e0cdb7d67960d4cab9dda0 -DIST xen-4.4.0-rc6.tar.gz 18116817 SHA256 0949d3d5c79312e3f053e6456216206e0c062d4f6962545521e972bc09a290dc SHA512 84d499ca725fd12fefb0cb345a5fd3ad52245863ca1700d90739a317349ea130418dc1bb83063b1c89378a862f4501847684e76363a338962ed64504ad935d6b WHIRLPOOL 20ff9d1f5317c228cf6d0bd01fab85864be49b3d3e72c928d6245363854693f9808c1bc002e99340592ed187d40f5257397505b5ec7547ef814774f9fe787292 +DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406 diff --git a/app-emulation/xen/xen-4.4.0_rc6.ebuild b/app-emulation/xen/xen-4.4.0.ebuild index 09c0a07..01c2efb 100644 --- a/app-emulation/xen/xen-4.4.0_rc6.ebuild +++ b/app-emulation/xen/xen-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-9999.ebuild,v 1.4 2011/09/11 14:48:15 alexxy Exp $ +# $Header: $ EAPI=5 @@ -14,7 +14,7 @@ if [[ $PV == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git" live_eclass="git-2" else - KEYWORDS="" + KEYWORDS="~amd64 ~arm -x86" UPSTREAM_VER= GENTOO_VER= @@ -47,7 +47,8 @@ RESTRICT="test" # Approved by QA team in bug #144032 QA_WX_LOAD="boot/xen-syms-${PV}" -REQUIRED_USE="flask? ( xsm )" +REQUIRED_USE="flask? ( xsm ) + arm? ( debug )" S="${WORKDIR}/${MY_P}" @@ -60,6 +61,8 @@ pkg_setup() { export XEN_TARGET_ARCH="x86_32" elif use amd64; then export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" else die "Unsupported architecture!" fi @@ -120,6 +123,8 @@ src_prepare() { } src_configure() { + use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" + use debug && myopt="${myopt} debug=y" if use custom-cflags; then @@ -132,7 +137,7 @@ src_configure() { src_compile() { # Send raw LDFLAGS so that --as-needed works - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} + emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} } src_install() { |