From ee85b6c6feaa2f18a9b49746cf6b76aa1d892893 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Sat, 24 Jan 2015 05:05:42 +0000 Subject: [PATCH] add patch to update for IUSE efi, prepared by D. Mannarino from bug #534570, fixes said bug Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- app-emulation/xen/ChangeLog | 7 ++++- app-emulation/xen/Manifest | 21 ++++--------- app-emulation/xen/files/xen-4.5-efi.patch | 37 +++++++++++++++++++++++ app-emulation/xen/xen-4.5.0.ebuild | 4 +-- 4 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 app-emulation/xen/files/xen-4.5-efi.patch diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog index 02c9ddac46e1..dadfd21fb4f5 100644 --- a/app-emulation/xen/ChangeLog +++ b/app-emulation/xen/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/xen # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.186 2015/01/21 02:46:30 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.187 2015/01/24 05:05:19 idella4 Exp $ + + 24 Jan 2015; Ian Delaney +files/xen-4.5-efi.patch, + xen-4.5.0.ebuild: + add patch to update for IUSE efi, prepared by D. Mannarino from bug #534570, + fixes said bug *xen-4.5.0 (21 Jan 2015) *xen-4.4.1-r5 (21 Jan 2015) diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 335f37c089cf..45a56bc3dc5d 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -5,6 +5,7 @@ AUX xen-4-fix_dotconfig-gcc.patch 1525 SHA256 943119cde08d16d05a927a85fb54ee4cee AUX xen-4.2-efi.patch 2216 SHA256 0886961e2656fe7e140dd0ac0e6620d4c14ef0796b8f8889bda163e2a9f8db8b SHA512 ecaa4f1f1c3ca737931fe5343529708dfb7ec7040dbf2acf2b155e7c7f019ce3e2630ddb302213570a2647fe220dbf23eb6c28618d6b1be9161e25fcadd71cb4 WHIRLPOOL 63b56e22683b2755ae17e7871c1b535d750f655ff8c003979d039654f5ef3303457b5d4469f216c1744202d4d1f4561f7498c1d93171ab1110a93e3a2fa8db8d AUX xen-4.3-fix_dotconfig-gcc.patch 8854 SHA256 4e0d22acdb4ecc4a1d418ec91bc6ddb9ef1c283ee3ca1f67bac85d3116d76ccc SHA512 b4c969b0cf166862ea5c5cb0912d7dae8c5bf7befd6dd6bdf4e56df8a4daf85c0a36c94247053f74edc0f24b1c15a18e7ddae9d24ad28d54b726a1fbbab442be WHIRLPOOL de7b614ae486fd2cc591b405b475745b003c638c9be4c8153b61a368802af36d2a2974d1e022eb14fb58ad9260f9f82c438c84cb65c3499076c579f7e1c3e6ad AUX xen-4.4-efi.patch 1873 SHA256 096ae932f6f9387b8d5a837279c436173310f121e06ba356b7dded67d682ac7a SHA512 a448b72f679fa2e9d544d73bfb68d2deef646706917114a458c9c44a0338d46390ebffe8b671a30f057be9f15b8fb4246c574916e674b5bd314b6908e5e06c82 WHIRLPOOL 02ba29e135f85727a655ed674624a97c3bad40ddd00a0e194b64f5179b9e65c9f6831c902c754001551dc4fbc0a08ee52c075208551d72a65b2f93f7aef29698 +AUX xen-4.5-efi.patch 1940 SHA256 f977cd11b28f3d8a8cd808c8910c661c6abd92864414ca1412409fe66f1773ae SHA512 7a5bf988c5c9b4fc231d3013f5be6994ef8a2c7e38c37871d54aeaf4f2cd4922c55f3551f4a7d8296b79078fa9192a3835b42197eb314e6cbeb89dd93e10961f WHIRLPOOL 5c7a01f292e39cb9b04acf40b2e1bba1766acf91f082923416c0e086461d5e8ac8f6885934ae1326128b061ec69a2f56a0c526e7d3e1d00da4cc7a6cdfda27d9 DIST xen-4.2.5-upstream-patches-2.tar.xz 16768 SHA256 5d63f9f4c0619465c4421ad4f9087e82f833b4b1683f0aa2a38c191aee36c71a SHA512 14bd3ed218d4c4711c084789e89914c1550c4154fa7e228f663eb5a635dfd8e0031e0d762d5502e0673a2991a8790ce3208fca5649093378066794f3ed32a1d5 WHIRLPOOL 54fcc148f70ddfde0b7bfb160850c473c1d8336ca4417bb27681ffd75127123c44d67ca04886dfc709fcbe45040abb9ffa49d392f1a82a9da525e7d93aadaba2 DIST xen-4.2.5-upstream-patches-3.tar.xz 17260 SHA256 bf024b119135f1ead6eb2ec9873a04629caccdfafe9cdf55e50d9b9e15db276b SHA512 7c54df4a7d8688fcd50ee85da2cb871a3a0d66d95ed44a812eb70f604d8e7e2def21401cfc05227b3cceabaa6d6a4cc9d59ceae9a8f7cbdc93c014b5a925068a WHIRLPOOL 1faf73d545f54bf46925cea2ffb62bce7ee9c538e5459486593106b6b135d1784913f2cd27a0cdec3e6cc7ef4531a06e41512db07d79be58bc242acb1d49c5c7 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368 @@ -21,23 +22,13 @@ EBUILD xen-4.3.3-r3.ebuild 4128 SHA256 ddb3860bc9b7e74b0883e36fe1d1856d1a4902b2b EBUILD xen-4.3.3-r4.ebuild 4130 SHA256 6b9c9a2862a039ab62b2110580fefd387f46e38342cb8928e7a0587305a3f8bf SHA512 7bcd4f65426496ab3503b5f84c71f68b70feda12b6aadc085e604c940b4169103569c424f7dbe740385877cf657ad39ab2be859ba94395fd6c89d7c9b8cde832 WHIRLPOOL d4ff81795d4627a626e8bd89afb0a782dec0acb635a06f63492a1cd31c855452d87e7aaf63430fe440de7fc983214733ae388df3a40fa11f854d0b65129c9b99 EBUILD xen-4.4.1-r4.ebuild 4359 SHA256 65d6f92f94194676be6506ebb7aced0198dcad57669934001f3d04fcc81cc72c SHA512 60511e65eccaec6cef94328f93df193630c8f1e88698d69ea19c76bc0b9ca445cf0648c0c70edebffdb8e3365983394b13f6bf8a0973b647e05cec90547ade0a WHIRLPOOL 8c4072c364801ed43aca4f1a0870339fba7c644b9c7b2b02b4d9ca9b80b46fcd2e3bcf658806705dfe627fbf345643647b404fd00b2ac1047f78961b9f7eac4c EBUILD xen-4.4.1-r5.ebuild 4359 SHA256 dc7d0f3657e4ad4cb3eecfe14b4626c4c3a736f80aa5bf73bbdf83420f16230c SHA512 f9e8ee94a933b01fc14945eb86c237dab21f6cb2df187feffbaafca773a11a537ba1dcf086a9344e1b48434079d39550f450811a1671d2b57fd3c5d8cf9cda7e WHIRLPOOL c66822e31da8b971ac318610419ff2ea313b1413b998da3d2d4227db4e9311a120889add7ddd11000f11fbd004dd1a97e94f874cf8c84a9786e505baa53f1b9a -EBUILD xen-4.5.0.ebuild 4414 SHA256 44083dd1f311937ed1f911ae282b9c24711b35cb907451269a26e335df860c1c SHA512 5f6d83e784ae1d5d553d4065161275d2f0a289476832a90bb184fcdb3f29ad2c82f0c5122dd8bf6d52f642a611b9d5d28b869b2d11e9173611c9c7c30c57033a WHIRLPOOL 360ad74221273f1e0b4fa18b226fbc63a3f0ad462b89f4f93e508c2e8ed0227f38e87c88be6e55fbafc8aa812bfab5534f9bd8a273668cad9cd7b95797d6a667 -MISC ChangeLog 34353 SHA256 42556138b0dcbeb6c3091bd7a4b9dc272157f8e4a525f42d234b2013e64df5d7 SHA512 b32d90f784c6aef20cf3e220ec86e5359c6bf191fe78a8e4f180de5bb8e878ea5d0ffebe5a575d81e7492e1fc9b00c5fd21fe8856360e9a62c465dfcfb7edfed WHIRLPOOL aa957409c079c62ff47ee4df96efaff9712b8673866d8b8b59441f44baf443bc88cc7bce859f2908f651570fca56eab756642f2d83d862f4c4e443ece75252b8 +EBUILD xen-4.5.0.ebuild 4417 SHA256 b29f790815a235aa7408dff1b83684ac29439fcdc4a642503c147556847c95f5 SHA512 5e5e7d07f62ac903fde435736b4159d4183848e3f0698eb084a174801970651cc3ba36383d6af2df061b4a60c2ac1394335000ff1d6afcf0323137549f55076a WHIRLPOOL 7349dd636ee273e1d115e841492b983f1f3c9184f365799b5190589a45eafd34051a7620b53809d4ae6974512279e819ab0a6754906339569cb3216c534fbd05 +MISC ChangeLog 34547 SHA256 1c69b4dbd1c7842be7d74b6d79050d4160bf5ed22b76e39d1d89e007e53aba9a SHA512 62ecfd7b6531c1bd5b8bd68a541af4a724c1ffd53cdfceda0e63b355340baffef9b1daf528c75969c3e4ca98aec701818f140f48efd2ecc8172a6f7464192a3b WHIRLPOOL e7c29d20d66213249712a1e3134353b03c79049752dd720363daf16813610b0abf7ec222f7545e9931c6b8805e05b529a6dd32f9e9c8b9e615514dd57427903e MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUvxMPAAoJEJIMDbyqvv1VipUQAIaQYH5qFyXeSADoQD2Cryco -ZapuAoYFybRMdHPkEGlDOrNKuPRs6xKNpS9h1qgopsoI6sDsfpU7hpzdAGkSv0N0 -166+IEC0LQAJ6CI/lKcBBBNdbvqin1OnstdZz9qUk/4yB3fvo3jl6UyjFNUP4n9N -HrzbCOnOXSWqFO3Wv+itY/vttMf2/PukvkE7+FpAp2NaU/hQIonHPaTfhFR5XL/8 -wMTzmpWVDx2nFO1zrPwYvf397W4t94xybVSZ89qQE6kKSG0U+KUqZ7H3X8o3PAP3 -Xr2h6YSJqa2ucqfwwROaDAWMpiGFsYU8uSqTTQU+DNYCG1cxGHpBOaiiibxwuQRK -JeIAgnyxnaMREgTlQgyfw+p2Q0Mv2YJsqN50RKHCC58FQVdwmoHlHRfU8eMGdnq5 -e8Hen6cPSH945eTcBtIMjrmr9rs+jMHdw/AYragD8B6PzM6CPL+k07lpzwnyMjgo -0DMQd6sNgBRzLKirEcw3cpd2kURHnPzM+EK/1xW348CRJ6C+OtxQgAv4WTRX4xZ9 -9peAeJqaPGeaJlHDuRf2cr4+JWrppWDqmdB0GyOlRn+dP6VGrKnqIklfBklQroV/ -iycjYnXGc5jKzEU3Tqzfo26pihJpmPuqZHI+R8BDkMIpkMqifDyw+kZaB/USY9z9 -p6BCeTuRh1eebS4KcMkW -=10iN +iEYEAREIAAYFAlTDKB4ACgkQso7CE7gHKw3hUQCfUEf7j6N0/x59QyzM8bxzzZQS +49gAn3KzalAlRH54HZGdRqF7tDDefrJ4 +=tMdi -----END PGP SIGNATURE----- diff --git a/app-emulation/xen/files/xen-4.5-efi.patch b/app-emulation/xen/files/xen-4.5-efi.patch new file mode 100644 index 000000000000..76ff44adc562 --- /dev/null +++ b/app-emulation/xen/files/xen-4.5-efi.patch @@ -0,0 +1,37 @@ +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_DIR)/$(T)-$(XEN_FULLVERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z) ++ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z);\ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ ++ else \ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z);\ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ ++ fi; \ + $(INSTALL_DATA) $(TARGET)-syms $(D)$(BOOT_DIR)/$(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/xen/arch/x86/Makefile b/xen/arch/x86/Makefile +index d502bdf..a2121b0 100644 +--- a/xen/arch/x86/Makefile ++++ b/xen/arch/x86/Makefile +@@ -112,7 +112,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o + $(@D)/.$(@F).1.o -o $@ + rm -f $(@D)/.$(@F).[0-9]* + +-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 ++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 + EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug + EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20 + EFI_LDFLAGS += --major-image-version=$(XEN_VERSION) + diff --git a/app-emulation/xen/xen-4.5.0.ebuild b/app-emulation/xen/xen-4.5.0.ebuild index d597890d84af..10f4e06cf669 100644 --- a/app-emulation/xen/xen-4.5.0.ebuild +++ b/app-emulation/xen/xen-4.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0.ebuild,v 1.1 2015/01/21 02:46:30 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0.ebuild,v 1.2 2015/01/24 05:05:19 idella4 Exp $ EAPI=5 @@ -98,7 +98,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.4-efi.patch + epatch "${FILESDIR}"/${PN}-4.5-efi.patch export EFI_VENDOR="gentoo" export EFI_MOUNTPOINT="boot" fi -- 2.26.2