API tools faq
paste
Advertisement
Guest User

fedora-like-xen.patch

a guest
Oct 25th, 2016
133
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.03 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/xen/Makefile b/xen/Makefile
  2. index ecacfe4..b8df99f 100644
  3. --- a/xen/Makefile
  4. +++ b/xen/Makefile
  5. @@ -20,8 +20,6 @@ export XEN_ROOT := $(BASEDIR)/..
  6.  MAKEFLAGS += -rR
  7.  
  8.  EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi
  9. -EFI_VENDOR=archlinux
  10. -LD_EFI ?= $(LD)
  11.  
  12.  ARCH=$(XEN_TARGET_ARCH)
  13.  SRCARCH=$(shell echo $(ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g')
  14. diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
  15. index d30377d..931917d 100644
  16. --- a/xen/arch/x86/Makefile
  17. +++ b/xen/arch/x86/Makefile
  18. @@ -173,20 +173,20 @@ endif
  19.  
  20.  $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc
  21.     $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
  22. -             $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
  23. +             $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
  24.                     $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) :
  25.     $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S
  26.     $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \
  27.         | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S
  28.     $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o
  29.     $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
  30. -             $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
  31. +             $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
  32.                     $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) :
  33.     $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S
  34.     $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \
  35.         | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S
  36.     $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o
  37. -   $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
  38. +   $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
  39.                     $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@
  40.     if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \
  41.     else $(NM) -pa --format=sysv $(@D)/$(@F) \
  42. diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile
  43. index 05153f4..ad3fdf7 100644
  44. --- a/xen/arch/x86/efi/Makefile
  45. +++ b/xen/arch/x86/efi/Makefile
  46. @@ -6,7 +6,7 @@ create = test -e $(1) || touch -t 199901010000 $(1)
  47.  
  48.  efi := y$(shell rm -f disabled)
  49.  efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c check.c 2>disabled && echo y))
  50. -efi := $(if $(efi),$(shell $(LD_EFI) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
  51. +efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
  52.  efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o)))
  53.  
  54.  extra-$(efi) += boot.init.o relocs-dummy.o runtime.o compat.o buildid.o
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!