Fixed a couple of Debian packaging bugs and cleaned out tabs from

menu.c.

diff --git a/NEWS.txt b/NEWS.txt
index 89fae21c8e11e7870a257a9e38dea77970973c3d..39316dca324eabfa51782503c4ebcec78a913001 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,6 +1,10 @@
 0.8.8 (3/??/2015):
 ------------------
 
+- Fixed Debian debinstall script to work correctly on IA32 systems. It had
+  a bug that caused filesystem drivers and gptsync to not be packaged for
+  IA32.
+
 - Modified Debian postinst file to call install.sh with --localkeys option
   if sbsign and openssl are available, even when NOT in Secure Boot mode or
   if shim is not detected. This helps with my Ubuntu PPA when using custom

diff --git a/debian/changelog b/debian/changelog
index 98769733f02150953708bd3bb4a394da06d9eea4..f94d6ed4c4e6a7b4ab993e21962edbddbefa8984 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+refind (0.8.7-0ppa2) trusty; urgency=medium
+
+  * Fix Debian packaging error affecting IA32 platforms
+
+ -- Roderick Smith <rodsmith@rodsbooks.com>  Thu, 19 Mar 2015 20:25:03 -0400
+
 refind (0.8.7-0ppa1) trusty; urgency=medium
 
   * Version bump

diff --git a/debian/debinstall b/debian/debinstall
index cdbd44fd38f47e08352e68cb399ba7d45403dd45..ad7af7117f2586e5531e5a0eb70086a36bbc86f5 100755 (executable)
--- a/debian/debinstall
+++ b/debian/debinstall
@@ -4,9 +4,9 @@ BUILD_ROOT=$1
 KEYDIR=/mnt/refind
 
 UNAMEARCH=`uname -m`
-if [[ $UNAMEARCH -eq "x86_64" ]] ; then
+if [[ $UNAMEARCH == "x86_64" ]] ; then
    EFIARCH=x64
-elif [[ $UNAMEARCH -eq "i686" || $UNAMEARCH -eq "i586" || $UNAMEARCH -eq "i486" || $UNAMEARCH -eq "i386" ]] ; then
+elif [[ $UNAMEARCH == "i686" || $UNAMEARCH == "i586" || $UNAMEARCH == "i486" || $UNAMEARCH == "i386" ]] ; then
    EFIARCH=ia32
 else
    EFIARCH=$UNAMEARCH
@@ -22,7 +22,7 @@ declare SBSign=`which sbsign 2> /dev/null`
 if [[ -f $KEYDIR/refind.key && -x $SBSign ]] ; then
    $SBSign --key $KEYDIR/refind.key --cert $KEYDIR/refind.crt --output $BUILD_ROOT/usr/share/refind/refind/refind_$EFIARCH.efi refind/refind_$EFIARCH.efi
    mkdir -p $BUILD_ROOT/usr/share/refind/refind/drivers_$EFIARCH
-   for File in `ls drivers_$EFIARCH/*_x64.efi` ; do
+   for File in `ls drivers_$EFIARCH/*_$EFIARCH.efi` ; do
       $SBSign --key $KEYDIR/refind.key --cert $KEYDIR/refind.crt --output $BUILD_ROOT/usr/share/refind/refind/$File $File
    done
    mkdir -p $BUILD_ROOT/usr/share/refind/refind/tools_$EFIARCH
@@ -58,3 +58,4 @@ install -Dp -m0755 mvrefind.sh $BUILD_ROOT/usr/sbin/
 cp -a banners $BUILD_ROOT/usr/share/refind/
 cp -a fonts $BUILD_ROOT/usr/share/refind/
 
+echo "*** Exiting debinstall! ***"
\ No newline at end of file

diff --git a/refind/menu.c b/refind/menu.c
index 55511be1ab93bcfc9da32ba91d2898a23ca8d277..a137b06148a6b921e22a5f6f1c05c706a9483b1b 100644 (file)
--- a/refind/menu.c
+++ b/refind/menu.c
@@ -445,38 +445,38 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty
                 MenuExit = MENU_EXIT_TIMEOUT;
                 break;
             } else if (HaveTimeout || GlobalConfig.ScreensaverTime > 0) {
-               EFI_EVENT           TimerEvent;
-               UINTN               ElapsCount = 1;
-
-               Status = refit_call5_wrapper(BS->CreateEvent, EVT_TIMER, 0, NULL, NULL, &TimerEvent);
-               if (EFI_ERROR(Status)) {
-                   refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
-               } else {
-                   EFI_EVENT           WaitList[2];
-                   UINTN               Index;
-
-                   refit_call3_wrapper(BS->SetTimer, TimerEvent, TimerRelative, 10000000); // 1s Timeout
-                   WaitList[0] = ST->ConIn->WaitForKey;
-                   WaitList[1] = TimerEvent;
-                   Status = refit_call3_wrapper(BS->WaitForEvent, 2, WaitList, &Index);
-                   refit_call1_wrapper(BS->CloseEvent, TimerEvent);
-                   if (EFI_ERROR(Status))
-                       refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
-                   else if(Index == 0)
-                       continue;
-                   else
-                       ElapsCount = 10; // always counted as 1s to end of the timeout
-               }
-               TimeSinceKeystroke += ElapsCount;
-               if(HaveTimeout) {
-                   TimeoutCountdown = TimeoutCountdown <= ElapsCount ? 0 : TimeoutCountdown - ElapsCount;
-               } else if (GlobalConfig.ScreensaverTime > 0 &&
-                       TimeSinceKeystroke > (GlobalConfig.ScreensaverTime * 10))
-               {
-                       SaveScreen();
-                       State.PaintAll = TRUE;
-                       TimeSinceKeystroke = 0;
-               } // if
+                EFI_EVENT           TimerEvent;
+                UINTN               ElapsCount = 1;
+
+                Status = refit_call5_wrapper(BS->CreateEvent, EVT_TIMER, 0, NULL, NULL, &TimerEvent);
+                if (EFI_ERROR(Status)) {
+                    refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
+                } else {
+                    EFI_EVENT           WaitList[2];
+                    UINTN               Index;
+
+                    refit_call3_wrapper(BS->SetTimer, TimerEvent, TimerRelative, 10000000); // 1s Timeout
+                    WaitList[0] = ST->ConIn->WaitForKey;
+                    WaitList[1] = TimerEvent;
+                    Status = refit_call3_wrapper(BS->WaitForEvent, 2, WaitList, &Index);
+                    refit_call1_wrapper(BS->CloseEvent, TimerEvent);
+                    if (EFI_ERROR(Status))
+                        refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
+                    else if(Index == 0)
+                        continue;
+                    else
+                        ElapsCount = 10; // always counted as 1s to end of the timeout
+                }
+                TimeSinceKeystroke += ElapsCount;
+                if(HaveTimeout) {
+                    TimeoutCountdown = TimeoutCountdown <= ElapsCount ? 0 : TimeoutCountdown - ElapsCount;
+                } else if (GlobalConfig.ScreensaverTime > 0 &&
+                        TimeSinceKeystroke > (GlobalConfig.ScreensaverTime * 10))
+                {
+                        SaveScreen();
+                        State.PaintAll = TRUE;
+                        TimeSinceKeystroke = 0;
+                } // if
             } else {
                 refit_call3_wrapper(BS->WaitForEvent, 1, &ST->ConIn->WaitForKey, &index);
             }