diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2014-03-25 05:19:39 +0000 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2014-03-25 05:19:39 +0000 |
| commit | 5983f762d8a3721e31291111facbc97ed07a4c6d (patch) | |
| tree | 418f4d2aa6b519a4dc6ec796f75af90bdbcdaa93 /app-emulation | |
| parent | Add PYTHON_REQ_USE, fixes Bug #501558 by M. Johnson, rm old (diff) | |
| download | historical-5983f762d8a3721e31291111facbc97ed07a4c6d.tar.gz historical-5983f762d8a3721e31291111facbc97ed07a4c6d.tar.bz2 historical-5983f762d8a3721e31291111facbc97ed07a4c6d.zip | |
amend efi patch, fix build err, thanks @mva
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/xen/Manifest | 12 | ||||
| -rw-r--r-- | app-emulation/xen/files/xen-4.4-efi.patch | 13 |
2 files changed, 14 insertions, 11 deletions
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 405188020d6d..0460ddb25812 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX xen-4-XSA-83.patch 598 SHA256 71ba62c024ed867f99f335ed63d7e04a7981d348cc29a3718e5c48f15a1e0fb1 SHA512 8ca0f9e896da10ad32b93e7dfa908550180912b0f1eeb8be214f54fb6cc6c7a925df26db6521a37430e5e66c31e3eafb8a7169ff92097adaff7227cb95759c14 WHIRLPOOL b7369455f0dbcb37c3a3b7afe8de1e47e3303ead0a37c7e2ae13c5ebd66031bbfca21b6f4fb8a1191e32ef17a5fe74564c93ec7861f4a8d7dbc815fecfb6e068 AUX xen-4-fix_dotconfig-gcc.patch 1525 SHA256 943119cde08d16d05a927a85fb54ee4cee323cb4870dd0d90a552051fedc9907 SHA512 aa507594d96159c4e01ccfc4781f9afe7b6fe125c9df5925128c002f28fdf04999954b523cc53c6d7eaa49cb6e05120605f4e7d6f8bab6d5718d73a60b5accea WHIRLPOOL 6f4395203199b8037363ed56256e12f426f0c26f449c5e4a001c5454370a0e412f18cd03099866c30592ee0413556b85b3c374efb7172212db37ff3891c004af AUX xen-4.2-efi.patch 2216 SHA256 0886961e2656fe7e140dd0ac0e6620d4c14ef0796b8f8889bda163e2a9f8db8b SHA512 ecaa4f1f1c3ca737931fe5343529708dfb7ec7040dbf2acf2b155e7c7f019ce3e2630ddb302213570a2647fe220dbf23eb6c28618d6b1be9161e25fcadd71cb4 WHIRLPOOL 63b56e22683b2755ae17e7871c1b535d750f655ff8c003979d039654f5ef3303457b5d4469f216c1744202d4d1f4561f7498c1d93171ab1110a93e3a2fa8db8d @@ -9,7 +6,7 @@ AUX xen-4.3-CVE-2013-6375-XSA-75.patch 1748 SHA256 039a74a4ccd1f17a5fd5341d160af AUX xen-4.3-CVE-2014-263-XSA-84-85.patch 6086 SHA256 91725c156bae4209f1401b38a37c1a38941ef6e9370ac3425523555fde81d835 SHA512 c26f9b3ecdb2894a72033850a532e0d9b735ba8e73c3cfc379171ec17c8f82e07596e6bd9824242702645d77e37054c0668279ad55effe10461d70e0831c39e8 WHIRLPOOL 94d0bf7fdc5064b0463344e1a09c81d9a41ab5c565c88accc511c547ed4ab3c0c7ac76443eab02c4b0153552ec2dc139da10960c5a8944aa9b49cee03160a911 AUX xen-4.3-XSA-87.patch 916 SHA256 a13ce270b177d33537d627b85471abaa01215cd458541f4c6524914d7c81eb38 SHA512 a1ad45f8311787ac0e1ed1a186f9c4e9aea924398ec7bbbc5b1e4b2d3b4617e113b385ff2aee854458270b0d73ed11defac5dfe603b1fd7b97f4c951def559b3 WHIRLPOOL b3a36c01d4e0bca3c5df42488f9bfc91e756af8c899d7414b81b7dac2bb60733555321b607ed229817ac546ebce65fddce0f8781909d7021d19b44a931fb85bf AUX xen-4.3-fix_dotconfig-gcc.patch 8854 SHA256 4e0d22acdb4ecc4a1d418ec91bc6ddb9ef1c283ee3ca1f67bac85d3116d76ccc SHA512 b4c969b0cf166862ea5c5cb0912d7dae8c5bf7befd6dd6bdf4e56df8a4daf85c0a36c94247053f74edc0f24b1c15a18e7ddae9d24ad28d54b726a1fbbab442be WHIRLPOOL de7b614ae486fd2cc591b405b475745b003c638c9be4c8153b61a368802af36d2a2974d1e022eb14fb58ad9260f9f82c438c84cb65c3499076c579f7e1c3e6ad -AUX xen-4.4-efi.patch 1246 SHA256 d7c943068ddfb982e5d82b77d9d7e2ecf5118bb1187106e98fc837f0399246e0 SHA512 2d7442f5e241deebd284cad6ff198ca85a578ae80c0c9d9ce812dbc1b8338dbba51b41e28a51f612bc8e05aadb24c58d616e5b03e8ec4f65e040fdd472dd282e WHIRLPOOL 0a2917ef5eb4c603f78e2ec0a9c4b5856a4cb20b476de80d4803ee73d3cb18b0a69a290c0dbe44aa8bba6453ec453f98d29df762f1ee34b7fbe00a0eabb3c44e +AUX xen-4.4-efi.patch 1873 SHA256 096ae932f6f9387b8d5a837279c436173310f121e06ba356b7dded67d682ac7a SHA512 a448b72f679fa2e9d544d73bfb68d2deef646706917114a458c9c44a0338d46390ebffe8b671a30f057be9f15b8fb4246c574916e674b5bd314b6908e5e06c82 WHIRLPOOL 02ba29e135f85727a655ed674624a97c3bad40ddd00a0e194b64f5179b9e65c9f6831c902c754001551dc4fbc0a08ee52c075208551d72a65b2f93f7aef29698 AUX xen-CVE-2013-4375-XSA-71.patch 1628 SHA256 f1ef802098be2220ec1c0e0d20ff5385d34036b8cd312001dcc0e17fbe25f8d1 SHA512 9d057827933decc046506c46e1a482424169cc8d525ac49a39b296181615a4525383851e990fd3d46995db2f8261d92dc7955354cdf6ca15db8cbb89def17c6d WHIRLPOOL d1749db3dcceb5221dad395e2caede633456a304d922070096889b4b7d8e79bcda5fe4f7c8cb3e5f1e6c9dae349ef744d98290f286cbfc3737b0ff62f198e2a8 AUX xen-CVE-2013-4494-XSA-73.patch 3723 SHA256 1c070e66d1bea3c109f22ea4db2e8828f0f4b016d51d6d88667b775eec340514 SHA512 d14be9077685aec682f2cfa23886bc430fe55d985650e5392da0988f69f242ac0fa242c84448e8203ab6dd1b44904a2f38ad9e8976a829100193a1c06efb8417 WHIRLPOOL 96a15f94eed123a5ff53193c8dcf708aa17d21b3ebe23b5fc50b7ecbdf64ed4f827252389cc15249d05041d036853053f3846b3fea3538fc8724fe828ca57bde AUX xen-CVE-2013-4554-XSA-76.patch 556 SHA256 8c4d460c71e8e8dffa32ce24f57ce872ccd8623ab72fd38be432f0a2b097e7c1 SHA512 4bfd4dfc560629968a81b4f9b7509d8366208ca6d7987f27da44a41caa840437f623ed5ab489c9a1623c99ba9e702a5d647aa833961ed7d4ab72d0141258d6a4 WHIRLPOOL 6a7020ff3df9020a716b3ecdd3dd11869025e7205c17a9314a8f2705812b1a9e6fd4a19d891d00ca5c750456f4c871317c0ec451ab84db3c985c57e92ecb47d4 @@ -29,10 +26,3 @@ EBUILD xen-4.3.2.ebuild 4107 SHA256 ffd84a6285e31ab05435e2143522c00ddd71683e9199 EBUILD xen-4.4.0.ebuild 4333 SHA256 ad596681105e4fabab3c36202012601ff4fb7f16191ecbeaedb4029ec2709738 SHA512 3e733984a5aec2f9abd21f09940ff6fba346a0b3d4ed98c40ac84044f558dccc7584fcffe2cfa1360b6623b0c082034df4f8c84e8a0a8f695b8166cea5750157 WHIRLPOOL 49ec43a6e4d7b48a5e379dd3281fa658e3649c7371bd43d85ee9961b7dcac8efede876bc09d90c526c2443505d78a11b98c881f3ac83daa8dfc3a2f53ba54683 MISC ChangeLog 28668 SHA256 8bbbd095607b018d8d92d570f06350289e228be01c142855bd458d0a0a75f09d SHA512 928bcf15122d0852e08c156c64e101adc6abf08df5dd4cf890a433c1e0b80bede77c526e0e0220779675fac55fb2a4009b43a75b213c82b3b97c53030f3871e1 WHIRLPOOL c0d9f3a256fad16b66264102501508489caf7dd06708ed0f558bfdd67d80ff5b67404a9b8077ebc41a9efbd96de22e9c349967b23c6462dfc4634823862736db MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iEYEAREIAAYFAlMuUh0ACgkQso7CE7gHKw2g+gCeNgjVTS1ezXwEU6HhVZEkWOxS -ezgAoJfLVCzZLsvyFE9fBaMWGWRZrJkE -=pyr1 ------END PGP SIGNATURE----- diff --git a/app-emulation/xen/files/xen-4.4-efi.patch b/app-emulation/xen/files/xen-4.4-efi.patch index 9213ade77da2..c584d141d4f2 100644 --- a/app-emulation/xen/files/xen-4.4-efi.patch +++ b/app-emulation/xen/files/xen-4.4-efi.patch @@ -21,3 +21,16 @@ index 39839a3..d2603f0 100644 $(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/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) |