From 4e212b27b5725174f1dc3b0d975552b486a59078 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 25 Jan 2023 11:32:23 +0100
Subject: [PATCH] add edk2-platforms, build ext4 driver

---
 .gitignore |  1 +
 edk2.spec  | 24 ++++++++++++++++++++++--
 sources    |  2 ++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a743c71..ed5cffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz
 /openssl-rhel-bdd048e929dcfcf2f046d74e812e0e3d5fc58504.tar.xz
 /openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz
+/jansson-2.13.1.tar.bz2
diff --git a/edk2.spec b/edk2.spec
index 0acdb9c..5d4331a 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -48,6 +48,8 @@ Source0: edk2-%{GITCOMMIT}.tar.xz
 Source1: ovmf-whitepaper-c770f8c.txt
 Source2: openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz
 Source3: softfloat-%{softfloat_version}.tar.xz
+Source4: edk2-platforms-b36fe8bc9b68.tar.xz
+Source5: jansson-2.13.1.tar.bz2
 
 # json description files
 Source10: 50-edk2-aarch64.json
@@ -69,7 +71,8 @@ Source45: 60-edk2-ovmf-x64-inteltdx.json
 # https://gitlab.com/kraxel/edk2-build-config
 Source80: edk2-build.py
 Source81: edk2-build.fedora
-Source82: edk2-build.rhel-9
+Source82: edk2-build.fedora.platforms
+Source83: edk2-build.rhel-9
 
 Source90: DBXUpdate-20200729.x64.bin
 
@@ -231,6 +234,14 @@ License:        BSD-2-Clause-Patent and OpenSSL
 EFI Development Kit II
 ARMv7 UEFI Firmware
 
+%package ext4
+Summary:        Ext4 filesystem driver
+License:        BSD-2-Clause-Patent and OpenSSL
+BuildArch:      noarch
+%description ext4
+EFI Development Kit II
+Ext4 filesystem driver
+
 %package tools-python
 Summary:        EFI Development Kit II Tools
 Requires:       python3
@@ -260,6 +271,8 @@ cp -a -- %{SOURCE1} .
 tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x
 # extract softfloat into place
 tar -xf %{SOURCE3} --strip-components=1 --directory ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3/
+tar -xf %{SOURCE4} --strip-components=1 "*/Drivers" "*/Features" "*/Platform" "*/Silicon"
+tar -xf %{SOURCE5} --strip-components=1 --directory RedfishPkg/Library/JsonLib/jansson
 
 # Done by %setup, but we do not use it for the auxiliary tarballs
 chmod -Rf a+rX,u+w,g-w,o-w .
@@ -269,7 +282,7 @@ cp -a -- \
    %{SOURCE20} \
    %{SOURCE30} %{SOURCE31} %{SOURCE32} \
    %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE43} %{SOURCE44} %{SOURCE45} \
-   %{SOURCE80} %{SOURCE81} %{SOURCE82} \
+   %{SOURCE80} %{SOURCE81} %{SOURCE82} %{SOURCE83} \
    %{SOURCE90} \
    .
 
@@ -328,6 +341,7 @@ build_iso RHEL-9/ovmf
 %else
 
 ./edk2-build.py --config edk2-build.fedora --silent --release-date "$RELEASE_DATE" -m ovmf
+./edk2-build.py --config edk2-build.fedora.platforms --silent -m x64
 virt-fw-vars --input   Fedora/ovmf/OVMF_VARS.fd \
              --output  Fedora/ovmf/OVMF_VARS.secboot.fd \
              --set-dbx DBXUpdate-20200729.x64.bin \
@@ -357,6 +371,7 @@ virt-fw-vars --input   Fedora/experimental/OVMF.stateless.fd \
 ./edk2-build.py --config edk2-build.rhel-9 --silent --release-date "$RELEASE_DATE" -m armvirt
 %else
 ./edk2-build.py --config edk2-build.fedora --silent --release-date "$RELEASE_DATE" -m armvirt
+./edk2-build.py --config edk2-build.fedora.platforms --silent -m aa64
 %endif
 for raw in */aarch64/*.raw; do
     qcow2="${raw%.raw}.qcow2"
@@ -602,6 +617,11 @@ done
 %{_datadir}/%{name}/arm/vars-template-pflash.raw
 %{_datadir}/qemu/firmware/50-edk2-arm-verbose.json
 
+%files ext4
+%common_files
+%dir %{_datadir}/%{name}/drivers
+%{_datadir}/%{name}/drivers/ext4*.efi
+
 
 %files tools-python
 %{_bindir}/build
diff --git a/sources b/sources
index f157b8f..25d1bcc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,5 @@
 SHA512 (softfloat-20180726-gitb64af41.tar.xz) = f079debd1bfcc0fe64329a8947b0689ef49246793edcdd28a2879f6550c652b0cf0f53ac4f6f5ab61ac4f7933972e0019d0ab63eb9931b6884c2909f3a5ead30
 SHA512 (openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz) = acc725d151666bb433e404e6da460e4ac93bd92dca0e9a64fdeb2f6b0a231af560c900f0f3e5bbba43895ead570fc9cd1273ff78dcc8d5f6be34a1fae55e6d3f
 SHA512 (edk2-fff6d81270b5.tar.xz) = 3b215ae200c6be355aa937ef933cc636867416a24e159a83852d7972b7b70f712df3773c429ed5ac5cc6e300fd6f733d6a5bc1b54a06fc0bc3f98ea14d7cb068
+SHA512 (edk2-platforms-b36fe8bc9b68.tar.xz) = 5d10c72700cf6b63e6b59ca8951fb343881fb01b97ec054804fd33385fe837df80a725fe73336d93cc6957414d865e1648a5daaea8f31891b5f2b217d1da774b
+SHA512 (jansson-2.13.1.tar.bz2) = 057f0eda43e4162569888d739f4d78d1d02fce8359400d8f66fdc6e440b0405cb457e1126820dc8ce51e9c4a7f4b7effc640caf1d54307c78c0c47c3fc093011