[arch-commits] Commit in ovmf/trunk (2 files)
Date: Saturday, March 4, 2017 @ 13:53:43
Author: thomas
Revision: 289980
upgpkg: ovmf 1:r21243.3858b4a1ff-1
Modified:
ovmf/trunk/PKGBUILD
Deleted:
ovmf/trunk/0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
---+
0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch | 37 --
PKGBUILD | 15 ++--
2 files changed, 9 insertions(+), 43 deletions(-)
Deleted: 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
===
--- 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
2017-03-04 12:59:41 UTC (rev 289979)
+++ 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
2017-03-04 13:53:43 UTC (rev 289980)
@@ -1,37 +0,0 @@
-From ab9435c71d894018c88c8f5ff89f654f2029d3ed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?=
-Date: Sat, 1 Mar 2014 20:30:57 +0100
-Subject: [PATCH] Fix uninitialized value in VfrCompiler constructor.
-
- BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 1 +
- BaseTools/Source/C/VfrCompile/VfrCompiler.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
-index dd34a1b..77b2cab 100644
a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
-+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
-@@ -371,6 +371,7 @@ CVfrCompiler::CVfrCompiler (
- {
- mPreProcessCmd = (CHAR8 *) PREPROCESSOR_COMMAND;
- mPreProcessOpt = (CHAR8 *) PREPROCESSOR_OPTIONS;
-+ SET_RUN_STATUS(STATUS_UNKNOWN);
-
- OptionInitialization(Argc, Argv);
-
-diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.h
b/BaseTools/Source/C/VfrCompile/VfrCompiler.h
-index ea20bbc..1603961 100644
a/BaseTools/Source/C/VfrCompile/VfrCompiler.h
-+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.h
-@@ -60,6 +60,7 @@ typedef struct {
- } OPTIONS;
-
- typedef enum {
-+ STATUS_UNKNOWN = 0,
- STATUS_INITIALIZED = 1,
- STATUS_PREPROCESSED,
- STATUS_COMPILEED,
---
-1.9.0
-
Modified: PKGBUILD
===
--- PKGBUILD2017-03-04 12:59:41 UTC (rev 289979)
+++ PKGBUILD2017-03-04 13:53:43 UTC (rev 289980)
@@ -1,7 +1,8 @@
# $Id$
# Maintainer: Thomas Bächler
pkgname=ovmf
-pkgver=18419
+pkgver=r21243.3858b4a1ff
+epoch=1
pkgrel=1
arch=('any')
pkgdesc="Tianocore UEFI firmware for qemu."
@@ -8,14 +9,14 @@
url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2";
license=('custom')
makedepends=('git' 'python2' 'iasl' 'nasm' 'subversion' 'perl-libwww')
-source=('edk2::git+https://github.com/tianocore/edk2#commit=ddd097e33f6e6829dc0413820e9971f3bf025f87')
+source=('edk2::git+https://github.com/tianocore/edk2#commit=3858b4a1ff09d3243fea8d07bd135478237cb8f7')
sha256sums=('SKIP')
options=(!makeflags)
-_toolchain_opt=GCC49
+_toolchain_opt=GCC5
pkgver() {
cd "${srcdir}"/edk2
- git svn find-rev HEAD
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short
HEAD)"
}
prepare() {
@@ -51,7 +52,9 @@
}
package() {
- install -D -m644
"${srcdir}"/edk2/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF.fd
"${pkgdir}"/usr/share/ovmf/ovmf_ia32.bin
- install -D -m644
"${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF.fd
"${pkgdir}"/usr/share/ovmf/ovmf_x64.bin
+ install -D -m644
"${srcdir}"/edk2/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd
"${pkgdir}"/usr/share/ovmf/ovmf_code_ia32.bin
+ install -D -m644
"${srcdir}"/edk2/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd
"${pkgdir}"/usr/share/ovmf/ovmf_vars_ia32.bin
+ install -D -m644
"${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd
"${pkgdir}"/usr/share/ovmf/ovmf_code_x64.bin
+ install -D -m644
"${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd
"${pkgdir}"/usr/share/ovmf/ovmf_vars_x64.bin
install -D -m644 "${srcdir}"/edk2/OvmfPkg/License.txt
"${pkgdir}"/usr/share/licenses/ovmf/License.txt
}
[arch-commits] Commit in ovmf/trunk (2 files)
Date: Sunday, March 2, 2014 @ 02:23:32
Author: thomas
Revision: 206578
newpkg: ovmf 15280-1 - UEFI firmware for qemu
Added:
ovmf/trunk/0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
ovmf/trunk/PKGBUILD
---+
0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch | 37 ++
PKGBUILD | 61 ++
2 files changed, 98 insertions(+)
Added: 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
===
--- 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
(rev 0)
+++ 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
2014-03-02 01:23:32 UTC (rev 206578)
@@ -0,0 +1,37 @@
+From ab9435c71d894018c88c8f5ff89f654f2029d3ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?=
+Date: Sat, 1 Mar 2014 20:30:57 +0100
+Subject: [PATCH] Fix uninitialized value in VfrCompiler constructor.
+
+---
+ BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 1 +
+ BaseTools/Source/C/VfrCompile/VfrCompiler.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
+index dd34a1b..77b2cab 100644
+--- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
+@@ -371,6 +371,7 @@ CVfrCompiler::CVfrCompiler (
+ {
+ mPreProcessCmd = (CHAR8 *) PREPROCESSOR_COMMAND;
+ mPreProcessOpt = (CHAR8 *) PREPROCESSOR_OPTIONS;
++ SET_RUN_STATUS(STATUS_UNKNOWN);
+
+ OptionInitialization(Argc, Argv);
+
+diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.h
b/BaseTools/Source/C/VfrCompile/VfrCompiler.h
+index ea20bbc..1603961 100644
+--- a/BaseTools/Source/C/VfrCompile/VfrCompiler.h
b/BaseTools/Source/C/VfrCompile/VfrCompiler.h
+@@ -60,6 +60,7 @@ typedef struct {
+ } OPTIONS;
+
+ typedef enum {
++ STATUS_UNKNOWN = 0,
+ STATUS_INITIALIZED = 1,
+ STATUS_PREPROCESSED,
+ STATUS_COMPILEED,
+--
+1.9.0
+
Added: PKGBUILD
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-03-02 01:23:32 UTC (rev 206578)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Thomas Bächler
+pkgname=ovmf
+pkgver=15280
+pkgrel=1
+arch=('any')
+pkgdesc="Tianocore UEFI firmware for qemu."
+url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2";
+license=('custom')
+makedepends=('git' 'python2' 'iasl')
+source=('edk2::git+https://github.com/tianocore/edk2#commit=57a1b9c4252985ee5d631340fed453e73e0c9146'
+'0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch')
+sha256sums=('SKIP'
+'8761c79b9d3e616c42bfb9c61d72893bbe19d774fe28ce9733ff62ed92478868')
+options=(!makeflags)
+
+pkgver() {
+ cd "${srcdir}"/edk2
+ git svn find-rev HEAD
+}
+
+prepare() {
+ cd "${srcdir}"
+ # edk2 uses python everywhere, but expects python2
+ mkdir bin
+ ln -s /usr/bin/python2 bin/python
+
+ cd edk2
+ patch -p1 -i
"${srcdir}"/0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
+}
+
+build() {
+ if [ "$CARCH" != "x86_64" ]; then
+error "This package must be built under the x86_64 architecture."
+false
+ fi
+ export PATH="${srcdir}/bin:$PATH"
+ cd "${srcdir}/"edk2
+ make -C BaseTools
+ export EDK_TOOLS_PATH="${srcdir}"/edk2/BaseTools
+ . edksetup.sh BaseTools
+
+ # Set RELEASE target, gcc 4.8 toolchain and number of build threads
+ sed "s|^TARGET[ ]*=.*|TARGET = RELEASE|; \
+ s|TOOL_CHAIN_TAG[ ]*=.*|TOOL_CHAIN_TAG = GCC48|; \
+ s|MAX_CONCURRENT_THREAD_NUMBER[ ]*=.*|MAX_CONCURRENT_THREAD_NUMBER =
$(nproc)|;" -i Conf/target.txt
+ # Build OVMF for ia32
+ sed "s|^TARGET_ARCH[ ]*=.*|TARGET_ARCH = IA32|; \
+ s|^ACTIVE_PLATFORM[ ]*=.*|ACTIVE_PLATFORM = OvmfPkg/OvmfPkgIa32.dsc|;"
-i Conf/target.txt
+ ./BaseTools/BinWrappers/PosixLike/build
+ # Build OVMF for x64
+ sed "s|^TARGET_ARCH[ ]*=.*|TARGET_ARCH = X64|; \
+ s|^ACTIVE_PLATFORM[ ]*=.*|ACTIVE_PLATFORM = OvmfPkg/OvmfPkgX64.dsc|;"
-i Conf/target.txt
+ ./BaseTools/BinWrappers/PosixLike/build
+}
+
+package() {
+ install -D -m644 "${srcdir}"/edk2/Build/OvmfIa32/RELEASE_GCC48/FV/OVMF.fd
"${pkgdir}"/usr/share/ovmf/ovmf_ia32.bin
+ install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_GCC48/FV/OVMF.fd
"${pkgdir}"/usr/share/ovmf/ovmf_x64.bin
+ install -D -m644 "${srcdir}"/edk2/OvmfPkg/License.txt
"${pkgdir}"/usr/share/licenses/ovmf/License.txt
+}
Property changes on: ovmf/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
