Add .gitignore and .gitea/workflows/ci.yml

.gitea/workflows/ci.yml

@@ -13,4 +13,5 @@ jobs:
         with:
           CI_DEPLOY: ${{ secrets.CI_DEPLOY }}
           PUBLICATOR: ${{ secrets.PUBLICATOR }}
+          REPO_DEPLOY: ${{ secrets.REPO_DEPLOY }}
 

edk2.rpmlintrc

@@ -0,0 +1 @@
+addFilter("E: use-of-RPM_SOURCE_DIR")

edk2.spec

@@ -1,6 +1,10 @@
-%global edk2_date	20171011
-%global edk2_githash	92d07e4
-%global openssl_version	1.1.0e
+%global edk2_date   202308
+%global edk2_githash    819cfc6
+%global openssl_version 1.1.0e
+%global mipi_version v1.1+edk2
+%global mipi_commit 370b5944c046bab043dd8b133727b2135af7747a
+%global ssl_version 3.0.9
+%global __python %{__python38}
 
 %bcond_without build_ovmf_ia32
 %ifarch x86_64
@@ -20,16 +24,21 @@ Release:	1.git%{edk2_githash}
 Summary:	EFI Development Kit II
 License:	BSD
 Group:		Emulators
-URL:		http://www.tianocore.org/edk2/
+URL:		https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/
 
-Source0:	edk2-%{edk2_date}-%{edk2_githash}.tar.xz
-Source1:	openssl-%{openssl_version}-hobbled.tar.xz
+#Source0:	edk2-%{edk2_date}-%{edk2_githash}.tar.xz
+Source0:    https://github.com/tianocore/edk2/archive/%{name}-stable%{edk2_date}/%{name}-stable%{edk2_date}.tar.gz
+#Source1:	openssl-%{openssl_version}-hobbled.tar.xz
 Source2:	ovmf-whitepaper-c770f8c.txt
 Source10:	hobble-openssl
 Source11:	build-iso.sh
 Source12:	update-tarball.sh
 Source13:	openssl-patch-to-tarball.sh
-
+Source14:   https://github.com/google/brotli/archive/v1.1.0/brotli-1.1.0.tar.gz
+Source15:   https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/%{mipi_version}/mipi-%{mipi_version}.tar.gz
+#Source16:   https://github.com/openssl/openssl/archive/%{ssl_version}/openssl-%{ssl_version}.tar.gz
+Source16:   https://github.com/openssl/openssl/releases/download/openssl-%{ssl_version}/openssl-%{ssl_version}.tar.gz
+Source1000: %{name}.rpmlintrc
 # non-upstream patches
 Patch0006:	0006-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch
 Patch0014:	0014-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
@@ -59,6 +68,7 @@ BuildRequires:	nasm
 BuildRequires:	dosfstools
 BuildRequires:	mtools
 BuildRequires:	genisoimage
+BuildRequires:  git-core
 
 Requires:	edk2-tools = %{EVRD}
 Requires:	edk2-tools-doc = %{EVRD}
@@ -243,7 +253,7 @@ armv7 UEFI Firmware.
 #---------------------------------------------------------------------------
 
 %prep
-%setup -q -n tianocore-%{name}-%{edk2_githash}
+%setup -qn %{name}-%{name}-stable%{edk2_date}
 
 
 # Ensure old shell and binary packages are not used
@@ -255,19 +265,46 @@ rm -rf ShellBinPkg
 cp -a -- %{SOURCE2} .
 
 # add openssl
-(cd .. && tar -xvf %{SOURCE1})
-cp CryptoPkg/Library/OpensslLib/openssl/LICENSE LICENSE.openssl
+#(cd .. && tar -xvf %{SOURCE1})
+#mv ../tianocore-edk2-92d07e4/CryptoPkg/Library/OpensslLib/openssl/* CryptoPkg/Library/OpensslLib/openssl/
+#cp CryptoPkg/Library/OpensslLib/openssl/LICENSE LICENSE.openssl
 
-%apply_patches
+(tar -xvf %{SOURCE14} \
+    && mv brotli-1.1.0/* BaseTools/Source/C/BrotliCompress/brotli/ \
+    && rm -rf brotli-1.1.0 )
+    
+(tar -xvf %{SOURCE15} \
+    && mv public-mipi-sys-t-1.1-edk2/* MdePkg/Library/MipiSysTLib/mipisyst/ \
+    && rm -rf public-mipi-sys-t-1.1-edk2 )
+
+(tar -xvf %{SOURCE16} \
+    && mv openssl-%{ssl_version}/* CryptoPkg/Library/OpensslLib/openssl/ \
+    && rm -rf openssl-%{ssl_version} )
+
+
+pushd MdeModulePkg/Library/BrotliCustomDecompressLib
+rm -rf brotli
+ln -s ../../../BaseTools/Source/C/BrotliCompress/brotli brotli
+popd
+
+
+#apply_patches
+
+#base64 --decode < MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 > MdeModulePkg/Logo/Logo-OpenSSL.bmp
+sed -i '/PYTHON_COMMAND/s/python3/\/usr\/libexec\/python3.8/g' ./edksetup.sh
 
-base64 --decode < MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 > MdeModulePkg/Logo/Logo-OpenSSL.bmp
 
 
 %build
+#echo $PYTHON $Python $python $PYTHON_COMMAND
+#env | grep PYTHON
+#exit 1
+
 source ./edksetup.sh
 
 # compiler
-CC_FLAGS="-t GCC49"
+#CC_FLAGS="-t GCC49"
+CC_FLAGS="-t GCC5"
 
 # parallel builds
 JOBS="%{?_smp_mflags}"