From: BigfootACA <bigfoot@classfun.cn>
Date: 星期天, 17 Jan 2021 15:19:03 +0000 (+0800)
Subject: fix logo generator
X-Git-Tag: v0.2~15
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=c7f641c9fec787d1e8cdc9007db86aadca7e671e;p=edk2-sdm845.git

fix logo generator
---

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 60f8a4c..0d0fe51 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Install requires packages
-        run: sudo apt install build-essential uuid-dev iasl git nasm python3-distutils gcc-aarch64-linux-gnu abootimg
+        run: sudo apt install build-essential uuid-dev iasl git nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git
 
       - name: Build all devices
         run: ./build.sh -a
diff --git a/README.md b/README.md
index dd30e87..155a89a 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Ubuntu 18.04:
 
 ```bash
 sudo apt update
-sudo apt install build-essential uuid-dev iasl git nasm python3-distutils gcc-aarch64-linux-gnu abootimg
+sudo apt install build-essential uuid-dev iasl git nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git
 ```
 Ubuntu 20.04 is also proved to be fine.
 
diff --git a/assets/generate-logo.py b/assets/generate-logo.py
index d2ec026..fc855af 100644
--- a/assets/generate-logo.py
+++ b/assets/generate-logo.py
@@ -3,7 +3,7 @@
 import time
 ohmydate = str(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
 
-import sys 
+import sys
 pwd = sys.path[0]
 
 import PIL
@@ -11,36 +11,34 @@ from PIL import ImageFont
 from PIL import Image
 from PIL import ImageDraw
 from git import Repo
- 
+
 
 imageFile = pwd + "/Logo.bmp"
 file_save_dir = pwd + "/../sdm845Pkg/Drivers/LogoDxe/"
 outputName = "Logo"
 print(ohmydate)
- 
+
 repoPath = pwd + "/.."
 repo = Repo(repoPath)
 gitHead = str(repo.head.commit)
 print(gitHead)
 strs = "head:" + gitHead + "\n Build:" + ohmydate
- 
+
 
 x = 1
 y = 1
 word_size = 11
 word_css  = pwd + "/NotoSerif-Italic.ttf"
- 
+
 #Set font
 font = ImageFont.truetype(word_css,word_size)
- 
 
 im1=Image.open(imageFile)
 draw = ImageDraw.Draw(im1)
 print(font.getsize(strs))
 draw.text((x, y),strs,(255,255,0),font=font)
-        
 
 new_filename = file_save_dir  +outputName.replace(",","-").replace("\n","-")+".bmp"
-im1.save(new_filename) 
+im1.save(new_filename)
 del draw
 im1.close()
diff --git a/build.sh b/build.sh
index 95c3f54..b4e6dfd 100755
--- a/build.sh
+++ b/build.sh
@@ -32,7 +32,6 @@ function _build(){
 	make -C "${_EDK2}/BaseTools" -j "$(nproc)"||exit "$?"
 	# based on the instructions from edk2-platform
 	rm -f "boot_${DEVICE}.img" uefi_img "uefi-${DEVICE}.img.gz" "uefi-${DEVICE}.img.gz-dtb"
-	python3 assets/generate-logo.py
 	build -s -n 0 -a AARCH64 -t GCC5 -p "sdm845Pkg/${DEVICE}.dsc"||return "$?"
 	gzip -c < workspace/Build/sdm845Pkg/DEBUG_GCC5/FV/SDM845PKG_UEFI.fd > "uefi-${DEVICE}.img.gz"||return "$?"
 	cat "uefi-${DEVICE}.img.gz" "device_specific/${DEVICE}.dtb" > "uefi-${DEVICE}.img.gz-dtb"||return "$?"
@@ -55,11 +54,13 @@ do	case "${1}" in
 		*)_help 1;;
 	esac
 done
-if ! [ -d ../edk2 ]
-then	echo "Updating submodules"
+if ! [ -f edk2/edksetup.sh ] || ! [ -f ../edk2/edksetup.sh ]
+then	set -e
+	echo "Updating submodules"
 	git submodule init&&git submodule update
 	pushd edk2&&git submodule init&&git submodule update&&popd
 	pushd edk2-platforms&&git submodule init&&git submodule update&&popd
+	set +e
 fi
 for i in "${EDK2}" ./edk2 ../edk2
 do	if [ -n "${i}" ]&&[ -f "${i}/edksetup.sh" ]
@@ -83,6 +84,7 @@ export PACKAGES_PATH="$_EDK2:$_EDK2_PLATFORMS:$PWD"
 export WORKSPACE="${PWD}/workspace"
 echo > ramdisk
 set -e
+python3 assets/generate-logo.py
 if [ -z "${DEVICE}" ]
 then _help 1
 elif [ "${DEVICE}" == "all" ]
diff --git a/sdm845Pkg/Drivers/LogoDxe/Logo.bmp b/sdm845Pkg/Drivers/LogoDxe/Logo.bmp
deleted file mode 100644
index 31d5761..0000000
Binary files a/sdm845Pkg/Drivers/LogoDxe/Logo.bmp and /dev/null differ