* [gentoo-commits] gentoo-x86 commit in app-emulation/xen/files: xen-4.4-efi.patch
@ 2014-03-25 5:18 Yixun Lan (dlan)
0 siblings, 0 replies; 2+ messages in thread
From: Yixun Lan (dlan) @ 2014-03-25 5:18 UTC (permalink / raw
To: gentoo-commits
dlan 14/03/25 05:18:32
Modified: xen-4.4-efi.patch
Log:
amend efi patch, fix build err, thanks @mva
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Revision Changes Path
1.2 app-emulation/xen/files/xen-4.4-efi.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/files/xen-4.4-efi.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/files/xen-4.4-efi.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/files/xen-4.4-efi.patch?r1=1.1&r2=1.2
Index: xen-4.4-efi.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/files/xen-4.4-efi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-4.4-efi.patch 23 Mar 2014 02:15:33 -0000 1.1
+++ xen-4.4-efi.patch 25 Mar 2014 05:18:32 -0000 1.2
@@ -21,3 +21,16 @@
$(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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/xen/files: xen-4.4-efi.patch
@ 2014-03-23 2:15 Yixun Lan (dlan)
0 siblings, 0 replies; 2+ messages in thread
From: Yixun Lan (dlan) @ 2014-03-23 2:15 UTC (permalink / raw
To: gentoo-commits
dlan 14/03/23 02:15:34
Added: xen-4.4-efi.patch
Log:
bump to 4.4.0
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Revision Changes Path
1.1 app-emulation/xen/files/xen-4.4-efi.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/files/xen-4.4-efi.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/files/xen-4.4-efi.patch?rev=1.1&content-type=text/plain
Index: xen-4.4-efi.patch
===================================================================
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); \
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-25 5:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-25 5:18 [gentoo-commits] gentoo-x86 commit in app-emulation/xen/files: xen-4.4-efi.patch Yixun Lan (dlan)
-- strict thread matches above, loose matches on Subject: below --
2014-03-23 2:15 Yixun Lan (dlan)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox