xiaomi-monet: update kernel and device
Updates linux-xiaomi-monet to 4.19.325 Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7100>
This commit is contained in:
Augis
The Friendly Merge Bot
parent
7039ad14cd
commit
726f8f7525
8 changed files with 614 additions and 872 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# Reference: <https://postmarketos.org/devicepkg>
|
||||
pkgname=device-xiaomi-monet
|
||||
pkgdesc="Xiaomi Mi 10 Lite 5G"
|
||||
pkgver=1
|
||||
pkgver=2
|
||||
pkgrel=0
|
||||
url="https://postmarketos.org"
|
||||
license="MIT"
|
||||
|
|
@ -11,7 +11,9 @@ options="!check !archcheck"
|
|||
depends="
|
||||
linux-xiaomi-monet
|
||||
mkbootimg
|
||||
msm-firmware-loader
|
||||
postmarketos-base
|
||||
soc-qcom
|
||||
"
|
||||
makedepends="devicepkg-dev"
|
||||
source="
|
||||
|
|
@ -27,5 +29,5 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
ee333c1b98c3e42c5a66f5249c44162d8c6318c750bbab9367f2fac982a38494c3f086d1b8335f10f72ebe9f550c0c4ff23ec977b750d429bf3b9752c37b2c4a deviceinfo
|
||||
e024e8707a0142987b8757e96c1b2a0b1310a5a3688c4c0203ab1bc32dc95f9687be8fc42831a1c1034dabd04c25a7686c227e9b33cf116cf63c6c48368d95a7 deviceinfo
|
||||
"
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ deviceinfo_arch="aarch64"
|
|||
|
||||
# Device related
|
||||
deviceinfo_chassis="handset"
|
||||
deviceinfo_keyboard="false"
|
||||
deviceinfo_external_storage="false"
|
||||
deviceinfo_no_framebuffer="true"
|
||||
|
||||
# Bootloader related
|
||||
deviceinfo_flash_method="fastboot"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Maintainer: Augustas Stankevicius <augustas.stankevicius@gmail.com>
|
||||
# Reference: <https://postmarketos.org/vendorkernel>
|
||||
# Kernel config based on: arch/arm64/configs/vendor/monet_user_defconfig
|
||||
# Kernel config based on: arch/arm64/configs/milito_defconfig
|
||||
pkgname=linux-xiaomi-monet
|
||||
pkgver=4.19.113
|
||||
pkgrel=1
|
||||
pkgver=4.19.325
|
||||
pkgrel=0
|
||||
pkgdesc="Xiaomi Mi 10 Lite 5G kernel fork"
|
||||
arch="aarch64"
|
||||
_carch="arm64"
|
||||
|
|
@ -15,24 +15,25 @@ makedepends="
|
|||
bash
|
||||
bc
|
||||
bison
|
||||
clang
|
||||
devicepkg-dev
|
||||
findutils
|
||||
flex
|
||||
linux-headers
|
||||
openssl-dev
|
||||
perl
|
||||
xz
|
||||
"
|
||||
|
||||
export CC="clang"
|
||||
export HOSTCC="clang"
|
||||
|
||||
_repository="android_kernel_xiaomi_sm7250"
|
||||
_commit="fe4abf71920f4685218fb9951ca9950ff6dac0a9"
|
||||
_commit="bf6ad6ec272d0d25c35ec41dcd0a02129638ce28"
|
||||
_config="config-$_flavor.$arch"
|
||||
source="
|
||||
$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
|
||||
$_config
|
||||
Remove-gcc-python-wrapper.patch
|
||||
selinux_include_generated_headers.patch
|
||||
Suppress-error-about-static-buffer-overflow.patch
|
||||
Revert-selinux-Relocate-ss_initialized-and-selinux_e.patch
|
||||
"
|
||||
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
|
|
@ -45,7 +46,7 @@ prepare() {
|
|||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" -j4 \
|
||||
make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
|
|
@ -58,10 +59,6 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
69ef51f16dbb3af9ad776cc1ca1169bb338a28643dc879841e1ffb2a99562b0ad78af1f445178610a5d0f244fc2ca1f0a90c95875a082325786805d46c044fe6 linux-xiaomi-monet-fe4abf71920f4685218fb9951ca9950ff6dac0a9.tar.gz
|
||||
35a9077f9351048579df71970095ae1ed715ae23eb20d30f05b54188827f7b2b7639a94863f695063c07f95210286aeb851009c0d9c4eb4ac5ed386ec1b3f794 config-xiaomi-monet.aarch64
|
||||
359f619b7aac5bab061311f0806018ed04ce96a2233584a507b14c50ce616dfbc1681dd465ca3f0182165a6fc6c7b87435615bd1bd93efe174b95deba071f5fc Remove-gcc-python-wrapper.patch
|
||||
6ab9db01d35f7f5cc2c19ebe5f65a7dc479a1c68de587300cdde9a6c759d34610666c72f0f321cd450cf56c13df3b54a774e0f7ebdbf0f8608fbfd66b49d04e7 selinux_include_generated_headers.patch
|
||||
4e7a73a1c6e8424a34d317899525ca3d783de1a5e65cc0ecdf6334bbb233d165b476107e599cbd86868ed91a5a60d2ef0eff975861d61cb2c403b572314b4a94 Suppress-error-about-static-buffer-overflow.patch
|
||||
16459200092a2fa68054a758ad8fb175c86e6cdaa49e81c0c91568082cd0348526d43b9dfe0faac8b21465240f44253683f9c475c6f7350d7ef74149aa9c1dba Revert-selinux-Relocate-ss_initialized-and-selinux_e.patch
|
||||
b1a22324eae5cf1fe745321858b43901e6f8be8a3382492c8f55ab65b1c9ba53de0624c590867771807b3393281b45e5a0fc799c7c03b40b9f255011b8feeb11 linux-xiaomi-monet-bf6ad6ec272d0d25c35ec41dcd0a02129638ce28.tar.gz
|
||||
b3a6006636fc3b697744adefa47930d13c94e6eb675daf4ee7e2fcedfcf1386d687466e093adb1234e01d9fc8d08ba1b13f346a8c3666d4d100843b1fd345265 config-xiaomi-monet.aarch64
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
From 966d3ac2409b59f431e1397f5ab8e9ee74ba5ae0 Mon Sep 17 00:00:00 2001
|
||||
From: Iskren Chernev <me@iskren.info>
|
||||
Date: Sat, 20 Feb 2021 00:49:45 +0200
|
||||
Subject: [PATCH 3/6] Remove gcc python wrapper
|
||||
|
||||
---
|
||||
Makefile | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 15a18b3cd15f6..e6a72c1a84fe9 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -370,7 +370,7 @@ KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS) $(HOSTLDLIBS)
|
||||
# Make variables (CC, etc...)
|
||||
AS = $(CROSS_COMPILE)as
|
||||
LD = $(CROSS_COMPILE)ld
|
||||
-REAL_CC = $(CROSS_COMPILE)gcc
|
||||
+CC = $(CROSS_COMPILE)gcc
|
||||
CPP = $(CC) -E
|
||||
AR = $(CROSS_COMPILE)ar
|
||||
NM = $(CROSS_COMPILE)nm
|
||||
@@ -389,10 +389,6 @@ PYTHON2 = python2
|
||||
PYTHON3 = python3
|
||||
CHECK = sparse
|
||||
|
||||
-# Use the wrapper for the compiler. This wrapper scans for new
|
||||
-# warnings and causes the build to stop upon encountering them
|
||||
-CC = $(PYTHON) $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)
|
||||
-
|
||||
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
|
||||
-Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
|
||||
NOSTDINC_FLAGS =
|
||||
--
|
||||
2.30.1
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../.shared-patches/linux/Revert-selinux-Relocate-ss_initialized-and-selinux_e.patch
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From e950e514cd6b45f8d1512eef1c959769183caf56 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandros Feuerstein <32029275+afeuerstein@users.noreply.github.com>
|
||||
Date: Tue, 13 Jul 2021 11:19:58 +0200
|
||||
Subject: [PATCH] Update ipa_hw_stats.c
|
||||
|
||||
---
|
||||
drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c b/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c
|
||||
index 1b900a27173b..d1e40689709a 100644
|
||||
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c
|
||||
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c
|
||||
@@ -2253,7 +2253,7 @@ static ssize_t ipa_debugfs_enable_disable_drop_stats(struct file *file,
|
||||
goto bail;
|
||||
}
|
||||
|
||||
- missing = copy_from_user(dbg_buff, ubuf, count);
|
||||
+ missing = _copy_from_user(dbg_buff, ubuf, count);
|
||||
if (missing) {
|
||||
ret = -EFAULT;
|
||||
goto bail;
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,33 +0,0 @@
|
|||
Arm64 has generated headers that other arches don't, didn't investigate why this
|
||||
is able to compile in downstream (our upstream). Possibly due to out-of-tree build.
|
||||
Note the hacky relative include. May not work in more complicated setups.
|
||||
|
||||
diff --git a/scripts/selinux/genheaders/Makefile b/scripts/selinux/genheaders/Makefile
|
||||
index e8c533140..62475f060 100644
|
||||
--- a/scripts/selinux/genheaders/Makefile
|
||||
+++ b/scripts/selinux/genheaders/Makefile
|
||||
@@ -2,6 +2,8 @@
|
||||
hostprogs-y := genheaders
|
||||
HOST_EXTRACFLAGS += \
|
||||
-I$(srctree)/include/uapi -I$(srctree)/include \
|
||||
- -I$(srctree)/security/selinux/include
|
||||
+ -I$(srctree)/security/selinux/include \
|
||||
+ -I./arch/$(ARCH)/include/generated/uapi \
|
||||
+ -I$(srctree)/arch/$(ARCH)/include/uapi
|
||||
|
||||
always := $(hostprogs-y)
|
||||
diff --git a/scripts/selinux/mdp/Makefile b/scripts/selinux/mdp/Makefile
|
||||
index e9c92db7e..09e626fa4 100644
|
||||
--- a/scripts/selinux/mdp/Makefile
|
||||
+++ b/scripts/selinux/mdp/Makefile
|
||||
@@ -2,7 +2,9 @@
|
||||
hostprogs-y := mdp
|
||||
HOST_EXTRACFLAGS += \
|
||||
-I$(srctree)/include/uapi -I$(srctree)/include \
|
||||
- -I$(srctree)/security/selinux/include
|
||||
+ -I$(srctree)/security/selinux/include \
|
||||
+ -I./arch/$(ARCH)/include/generated/uapi \
|
||||
+ -I$(srctree)/arch/$(ARCH)/include/uapi
|
||||
|
||||
always := $(hostprogs-y)
|
||||
clean-files := policy.* file_contexts
|
||||
Loading…
Add table
Add a link
Reference in a new issue