diff options
Diffstat (limited to '0038-Rename-our-installed-.o-and-linker-scripts.patch')
| -rw-r--r-- | 0038-Rename-our-installed-.o-and-linker-scripts.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/0038-Rename-our-installed-.o-and-linker-scripts.patch b/0038-Rename-our-installed-.o-and-linker-scripts.patch new file mode 100644 index 0000000..f59ff1d --- /dev/null +++ b/0038-Rename-our-installed-.o-and-linker-scripts.patch @@ -0,0 +1,63 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones <pjones@redhat.com> +Date: Wed, 13 Nov 2019 15:24:27 -0500 +Subject: [PATCH] Rename our installed .o and linker scripts. + +Since crt0 and our linker scripts are now in a subdirectory, there's no +need to make them named differently in the installed machine. This +renames them to crt0.o and efi.lds . + +Signed-off-by: Peter Jones <pjones@redhat.com> +--- + gnuefi/Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/gnuefi/Makefile b/gnuefi/Makefile +index 7652669a7cc..86760f55578 100644 +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile +@@ -55,35 +55,35 @@ all: $(TARGETS) + libgnuefi.a: $(OBJS) + $(AR) $(ARFLAGS) $@ $^ + +- + clean: + @rm -vf $(TARGETS) *~ *.o $(OBJS) + + install: +- mkdir -p $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) +- $(INSTALL) -m 644 -t $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/ $(TARGETS) ++ @mkdir -p $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ @$(INSTALL) -v -m 644 -t $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) libgnuefi.a ++ @$(INSTALL) -v -m 644 crt0-efi-$(ARCH).o $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/crt0.o + ifneq (,$(findstring FreeBSD,$(OS))) + ifeq ($(ARCH),x64) +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) + else +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/efi.lds + endif + else +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/efi.lds + endif + + install_compat: install + mkdir -p $(INSTALLROOT)$(LIBDIR) + $(SYMLINK) gnuefi/$(ARCH)/libgnuefi.a $(INSTALLROOT)$(LIBDIR)/libgnuefi.a +- $(SYMLINK) gnuefi/$(ARCH)/crt0-efi-$(ARCH).o $(INSTALLROOT)$(LIBDIR)/crt0-efi-$(BFD_ARCH).o ++ $(SYMLINK) gnuefi/$(ARCH)/crt0.o $(INSTALLROOT)$(LIBDIR)/crt0-efi-$(BFD_ARCH).o + ifneq (,$(findstring FreeBSD,$(OS))) + ifeq ($(ARCH),x64) + $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_fbsd_efi.lds + else +- $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds ++ $(SYMLINK) gnuefi/$(ARCH)/efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds + endif + else +- $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds ++ $(SYMLINK) gnuefi/$(ARCH)/efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds + endif + + include $(SRCDIR)/../Make.rules |