From 676f86fd4379b3fdd80c1b141405b336d1a7a5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?El=20Koulali=20Andr=C3=A1s?= Date: Tue, 22 Dec 2020 22:02:12 +0100 Subject: [PATCH] main/postmarketos-mkinitfs: include support for pxa-mkbootimg (MR 1823) [ci:skip-build]: already built successfully in CI --- main/postmarketos-mkinitfs/APKBUILD | 4 ++-- main/postmarketos-mkinitfs/mkinitfs_functions.sh | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 8a691e268..e4269ae84 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Oliver Smith pkgname=postmarketos-mkinitfs -pkgver=0.18 +pkgver=0.19 pkgrel=0 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" @@ -57,5 +57,5 @@ sha512sums="5037cb7285bb7c0c40ca9e6df332d882ef9a8b379756c785f921e062dab1b7e7f313 bafd06286594102b8b3b126c3ae0a77a97f004ab804f03426154310c5107a1acaf3636bdba92626333adfe4fb0df32ff42c6d8d9e7adf35f6da620c6e14407a1 init.sh.in e4b5bb7206a4a8f99a23414d6830ccf6ecaf2990ca4923842e99fa14dc50a0a4ae88e0368129b423f9e7e7b446f25b641ad629b7aa08682f269aed7a234762cb init_functions.sh dfc01ee0547ea88b7aa45a005e842b636e9e19bbf1705f3dad53a66d57af7c5c513c092b5469a06d9b00322e56a4d25f1b47e4c5324aafa99f5291679968d1f1 mkinitfs.sh -42b0e9be17569ca0122f1653c994ed6bee626d94efba3485ccb3587fa1e1594657ec52bd20669a400e7ef492480e414235e76276d8bbd086475e91797d918b03 mkinitfs_functions.sh +7c6dcc94575c7c862b2d14dface466b4f549fdda4f64b42aaff7ac3f2a46bdb8bd092730c50ba1a5aeb7b327a0ba38e707299e650f61fc1d8220c3b0c6ecac89 mkinitfs_functions.sh c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh" diff --git a/main/postmarketos-mkinitfs/mkinitfs_functions.sh b/main/postmarketos-mkinitfs/mkinitfs_functions.sh index 698b7a38f..f2d05aae8 100644 --- a/main/postmarketos-mkinitfs/mkinitfs_functions.sh +++ b/main/postmarketos-mkinitfs/mkinitfs_functions.sh @@ -7,6 +7,7 @@ deviceinfo_bootimg_append_seandroidenforce="" deviceinfo_bootimg_blobpack="" deviceinfo_bootimg_dtb_second="" deviceinfo_bootimg_mtk_mkimage="" +deviceinfo_bootimg_pxa="" deviceinfo_bootimg_qcdt="" deviceinfo_dtb="" deviceinfo_flash_offset_base="" @@ -335,7 +336,14 @@ create_uboot_files() create_bootimg() { [ "${deviceinfo_generate_bootimg}" = "true" ] || return - require_package "mkbootimg-osm0sis" "mkbootimg" "generate_bootimg" + + if [ "${deviceinfo_bootimg_pxa}" = "true" ]; then + require_package "pxa-mkbootimg" "pxa-mkbootimg" "bootimg_pxa" + MKBOOTIMG=pxa-mkbootimg + else + require_package "mkbootimg-osm0sis" "mkbootimg" "generate_bootimg" + MKBOOTIMG=mkbootimg-osm0sis + fi echo "==> initramfs: creating boot.img" _base="${deviceinfo_flash_offset_base}" @@ -385,7 +393,7 @@ create_bootimg() fi fi # shellcheck disable=SC2039 disable=SC2086 - mkbootimg-osm0sis \ + "${MKBOOTIMG}" \ --kernel "${kernelfile}" \ --ramdisk "$outfile" \ --base "${_base}" \