Small build process changes.

diff --git a/BUILDING.txt b/BUILDING.txt
index 869ed1eafde5a8717d2a448fb06be7c102489399..3899967917ede147e7aaf2fb124206b5c2d3819e 100644 (file)
--- 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 2cf75b864202e6bd914a49d3e13a6d88646ab24a..e5d1cc4a0eb0845242eee1cb38790a3cf02c8880 100644 (file)
--- 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 7339c83e4f9bf44ddc8778018e8f8d70dc4cc1ef..e219fef4a02b5bc4883a7a11de8f68a25a4723ab 100644 (file)
--- 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 535eae4e10598543aaf7374aba8dec3db7d8d36e..2abfe82878c88a5a76cc4a82e40e93f878839546 100644 (file)
--- 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 1c7e950ab540aa0e2cd3234838436c4f8b63661b..3b99878fb047a49ce91619fb12e4766fc384bce6 100644 (file)
--- 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 ff883271503f0a8874742c84f6dca95a0a36fc0e..3aa912ff0b7e230fec1987056033fbd64dcaa87f 100644 (file)
--- 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 87bd63c99808bf71c43ea6e0a2066fabfdca7378..7dbc80a6d21ac801e730795582ac377c58007656 100644 (file)
--- 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");