From: srs5694 Date: Thu, 3 Dec 2015 22:01:23 +0000 (-0500) Subject: Another round of changes to clear lintian issues. X-Git-Url: https://code.delx.au/refind/commitdiff_plain/63072e911e51d8960638fb086fc8ff0fe62ebc9d Another round of changes to clear lintian issues. --- diff --git a/Make.common b/Make.common index 96eb50f..cb5d181 100644 --- a/Make.common +++ b/Make.common @@ -52,6 +52,7 @@ ifeq ($(ARCH),x86_64) CFLAGS += -DEFI_FUNCTION_WRAPPER -mno-red-zone CPPFLAGS += -DEFIX64 LDFLAGS += -znocombreloc -zdefs + DRV_LDFLAGS += -znocombreloc -zdefs ifeq ($(HOSTARCH),ia32) ARCH3264 = -m64 @@ -65,6 +66,7 @@ endif ifeq ($(ARCH),ia32) CPPFLAGS += -DEFI32 -malign-double LDFLAGS += -znocombreloc -zdefs + DRV_LDFLAGS += -znocombreloc -zdefs ifeq ($(HOSTARCH),x86_64) ARCH3264 = -m32 diff --git a/debian/changelog b/debian/changelog index 0920e61..aaa3946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -refind (0.10.0~git20151201.030531.0.dca8799-1) UNRELEASED; urgency=medium +refind (0.10.0-1) UNRELEASED; urgency=medium * Initial release (Closes: #715426) - -- Tianon Gravi Mon, 30 Nov 2015 20:16:30 -0800 + -- Tianon Gravi Wed, 25 Nov 2015 09:07:15 -0800 diff --git a/debian/copyright b/debian/copyright index 2074ea1..3efb35b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -326,30 +326,6 @@ Copyright: 2010,2011 Canonical Ltd. License: UFL-1 Comment: PNG bitmap derived from TrueType font -Files: banners/* -Copyright: 2015 Roderick W. Smith -License: LGPLv3+ or Creative Commons Attribution-Share Alike 3.0 (CC-SA 3.0) - -Files: fonts/liberation* -Copyright: 2010 Google & 2012 Red Hat -License: SIL-1.10 -Comment: PNG bitmap derived from TrueType font; - liberation-mono-regular-14.png embedded in rEFInd binary - -Files: fonts/mkfont.sh -Copyright: 2013 Roderick W. Smith -License: GPL-3+ - -Files: fonts/nimbus* -Copyright: 1984, 1996, 2009 URW Studio -License: GPL-2 -Comment: PNG bitmap derived from PostScript font - -Files: fonts/ubuntu* -Copyright: 2010,2011 Canonical Ltd. -License: UFL-1 (Ubuntu Font License) -Comment: PNG bitmap derived from TrueType font - Files: keys/altlinux.cer Copyright: 2013 Alt Linux License: Public-Domain @@ -372,10 +348,7 @@ License: BSD-2-Clause Comment: The .cer file is taken from the Fedora RPM for shim 0.8. The .crt file was created from that by using openssl. -Files: keys/microsoft-kekca-public.der - keys/microsoft-pca-public.der - keys/microsoft-uefica-public.crt - keys/microsoft-uefica-public.der +Files: keys/microsoft-* Copyright: ??? ??? License: ??? diff --git a/debian/debinstall b/debian/debinstall index 75fed9e..7fcf330 100755 --- a/debian/debinstall +++ b/debian/debinstall @@ -8,6 +8,8 @@ if [[ $UNAMEARCH == "x86_64" ]] ; then EFIARCH=x64 elif [[ $UNAMEARCH == "i686" || $UNAMEARCH == "i586" || $UNAMEARCH == "i486" || $UNAMEARCH == "i386" ]] ; then EFIARCH=ia32 +elif [[ $UNAMEARCH == "aarch64" ]] ; then + EFIARCH=aa64 else EFIARCH=$UNAMEARCH fi diff --git a/docs/refind/bootmode.html b/docs/refind/bootmode.html index e596b6f..82b39c6 100644 --- a/docs/refind/bootmode.html +++ b/docs/refind/bootmode.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/configfile.html b/docs/refind/configfile.html index 9ec8cb5..9b45df5 100644 --- a/docs/refind/configfile.html +++ b/docs/refind/configfile.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/donate.png b/docs/refind/donate.png new file mode 100644 index 0000000..bf96037 Binary files /dev/null and b/docs/refind/donate.png differ diff --git a/docs/refind/donate.svg b/docs/refind/donate.svg new file mode 100644 index 0000000..8b24184 --- /dev/null +++ b/docs/refind/donate.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Donate + + + diff --git a/docs/refind/drivers.html b/docs/refind/drivers.html index c961b34..06031af 100644 --- a/docs/refind/drivers.html +++ b/docs/refind/drivers.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/features.html b/docs/refind/features.html index 213adfc..c383513 100644 --- a/docs/refind/features.html +++ b/docs/refind/features.html @@ -42,7 +42,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -56,7 +56,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -71,7 +71,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -85,7 +85,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -99,7 +99,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -112,7 +112,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/getting.html b/docs/refind/getting.html index a154f0a..c56ec60 100644 --- a/docs/refind/getting.html +++ b/docs/refind/getting.html @@ -42,7 +42,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -56,7 +56,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -71,7 +71,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -85,7 +85,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -99,7 +99,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -112,7 +112,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/index.html b/docs/refind/index.html index 1d7ebe0..16cba5e 100644 --- a/docs/refind/index.html +++ b/docs/refind/index.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/installing.html b/docs/refind/installing.html index f32308c..6f5d1e6 100644 --- a/docs/refind/installing.html +++ b/docs/refind/installing.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/linux.html b/docs/refind/linux.html index 2741837..80713ca 100644 --- a/docs/refind/linux.html +++ b/docs/refind/linux.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/revisions.html b/docs/refind/revisions.html index dea6b1e..265b2fd 100644 --- a/docs/refind/revisions.html +++ b/docs/refind/revisions.html @@ -41,7 +41,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -55,7 +55,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -70,7 +70,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -84,7 +84,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -98,7 +98,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -111,7 +111,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/secureboot.html b/docs/refind/secureboot.html index ef8b7c0..66cb319 100644 --- a/docs/refind/secureboot.html +++ b/docs/refind/secureboot.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/sip.html b/docs/refind/sip.html index 296d829..49db945 100644 --- a/docs/refind/sip.html +++ b/docs/refind/sip.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + diff --git a/docs/refind/themes.html b/docs/refind/themes.html index ce4f3ca..6536583 100644 --- a/docs/refind/themes.html +++ b/docs/refind/themes.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

