From 703f834438ae73dd9bbbdfdaff9b3d31bb8d7d52 Mon Sep 17 00:00:00 2001 From: srs5694 Date: Fri, 4 Jan 2013 00:54:16 -0500 Subject: [PATCH] Small build process changes. --- BUILDING.txt | 12 ++++++------ Make.common | 6 +++--- Makefile | 2 +- NEWS.txt | 17 ++++++++++++++++- filesystems/Make.gnuefi | 1 + refind.spec | 5 +++-- refind/main.c | 2 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 869ed1e..3899967 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -204,15 +204,15 @@ to the various GNU-EFI include files and libraries. Since rEFInd 0.6.2, the default Make.common file includes the following definitions: EFIINC = /usr/include/efi -GNUEFILIB = /usr/lib -EFILIB = /usr/lib -EFICRT0 = /usr/lib +GNUEFILIB = /usr/lib64 +EFILIB = /usr/lib64 +EFICRT0 = /usr/lib64 If you've installed GNU-EFI from source code, you may need to add "local" to those paths, as in "/usr/local/include/efi". You might need to change -references to "lib" to "lib64" on some systems. Recall that you need at -least GNU-EFI version 3.0l to build rEFInd, and until very recently, most -distributions provided out-of-date versions of this package. +references to "lib64" to "lib32" or "lib" on some systems. Recall that you +need at least GNU-EFI version 3.0l to build rEFInd, and until very +recently, most distributions provided out-of-date versions of this package. If you're using TianoCore's EDK2, as noted earlier, you may need to adjust the EDK2BASE variable in Make.tiano and filesystems/Make.tiano. diff --git a/Make.common b/Make.common index 2cf75b8..e5d1cc4 100644 --- a/Make.common +++ b/Make.common @@ -4,9 +4,9 @@ # EFIINC = /usr/include/efi -GNUEFILIB = /usr/lib -EFILIB = /usr/lib -EFICRT0 = /usr/lib +GNUEFILIB = /usr/lib64 +EFILIB = /usr/lib64 +EFICRT0 = /usr/lib64 HOSTARCH = $(shell uname -m | sed s,i[3456789]86,ia32,) ARCH := $(HOSTARCH) diff --git a/Makefile b/Makefile index 7339c83..e219fef 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ clean: make -C $(LIBEG_DIR) clean make -C $(MOK_DIR) clean make -C $(LOADER_DIR) clean - make -C $(EFILIB_DIR) clean -f Make.tiano + make -C $(EFILIB_DIR) clean make -C $(FS_DIR) clean rm -f include/*~ diff --git a/NEWS.txt b/NEWS.txt index 535eae4..2abfe82 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,7 +1,22 @@ 0.6.3 (?/?/2013): ----------------- - +- New mvrefind.sh script to move a rEFInd installation between a standard + location (typically EFI/refind) or one of the fallback locations + (EFI/BOOT or EFI/Microsoft/Boot). It can also do more exotic locations. + +- The install.sh script now installs to EFI/BOOT/bootx64.efi or + EFI/Microsoft/Boot/bootmgfw.efi if it's run in BIOS mode. This is + intended to give some chance of producing a bootable installation should + a user accidentally install Linux in EFI mode and then install rEFInd + from that installation. + +- The install.sh script now tries to find an existing rEFInd installation + and upgrade it, even if it's in EFI/BOOT or EFI/Microsoft/Boot rather + than in EFI/refind. + +- New "--yes" option to install.sh to help with unattended or automated + installations (as from an RPM or Debian package). 0.6.2 (12/30/2012): ------------------- diff --git a/filesystems/Make.gnuefi b/filesystems/Make.gnuefi index 1c7e950..3b99878 100644 --- a/filesystems/Make.gnuefi +++ b/filesystems/Make.gnuefi @@ -44,6 +44,7 @@ $(TARGET): $(SHLIB_TARGET) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \ -j .rela -j .reloc --target=$(FORMAT_DRIVER) $< $@ chmod a-x $(TARGET) + mkdir -p ../drivers_$(FILENAME_CODE) cp $(TARGET) ../drivers_$(FILENAME_CODE) # EOF diff --git a/refind.spec b/refind.spec index ff88327..3aa912f 100644 --- a/refind.spec +++ b/refind.spec @@ -72,7 +72,8 @@ if [[ -f %{keydir}/refind.key && -x $SBSign ]] ; then done else install -Dp -m0644 refind/refind*.efi $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/ - cp -a drivers_* $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/ + mkdir -p $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/drivers_%{efiarch} + cp -a drivers_%{efiarch}/* $RPM_BUILD_ROOT/usr/share/refind-%{version}/refind/drivers_%{efiarch}/ fi # Copy configuration and support files to /usr/share/refind-%{version} @@ -95,7 +96,7 @@ install -Dp -m0755 mkrlconf.sh $RPM_BUILD_ROOT/usr/sbin/ install -Dp -m0755 mvrefind.sh $RPM_BUILD_ROOT/usr/sbin/ %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root -) diff --git a/refind/main.c b/refind/main.c index 87bd63c..7dbc80a 100644 --- a/refind/main.c +++ b/refind/main.c @@ -132,7 +132,7 @@ static VOID AboutrEFInd(VOID) if (AboutMenu.EntryCount == 0) { AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.2"); + AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.2.1"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer"); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith"); -- 2.39.2