[arch-commits] Commit in refind-efi/trunk (PKGBUILD refind-efi.install)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Mon May 6 10:27:39 UTC 2013
Date: Monday, May 6, 2013 @ 12:27:39
Author: tpowa
Revision: 184342
upgpkg: refind-efi 0.6.10-1
bump to latest version
Modified:
refind-efi/trunk/PKGBUILD
refind-efi/trunk/refind-efi.install
--------------------+
PKGBUILD | 160 ++++++++++++++++++++++++++-------------------------
refind-efi.install | 23 ++-----
2 files changed, 92 insertions(+), 91 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-06 10:26:44 UTC (rev 184341)
+++ PKGBUILD 2013-05-06 10:27:39 UTC (rev 184342)
@@ -1,9 +1,14 @@
# $Id$
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
#######
_TIANOCORE_SVN_URL="https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1"
+# BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg EdkCompatibilityPkg
+_TIANO_DIR_="tianocore-udk-svn"
+#######
+
+#######
_TIANOCORE_PKG="Mde"
_TIANOCORE_TARGET="RELEASE"
_UDK_TARGET="${_TIANOCORE_PKG}Pkg/${_TIANOCORE_PKG}Pkg.dsc"
@@ -11,7 +16,7 @@
#######
pkgname="refind-efi"
-pkgver="0.6.8"
+pkgver="0.6.10"
pkgrel="1"
pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
url="http://www.rodsbooks.com/refind/index.html"
@@ -19,54 +24,48 @@
license=('GPL3' 'custom')
makedepends=('subversion' 'python2')
depends=('dosfstools' 'efibootmgr')
-optdepends=('mactel-boot: For bless command in Apple Mac systems')
+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')
-options=('!strip' 'docs' '!makeflags')
install="${pkgname}.install"
+
source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip"
+ "${_TIANO_DIR_}/BaseTools::svn+${_TIANOCORE_SVN_URL}/BaseTools"
+ "${_TIANO_DIR_}/MdePkg::svn+${_TIANOCORE_SVN_URL}/MdePkg"
+ "${_TIANO_DIR_}/MdeModulePkg::svn+${_TIANOCORE_SVN_URL}/MdeModulePkg"
+ "${_TIANO_DIR_}/IntelFrameworkPkg::svn+${_TIANOCORE_SVN_URL}/IntelFrameworkPkg"
+ "${_TIANO_DIR_}/IntelFrameworkModulePkg::svn+${_TIANOCORE_SVN_URL}/IntelFrameworkModulePkg"
+ "${_TIANO_DIR_}/EdkCompatibilityPkg::svn+${_TIANOCORE_SVN_URL}/EdkCompatibilityPkg"
'UDK-MdePkg-Revert-PathNodeCount.patch'
'refind_linux.conf')
-_update_tianocore_udk_svn() {
-
- if [[ -d "${srcdir}/${_TIANO_DIR_}/${_DIR_}" ]]; then
- cd "${srcdir}/${_TIANO_DIR_}/${_DIR_}"
- svn update || true
- echo
- else
- cd "${srcdir}/${_TIANO_DIR_}/"
- svn checkout "${_TIANOCORE_SVN_URL}/${_DIR_}" "${srcdir}/${_TIANO_DIR_}/${_DIR_}"
- echo
- fi
-
- unset _DIR_
-
-}
-
_tianocore_udk_common() {
- _TIANO_DIR_="tianocore-udk-svn"
+ ## Unset all FLAGS
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
- mkdir -p "${srcdir}/${_TIANO_DIR_}/"
- cd "${srcdir}/${_TIANO_DIR_}/"
-
- for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
- _update_tianocore_udk_svn
- done
-
- unset _DIR_
-
## Setup UDK Environment variables
export _UDK_DIR="${srcdir}/${_TIANO_DIR_}_build"
export EDK_TOOLS_PATH="${_UDK_DIR}/BaseTools"
rm -rf "${_UDK_DIR}/" || true
- cp -r "${srcdir}/${_TIANO_DIR_}" "${_UDK_DIR}"
+ mkdir -p "${_UDK_DIR}/"
+ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg EdkCompatibilityPkg ; do
+ mv "${srcdir}/${_DIR_}" "${_UDK_DIR}/${_DIR_}"
+ done
+
cd "${_UDK_DIR}/"
+ ## Fix PcdMaximumPathNodeCount compile error
patch -Np1 -R -i "${srcdir}/UDK-MdePkg-Revert-PathNodeCount.patch"
echo
@@ -84,7 +83,7 @@
sed 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' -i "${EDK_TOOLS_PATH}/Source/C/Makefiles/header.makefile" || true
sed 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
- ## Fix GCC 4.7 error - gcc: error: unrecognized command line option '-melf_x86_64'
+ ## Fix GCC >=4.7 error - gcc: error: unrecognized command line option '-melf_x86_64'
sed 's| -m64 --64 -melf_x86_64| -m64|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
sed 's|--64 | |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
sed 's| -m64 -melf_x86_64| -m64|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
@@ -98,9 +97,6 @@
sed "s|TARGET = DEBUG|TARGET = ${_TIANOCORE_TARGET}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
sed "s|TOOL_CHAIN_TAG = MYTOOLS|TOOL_CHAIN_TAG = ${_COMPILER}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
- ## Fix UDK Target ARCH
- sed 's|IA32|X64|g' -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
-
## Setup UDK Environment
chmod +x "${_UDK_DIR}/BaseTools/BuildEnv"
source "${_UDK_DIR}/BaseTools/BuildEnv" BaseTools
@@ -118,47 +114,35 @@
"${EDK_TOOLS_PATH}/BinWrappers/PosixLike/build" -p "${_UDK_TARGET}" -a "IA32" -b "${_TIANOCORE_TARGET}" -t "${_COMPILER}"
echo
-}
-
-_refind_changes() {
+ ## Fix UDK Target ARCH for rEFInd
+ sed "s|IA32|X64 IA32|g" -i "${_UDK_DIR}/Conf/target.txt" || true
- cd "${srcdir}/refind-${pkgver}/"
-
- ## Use passed ARCH variable value
- sed 's|ARCH :=|ARCH ?=|g' -i "${srcdir}/refind-${pkgver}/Make.tiano" || true
- sed 's|ARCH :=|ARCH ?=|g' -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true
-
- ## Fix UDK Target Platform in rEFInd Makefiles
- sed "s|EFILIB = \$(EDK2BASE)/Build/MdeModule/|EFILIB = \$(EDK2BASE)/Build/${_TIANOCORE_PKG}/|g" -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true
- sed "s|EFILIB = \$(EDK2BASE)/Build/MdeModule/|EFILIB = \$(EDK2BASE)/Build/${_TIANOCORE_PKG}/|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true
-
}
_build_refind-efi-common() {
+ ## Unset all FLAGS
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
rm -rf "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/" || true
cp -r "${srcdir}/refind-${pkgver}" "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/"
cd "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/"
- ## Fix UDK Target ARCH
- sed "s|IA32|${_SPEC_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true
- sed "s|X64|${_SPEC_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true
-
## 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
-
- ## Fix ld "-m elf_ARCH" parameter
- sed "s|LDFLAGS = |LDFLAGS = -m elf_${_ARCH} |g" -i "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/Make.tiano" || true
- sed "s|LDFLAGS = |LDFLAGS = -m elf_${_ARCH} |g" -i "${srcdir}/refind-${pkgver}_${_UEFI_ARCH}/filesystems/Make.tiano" || true
-
- ARCH="${_UEFI_ARCH}" make clean || true
- echo
-
+ 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
@@ -174,18 +158,11 @@
_tianocore_udk_common
echo
- _refind_changes
- echo
-
- _UEFI_ARCH="x86_64"
- _SPEC_ARCH="X64"
- _ARCH="x86_64"
+ _UEFI_ARCH="x86_64"
_build_refind-efi-common
echo
_UEFI_ARCH="ia32"
- _SPEC_ARCH="IA32"
- _ARCH="i386"
_build_refind-efi-common
echo
@@ -193,7 +170,7 @@
package() {
- ## install the rEFInd UEFI applications
+ ## 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/refind_x64.efi"
install -D -m0644 "${srcdir}/refind-${pkgver}_ia32/refind/refind_ia32.efi" "${pkgdir}/usr/lib/refind/refind_ia32.efi"
@@ -204,16 +181,18 @@
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 the rEFInd config file
+ ## 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 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 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/"
@@ -222,11 +201,38 @@
install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS"
rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true
- ## install the rEFIt license file, since rEFInd is a fork of rEFIt
+ ## Install the rEFInd fonts
+ install -d "${pkgdir}/usr/share/refind/fonts/"
+ install -D -m0644 "${srcdir}/refind-${pkgver}/fonts"/* "${pkgdir}/usr/share/refind/fonts/"
+ rm -f "${pkgdir}/usr/share/refind/fonts/mkfont.sh"
+
+ ## Install the rEFInd mkfont.sh
+ install -d "${pkgdir}/usr/bin/"
+ install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont"
+
+ ## 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 images
+ install -d "${pkgdir}/usr/share/refind/images/"
+ install -D -m0644 "${srcdir}/refind-${pkgver}/images"/*.{png,bmp} "${pkgdir}/usr/share/refind/images/"
+
+ ## Install the rEFInd keys
+ install -d "${pkgdir}/usr/share/refind/keys/"
+ install -D -m0644 "${srcdir}/refind-${pkgver}/keys"/* "${pkgdir}/usr/share/refind/keys/"
+
+ ## 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=('c74143c01aef7eeac9327b83cfec0811'
+md5sums=('132adf75bcde71ec89e0dbf73519adef'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
'98291849f9530c8ddb71b6563c61fb24'
'a83e45b10d5efbca1c93a63851728712')
Modified: refind-efi.install
===================================================================
--- refind-efi.install 2013-05-06 10:26:44 UTC (rev 184341)
+++ refind-efi.install 2013-05-06 10:27:39 UTC (rev 184342)
@@ -1,19 +1,23 @@
post_install() {
cat << EOF
-refind-efi applications have been installed at /usr/lib/refind/*.efi
-UEFI FS drivers have deen installed at /usr/lib/refind/drivers_*/
+rEFInd UEFI applications have been installed at /usr/lib/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)
-rEFInd icons have been installed at /usr/share/refind/icons/
+rEFInd Icons have been installed at /usr/share/refind/icons/
+rEFInd Fonts have been installed at /usr/share/refind/fonts/
HTML Documentation is available at /usr/share/refind/docs/html/
-More info at https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd
+More info: https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd
EOF
@@ -22,15 +26,6 @@
post_upgrade() {
post_install
-if [ "$(vercmp $2 0.6.5)" -lt 0 ]; then
-cat << EOF
-
-ATTENTION:
-efi applications have been renamed to:
-refind_x64.efi
-refind_ia32.efi
-
-EOF
-fi
+
}
More information about the arch-commits
mailing list