- + @@ -317,12 +317,7 @@ to be tedious.

src="http://orig15.deviantart.net/5db2/f/2013/290/b/d/refind_next_theme_by_sdbinwiiexe-d6qrlfq.png" align="center" width="750" alt="rEFInd Next uses simple white icons against green artwork" border=2>
-
  • Zhu Qunying has created a Slackware-themed banner logo for rEFInd. Although it's not a full theme, I thought I'd mention and show it here:
  • - -
    If you use Slackware, this banner may interest you

    +
  • Zhu Qunying has created a Slackware-themed banner logo for rEFInd. Although it's not a full theme, I thought I'd mention it.
  • naymlezwun has created an OS X theme for rEFInd.
  • diff --git a/docs/refind/todo.html b/docs/refind/todo.html index e8e2dd8..866e8f9 100644 --- a/docs/refind/todo.html +++ b/docs/refind/todo.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + diff --git a/docs/refind/using.html b/docs/refind/using.html index dc4a5f0..de05169 100644 --- a/docs/refind/using.html +++ b/docs/refind/using.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + diff --git a/docs/refind/yosemite.html b/docs/refind/yosemite.html index 850d6ca..2c174f2 100644 --- a/docs/refind/yosemite.html +++ b/docs/refind/yosemite.html @@ -43,7 +43,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -57,7 +57,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -72,7 +72,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -86,7 +86,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -100,7 +100,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + @@ -113,7 +113,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

    - + diff --git a/filesystems/Make.gnuefi b/filesystems/Make.gnuefi index 1203bdc..6eab253 100644 --- a/filesystems/Make.gnuefi +++ b/filesystems/Make.gnuefi @@ -24,7 +24,7 @@ endif ifeq ($(ARCH),ia32) LIBEG = build32 - ARCH_C_FLAGS = -m32 -malign-double + ARCH_C_FLAGS = -m32 FILENAME_CODE = ia32 LD_CODE = elf_i386 endif diff --git a/filesystems/fsw_efi.c b/filesystems/fsw_efi.c index 0a9c24e..878d106 100644 --- a/filesystems/fsw_efi.c +++ b/filesystems/fsw_efi.c @@ -557,7 +557,11 @@ fsw_status_t EFIAPI fsw_efi_read_block(struct fsw_volume *vol, fsw_u64 phys_bno, // compiled with Tianocore. Further clue: Omitting "Status =" avoids the // hang but produces a failure to mount the filesystem, even when the same // change is made to later similar call. Calling Volume->DiskIo->ReadDisk() - // directly (without refit_call5_wrapper()) changes nothing. FIGURE THIS OUT! + // directly (without refit_call5_wrapper()) changes nothing. Placing Print() + // statements at the start and end of the function, and before and after the + // ReadDisk() call, suggests that when it fails, the program is executing + // code starting mid-function, so there seems to be something messed up in + // the way the function is being called. FIGURE THIS OUT! Status = refit_call5_wrapper(Volume->DiskIo->ReadDisk, Volume->DiskIo, Volume->MediaId, StartRead, (UINTN) CACHE_SIZE, (VOID*) Caches[ReadCache].Cache); if (!EFI_ERROR(Status)) { diff --git a/mkdistrib b/mkdistrib index 78fbe95..865c752 100755 --- a/mkdistrib +++ b/mkdistrib @@ -139,7 +139,19 @@ zip -9r ../refind-bin-gnuefi-$1.zip refind-bin-$1 cd .. rm -r refind-$1 -# Prepare the RPM & Debian package files +# Prepare NATIVE Debian package files +tar xvfz refind-src-$1.tar.gz +ln -s refind-src-$1.tar.gz refind_$1.orig.tar.gz +cd refind-$1 +debuild -S -sa -rfakeroot -k'Rod Smith ' +debuild -sa -rfakeroot -k'Rod Smith ' +cd .. +#rm refind_$1.orig.tar.gz +#rm -r refind-$1 + +exit + +# Prepare the RPM & alien-built Debian package files cp refind-src-$1.tar.gz ~/rpmbuild/SOURCES/ rpmbuild -ba $StartDir/refind.spec mv ~/rpmbuild/RPMS/*/refind-$1* ./ diff --git a/refind.spec b/refind.spec index 12acf19..31e74fd 100644 --- a/refind.spec +++ b/refind.spec @@ -1,6 +1,6 @@ Summary: EFI boot manager software Name: refind -Version: 0.10.0 +Version: 0.10.0.8 Release: 1%{?dist} Summary: EFI boot manager software License: GPLv3 @@ -178,6 +178,8 @@ fi # thus wiping out the just-updated files. %changelog +* Thu Dec 3 2015 R Smith - 0.10.0.8 +- Updated spec file for 0.10.0.8 * Sun Nov 8 2015 R Smith - 0.10.0 - Updated spec file for 0.10.0 * Sat Sep 19 2015 R Smith - 0.9.2