Arch Linux User Repository

Looks like its pulling older tag using git describe. Maybe annotated vs annotated issues. Changing to 'git describe --tags' works for me and pulls the later tag : edk2-stable202102-188-g1e6b0394d6

Noticed that submodules didn't get cached (I have SRCDEST=$XDG_CACHE_HOME/pacman/sources), so I wrote this patch. Basically, declarations at toplevel of PKGBUILD aren't passed through to functions:

From 80a3d3ea401897e9e3e1b6a27f78f6bccf00af47 Mon Sep 17 00:00:00 2001
From: gesh <gesh@gesh.uni.cx>
Date: Mon, 8 Mar 2021 15:00:00
Subject: [PATCH] Move _submod_path to _prepare_tianocore_sources()

---
 PKGBUILD | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 7fcb285..e6d839b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -45,14 +45,6 @@ provides=('uefi-shell')

 install="${_pkgname}.install"

-declare -A _submod_path
-_submod_path["CryptoPkg/Library/OpensslLib/openssl"]="openssl"
-_submod_path["SoftFloat"]="softfloat"
-_submod_path["UnitTestFrameworkPkg/Library/CmockaLib/cmocka"]="cmocka"
-_submod_path["MdeModulePkg/Universal/RegularExpressionDxe/oniguruma"]="oniguruma"
-_submod_path["MdeModulePkg/Library/BrotliCustomDecompressLib/brotli"]="brotli"
-_submod_path["BaseTools/Source/C/BrotliCompress/brotli"]="brotli"
-
 source=(
    "${_TIANO_DIR_}::git+https://github.com/tianocore/edk2.git#branch=master"
    "brotli::git+https://github.com/google/brotli"
@@ -85,6 +77,14 @@ _setup_env_vars() {
 _prepare_tianocore_sources() {
    cd "${_UDK_DIR}/"

+    declare -A _submod_path
+    _submod_path["CryptoPkg/Library/OpensslLib/openssl"]="openssl"
+    _submod_path["SoftFloat"]="softfloat"
+    _submod_path["UnitTestFrameworkPkg/Library/CmockaLib/cmocka"]="cmocka"
+    _submod_path["MdeModulePkg/Universal/RegularExpressionDxe/oniguruma"]="oniguruma"
+    _submod_path["MdeModulePkg/Library/BrotliCustomDecompressLib/brotli"]="brotli"
+    _submod_path["BaseTools/Source/C/BrotliCompress/brotli"]="brotli"
+
    msg "Updating submodules"
    git submodule init
    for _module in "${!_submod_path[@]}"; do
-- 
2.30.1

It was actually down to spacing in the patch (not sure if it's on my end or the AUR has done it). I manually fixed that up and got it applied now. Thanks for your help.

I think the sticking point is the pkgver edit, try removing it. Can't test right now.

gesh: Thanks for the patch but I couldn't get it to apply. I could obviously apply the same changes but that would then lose your attribution. Any chance you can update the patch for the current state?

For now I applied mcmodder's suggestion which at least fixes the immediate issue.

Below is a patch to implement mcmodder's suggestion. I go a little further, having all module fetching managed by makepkg instead of git directly

From 9117c0006bfc42e8c55db40710640cc7beec189c Mon Sep 17 00:00:00 2001
From: Gesh <gesh@gesh.uni.cx>
Date: Mon, 2 Nov 2020 21:35:24
Subject: [PATCH] Fix build after submodulification

---
 PKGBUILD | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index d3ba187..2362500 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,8 +29,8 @@ _GUID="EA4BB293-2D7F-4456-A681-1F22F42CD0BC"
 _pkgname="uefi-shell"
 pkgname="${_pkgname}-git"

-pkgver=26946.edk2.stable201903.1209.gf8dd7c7018
-pkgrel=1
+pkgver=28247.edk2.stable201903.2510.gffddac3e0f
+pkgrel=2
 pkgdesc="UEFI Shell v2 - from Tianocore EDK2 - GIT Version"
 url="https://github.com/tianocore/edk2"
 arch=('x86_64' 'i686')
@@ -45,9 +45,28 @@ provides=('uefi-shell')

 install="${_pkgname}.install"

-source=("${_TIANO_DIR_}::git+https://github.com/tianocore/edk2.git#branch=master")
-
-sha1sums=('SKIP')
+declare -A _submod_path
+_submod_path["CryptoPkg/Library/OpensslLib/openssl"]="openssl"
+_submod_path["SoftFloat"]="softfloat"
+_submod_path["UnitTestFrameworkPkg/Library/CmockaLib/cmocka"]="cmocka"
+_submod_path["MdeModulePkg/Universal/RegularExpressionDxe/oniguruma"]="oniguruma"
+_submod_path["MdeModulePkg/Library/BrotliCustomDecompressLib/brotli"]="brotli"
+_submod_path["BaseTools/Source/C/BrotliCompress/brotli"]="brotli"
+
+source=("${_TIANO_DIR_}::git+https://github.com/tianocore/edk2.git#branch=master"
+        brotli::git+https://github.com/google/brotli
+        softfloat::git+https://github.com/ucb-bar/berkeley-softfloat-3.git
+        cmocka::git+https://git.cryptomilk.org/projects/cmocka.git
+        oniguruma::git+https://github.com/kkos/oniguruma
+        openssl::git+https://github.com/openssl/openssl
+        )
+
+sha1sums=('SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP')

 pkgver() {
    cd "${srcdir}/${_TIANO_DIR_}/"
@@ -63,6 +82,12 @@ _setup_env_vars() {
 _prepare_tianocore_sources() {
    cd "${_UDK_DIR}/"

+    git submodule init
+    for _module in "${!_submod_path[@]}"; do
+        git config submodule."$_module".url "$srcdir/${_submod_path[$_module]}"
+    done
+    git submodule update
+
    msg "Cleanup UDK config files"
    rm -rf "${_UDK_DIR}/Build/" || true
    rm -rf "${_UDK_DIR}/Conf/" || true
-- 
2.29.2

Build fails due to non-initialized git submodules: https://github.com/tianocore/tianocore.github.io/wiki/Common-instructions#initialize-submodules https://bugzilla.tianocore.org/show_bug.cgi?id=2677

Fixes with adding git submodule update --init to _prepare_tianocore_sources()

Yes, I've done that now, thanks for the suggestion. Seems sensible and it even simplifies the PKGBUILD a bit as a nice little bonus.

Can you remove the python2 references, and add the normal "python" package (for python3) to the "makedepends" array? Upstream has supported python3 since February 2019: https://bugzilla.tianocore.org/show_bug.cgi?id=55

Thank you for adopting :)