[arch-commits] Commit in refind-efi/trunk (PKGBUILD refind-efi.install)

2013-07-24 Thread Tobias Powalowski
Date: Wednesday, July 24, 2013 @ 12:47:44
  Author: tpowa
Revision: 191364

upgpkg: refind-efi 0.7.1-4

fix #36151

Modified:
  refind-efi/trunk/PKGBUILD
  refind-efi/trunk/refind-efi.install

+
 PKGBUILD   |   44 +++-
 refind-efi.install |8 
 2 files changed, 23 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-24 02:13:55 UTC (rev 191363)
+++ PKGBUILD2013-07-24 10:47:44 UTC (rev 191364)
@@ -17,7 +17,7 @@
 
 pkgname=refind-efi
 pkgver=0.7.1
-pkgrel=3
+pkgrel=4
 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')
@@ -181,16 +181,16 @@
 package() {

msg Install the rEFInd UEFI application
-   install -d ${pkgdir}/usr/lib/refind/
-   install -D -m0644 
${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi 
${pkgdir}/usr/lib/refind/refind_${_TIANO_S_ARCH}.efi
+   install -d ${pkgdir}/usr/share/refind/
+   install -D -m0644 
${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi 
${pkgdir}/usr/share/refind/refind_${_TIANO_S_ARCH}.efi

msg Install UEFI drivers built from rEFInd
-   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 -d ${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/
+   install -D -m0644 
${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}/*.efi 
${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/

msg Install UEFI applications built from rEFInd
-   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 -d ${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}
+   install -D -m0644 
${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi 
${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi

msg Install rEFInd helper scripts
install -d ${pkgdir}/usr/bin/
@@ -200,17 +200,17 @@
install -D -m0755 ${srcdir}/refind-${pkgver}/fonts/mkfont.sh 
${pkgdir}/usr/bin/refind-mkfont

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
+   install -D -m0644 ${srcdir}/refind-${pkgver}/refind.conf-sample 
${pkgdir}/usr/share/refind/refind.conf-sample
+   install -D -m0644 ${srcdir}/refind_linux.conf 
${pkgdir}/usr/share/refind/refind_linux.conf-sample

msg Install the rEFInd docs
-   install -d ${pkgdir}/usr/share/doc/refind/html/
-   install -d ${pkgdir}/usr/share/doc/refind/Styles/
-   install -D -m0644 ${srcdir}/refind-${pkgver}/docs/refind/* 
${pkgdir}/usr/share/doc/refind/html/
-   install -D -m0644 ${srcdir}/refind-${pkgver}/docs/Styles/* 
${pkgdir}/usr/share/doc/refind/Styles/
-   install -D -m0644 ${srcdir}/refind-${pkgver}/README.txt 
${pkgdir}/usr/share/doc/refind/README
-   install -D -m0644 ${srcdir}/refind-${pkgver}/NEWS.txt 
${pkgdir}/usr/share/doc/refind/NEWS
-   rm -f ${pkgdir}/usr/share/doc/refind/html/.DS_Store || true
+   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

msg Install the rEFInd fonts
install -d ${pkgdir}/usr/share/refind/fonts/
@@ -236,15 +236,9 @@
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
+   msg Point refind dir paths to /usr/share/refind/ in refind-install 
script
+   sed 's|^ThisDir=.*|ThisDir=/usr/share/refind/|g' -i 
${pkgdir}/usr/bin/refind-install
+   sed 

[arch-commits] Commit in refind-efi/trunk (PKGBUILD refind-efi.install)

2013-07-18 Thread Tobias Powalowski
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
===
--- PKGBUILD2013-07-17 23:37:25 UTC (rev 190823)
+++ PKGBUILD2013-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 @@
   

[arch-commits] Commit in refind-efi/trunk (PKGBUILD refind-efi.install)

2013-07-14 Thread Tobias Powalowski
Date: Sunday, July 14, 2013 @ 20:30:44
  Author: tpowa
Revision: 190082

upgpkg: refind-efi 0.7.1-2

added more upstream scripts

Modified:
  refind-efi/trunk/PKGBUILD
  refind-efi/trunk/refind-efi.install

+
 PKGBUILD   |   32 ++--
 refind-efi.install |2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-14 17:01:42 UTC (rev 190081)
+++ PKGBUILD2013-07-14 18:30:44 UTC (rev 190082)
@@ -17,16 +17,15 @@
 
 pkgname=refind-efi
 pkgver=0.7.1
-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=('x86_64' 'i686')
 license=('GPL3' 'custom')
 
 makedepends=('subversion' 'python2')
-depends=('dosfstools' 'efibootmgr')
+depends=('bash' 'dosfstools' 'efibootmgr')
 optdepends=('mactel-boot: For bless command in Apple Mac systems'
-'bash: For refind-mkfont script'
 'imagemagick: For refind-mkfont script')
 
 options=('!strip' 'docs' '!makeflags')
@@ -191,29 +190,34 @@
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

+   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}/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 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/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 || true
+   install -d ${pkgdir}/usr/share/doc/refind/html/
+   install -d ${pkgdir}/usr/share/doc/refind/Styles/
+   install -D -m0644 ${srcdir}/refind-${pkgver}/docs/refind/* 
${pkgdir}/usr/share/doc/refind/html/
+   install -D -m0644 ${srcdir}/refind-${pkgver}/docs/Styles/* 
${pkgdir}/usr/share/doc/refind/Styles/
+   install -D -m0644 ${srcdir}/refind-${pkgver}/README.txt 
${pkgdir}/usr/share/doc/refind/README
+   install -D -m0644 ${srcdir}/refind-${pkgver}/NEWS.txt 
${pkgdir}/usr/share/doc/refind/NEWS
+   rm -f ${pkgdir}/usr/share/doc/refind/html/.DS_Store || true

msg 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

-   msg Install the rEFInd mkfont.sh
-   install -d ${pkgdir}/usr/bin/
-   install -D -m0755 ${srcdir}/refind-${pkgver}/fonts/mkfont.sh 
${pkgdir}/usr/bin/refind-mkfont
-   
msg Install the rEFInd icons
install -d ${pkgdir}/usr/share/refind/icons/
install -D -m0644 ${srcdir}/refind-${pkgver}/icons/* 
${pkgdir}/usr/share/refind/icons/

Modified: refind-efi.install
===
--- refind-efi.install  2013-07-14 17:01:42 UTC (rev 190081)
+++ refind-efi.install  2013-07-14 18:30:44 UTC (rev 190082)
@@ -15,7 +15,7 @@
 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/
+HTML Documentation is available at /usr/share/doc/refind/html/
 
 More info: https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd
 



[arch-commits] Commit in refind-efi/trunk (PKGBUILD refind-efi.install)

2013-06-21 Thread Tobias Powalowski
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
===
--- PKGBUILD2013-06-21 19:40:34 UTC (rev 188811)
+++ PKGBUILD2013-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 

[arch-commits] Commit in refind-efi/trunk (PKGBUILD refind-efi.install)

2013-05-06 Thread Tobias Powalowski
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
===
--- PKGBUILD2013-05-06 10:26:44 UTC (rev 184341)
+++ PKGBUILD2013-05-06 10:27:39 UTC (rev 184342)
@@ -1,9 +1,14 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@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' 

[arch-commits] Commit in refind-efi/trunk (PKGBUILD refind-efi.install)

2013-01-22 Thread tpowa
Date: Tuesday, January 22, 2013 @ 12:25:23
  Author: tpowa
Revision: 175828

upgpkg: refind-efi 0.6.5-1

bump to latest version, added new upgrade message due to efi application name 
change

Modified:
  refind-efi/trunk/PKGBUILD
  refind-efi/trunk/refind-efi.install

+
 PKGBUILD   |9 ++---
 refind-efi.install |   12 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-22 09:52:02 UTC (rev 175827)
+++ PKGBUILD2013-01-22 11:25:23 UTC (rev 175828)
@@ -11,7 +11,7 @@
 ###
 
 pkgname=refind-efi
-pkgver=0.6.4
+pkgver=0.6.5
 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;
@@ -27,7 +27,6 @@
 install=${pkgname}.install
 source=(http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip;
 'UDK-MdePkg-Revert-PathNodeCount.patch'
-'refind_include_more_shell_paths.patch'
 'refind_linux.conf')
 
 _update_tianocore_udk_svn() {
@@ -125,9 +124,6 @@

cd ${srcdir}/refind-${pkgver}/

-   patch -Np1 -i ${srcdir}/refind_include_more_shell_paths.patch
-   echo
-   
## 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
@@ -231,7 +227,6 @@
install -D -m0644 ${srcdir}/refind-${pkgver}/LICENSE.txt 
${pkgdir}/usr/share/licenses/refind/LICENSE

 }
-md5sums=('226618f181824cf446abbc285eec7cd6'
+md5sums=('da748b4cf69d18d5b85669e6c7a356af'
  '98291849f9530c8ddb71b6563c61fb24'
- '3c12f0b5ea52d659c07f2ba9c226a5ab'
  'a83e45b10d5efbca1c93a63851728712')

Modified: refind-efi.install
===
--- refind-efi.install  2013-01-22 09:52:02 UTC (rev 175827)
+++ refind-efi.install  2013-01-22 11:25:23 UTC (rev 175828)
@@ -1,7 +1,6 @@
 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_*/
@@ -23,6 +22,15 @@
 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
 }