summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeshav Amburay2015-12-16 12:45:48 -0500
committerKeshav Amburay2015-12-16 12:45:48 -0500
commit76e0fc29383edde325e32f284587d4c42d5b1eed (patch)
tree043c2701af4e0a005368bda803bd9d665e5b4454
parent24cfbbc57522bbbf4a21d04bf457ae45624d05b1 (diff)
downloadaur-76e0fc29383edde325e32f284587d4c42d5b1eed.tar.gz
Switch to single edk2 git repo
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD31
2 files changed, 8 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e6687f1c618..6f38134073e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Dec 16 17:45:14 UTC 2015
pkgbase = uefi-shell-git
pkgdesc = UEFI Shell v2 - from Tianocore EDK2 - GIT Version
- pkgver = 681.85807a5
+ pkgver = 17363.e7e1201
pkgrel = 1
url = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=ShellPkg
install = uefi-shell.install
@@ -16,13 +18,7 @@ pkgbase = uefi-shell-git
conflicts = uefi-shell-svn
options = !strip
options = !makeflags
- source = edk2-BaseTools::git+https://github.com/tianocore/edk2-BaseTools.git#branch=master
- source = edk2-MdePkg::git+https://github.com/tianocore/edk2-MdePkg.git#branch=master
- source = edk2-MdeModulePkg::git+https://github.com/tianocore/edk2-MdeModulePkg.git#branch=master
- source = edk2-ShellPkg::git+https://github.com/tianocore/edk2-ShellPkg.git#branch=master
- sha1sums = SKIP
- sha1sums = SKIP
- sha1sums = SKIP
+ source = edk2::git+https://github.com/tianocore/edk2.git#branch=master
sha1sums = SKIP
pkgname = uefi-shell-git
diff --git a/PKGBUILD b/PKGBUILD
index 3dcbeea162b..43a62cfaddb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,6 @@
_SHELL_IA32_ARCH_X64="1"
###############
-_TIANOCORE_GIT_URL="https://github.com/tianocore/edk2"
_TIANO_DIR_="edk2"
###############
@@ -26,7 +25,7 @@ _COMPILER="GCC49"
_pkgname="uefi-shell"
pkgname="${_pkgname}-git"
-pkgver=681.85807a5
+pkgver=17363.e7e1201
pkgrel=1
pkgdesc="UEFI Shell v2 - from Tianocore EDK2 - GIT Version"
url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=ShellPkg"
@@ -42,20 +41,13 @@ provides=('uefi-shell' 'uefi-shell-svn')
install="${_pkgname}.install"
-source=()
+source=("${_TIANO_DIR_}::git+https://github.com/tianocore/edk2.git#branch=master")
-for _DIR_ in BaseTools MdePkg MdeModulePkg ShellPkg ; do
- source+=("${_TIANO_DIR_}-${_DIR_}::git+${_TIANOCORE_GIT_URL}-${_DIR_}.git#branch=master")
-done
-
-sha1sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP')
+sha1sums=('SKIP')
pkgver() {
- cd "${srcdir}/${_TIANO_DIR_}-${_TIANOCORE_PKG}Pkg/"
+ cd "${srcdir}/${_TIANO_DIR_}/"
echo "$(git rev-list --count HEAD).$(git describe --always)" | sed -e 's|-|\.|g'
}
@@ -70,16 +62,6 @@ _setup_env_vars() {
_prepare_tianocore_sources() {
- 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 ShellPkg ; do
- mv "${srcdir}/${_TIANO_DIR_}-${_DIR_}" "${_UDK_DIR}/${_DIR_}"
- done
-
cd "${_UDK_DIR}/"
msg "Cleanup UDK config files"
@@ -98,11 +80,6 @@ _prepare_tianocore_sources() {
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
- msg "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
-
msg "Remove GCC -g debug option and add -O0 -mabi=ms -maccumulate-outgoing-args"
sed 's|DEFINE GCC_ALL_CC_FLAGS = -g |DEFINE GCC_ALL_CC_FLAGS = -O0 -mabi=ms -maccumulate-outgoing-args |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
sed 's|DEFINE GCC44_ALL_CC_FLAGS = -g |DEFINE GCC44_ALL_CC_FLAGS = -O0 -mabi=ms -maccumulate-outgoing-args |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true