M

3 files changed, 4 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33cd98a7b448..111c27ce4677 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = refind-efi-tianocore-git
 	pkgdesc = Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs - GIT Version
-	pkgver = 20121109
+	pkgver = 20121112
 	pkgrel = 1
 	url = http://www.rodsbooks.com/refind/index.html
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index c894735b4759..e6fa98ea384d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ _COMPILER="GCC46"
 _pkgname="refind-efi-tianocore"
 pkgname="${_pkgname}-git"
 
-pkgver=20121109
+pkgver=20121112
 pkgrel=1
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs - GIT Version"
 url="http://www.rodsbooks.com/refind/index.html"
@@ -40,10 +40,6 @@ _gitroot="git://git.code.sf.net/p/refind/code"
 _gitname="refind"
 _gitbranch="master"
 
-# _refind_dsc_gitroot="git://github.com/snarez/refind-edk2.git"
-# _refind_dsc_gitname="RefindPkg"
-# _refind_efi_gitbranch="master"
-
 _update_tianocore_udk_svn() {
 	
 	if [[ -d "${srcdir}/${_TIANO_DIR_}/${_DIR_}" ]]; then
@@ -111,6 +107,7 @@ _tianocore_udk_common() {
 	
 	cd "${_UDK_DIR}/"
 	
+	## Fix PcdMaximumPathNodeCount compile error
 	patch -Np1 -R -i "${srcdir}/UDK-MdePkg-Revert-PathNodeCount.patch"
 	echo
 	
@@ -142,9 +139,6 @@ _tianocore_udk_common() {
 	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
@@ -177,20 +171,13 @@ _refind_changes() {
 	patch -Np1 -i "${srcdir}/refind_include_more_shell_paths.patch"
 	echo
 	
-	## Use passed ARCH variable value
-	# sed 's|ARCH            :=|ARCH            ?=|g' -i "${srcdir}/${_gitname}_build/Make.tiano" || true
-	# sed 's|ARCH            :=|ARCH            ?=|g' -i "${srcdir}/${_gitname}_build/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}/${_gitname}_build/refind/Make.tiano" || true
-	# sed "s|EFILIB          = \$(EDK2BASE)/Build/MdeModule/|EFILIB          = \$(EDK2BASE)/Build/${_TIANOCORE_PKG}/|g" -i "${srcdir}/${_gitname}_build/filesystems/Make.tiano" || true
-	
 }
 
 _build_refind-efi-common() {
 	
 	## Unset all FLAGS
 	unset CFLAGS
+	unset CPPFLAGS
 	unset CXXFLAGS
 	unset LDFLAGS
 	
@@ -203,10 +190,6 @@ _build_refind-efi-common() {
 	sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/${_gitname}_build_${_UEFI_ARCH}/Make.tiano" || true
 	sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/${_gitname}_build_${_UEFI_ARCH}/filesystems/Make.tiano" || true
 	
-	## Fix ld "-m elf_ARCH" parameter
-	# sed "s|LDFLAGS         = |LDFLAGS         = -m elf_${_ARCH} |g" -i "${srcdir}/${_gitname}_build_${_UEFI_ARCH}/Make.tiano" || true
-	# sed "s|LDFLAGS         = |LDFLAGS         = -m elf_${_ARCH} |g" -i "${srcdir}/${_gitname}_build_${_UEFI_ARCH}/filesystems/Make.tiano" || true
-	
 	## Clean any existing binary files in git repo
 	ARCH="${_UEFI_ARCH}" make clean || true
 	echo
diff --git a/refind-efi.install b/refind-efi.install
deleted file mode 100644
index 72f6850f4a01..000000000000
--- a/refind-efi.install
+++ /dev/null
@@ -1,28 +0,0 @@
-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_*/
-
-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
-	
-}
-