From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0F219138247 for ; Mon, 20 Jan 2014 10:27:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6AB0E0DE9; Mon, 20 Jan 2014 10:27:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1995E0DE7 for ; Mon, 20 Jan 2014 10:27:08 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 502B333F9C9 for ; Mon, 20 Jan 2014 10:27:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7DBF518737 for ; Mon, 20 Jan 2014 10:27:05 +0000 (UTC) From: "Lan Yixun" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lan Yixun" Message-ID: <1390212827.58006ef202f8eb848135222f9d3957159e6c099c.dlan@gentoo> Subject: [gentoo-commits] proj/virtualization:dlan commit in: app-emulation/xen-tools/ X-VCS-Repository: proj/virtualization X-VCS-Files: app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: dlan X-VCS-Committer-Name: Lan Yixun X-VCS-Revision: 58006ef202f8eb848135222f9d3957159e6c099c X-VCS-Branch: dlan Date: Mon, 20 Jan 2014 10:27:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6f1ddf39-2767-4dad-9fec-35944f8c550a X-Archives-Hash: 0ff31174a7aa8815c5f7f3676b76c6c5 commit: 58006ef202f8eb848135222f9d3957159e6c099c Author: Yixun Lan gentoo org> AuthorDate: Mon Jan 20 10:13:47 2014 +0000 Commit: Lan Yixun gentoo org> CommitDate: Mon Jan 20 10:13:47 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=58006ef2 app-emulation/xen-tools: rework, make patches go first Signed-off-by: Yixun Lan gentoo.org> --- app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild | 78 +++++++++++----------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild index 3adad19..720538e 100644 --- a/app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.4.0_rc2.ebuild @@ -143,6 +143,46 @@ pkg_setup() { } src_prepare() { + # Fix texi2html build error with new texi2html, qemu.doc.html + epatch "${FILESDIR}"/${PN}-4-docfix.patch + + # Fix network broadcast on bridged networks + epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" + + # Prevent the downloading of ipxe, seabios + epatch "${FILESDIR}"/${PN/-tools/}-4.3-anti-download.patch + + # Fix bridge by idella4, bug #362575 + epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" + + # Don't build ipxe with pie on hardened, Bug #360805 + if gcc-specs-pie; then + epatch "${FILESDIR}"/ipxe-nopie.patch + fi + + # Prevent double stripping of files at install + epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip-r1.patch + + # fix jobserver in Makefile + epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch + + # Set dom0-min-mem to kb; Bug #472982 + epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch + + # Bug 477676 + epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch + + # Prevent file collision with qemu package Bug 478064 + epatch "${FILESDIR}"/qemu-bridge-r1.patch + mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die + + use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die + sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ + -i tools/firmware/Makefile || die + + # Bug 379537 + epatch "${FILESDIR}"/fix-gold-ld.patch + # Drop .config, fixes to gcc-4.6 sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" @@ -177,54 +217,16 @@ src_prepare() { # Don't bother with qemu, only needed for fully virtualised guests sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die - # Fix texi2html build error with new texi2html, qemu.doc.html - epatch "${FILESDIR}"/${PN}-4-docfix.patch - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - - # Prevent the downloading of ipxe, seabios - epatch "${FILESDIR}"/${PN/-tools/}-4.3-anti-download.patch cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die mv ../seabios-dir-remote tools/firmware/ || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die popd > /dev/null - # Fix bridge by idella4, bug #362575 - epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - - # Don't build ipxe with pie on hardened, Bug #360805 - if gcc-specs-pie; then - epatch "${FILESDIR}"/ipxe-nopie.patch - fi - - # Prevent double stripping of files at install - epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip-r1.patch - - # fix jobserver in Makefile - epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch - - # Set dom0-min-mem to kb; Bug #472982 - epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch - # Bug 472438 sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \ -i Config.mk || die - # Bug 477676 - epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch - - # Prevent file collision with qemu package Bug 478064 - epatch "${FILESDIR}"/qemu-bridge-r1.patch - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Bug 379537 - epatch "${FILESDIR}"/fix-gold-ld.patch # xencommons, Bug #492332, sed lighter weight than patching sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \