forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

linux-xiaomi-cepheus-downstream: use mkdtboimg from android-tools (MR 4145)

Browse source 
... and also work around https://gitlab.com/postmarketOS/pmaports/-/issues/1990
This commit is contained in:
Newbyte 2023-06-02 20:54:35 +02:00 committed by Alexey Minnekhanov
parent 945a74a9ce
commit 9291b05b2c
No known key found for this signature in database
GPG key ID: 6FE3B029D9D9FAFF
8 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
device/unmaintained/linux-xiaomi-cepheus-downstream/0001-Disable-YAML-for-dtc-build.patch
View file

@ -1,4 +1,4 @@
From 28b6827f5f28c4b29b61f04ef3759b6462a43a0c Mon Sep 17 00:00:00 2001 From 87890022e5b2277001aeed0adf429945cfb75ba7 Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com> From: Alexey Min <alexey.min@gmail.com>
Date: Wed, 14 Jul 2021 00:59:01 +0300 Date: Wed, 14 Jul 2021 00:59:01 +0300
Subject: [PATCH 1/7] Disable YAML for dtc build Subject: [PATCH 1/7] Disable YAML for dtc build
@ -34,5 +34,5 @@ index ae39c56b66a5..e657ba66ad19 100644
# Generated files need one more search path to include headers in source tree # Generated files need one more search path to include headers in source tree
HOSTCFLAGS_dtc-lexer.lex.o := -I$(src) HOSTCFLAGS_dtc-lexer.lex.o := -I$(src)
-- --
2.31.1 2.40.1

4
device/unmaintained/linux-xiaomi-cepheus-downstream/0002-ipa_v3-fix-potential-buffer-overflow.patch
View file

@ -1,4 +1,4 @@
From 0520d423977f67cafc2157f07e21e0318d4c578a Mon Sep 17 00:00:00 2001 From 3f7040a432fd468247e971c1ef7a9d69c8075968 Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com> From: Alexey Min <alexey.min@gmail.com>
Date: Wed, 14 Jul 2021 01:11:53 +0300 Date: Wed, 14 Jul 2021 01:11:53 +0300
Subject: [PATCH 2/7] ipa_v3: fix potential buffer overflow Subject: [PATCH 2/7] ipa_v3: fix potential buffer overflow
@ -24,5 +24,5 @@ index 0cf0e60617b9..0183894a32d7 100644
ret = -EFAULT; ret = -EFAULT;
goto bail; goto bail;
-- --
2.31.1 2.40.1

4
device/unmaintained/linux-xiaomi-cepheus-downstream/0003-fix-invalid-printf-format.patch
View file

@ -1,4 +1,4 @@
From c6be4821ee64cb296f12645f4f4246a8134a473c Mon Sep 17 00:00:00 2001 From 92488ccb1c0dcf91e530e2525e1331a8bc0f4be2 Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com> From: Alexey Min <alexey.min@gmail.com>
Date: Wed, 14 Jul 2021 01:23:50 +0300 Date: Wed, 14 Jul 2021 01:23:50 +0300
Subject: [PATCH 3/7] fix invalid printf format Subject: [PATCH 3/7] fix invalid printf format
@ -22,5 +22,5 @@ index e40063cf61f0..797ce1e2c730 100644
reg + read_len, read_len); reg + read_len, read_len);
return ret; return ret;
-- --
2.31.1 2.40.1

4
device/unmaintained/linux-xiaomi-cepheus-downstream/0004-Get-rid-of-Werror.patch
View file

@ -1,4 +1,4 @@
From db089f9e641eb40748a7707f5fd18c6f4e1f3047 Mon Sep 17 00:00:00 2001 From 4c2f415a0a1fb574cc22efde5380a5268cb5e34f Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com> From: Alexey Min <alexey.min@gmail.com>
Date: Wed, 14 Jul 2021 09:07:09 +0300 Date: Wed, 14 Jul 2021 09:07:09 +0300
Subject: [PATCH 4/7] Get rid of -Werror Subject: [PATCH 4/7] Get rid of -Werror
@ -359,5 +359,5 @@ index fa1c90989bc4..d2cb49df6220 100644
KERNEL_FLAGS ?= ARCH=arm KERNEL_FLAGS ?= ARCH=arm
-- --
2.31.1 2.40.1

10
device/unmaintained/linux-xiaomi-cepheus-downstream/0005-Use-real-mkdtimg-don-t-use-python2-one.patch → device/unmaintained/linux-xiaomi-cepheus-downstream/0005-Use-real-mkdtboimg-don-t-use-python2-one.patch
View file

@ -1,14 +1,14 @@
From 63d4cc0e82f726c9261f296ebd66610cef9bec7c Mon Sep 17 00:00:00 2001 From 34f8d3f8c997a1aa176d8c896a728760fcb31c22 Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com> From: Alexey Min <alexey.min@gmail.com>
Date: Wed, 14 Jul 2021 09:30:56 +0300 Date: Wed, 14 Jul 2021 09:30:56 +0300
Subject: [PATCH 5/7] Use real mkdtimg, don't use python2 one Subject: [PATCH 5/7] Use real mkdtboimg, don't use python2 one
--- ---
scripts/Makefile.lib | 2 +- scripts/Makefile.lib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 89cf8123ef0a..85b5f4b9b046 100644 index 89cf8123ef0a..97ee47ca432c 100644
--- a/scripts/Makefile.lib --- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib +++ b/scripts/Makefile.lib
@@ -336,7 +336,7 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) @@ -336,7 +336,7 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
@ -16,10 +16,10 @@ index 89cf8123ef0a..85b5f4b9b046 100644
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
quiet_cmd_mkdtimg = DTBOIMG $@ quiet_cmd_mkdtimg = DTBOIMG $@
-cmd_mkdtimg = python2 $(srctree)/scripts/dtc/mkdtboimg.py create $@ --page_size=4096 $(filter-out FORCE,$^) -cmd_mkdtimg = python2 $(srctree)/scripts/dtc/mkdtboimg.py create $@ --page_size=4096 $(filter-out FORCE,$^)
+cmd_mkdtimg = mkdtimg create $@ --page_size=4096 $(filter-out FORCE,$^) +cmd_mkdtimg = mkdtboimg create $@ --page_size=4096 $(filter-out FORCE,$^)
# cat # cat
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
-- --
2.31.1 2.40.1

4
device/unmaintained/linux-xiaomi-cepheus-downstream/0006-Do-not-skip-initramfs.patch
View file

@ -1,4 +1,4 @@
From ded3d2e0f5abe2c9c0435158a2ff94631eec211d Mon Sep 17 00:00:00 2001 From 7182dbdfa5fe14d747bd0fbe46916ad4582ddecb Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com> From: Alexey Min <alexey.min@gmail.com>
Date: Wed, 14 Jul 2021 11:50:09 +0300 Date: Wed, 14 Jul 2021 11:50:09 +0300
Subject: [PATCH 6/7] Do not skip initramfs Subject: [PATCH 6/7] Do not skip initramfs
@ -25,5 +25,5 @@ index 87d27f4e1d4c..dc8c04a8d6d2 100644
} }
__setup("want_initramfs", skip_initramfs_param); __setup("want_initramfs", skip_initramfs_param);
-- --
2.31.1 2.40.1

4
device/unmaintained/linux-xiaomi-cepheus-downstream/0007-qpnp-fg-gen4-reduce-dmesg-spamming.patch
View file

@ -1,4 +1,4 @@
From 0eb512a3fc66b1a6eb08cb3e2abcca2683a1a4b3 Mon Sep 17 00:00:00 2001 From be5d7277194f9d21d8e3bccb4e1f1cdeba9dbd07 Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com> From: Alexey Min <alexey.min@gmail.com>
Date: Wed, 14 Jul 2021 15:04:34 +0300 Date: Wed, 14 Jul 2021 15:04:34 +0300
Subject: [PATCH 7/7] qpnp-fg-gen4: reduce dmesg spamming Subject: [PATCH 7/7] qpnp-fg-gen4: reduce dmesg spamming
@ -32,5 +32,5 @@ index 0aa056efec03..e208aa245b6e 100644
if (temp < 450 && fg->last_batt_temp >= 450) { if (temp < 450 && fg->last_batt_temp >= 450) {
/* follow the way that fg_notifier_cb use wake lock */ /* follow the way that fg_notifier_cb use wake lock */
-- --
2.31.1 2.40.1

23
device/unmaintained/linux-xiaomi-cepheus-downstream/APKBUILD
View file

@ -4,7 +4,7 @@
pkgname=linux-xiaomi-cepheus-downstream pkgname=linux-xiaomi-cepheus-downstream
pkgver=4.14.239 pkgver=4.14.239
pkgrel=0 pkgrel=1
pkgdesc="Xiaomi Mi 9 (cepheus) downstream kernel fork" pkgdesc="Xiaomi Mi 9 (cepheus) downstream kernel fork"
arch="aarch64" arch="aarch64"
_carch="arm64" _carch="arm64"
@ -13,7 +13,7 @@ url="https://github.com/EcrosoftXiao/kernel_xiaomi_cepheus"
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-mkdtimg android-tools
bash bash
bc bc
bison bison
@ -35,7 +35,7 @@ source="
0002-ipa_v3-fix-potential-buffer-overflow.patch 0002-ipa_v3-fix-potential-buffer-overflow.patch
0003-fix-invalid-printf-format.patch 0003-fix-invalid-printf-format.patch
0004-Get-rid-of-Werror.patch 0004-Get-rid-of-Werror.patch
0005-Use-real-mkdtimg-don-t-use-python2-one.patch 0005-Use-real-mkdtboimg-don-t-use-python2-one.patch
0006-Do-not-skip-initramfs.patch 0006-Do-not-skip-initramfs.patch
0007-qpnp-fg-gen4-reduce-dmesg-spamming.patch 0007-qpnp-fg-gen4-reduce-dmesg-spamming.patch
" "
@ -50,7 +50,8 @@ prepare() {
build() { build() {
unset LDFLAGS unset LDFLAGS
make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \ make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
V=1
} }
package() { package() {
@ -64,11 +65,11 @@ package() {
sha512sums=" sha512sums="
53541473317d2205d1583cc663eb96394d4ce29acb31fb3bde4bf6fce6ca5ace5a184ff298b63f2984f2a92747c46c5b7bfd0e7b10c4b42f5b94e2c806dc9c2b linux-xiaomi-cepheus-downstream-b8381357dcb21e10c86e81f62705fa1de6e942ed.tar.gz 53541473317d2205d1583cc663eb96394d4ce29acb31fb3bde4bf6fce6ca5ace5a184ff298b63f2984f2a92747c46c5b7bfd0e7b10c4b42f5b94e2c806dc9c2b linux-xiaomi-cepheus-downstream-b8381357dcb21e10c86e81f62705fa1de6e942ed.tar.gz
18f7a156890472241656345dca18cfb9958119c84c57dc027da37b6e61b302318fe9c67acd0fdf1c6436dcda824ed1f8b600a1f988642ca33b3458c39f8ea795 config-xiaomi-cepheus-downstream.aarch64 18f7a156890472241656345dca18cfb9958119c84c57dc027da37b6e61b302318fe9c67acd0fdf1c6436dcda824ed1f8b600a1f988642ca33b3458c39f8ea795 config-xiaomi-cepheus-downstream.aarch64
9e4e499160e28132a251cdd09e24e3d9658ec42980b182e2756d62098de27d836c52ae3a6f24c57524e5f0b3040ceea301b1a1d0a3f226131df7eb56bf442f3d 0001-Disable-YAML-for-dtc-build.patch 60713f4260c27417dbf80c8d6edd2aa1a2d440c4e6f5a38ba4df1dc01186bae70ec832f91b4769810d3600e34881948892137e36028a3c54bcbba1f4f9096620 0001-Disable-YAML-for-dtc-build.patch
f44ab25b7acdb0a80214491c8e9c4cea1e71039df115f760aeb38e80acdf0dd0b63b4dd7621201ad1db436bb4d95e3b7c4d3e66cbfdf29fdd486779dfbe99af8 0002-ipa_v3-fix-potential-buffer-overflow.patch 0faeb11653f940e9741638ed2a43a214e33c4e316e6454b56082de02bfae2180f0f81d4c225083f8813fe201e9cd194085333e615f92d5dee6b7b9288e4d5f20 0002-ipa_v3-fix-potential-buffer-overflow.patch
af74c336348c5e4d980e28225c7d93b2e1ce9be2e4d6b70721a103cf12fb93f2c22b50963265a9d76a84f2ba276c9ab18b07fe102121c0a1a52e87124db5fdd7 0003-fix-invalid-printf-format.patch a9dc748e0b00f6a604dfde0ec4c52fcd84a91ff3203f07eed74cba2c821cda605016d79d1e7aba5939f5ebf59dfd680c8f4e9b4d20ce3aa415ece927a045d170 0003-fix-invalid-printf-format.patch
8d277e6e02f026955347978800be018e34ad40630a27283614eb087ab4e5d10785c0ad388b2a57c33b16f3268f3ecf541118cf9770ca093ef83cfbea56e6c8c8 0004-Get-rid-of-Werror.patch 486f8ed2807ed4c4f255ad3620c3ed859fc9c627d70c4dd83f28260ac19f0a20c8c229f577ec38c6c566572040cecbb272a7e74838618601b2bf6c2c3177d5b9 0004-Get-rid-of-Werror.patch
8740bbbe90b410ca8958f488b8950e56243dd17dda67a9a2edbd3274d7c1d97106a19d76a28da447c32f5696e5672d511d410234b8a65dff3fa9a78ecdee99a8 0005-Use-real-mkdtimg-don-t-use-python2-one.patch fdb2e85b149107f57f816434832ded9d07f3a2221dc39bf5cd69f8ef2787a8ae6d5c83d3885a3be8bb8ebdafc8559e8c1563b41893782c7f349c45d57eb824b9 0005-Use-real-mkdtboimg-don-t-use-python2-one.patch
4727cdcdaa03c8df62d5e26930baa036d43363b5d1b7f43059fbd361c463a09fc7957cca357ef1e9ad7488647e00fc5656fdbc4d209010cc85b8d2c98268ae6d 0006-Do-not-skip-initramfs.patch e05182832f96b5c73f577be9f71bfd71beef880763154f8b7277a6db8037699d610821242b14f097e5e452afc79c81c60d0516b1022d0fee9cd8b55dfcc1d960 0006-Do-not-skip-initramfs.patch
167f43e23b50f62031e8de827a00d839cc754926be6a8336ecee1ed9da5e2196c6cd0ff9988654a26fb636e13500c3520d18d47594c6f9956d379c96cd8bc858 0007-qpnp-fg-gen4-reduce-dmesg-spamming.patch 5b8b362eb1013a8fd7a05c15c0fab6ebd178b4ba8d805d899e3a1b1f984a1fe1c390d08380c472ade20b8bc313cd8cda92235ad0486b246971503c1585d84cc9 0007-qpnp-fg-gen4-reduce-dmesg-spamming.patch
" "