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 669351391DB for ; Wed, 19 Mar 2014 23:45:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DE56E092C; Wed, 19 Mar 2014 23:45:25 +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 C64C2E092C for ; Wed, 19 Mar 2014 23:45:24 +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 DAAFD340377 for ; Wed, 19 Mar 2014 23:45:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 6EE3218875 for ; Wed, 19 Mar 2014 23:45:22 +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: <1395272704.35aac8af4c1501571583e1faa13f6ce845e27458.dlan@gentoo> Subject: [gentoo-commits] proj/virtualization:master commit in: app-emulation/xen/, app-emulation/xen/files/ X-VCS-Repository: proj/virtualization X-VCS-Files: app-emulation/xen/files/xen-4.4-efi.patch app-emulation/xen/xen-4.4.0.ebuild X-VCS-Directories: app-emulation/xen/ app-emulation/xen/files/ X-VCS-Committer: dlan X-VCS-Committer-Name: Lan Yixun X-VCS-Revision: 35aac8af4c1501571583e1faa13f6ce845e27458 X-VCS-Branch: master Date: Wed, 19 Mar 2014 23:45:22 +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: 88a3d9e8-49e6-44cf-a456-fece9f5ced90 X-Archives-Hash: 7097124a4e5ff2c815694eb4739193d9 commit: 35aac8af4c1501571583e1faa13f6ce845e27458 Author: Yixun Lan gentoo org> AuthorDate: Wed Mar 19 23:45:04 2014 +0000 Commit: Lan Yixun gentoo org> CommitDate: Wed Mar 19 23:45:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=35aac8af app-emulation/xen: amend efi patch Signed-off-by: Yixun Lan gentoo.org> --- app-emulation/xen/files/xen-4.4-efi.patch | 23 +++++++++++++++++++++++ app-emulation/xen/xen-4.4.0.ebuild | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app-emulation/xen/files/xen-4.4-efi.patch b/app-emulation/xen/files/xen-4.4-efi.patch new file mode 100644 index 0000000..9213ade --- /dev/null +++ b/app-emulation/xen/files/xen-4.4-efi.patch @@ -0,0 +1,23 @@ +diff --git a/xen/Makefile b/xen/Makefile +index 39839a3..d2603f0 100644 +--- a/xen/Makefile ++++ b/xen/Makefile +@@ -38,9 +38,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) + _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) + [ -d $(D)/boot ] || $(INSTALL_DIR) $(D)/boot + $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_FULLVERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)$(Z) ++ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z);\ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)/boot/$(T)$(Z); \ ++ else \ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_VERSION)$(Z);\ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)$(Z); \ ++ fi; \ + $(INSTALL_DATA) $(TARGET)-syms $(D)/boot/$(T)-syms-$(XEN_FULLVERSION) + if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ + [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \ diff --git a/app-emulation/xen/xen-4.4.0.ebuild b/app-emulation/xen/xen-4.4.0.ebuild index 01c2efb..f311c3d 100644 --- a/app-emulation/xen/xen-4.4.0.ebuild +++ b/app-emulation/xen/xen-4.4.0.ebuild @@ -95,7 +95,7 @@ src_prepare() { sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" if use efi; then - epatch "${FILESDIR}"/${PN}-4.2-efi.patch + epatch "${FILESDIR}"/${PN}-4.4-efi.patch export EFI_VENDOR="gentoo" export EFI_MOUNTPOINT="boot" fi