Bump to latest version

arenekosreal · Apr 11, 2024 · 1f967f3 · 1f967f3
1 parent 0f92ddc
commit 1f967f3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/raspberrypi-overlays/PKGBUILD b/raspberrypi-overlays/PKGBUILD
@@ -1,7 +1,7 @@
 buildarch=1 # any
 
 pkgname="raspberrypi-overlays"
-pkgver=20230405
+pkgver=20240306
 pkgrel=1
 pkgdesc="/boot/overlays for RaspberryPi"
 url="https://github.com/raspberrypi/firmware"
@@ -10,7 +10,7 @@ license=("GPL2")
 conflicts=("linux-rpi" "raspberrypi-devicetree")
 replaces=("raspberrypi4-overlays" "raspberrypi4-dtbs")
 source=("https://github.com/raspberrypi/firmware/archive/refs/tags/1.${pkgver}.tar.gz")
-sha256sums=('08b208bf715d0379a93d38f20aed409cbe2e12c1dc27e3a3794416faefde1aa9')
+sha256sums=('f2a288c5f0e52f4fdb706f19f4848da4b04d26e7994daf0ebd548f8b6b3b57d8')
 
 package(){
     cd "${srcdir}/firmware-1.${pkgver}"

diff --git a/uefi-raspberrypi4-bin/PKGBUILD b/uefi-raspberrypi4-bin/PKGBUILD
@@ -3,7 +3,7 @@
 buildarch=1 # any
 
 pkgname="uefi-raspberrypi4-bin" 
-pkgver=1.36
+pkgver=1.37
 pkgrel=1
 backup=("boot/config.txt")
 pkgdesc="UEFI firmware for RaspberryPi 4B (bin version)"
@@ -19,7 +19,7 @@ source=(
     "pre-remove-uefi"
 )
 sha256sums=('f5c8f78f51f9ccf36e4e4cda4d9d70cb37b8161145eb0434e983ce91c3c17087'
-            '328cd55f7f18a912d201ef362846cd43055b415fd46c91ba798b1a118cf7b04a'
+            '71a2343604a2f0f312ea9db215dcc71337fab2589809ca20a878b85ff35d154d'
             '8e55eb4afdd6b572d2413e87b64219d2f9d3bd033de2dfd37e176e92d25d5821'
             'caa86b22a1452d8974e7bbecbb6d9fb591a58da928a06d5e13cee9592e785b12'
             'aed9dfd4c1e7c6092179e8bec63be3fc7b5d958c94063d60a7d1fe4a36f460ef'

diff --git a/uefi-raspberrypi4/PKGBUILD b/uefi-raspberrypi4/PKGBUILD
@@ -3,7 +3,7 @@
 buildarch=8 # aarch64
 
 declare -rAg _modules_name_map=(
-    [edk2]=https://github.com/tianocore/edk2/archive/ddaf39263a1ed84e60238622dfed83ff14ecc50a.tar.gz
+    [edk2]=https://github.com/tianocore/edk2/archive/963671d3801a6992d1aa06f05d86e32efa6b205e.tar.gz
     [edk2/CryptoPkg/Library/OpensslLib/openssl]=https://github.com/openssl/openssl/archive/de90e54bbe82e5be4fb9608b6f5c308bb837d355.tar.gz
     [edk2/CryptoPkg/Library/OpensslLib/openssl/gost-engine]=https://github.com/gost-engine/engine/archive/b2b4d629f100eaee9f5942a106b1ccefe85b8808.tar.gz
     [edk2/CryptoPkg/Library/OpensslLib/openssl/libprov]=https://github.com/provider-corner/libprov/archive/8a126e09547630ef900177625626b6156052f0ee.tar.gz
@@ -24,14 +24,14 @@ declare -rAg _modules_name_map=(
     [edk2/MdePkg/Library/MipiSysTLib/mipisyst/external/googletest]=https://github.com/google/googletest/archive/a6f06bf2fd3b832822cd4e9e554b7d47f32ec084.tar.gz
     [edk2/CryptoPkg/Library/MbedTlsLib/mbedtls]=https://github.com/Mbed-TLS/mbedtls/archive/8c89224991adff88d53cd380f42a2baa36f91454.tar.gz
 
-    [edk2-non-osi]=https://github.com/tianocore/edk2-non-osi/archive/1768928be7451a4a8ba43a9acd16ab30582b9511.tar.gz
+    [edk2-non-osi]=https://github.com/tianocore/edk2-non-osi/archive/0544808c623bb73252310b1e5ef887caaf08c34b.tar.gz
 
-    [edk2-platforms]=https://github.com/tianocore/edk2-platforms/archive/085c2fb0221ffb72f5724e21f41e26dd3740947e.tar.gz
+    [edk2-platforms]=https://github.com/tianocore/edk2-platforms/archive/45f9683253f3a9eca341ff5a8b4c8d8e4ca59430.tar.gz
     [edk2-platforms/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi]=https://github.com/riscv-software-src/opensbi/archive/a731c7e36988c3308e1978ecde491f2f6182d490.tar.gz
 )
 
 pkgname="uefi-raspberrypi4" 
-pkgver=1.36
+pkgver=1.37
 pkgrel=1
 backup=("boot/config.txt")
 pkgdesc="UEFI firmware for RaspberryPi 4B"
@@ -42,9 +42,10 @@ makedepends=("acpica" "openssl" "util-linux" "python")
 source=(
     "RPi4-${pkgver}.tar.gz::https://github.com/pftf/RPi4/archive/refs/tags/v${pkgver}.tar.gz"
 )
+
+declare name commit source_str uri
 for uri in "${_modules_name_map[@]}"
 do
-    declare name commit source_str
     name=$(echo "${uri}" | cut -d / -f 5)
     commit=${uri##*/}
     source_str="${name}-${commit}::${uri}"
@@ -53,28 +54,33 @@ do
         source+=("${source_str}")
     fi
 done
+unset name commit source_str uri
+
 source+=(
-    "ms_kek.cer::https://go.microsoft.com/fwlink/?LinkId=321185"
+    "ms_kek1.cer::https://go.microsoft.com/fwlink/?LinkId=321185"
+    "ms_kek2.cer::https://go.microsoft.com/fwlink/?linkid=2239775"
     "ms_db1.cer::https://go.microsoft.com/fwlink/?linkid=321192"
     "ms_db2.cer::https://go.microsoft.com/fwlink/?linkid=321194"
+    "ms_db3.cer::https://go.microsoft.com/fwlink/?linkid=2239776"
+    "ms_db4.cer::https://go.microsoft.com/fwlink/?linkid=2239872"
     "arm64_dbx.bin::https://uefi.org/sites/default/files/resources/dbxupdate_arm64.bin"
     "70-post-install-uefi.hook"
     "80-pre-remove-uefi.hook"
     "post-install-uefi"
     "pre-remove-uefi"
 )
-sha256sums=('1b8a7f0c3e03d145491176d9becb59d186c4876b5446df3ba5b57f68026414aa'
+sha256sums=('d1941f5449870143d201903fedf9905133ff7234d8d13d9693f84258de4a0503'
             'eea977380ebb1871d5de38c4f7f15442ee690c90bdf790590d930a6bbf347f28'
             '59cd4b81abafae35d94ac5d91cf4ae5b05122e688713cd6db51e5e4cef471d8f'
-            'abbe6975ce767165e7b8bd2245e716269a747b1735e7091863424867031bdfc3'
+            '50a9a0f08839c0e659c4f614b0c3cb93a2a4eb9013b94deb272a1d3f0c47d7dc'
             'e1e1d75109315cbd0610b65295a081ccb4ec1886076241820ce5d61b44b87a91'
             'b5c7e7c54e013c168f4aae036e59912785f11b4aeebd57f6165a14e879b9a82c'
             '1193910f475fde07f3cd4fe1c1a353d69b8cedb574967134838fcdc8208d224e'
             '6d6cacce05086b7debe75127415ff9c3661849f564fe2f5f3b0383d48aa4ed77'
-            'f2e4f1ad16bef68259a14153385fbdf1ec6c99f639f51ba41abfd32b3bb10522'
+            '7bc0838c78542d6aaa9dac79a3ef397be12b49d33078dd47820b1f91402d5e4b'
             '981ab3e9634cb7c041b484cc1876f22a743dc0ae53a970117ca1b5700670a964'
             '9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b'
-            '8f8a47a6189a7ddc3a8935be444c538851e8dcd97d595fe1064772d522a248e0'
+            '2075508b22375e4c608b88f79d934860ba38c46cd8f5121af9b1f6f96e880236'
             '1f5f3eb67cccd4498940bb71c456c07c385eefeda645fa49ef2c432b5723b875'
             '4049ab4cdfae20c376c33b139c34a805a0074dc0d6fe8f47491cd2ab3c3eba98'
             '3c3095488b936b14538dca64d7e68bcde09a8a18d2a32a47b59877eff0340403'
@@ -87,8 +93,11 @@ sha256sums=('1b8a7f0c3e03d145491176d9becb59d186c4876b5446df3ba5b57f68026414aa'
             '6467f52b39f5954d6fd242487140c459001b650e1df7511392397e099894a2a1'
             '28d89f42da17357f4292574e1ba8780f4f233c6324993d4885f25b8699c75938'
             'a1117f516a32cefcba3f2d1ace10a87972fd6bbe8fe0d0b996e09e65d802a503'
+            '3cd3f0309edae228767a976dd40d9f4affc4fbd5218f2e8cc3c9dd97e8ac6f9d'
             'e8e95f0733a55e8bad7be0a1413ee23c51fcea64b3c8fa6a786935fddcc71961'
             '48e99b991f57fc52f76149599bff0a58c47154229b9f8d603ac40d3500248507'
+            '076f1fea90ac29155ebf77c17682f75f1fdd1be196da302dc8461e350a9ae330'
+            'f6124e34125bee3fe6d79a574eaa7b91c0e7bd9d929c1a321178efd611dad901'
             'f42c187f8b01b497f81fb0459164b27d16ca2af0b95c7331a82c1a27a731a885'
             '8e55eb4afdd6b572d2413e87b64219d2f9d3bd033de2dfd37e176e92d25d5821'
             'caa86b22a1452d8974e7bbecbb6d9fb591a58da928a06d5e13cee9592e785b12'
@@ -144,7 +153,7 @@ prepare(){
         fi
     done
     mkdir -p keys
-    cp "${srcdir}"/{ms_kek.cer,ms_db1.cer,ms_db2.cer,arm64_dbx.bin} keys/
+    cp "${srcdir}"/{ms_kek1.cer,ms_kek2.cer,ms_db1.cer,ms_db2.cer,ms_db3.cer,ms_db4.cer,arm64_dbx.bin} keys/
     openssl req -new -x509 -newkey rsa:2048 -subj "/CN=Raspberry Pi Platform Key/" -keyout /dev/null -outform DER -out keys/pk.cer -days 7300 -nodes -sha256
 }
 build(){
@@ -156,7 +165,7 @@ build(){
         export WORKSPACE=\$PWD
         export PACKAGES_PATH=\$WORKSPACE/edk2:\$WORKSPACE/edk2-platforms:\$WORKSPACE/edk2-non-osi
         export BUILD_FLAGS=\"-D SECURE_BOOT_ENABLE=TRUE -D INCLUDE_TFTP_COMMAND=TRUE -D NETWORK_ISCSI_ENABLE=TRUE -D SMC_PCI_SUPPORT=1\"
-        export DEFAULT_KEYS=\"-D DEFAULT_KEYS=TRUE -D PK_DEFAULT_FILE=\$WORKSPACE/keys/pk.cer -D KEK_DEFAULT_FILE1=\$WORKSPACE/keys/ms_kek.cer -D DB_DEFAULT_FILE1=\$WORKSPACE/keys/ms_db1.cer -D DB_DEFAULT_FILE2=\$WORKSPACE/keys/ms_db2.cer -D DBX_DEFAULT_FILE1=\$WORKSPACE/keys/arm64_dbx.bin\"
+        export DEFAULT_KEYS=\"-D DEFAULT_KEYS=TRUE -D PK_DEFAULT_FILE=\$WORKSPACE/keys/pk.cer -D KEK_DEFAULT_FILE1=\$WORKSPACE/keys/ms_kek1.cer -D KEK_DEFAULT_FILE2=\$WORKSPACE/keys/ms_kek2.cer -D DB_DEFAULT_FILE1=\$WORKSPACE/keys/ms_db1.cer -D DB_DEFAULT_FILE2=\$WORKSPACE/keys/ms_db2.cer -D DB_DEFAULT_FILE3=\$WORKSPACE/keys/ms_db3.cer -D DB_DEFAULT_FILE4=\$WORKSPACE/keys/ms_db4.cer -D DBX_DEFAULT_FILE1=\$WORKSPACE/keys/arm64_dbx.bin\"
         source edk2/edksetup.sh
         build -a AARCH64 -t GCC -p edk2-platforms/Platform/RaspberryPi/RPi4/RPi4.dsc -b RELEASE -n \$(nproc) --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor=L\"https://github.com/pftf/RPi4\" --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString=L\"UEFI Firmware ${pkgver}-${pkgrel}\" --pcd gRaspberryPiTokenSpaceGuid.PcdRamLimitTo3GB=0 \${BUILD_FLAGS} \${DEFAULT_KEYS}
         "