linux-oneplus-kebab: use mkdtboimg from android-tools (MR 4145)

... and work around https://gitlab.com/postmarketOS/pmaports/-/issues/1990
This commit is contained in:
Newbyte 2023-06-02 20:57:56 +02:00 committed by Alexey Minnekhanov
parent f5fc3217f0
commit 56c96a30e9
No known key found for this signature in database
GPG key ID: 6FE3B029D9D9FAFF

View file

@ -3,7 +3,7 @@
pkgname=linux-oneplus-kebab pkgname=linux-oneplus-kebab
pkgver=4.19.110 pkgver=4.19.110
pkgrel=4 pkgrel=5
pkgdesc="OnePlus 8T kernel fork" pkgdesc="OnePlus 8T kernel fork"
arch="aarch64" arch="aarch64"
_carch="arm64" _carch="arm64"
@ -12,7 +12,7 @@ url="https://kernel.org"
license="GPL-2.0-only" license="GPL-2.0-only"
options="!strip !check !tracedeps pmb:cross-native" options="!strip !check !tracedeps pmb:cross-native"
makedepends=" makedepends="
android-mkdtboimg android-tools
bash bash
bc bc
bison bison
@ -51,7 +51,8 @@ prepare() {
build() { build() {
unset LDFLAGS unset LDFLAGS
make O="$_outdir" DTC_EXT="/usr/bin/dtc" ARCH="$_carch" CC="${CC:-gcc}" \ make O="$_outdir" DTC_EXT="/usr/bin/dtc" ARCH="$_carch" CC="${CC:-gcc}" \
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
V=1
} }
package() { package() {
@ -59,7 +60,7 @@ package() {
"$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir" "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
dtbodir="$builddir/$_outdir/arch/arm64/boot/dts/vendor/qcom" dtbodir="$builddir/$_outdir/arch/arm64/boot/dts/vendor/qcom"
mkdtimg create "$pkgdir/boot/dtbo.img" --page_size=4096 \ mkdtboimg create "$pkgdir/boot/dtbo.img" --page_size=4096 \
"$dtbodir/kebab-overlay.dtbo" \ "$dtbodir/kebab-overlay.dtbo" \
"$dtbodir/instantnoodle-overlay-dvt.dtbo" \ "$dtbodir/instantnoodle-overlay-dvt.dtbo" \
"$dtbodir/instantnoodle-overlay-evt1.dtbo" \ "$dtbodir/instantnoodle-overlay-evt1.dtbo" \