diff -Nru refind-0.8.7/debian/changelog refind-0.8.7/debian/changelog --- refind-0.8.7/debian/changelog 2015-03-01 23:32:40.000000000 +0000 +++ refind-0.8.7/debian/changelog 2015-03-20 00:30:49.000000000 +0000 @@ -1,3 +1,9 @@ +refind (0.8.7-0ppa2) trusty; urgency=medium + + * Fix Debian packaging error affecting IA32 platforms + + -- Roderick Smith Thu, 19 Mar 2015 20:25:03 -0400 + refind (0.8.7-0ppa1) trusty; urgency=medium * Version bump diff -Nru refind-0.8.7/debian/control refind-0.8.7/debian/control --- refind-0.8.7/debian/control 2014-05-16 18:37:38.000000000 +0000 +++ refind-0.8.7/debian/control 2015-03-20 00:30:50.000000000 +0000 @@ -12,11 +12,12 @@ A graphical boot manager for EFI- and UEFI-based computers, such as all Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents a boot menu showing all the EFI boot loaders on the EFI-accessible - partitions, and optionally BIOS-bootable partitions on Macs. - EFI-compatbile OSes, including Linux, provide boot loaders that rEFInd can - detect and launch. rEFInd can launch Linux EFI boot loaders such as ELILO, - GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI stub support. - EFI filesystem drivers for ext2/3/4fs, ReiserFS, Btrfs, HFS+, and ISO-9660 - enable rEFInd to read boot loaders from these filesystems, too. rEFInd's - ability to detect boot loaders at runtime makes it very easy to use, - particularly when paired with Linux kernels that provide EFI stub support. + partitions, and optionally BIOS-bootable partitions on Macs and BIOS boot + entries on UEFI PCs with CSMs. EFI-compatbile OSes, including Linux, + provide boot loaders that rEFInd can detect and launch. rEFInd can launch + Linux EFI boot loaders such as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and + later kernels with EFI stub support. EFI filesystem drivers for ext2/3/4fs, + ReiserFS, Btrfs, NTFS, HFS+, and ISO-9660 enable rEFInd to read boot + loaders from these filesystems, too. rEFInd's ability to detect boot + loaders at runtime makes it very easy to use, particularly when paired with + Linux kernels that provide EFI stub support. diff -Nru refind-0.8.7/debian/debinstall refind-0.8.7/debian/debinstall --- refind-0.8.7/debian/debinstall 2014-05-16 17:44:34.000000000 +0000 +++ refind-0.8.7/debian/debinstall 2015-03-20 00:30:50.000000000 +0000 @@ -4,9 +4,9 @@ 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 @@ 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 @@ 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 -Nru refind-0.8.7/debian/postinst refind-0.8.7/debian/postinst --- refind-0.8.7/debian/postinst 2015-02-13 00:39:50.000000000 +0000 +++ refind-0.8.7/debian/postinst 2015-03-20 00:30:50.000000000 +0000 @@ -7,7 +7,7 @@ # Remove any existing NVRAM entry for rEFInd, to avoid creating a duplicate. ExistingEntry=`efibootmgr | grep "rEFInd Boot Manager" | cut -c 5-8` if [[ -n $ExistingEntry ]] ; then - efibootmgr --bootnum $ExistingEntry --delete-bootnum + efibootmgr --bootnum $ExistingEntry --delete-bootnum &> /dev/null fi cd /usr/share/refind @@ -42,5 +42,9 @@ ./install.sh --shim $ShimFile --yes fi else - ./install.sh --yes + if [[ -n $SBSign && -n $OpenSSL ]] ; then + ./install.sh --localkeys --yes + else + ./install.sh --yes + fi fi diff -Nru refind-0.8.7/foo refind-0.8.7/foo --- refind-0.8.7/foo 1970-01-01 00:00:00.000000000 +0000 +++ refind-0.8.7/foo 2015-03-20 00:17:11.000000000 +0000 @@ -0,0 +1,13 @@ +#!/bin/bash + +UNAMEARCH=`uname -m` +uname -a +if [[ $UNAMEARCH == "x86_64" ]] ; then + EFIARCH=x64 + echo "*** EFIARCH is x64! ***" +elif [[ $UNAMEARCH == "i686" || $UNAMEARCH == "i586" || $UNAMEARCH == "i486" || $UNAMEARCH == "i386" ]] ; then + EFIARCH=ia32 + echo "*** EFIARCH is ia32! ***" +else + EFIARCH=$UNAMEARCH +fi