Date: Friday, October 12, 2012 @ 02:30:16 Author: tpowa Revision: 168459
archrelease: copy trunk to extra-any Added: refind-efi/repos/extra-any/PKGBUILD (from rev 168458, refind-efi/trunk/PKGBUILD) refind-efi/repos/extra-any/refind-efi.install (from rev 168458, refind-efi/trunk/refind-efi.install) refind-efi/repos/extra-any/refind_include_more_shell_paths.patch (from rev 168458, refind-efi/trunk/refind_include_more_shell_paths.patch) refind-efi/repos/extra-any/refind_linux.conf (from rev 168458, refind-efi/trunk/refind_linux.conf) Deleted: refind-efi/repos/extra-any/PKGBUILD refind-efi/repos/extra-any/refind-efi.install refind-efi/repos/extra-any/refind_include_more_shell_paths.patch refind-efi/repos/extra-any/refind_linux.conf ---------------------------------------+ PKGBUILD | 154 ++++++++++++++++---------------- refind-efi.install | 52 +++++----- refind_include_more_shell_paths.patch | 42 ++++---- refind_linux.conf | 10 +- 4 files changed, 129 insertions(+), 129 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-10-12 06:29:52 UTC (rev 168458) +++ PKGBUILD 2012-10-12 06:30:16 UTC (rev 168459) @@ -1,77 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> - -pkgname="refind-efi" -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-libs>=3.0q') -depends=('dosfstools' 'efibootmgr') -optdepends=('mactel-boot: For bless command in Apple Mac systems') -conflicts=('refind-efi-x86_64' 'refind-efi-i386') -provides=('refind-efi-x86_64' 'refind-efi-i386') -replaces=('refind-efi-x86_64' 'refind-efi-i386') -options=('!strip' 'docs') -install="${pkgname}.install" -source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip" - 'refind_include_more_shell_paths.patch' - 'refind_linux.conf') -sha1sums=('4c8f9809c9a25b787300eeda13a60288611c028f' - '7cdf178ddb1de20e1ec816b24de1769b39da0063' - '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24') - -build() { - if [[ "${CARCH}" != "x86_64" ]]; then - msg "refind-efi can be built only in an x86_64 system. Exiting." - exit 1 - fi - - cd "${srcdir}/refind-${pkgver}/" - 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" - sed 's|/usr/local/lib|/usr/lib|g' -i "${srcdir}/refind-${pkgver}/Make.common" - sed 's|ARCH :=|ARCH ?=|g' -i "${srcdir}/refind-${pkgver}/Make.common" - sed 's|ARCH =|ARCH ?=|g' -i "${srcdir}/refind-${pkgver}/refind/Makefile" - - cp -r "${srcdir}/refind-${pkgver}" "${srcdir}/refind-${pkgver}-x86_64" - cd "${srcdir}/refind-${pkgver}-x86_64/" - ARCH="x86_64" make - - cp -r "${srcdir}/refind-${pkgver}" "${srcdir}/refind-${pkgver}-i386" - cd "${srcdir}/refind-${pkgver}-i386/" - ARCH="ia32" make -} - -package() { - ## install the rEFInd UEFI applications - install -d "${pkgdir}/usr/lib/refind/" - install -D -m0644 "${srcdir}/refind-${pkgver}-x86_64/refind/refind_x64.efi" "${pkgdir}/usr/lib/refind/refindx64.efi" - install -D -m0644 "${srcdir}/refind-${pkgver}-i386/refind/refind_ia32.efi" "${pkgdir}/usr/lib/refind/refindia32.efi" - - ## install the rEFInd config file - install -d "${pkgdir}/usr/lib/refind/config/" - install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/config/refind.conf" - install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/config/refind_linux.conf" - - ## install the rEFInd icons - install -d "${pkgdir}/usr/share/refind/icons/" - install -D -m0644 "${srcdir}/refind-${pkgver}/icons"/* "${pkgdir}/usr/share/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" - install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS" - rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" - - ## 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" -} Copied: refind-efi/repos/extra-any/PKGBUILD (from rev 168458, refind-efi/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-10-12 06:30:16 UTC (rev 168459) @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> + +pkgname="refind-efi" +pkgver="0.4.6" +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-libs>=3.0q') +depends=('dosfstools' 'efibootmgr') +optdepends=('mactel-boot: For bless command in Apple Mac systems') +conflicts=('refind-efi-x86_64' 'refind-efi-i386') +provides=('refind-efi-x86_64' 'refind-efi-i386') +replaces=('refind-efi-x86_64' 'refind-efi-i386') +options=('!strip' 'docs') +install="${pkgname}.install" +source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip" + 'refind_include_more_shell_paths.patch' + 'refind_linux.conf') + +build() { + if [[ "${CARCH}" != "x86_64" ]]; then + msg "refind-efi can be built only in an x86_64 system. Exiting." + exit 1 + fi + + cd "${srcdir}/refind-${pkgver}/" + 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" + sed 's|/usr/local/lib|/usr/lib|g' -i "${srcdir}/refind-${pkgver}/Make.common" + sed 's|ARCH :=|ARCH ?=|g' -i "${srcdir}/refind-${pkgver}/Make.common" + sed 's|ARCH =|ARCH ?=|g' -i "${srcdir}/refind-${pkgver}/refind/Makefile" + + cp -r "${srcdir}/refind-${pkgver}" "${srcdir}/refind-${pkgver}-x86_64" + cd "${srcdir}/refind-${pkgver}-x86_64/" + ARCH="x86_64" make gnuefi + + cp -r "${srcdir}/refind-${pkgver}" "${srcdir}/refind-${pkgver}-i386" + cd "${srcdir}/refind-${pkgver}-i386/" + ARCH="ia32" make gnuefi +} + +package() { + ## install the rEFInd UEFI applications + install -d "${pkgdir}/usr/lib/refind/" + install -D -m0644 "${srcdir}/refind-${pkgver}-x86_64/refind/refind_x64.efi" "${pkgdir}/usr/lib/refind/refindx64.efi" + install -D -m0644 "${srcdir}/refind-${pkgver}-i386/refind/refind_ia32.efi" "${pkgdir}/usr/lib/refind/refindia32.efi" + + ## install the rEFInd config file + install -d "${pkgdir}/usr/lib/refind/config/" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/config/refind.conf" + install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/config/refind_linux.conf" + + ## install the rEFInd icons + install -d "${pkgdir}/usr/share/refind/icons/" + install -D -m0644 "${srcdir}/refind-${pkgver}/icons"/* "${pkgdir}/usr/share/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" + install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS" + rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" + + ## 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=('14728e08d8e7956acf9dfc214b26c7cf' + '8da259d08ea1dc0a3a4c572913e453f9' + 'a83e45b10d5efbca1c93a63851728712') Deleted: refind-efi.install =================================================================== --- refind-efi.install 2012-10-12 06:29:52 UTC (rev 168458) +++ refind-efi.install 2012-10-12 06:30:16 UTC (rev 168459) @@ -1,26 +0,0 @@ -post_install() { - - cat << EOF - -refind-efi applications have been installed at /usr/lib/refind/*.efi - -Copy the efi application (according to your UEFI ARCH) -and /usr/lib/refind/config/refind.conf to a sub-directory of <EFISYS>/EFI/ -and add an entry to firmware boot menu using efibootmgr or mactel-boot (for Macs) - -rEFInd icons have been installed at /usr/share/refind/icons/ - -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/repos/extra-any/refind-efi.install (from rev 168458, refind-efi/trunk/refind-efi.install) =================================================================== --- refind-efi.install (rev 0) +++ refind-efi.install 2012-10-12 06:30:16 UTC (rev 168459) @@ -0,0 +1,26 @@ +post_install() { + + cat << EOF + +refind-efi applications have been installed at /usr/lib/refind/*.efi + +Copy the efi application (according to your UEFI ARCH) +and /usr/lib/refind/config/refind.conf to a sub-directory of <EFISYS>/EFI/ +and add an entry to firmware boot menu using efibootmgr or mactel-boot (for Macs) + +rEFInd icons have been installed at /usr/share/refind/icons/ + +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-10-12 06:29:52 UTC (rev 168458) +++ refind_include_more_shell_paths.patch 2012-10-12 06:30:16 UTC (rev 168459) @@ -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/repos/extra-any/refind_include_more_shell_paths.patch (from rev 168458, refind-efi/trunk/refind_include_more_shell_paths.patch) =================================================================== --- refind_include_more_shell_paths.patch (rev 0) +++ refind_include_more_shell_paths.patch 2012-10-12 06:30:16 UTC (rev 168459) @@ -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-10-12 06:29:52 UTC (rev 168458) +++ refind_linux.conf 2012-10-12 06:30:16 UTC (rev 168459) @@ -1,5 +0,0 @@ -## This file should be present in the same directory as the EFISTUB kernel and initramfs files -## More info at http://www.rodsbooks.com/refind/linux.html , http://www.rodsbooks.com/efi-bootloaders/efistub.html - -"Boot with defaults" "root=PARTUUID=XXXXXXXX rootfstype=XXXX ro" -"Boot to terminal" "root=PARTUUID=XXXXXXXX rootfstype=XXXX ro systemd.unit=multi-user.target" Copied: refind-efi/repos/extra-any/refind_linux.conf (from rev 168458, refind-efi/trunk/refind_linux.conf) =================================================================== --- refind_linux.conf (rev 0) +++ refind_linux.conf 2012-10-12 06:30:16 UTC (rev 168459) @@ -0,0 +1,5 @@ +## This file should be present in the same directory as the EFISTUB kernel and initramfs files +## More info at http://www.rodsbooks.com/refind/linux.html , http://www.rodsbooks.com/efi-bootloaders/efistub.html + +"Boot with defaults" "root=PARTUUID=XXXXXXXX rootfstype=XXXX ro" +"Boot to terminal" "root=PARTUUID=XXXXXXXX rootfstype=XXXX ro systemd.unit=multi-user.target"