From c7f641c9fec787d1e8cdc9007db86aadca7e671e Mon Sep 17 00:00:00 2001 From: BigfootACA Date: Sun, 17 Jan 2021 23:19:03 +0800 Subject: [PATCH] fix logo generator --- .github/workflows/main.yml | 2 +- README.md | 2 +- assets/generate-logo.py | 14 ++++++-------- build.sh | 8 +++++--- sdm845Pkg/Drivers/LogoDxe/Logo.bmp | Bin 235254 -> 0 bytes 5 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 sdm845Pkg/Drivers/LogoDxe/Logo.bmp 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 31d57611937c44955a17b0caac52f7075c53abb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235254 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 a1c(3;AOb{y2oM1xKm>>Y5g-Dk2>cIG0vlui -- 2.45.2