Date: Friday, June 21, 2013 @ 21:45:55 Author: tpowa Revision: 188812
upgpkg: refind-efi 0.6.12-2 rebuild for splitted arches Modified: refind-efi/trunk/PKGBUILD refind-efi/trunk/refind-efi.install --------------------+ PKGBUILD | 91 ++++++++++++++++++--------------------------------- refind-efi.install | 2 - 2 files changed, 34 insertions(+), 59 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-06-21 19:40:34 UTC (rev 188811) +++ PKGBUILD 2013-06-21 19:45:55 UTC (rev 188812) @@ -17,20 +17,20 @@ pkgname="refind-efi" pkgver="0.6.12" -pkgrel="1" +pkgrel="2" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html"; -arch=('any') +arch=('x86_64' 'i686') license=('GPL3' 'custom') + makedepends=('subversion' 'python2') depends=('dosfstools' 'efibootmgr') optdepends=('mactel-boot: For bless command in Apple Mac systems' 'bash: For /usr/bin/refind-mkfont script' 'imagemagick: For /usr/bin/refind-mkfont script') + options=('!strip' 'docs' '!makeflags') -conflicts=('refind-efi-x86_64' 'refind-efi-i386') -provides=('refind-efi-x86_64' 'refind-efi-i386') -replaces=('refind-efi-x86_64' 'refind-efi-i386') + install="${pkgname}.install" source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip"; @@ -50,6 +50,12 @@ 'SKIP' 'SKIP') +[[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64" +[[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32" + +[[ "${CARCH}" == "x86_64" ]] && _TIANO_S_ARCH="x64" +[[ "${CARCH}" == "i686" ]] && _TIANO_S_ARCH="ia32" + _tianocore_udk_common() { ## Unset all FLAGS @@ -114,20 +120,26 @@ echo ## Compile UDK x86_64-UEFI Libraries - "${EDK_TOOLS_PATH}/BinWrappers/PosixLike/build" -p "${_UDK_TARGET}" -a "X64" -b "${_TIANOCORE_TARGET}" -t "${_COMPILER}" + "${EDK_TOOLS_PATH}/BinWrappers/PosixLike/build" -p "${_UDK_TARGET}" -a "${_TIANO_ARCH}" -b "${_TIANOCORE_TARGET}" -t "${_COMPILER}" echo - ## Compile UDK i386-UEFI Libraries - "${EDK_TOOLS_PATH}/BinWrappers/PosixLike/build" -p "${_UDK_TARGET}" -a "IA32" -b "${_TIANOCORE_TARGET}" -t "${_COMPILER}" - echo - ## Fix UDK Target ARCH for rEFInd - sed "s|IA32|X64 IA32|g" -i "${_UDK_DIR}/Conf/target.txt" || true + sed "s|IA32|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true } -_build_refind-efi-common() { +build() { + _tianocore_udk_common + echo + + cd "${srcdir}/refind-${pkgver}/" + + ## Fix UDK Path in rEFInd Makefiles + sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/Make.tiano" || true + sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true + sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true + ## Unset all FLAGS unset CFLAGS unset CPPFLAGS @@ -135,64 +147,27 @@ unset LDFLAGS unset MAKEFLAGS - rm -rf "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/" || true - cp -r "${srcdir}/refind-${pkgver}" "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/" + ## Compile refind.efi + make tiano - cd "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/" - - ## Fix UDK Path in rEFInd Makefiles - sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/Make.tiano" || true - sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/filesystems/Make.tiano" || true - sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/gptsync/Make.tiano" || true - - ## Compile refind.efi - ARCH="${_UEFI_ARCH}" make tiano - echo - ## Compile UEFI FS drivers - ARCH="${_UEFI_ARCH}" make fs - echo + make fs } -build() { - - if [[ "${CARCH}" != "x86_64" ]]; then - echo "${pkgname} package can be built only in a x86_64 system. Exiting." - exit 1 - fi - - _tianocore_udk_common - echo - - _UEFI_ARCH="x86_64" - _build_refind-efi-common - echo - - _UEFI_ARCH="ia32" - _build_refind-efi-common - echo - -} - package() { - ## Install the rEFInd UEFI applications + ## Install the rEFInd UEFI application install -d "${pkgdir}/usr/lib/refind/" - install -D -m0644 "${srcdir}/refind-${pkgver}_x86_64/refind/refind_x64.efi" "${pkgdir}/usr/lib/refind/refind_x64.efi" - install -D -m0644 "${srcdir}/refind-${pkgver}_ia32/refind/refind_ia32.efi" "${pkgdir}/usr/lib/refind/refind_ia32.efi" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/refind_${_TIANO_S_ARCH}.efi" ## Install UEFI drivers built from rEFInd - install -d "${pkgdir}/usr/lib/refind/drivers_x64/" - install -d "${pkgdir}/usr/lib/refind/drivers_ia32/" - install -D -m0644 "${srcdir}/refind-${pkgver}_x86_64/drivers_x64"/*_x64.efi "${pkgdir}/usr/lib/refind/drivers_x64/" - install -D -m0644 "${srcdir}/refind-${pkgver}_ia32/drivers_ia32"/*_ia32.efi "${pkgdir}/usr/lib/refind/drivers_ia32/" + install -d "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" + install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" ## Install UEFI applications built from rEFInd - install -d "${pkgdir}/usr/lib/refind/tools_x64/" - install -d "${pkgdir}/usr/lib/refind/tools_ia32/" - install -D -m0644 "${srcdir}/refind-${pkgver}_x86_64/gptsync/gptsync_x64.efi" "${pkgdir}/usr/lib/refind/tools_x64/gptsync_x64.efi" - install -D -m0644 "${srcdir}/refind-${pkgver}_ia32/gptsync/gptsync_ia32.efi" "${pkgdir}/usr/lib/refind/tools_ia32/gptsync_ia32.efi" + install -d "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}" + install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi" ## Install the rEFInd config file install -d "${pkgdir}/usr/lib/refind/config/" Modified: refind-efi.install =================================================================== --- refind-efi.install 2013-06-21 19:40:34 UTC (rev 188811) +++ refind-efi.install 2013-06-21 19:45:55 UTC (rev 188812) @@ -2,7 +2,7 @@ cat << EOF -rEFInd UEFI applications have been installed at /usr/lib/refind/*.efi +rEFInd UEFI applications have been installed at /usr/lib/refind/refind_*.efi Other UEFI applications have been installed at /usr/lib/refind/tools_*/
