From: BigfootACA <bigfoot@classfun.cn>
Date: 星期二, 17 May 2022 05:00:03 +0000 (+0800)
Subject: build.sh: use mkbootimg instead abootimg
X-Git-Tag: v2.0rc2~14
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=004b5693a3f2ab6eda284bcc58126760f576a27a;p=edk2-sdm845.git

build.sh: use mkbootimg instead abootimg
---

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cd5c431..4105258 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Install requires packages
         run: |
           sudo apt-get update
-          sudo apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git gettext
+          sudo apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu mkbootimg python3-distutils python3-pil python3-git gettext
 
       - name: Build device ${{ matrix.device }}
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f27a926..d69daf3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Install requires packages
         run: |
           sudo apt-get update
-          sudo apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git gettext
+          sudo apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu mkbootimg python3-distutils python3-pil python3-git gettext
 
       - name: Build device ${{ matrix.device }}
         run: |
diff --git a/README.md b/README.md
index 44e0fd9..592d86c 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ For Ubuntu 20.04:
 ```bash
 sudo apt update
 sudo apt upgrade
-sudo apt install build-essential uuid-dev iasl git nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git gettext
+sudo apt install build-essential uuid-dev iasl git nasm gcc-aarch64-linux-gnu mkbootimg python3-distutils python3-pil python3-git gettext
 ```
 
 If you are using GCC 11+, modify `edk2/BaseTools/Source/C/Makefiles/header.makefile`
diff --git a/README.zh.md b/README.zh.md
index 0e8b517..ed3ab51 100644
--- a/README.zh.md
+++ b/README.zh.md
@@ -57,7 +57,7 @@ Ubuntu 20.04:
 ```bash
 sudo apt update
 sudo apt upgrade
-sudo apt install build-essential uuid-dev iasl git nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git gettext
+sudo apt install build-essential uuid-dev iasl git nasm gcc-aarch64-linux-gnu mkbootimg python3-distutils python3-pil python3-git gettext
 ```
 
 如果你的编译器为 GCC 11+, 请手动修改 `edk2/BaseTools/Source/C/Makefiles/header.makefile`
diff --git a/build.sh b/build.sh
index b51e995..3fc07a1 100755
--- a/build.sh
+++ b/build.sh
@@ -87,10 +87,16 @@ function _build(){
 		"device_specific/${DEVICE}.dtb" \
 		> "workspace/uefi-${DEVICE}.img.gz-dtb" \
 		||return "$?"
-	abootimg \
-		--create "${OUTDIR}/boot-${DEVICE}.img" \
-		-k "workspace/uefi-${DEVICE}.img.gz-dtb" \
-		-r ramdisk \
+	mkbootimg \
+		--kernel "workspace/uefi-${DEVICE}.img.gz-dtb" \
+		--ramdisk ramdisk \
+		--kernel_offset 0x00000000 \
+		--ramdisk_offset 0x00000000 \
+		--tags_offset 0x00000000 \
+		--os_version 12.0.0 \
+		--os_patch_level 2022-04 \
+		--header_version 1 \
+		-o "${OUTDIR}/boot-${DEVICE}.img" \
 		||return "$?"
 	echo "Build done: ${OUTDIR}/boot-${DEVICE}.img"
 	set +x