From c4886f93c78422c52bb8e9c0382966bc48c2a86e Mon Sep 17 00:00:00 2001 From: Newbyte Date: Fri, 2 Jun 2023 20:56:05 +0200 Subject: [PATCH] linux-postmarketos-mediatek-mt6768: use mkdtboimg from android-tools (MR 4145) ... and work around https://gitlab.com/postmarketOS/pmaports/-/issues/1990 --- .../testing/linux-postmarketos-mediatek-mt6768/APKBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/device/testing/linux-postmarketos-mediatek-mt6768/APKBUILD b/device/testing/linux-postmarketos-mediatek-mt6768/APKBUILD index 34eae053d..0c2470b82 100644 --- a/device/testing/linux-postmarketos-mediatek-mt6768/APKBUILD +++ b/device/testing/linux-postmarketos-mediatek-mt6768/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-mediatek-mt6768" pkgname=linux-$_flavor pkgver=6.1_rc5 -pkgrel=0 +pkgrel=1 _commit="d8741eb21ebe5b989e69e40a058cd2d593397ae2" pkgdesc="Mainline Kernel fork for MT6768-based devices" arch="aarch64" @@ -16,7 +16,7 @@ options="!strip !check !tracedeps pmb:cross-native " makedepends=" - android-mkdtboimg + android-tools bash bison findutils @@ -43,7 +43,8 @@ prepare() { build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1))-$_flavor" + KBUILD_BUILD_VERSION="$((pkgrel + 1))-$_flavor"\ + V=1 } package() { @@ -59,7 +60,7 @@ package() { "$pkgdir"/usr/share/kernel/$_flavor/kernel.release dtbodir="$builddir/$_outdir/arch/arm64/boot/dts/mediatek" - mkdtimg create "$pkgdir/boot/dtbo.img" \ + mkdtboimg create "$pkgdir/boot/dtbo.img" \ "$dtbodir/mt6769z-volla-mimameid-minimal-dtbo.dtb" }