Date: Monday, September 17, 2012 @ 09:33:35 Author: tpowa Revision: 166741
archrelease: copy trunk to extra-any Added: refind-efi-i386/repos/extra-any/PKGBUILD (from rev 166740, refind-efi-i386/trunk/PKGBUILD) refind-efi-i386/repos/extra-any/refind-efi-i386.install (from rev 166740, refind-efi-i386/trunk/refind-efi-i386.install) refind-efi-i386/repos/extra-any/refind_include_more_shell_paths.patch (from rev 166740, refind-efi-i386/trunk/refind_include_more_shell_paths.patch) refind-efi-i386/repos/extra-any/refind_linux.conf (from rev 166740, refind-efi-i386/trunk/refind_linux.conf) Deleted: refind-efi-i386/repos/extra-any/PKGBUILD refind-efi-i386/repos/extra-any/refind-efi-i386.install refind-efi-i386/repos/extra-any/refind_include_more_shell_paths.patch refind-efi-i386/repos/extra-any/refind_linux.conf ---------------------------------------+ PKGBUILD | 143 ++++++++++++++++---------------- refind-efi-i386.install | 40 ++++---- refind_include_more_shell_paths.patch | 42 ++++----- refind_linux.conf | 10 +- 4 files changed, 118 insertions(+), 117 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-09-17 13:33:14 UTC (rev 166740) +++ PKGBUILD 2012-09-17 13:33:35 UTC (rev 166741) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> - -# _GNU_EFI_LIB_DIR="/usr/lib" - -_actualname="refind" -_pkgname="${_actualname}-efi-i386" -pkgname="${_pkgname}" - -pkgver="0.4.5" -pkgrel="1" -pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager" -url="http://www.rodsbooks.com/refind/index.html" -arch=('any') -license=('GPL3' 'custom') -makedepends=('gnu-efi>=3.0q') -depends=('dosfstools' 'efibootmgr') -optdepends=('mactel-boot: For bless command in Apple Mac systems') -backup=('boot/efi/EFI/arch/refind/refind.conf' - 'boot/efi/EFI/arch/refind/refind_linux.conf') -source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip" - 'refind_include_more_shell_paths.patch' - 'refind_linux.conf') -options=('!strip' 'docs') -install="${_pkgname}.install" - -build() { - if [[ "${CARCH}" != "i686" ]]; then - echo "${pkgname} package can be built only in a i686 system. Exiting." - exit 1 - fi - cd "${srcdir}/refind-${pkgver}/" - make clean || true - patch -Np1 -i "${srcdir}/refind_include_more_shell_paths.patch" - sed 's|/usr/local/include/efi|/usr/include/efi|g' -i "${srcdir}/refind-${pkgver}/Make.common" || true - sed 's|/usr/local/lib|/usr/lib|g' -i "${srcdir}/refind-${pkgver}/Make.common" || true - make -} - -package() { - cd "${srcdir}/refind-${pkgver}/" - - ## install the rEFInd i386 UEFI app - install -d "${pkgdir}/boot/efi/EFI/arch/refind/" - install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_ia32.efi" "${pkgdir}/boot/efi/EFI/arch/refind/refindia32.efi" - - ## install the rEFInd config file - install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/boot/efi/EFI/arch/refind/refind.conf" - install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/boot/efi/EFI/arch/refind/refind_linux.conf" - - ## install the rEFInd icons - install -d "${pkgdir}/boot/efi/EFI/arch/refind/icons/" - install -D -m0644 "${srcdir}/refind-${pkgver}/icons"/* "${pkgdir}/boot/efi/EFI/arch/refind/icons/" - - ## install the rEFInd docs - install -d "${pkgdir}/usr/share/refind/docs/html/" - install -d "${pkgdir}/usr/share/refind/docs/Styles/" - install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/refind/docs/html/" - install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/refind/docs/Styles/" - install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README.txt" - install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS.txt" - rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true - - ## install the rEFIt license file, since rEFInd is a fork of rEFIt - install -d "${pkgdir}/usr/share/licenses/refind/" - install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" -} -md5sums=('d3ee0a34657f0d53aad95be2c13b2acf' - '8da259d08ea1dc0a3a4c572913e453f9' - '9724316d215437b25d8cab3e19438d63') Copied: refind-efi-i386/repos/extra-any/PKGBUILD (from rev 166740, refind-efi-i386/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-09-17 13:33:35 UTC (rev 166741) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> + +# _GNU_EFI_LIB_DIR="/usr/lib" + +_actualname="refind" +_pkgname="${_actualname}-efi-i386" +pkgname="${_pkgname}" + +pkgver="0.4.5" +pkgrel="2" +pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager for i386 UEFI" +url="http://www.rodsbooks.com/refind/index.html" +arch=('any') +license=('GPL3' 'custom') +makedepends=('gnu-efi>=3.0q') +depends=('dosfstools' 'efibootmgr') +optdepends=('mactel-boot: For bless command in Apple Mac systems') +backup=('boot/efi/EFI/arch/refind/refind.conf' + 'boot/efi/EFI/arch/refind/refind_linux.conf') +source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip" + 'refind_include_more_shell_paths.patch' + 'refind_linux.conf') +options=('!strip' 'docs') +install="${_pkgname}.install" +conflicts=('refind-efi-x86_64') + +build() { + if [[ "${CARCH}" != "i686" ]]; then + echo "${pkgname} package can be built only in a i686 system. Exiting." + exit 1 + fi + cd "${srcdir}/refind-${pkgver}/" + make clean || true + patch -Np1 -i "${srcdir}/refind_include_more_shell_paths.patch" + sed 's|/usr/local/include/efi|/usr/include/efi|g' -i "${srcdir}/refind-${pkgver}/Make.common" || true + sed 's|/usr/local/lib|/usr/lib|g' -i "${srcdir}/refind-${pkgver}/Make.common" || true + make +} + +package() { + cd "${srcdir}/refind-${pkgver}/" + + ## install the rEFInd i386 UEFI app + install -d "${pkgdir}/boot/efi/EFI/arch/refind/" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_ia32.efi" "${pkgdir}/boot/efi/EFI/arch/refind/refindia32.efi" + + ## install the rEFInd config file + install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/boot/efi/EFI/arch/refind/refind.conf" + install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/boot/efi/EFI/arch/refind/refind_linux.conf" + + ## install the rEFInd icons + install -d "${pkgdir}/boot/efi/EFI/arch/refind/icons/" + install -D -m0644 "${srcdir}/refind-${pkgver}/icons"/* "${pkgdir}/boot/efi/EFI/arch/refind/icons/" + + ## install the rEFInd docs + install -d "${pkgdir}/usr/share/refind/docs/html/" + install -d "${pkgdir}/usr/share/refind/docs/Styles/" + install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/refind/docs/html/" + install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/refind/docs/Styles/" + install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README.txt" + install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS.txt" + rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true + + ## install the rEFIt license file, since rEFInd is a fork of rEFIt + install -d "${pkgdir}/usr/share/licenses/refind/" + install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" +} +md5sums=('d3ee0a34657f0d53aad95be2c13b2acf' + '8da259d08ea1dc0a3a4c572913e453f9' + '9724316d215437b25d8cab3e19438d63') Deleted: refind-efi-i386.install =================================================================== --- refind-efi-i386.install 2012-09-17 13:33:14 UTC (rev 166740) +++ refind-efi-i386.install 2012-09-17 13:33:35 UTC (rev 166741) @@ -1,20 +0,0 @@ -post_install() { - - cat << EOF - -rEFInd-efi-i386 is installed at /boot/efi/EFI/arch/refind/refindia32.efi - -HTML Documentation is available at /usr/share/refind/docs/html/ - -More info at https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd - -EOF - -} - -post_upgrade() { - - post_install - -} - Copied: refind-efi-i386/repos/extra-any/refind-efi-i386.install (from rev 166740, refind-efi-i386/trunk/refind-efi-i386.install) =================================================================== --- refind-efi-i386.install (rev 0) +++ refind-efi-i386.install 2012-09-17 13:33:35 UTC (rev 166741) @@ -0,0 +1,20 @@ +post_install() { + + cat << EOF + +rEFInd-efi-i386 is installed at /boot/efi/EFI/arch/refind/refindia32.efi + +HTML Documentation is available at /usr/share/refind/docs/html/ + +More info at https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd + +EOF + +} + +post_upgrade() { + + post_install + +} + Deleted: refind_include_more_shell_paths.patch =================================================================== --- refind_include_more_shell_paths.patch 2012-09-17 13:33:14 UTC (rev 166740) +++ refind_include_more_shell_paths.patch 2012-09-17 13:33:35 UTC (rev 166741) @@ -1,21 +0,0 @@ -diff --git a/refind/main.c b/refind/main.c -index 9558655..3f54b4f 100644 ---- a/refind/main.c -+++ b/refind/main.c -@@ -58,13 +58,13 @@ - - #define MACOSX_LOADER_PATH L"System\\Library\\CoreServices\\boot.efi" - #if defined (EFIX64) --#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellx64.efi" -+#define SHELL_NAMES L"\\EFI\\tools\\shellx64.efi,\\EFI\\tools\\shell.efi,\\shellx64.efi" - #define DRIVER_DIRS L"drivers,drivers_x64" - #elif defined (EFI32) --#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellia32.efi" -+#define SHELL_NAMES L"\\EFI\\tools\\shellia32.efi,\\EFI\\tools\\shell.efi,\\shellia32.efi" - #define DRIVER_DIRS L"drivers,drivers_ia32" - #else --#define SHELL_NAMES L"\\EFI\\tools\\shell.efi" -+#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shell.efi" - #define DRIVER_DIRS L"drivers" - #endif - Copied: refind-efi-i386/repos/extra-any/refind_include_more_shell_paths.patch (from rev 166740, refind-efi-i386/trunk/refind_include_more_shell_paths.patch) =================================================================== --- refind_include_more_shell_paths.patch (rev 0) +++ refind_include_more_shell_paths.patch 2012-09-17 13:33:35 UTC (rev 166741) @@ -0,0 +1,21 @@ +diff --git a/refind/main.c b/refind/main.c +index 9558655..3f54b4f 100644 +--- a/refind/main.c ++++ b/refind/main.c +@@ -58,13 +58,13 @@ + + #define MACOSX_LOADER_PATH L"System\\Library\\CoreServices\\boot.efi" + #if defined (EFIX64) +-#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellx64.efi" ++#define SHELL_NAMES L"\\EFI\\tools\\shellx64.efi,\\EFI\\tools\\shell.efi,\\shellx64.efi" + #define DRIVER_DIRS L"drivers,drivers_x64" + #elif defined (EFI32) +-#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellia32.efi" ++#define SHELL_NAMES L"\\EFI\\tools\\shellia32.efi,\\EFI\\tools\\shell.efi,\\shellia32.efi" + #define DRIVER_DIRS L"drivers,drivers_ia32" + #else +-#define SHELL_NAMES L"\\EFI\\tools\\shell.efi" ++#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shell.efi" + #define DRIVER_DIRS L"drivers" + #endif + Deleted: refind_linux.conf =================================================================== --- refind_linux.conf 2012-09-17 13:33:14 UTC (rev 166740) +++ refind_linux.conf 2012-09-17 13:33:35 UTC (rev 166741) @@ -1,5 +0,0 @@ -## This file should be present in the same directory as the kernel file(s) -## More info at http://www.rodsbooks.com/refind/linux.html , http://www.rodsbooks.com/efi-bootloaders/efistub.html - -"Boot with defaults" "root=/dev/disk/by-uuid/XXXXXXXXXXXXXXXXX ro rootfstype=ext4 add_efi_memmap" -"Boot into terminal" "root=/dev/disk/by-uuid/XXXXXXXXXXXXXXXXX ro rootfstype=ext4 add_efi_memmap 3" Copied: refind-efi-i386/repos/extra-any/refind_linux.conf (from rev 166740, refind-efi-i386/trunk/refind_linux.conf) =================================================================== --- refind_linux.conf (rev 0) +++ refind_linux.conf 2012-09-17 13:33:35 UTC (rev 166741) @@ -0,0 +1,5 @@ +## This file should be present in the same directory as the kernel file(s) +## More info at http://www.rodsbooks.com/refind/linux.html , http://www.rodsbooks.com/efi-bootloaders/efistub.html + +"Boot with defaults" "root=/dev/disk/by-uuid/XXXXXXXXXXXXXXXXX ro rootfstype=ext4 add_efi_memmap" +"Boot into terminal" "root=/dev/disk/by-uuid/XXXXXXXXXXXXXXXXX ro rootfstype=ext4 add_efi_memmap 3"