Date: Thursday, July 18, 2013 @ 09:06:05 Author: tpowa Revision: 190824
upgpkg: refind-efi 0.7.1-3 #36151 fix upstream scripts with symlinks Modified: refind-efi/trunk/PKGBUILD refind-efi/trunk/refind-efi.install --------------------+ PKGBUILD | 43 ++++++++++++++++++++++++++++--------------- refind-efi.install | 7 ++++--- 2 files changed, 32 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-07-17 23:37:25 UTC (rev 190823) +++ PKGBUILD 2013-07-18 07:06:05 UTC (rev 190824) @@ -17,7 +17,7 @@ pkgname="refind-efi" pkgver="0.7.1" -pkgrel="2" +pkgrel="3" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') @@ -63,10 +63,10 @@ _prepare_tianocore_sources() { - _setup_env_vars - msg "Delete old UDK BUILD dir" rm -rf "${_UDK_DIR}/" || true + + msg "Create UDK BUILD dir" mkdir -p "${_UDK_DIR}/" for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do @@ -104,10 +104,10 @@ sed "s|TOOL_CHAIN_TAG = MYTOOLS|TOOL_CHAIN_TAG = ${_COMPILER}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true msg "Fix UDK Target ARCH for rEFInd" - sed "s|X64|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true - sed "s|IA32|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true + sed "s|X64|${_TIANO_ARCH}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true + sed "s|IA32|${_TIANO_ARCH}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true - chmod +x "${_UDK_DIR}/BaseTools/BuildEnv" + chmod 0755 "${_UDK_DIR}/BaseTools/BuildEnv" } @@ -124,6 +124,8 @@ prepare() { + _setup_env_vars + msg "Prepare Tianocore Sources" _prepare_tianocore_sources @@ -192,18 +194,15 @@ msg "Install rEFInd helper scripts" install -d "${pkgdir}/usr/bin/" - install -D -m0644 "${srcdir}/refind-${pkgver}/install.sh" "${pkgdir}/usr/bin/refind-install" - install -D -m0644 "${srcdir}/refind-${pkgver}/mkrlconf.sh" "${pkgdir}/usr/bin/refind-mkrlconf" - install -D -m0644 "${srcdir}/refind-${pkgver}/mvrefind.sh" "${pkgdir}/usr/bin/refind-mvrefind" + install -D -m0755 "${srcdir}/refind-${pkgver}/install.sh" "${pkgdir}/usr/bin/refind-install" + install -D -m0755 "${srcdir}/refind-${pkgver}/mkrlconf.sh" "${pkgdir}/usr/bin/refind-mkrlconf" + install -D -m0755 "${srcdir}/refind-${pkgver}/mvrefind.sh" "${pkgdir}/usr/bin/refind-mvrefind" install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont" - sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true + msg "Install the rEFInd sample config files" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/refind.conf-sample" + install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/refind_linux.conf-sample" - msg "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" - msg "Install the rEFInd docs" install -d "${pkgdir}/usr/share/doc/refind/html/" install -d "${pkgdir}/usr/share/doc/refind/Styles/" @@ -234,4 +233,18 @@ install -d "${pkgdir}/usr/share/licenses/refind/" install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" + msg "Use '#!/usr/bin/env bash' in all scripts" + sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true + + msg "Point refind dir paths to /usr/lib/refind/ in refind-install script" + sed 's|^ThisDir=.*|ThisDir="/usr/lib/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" + sed 's|^RefindDir=.*|RefindDir="/usr/lib/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" + sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install" + + msg "Setup SYMLINKS to refind dirs for the sake of refind-install script" + ln -s "/usr/share/refind/fonts" "${pkgdir}/usr/lib/refind/fonts" + ln -s "/usr/share/refind/icons" "${pkgdir}/usr/lib/refind/icons" + ln -s "/usr/share/refind/keys" "${pkgdir}/usr/lib/refind/keys" + ln -s "/usr/share/doc/refind" "${pkgdir}/usr/lib/refind/docs" + } Modified: refind-efi.install =================================================================== --- refind-efi.install 2013-07-17 23:37:25 UTC (rev 190823) +++ refind-efi.install 2013-07-18 07:06:05 UTC (rev 190824) @@ -2,15 +2,16 @@ cat << EOF -rEFInd UEFI applications have been installed at /usr/lib/refind/refind_*.efi +rEFInd UEFI application has been installed at /usr/lib/refind/refind_*.efi Other UEFI applications have been installed at /usr/lib/refind/tools_*/ UEFI drivers have deen installed at /usr/lib/refind/drivers_*/ 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) +and /usr/lib/refind/refind.conf-sample to a sub-directory of <EFISYS>/EFI/ +as refind.conf 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/ rEFInd Fonts have been installed at /usr/share/refind/fonts/
