diff --git a/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD b/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD index 235823933..295f0b6a2 100644 --- a/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD +++ b/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Adam Thiede # Co-Maintainer: Jenneron pkgname=linux-postmarketos-mediatek-mt8173 -pkgver=6.10.6 -pkgrel=1 +pkgver=6.10.10 +pkgrel=0 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices" arch="aarch64" _carch="arm64" @@ -39,7 +39,6 @@ source=" fix-mmc1-speed.patch fix-mmc-order.patch fix-spi-nor-max-frequency.patch - temp-fix-build-error.patch " builddir="$srcdir/linux-${_kernver//_/-}" @@ -69,10 +68,9 @@ package() { } sha512sums=" -991ec7c7d2d490cb90b182a29e892dae586918eee7f3ff4b6e26f4ff9b31b6d7a31cdc31d25ca12243ecab59787aad75f0056b2fbe6997d0dfd68c357e7703af linux-6.10.6.tar.xz -fa54abe84000b9ba45147e08e385ec90eba53357abc1026fcf06b968ed5fceeba6fd991b233431244eabd4825545d1acc839527d432ef64afb843d26a9d94476 config-postmarketos-mediatek-mt8173.aarch64 +affaa3690150ca13f0ee14f91f0e09a5ad3340a7ea6404e34286dfb4bd4fdfe12fcac47e83da7878681bf28a8a8b78e0b315e1563408885dbb07aac5bd2e4dce linux-6.10.10.tar.xz +078f06d292c3a44efcac50eb5b9b4036d4008cba446b4d8442bae998c040dac9f3aaa97bb25f583eca97f5bc51a9a1be100bbfb042a24e93809e6c863e517596 config-postmarketos-mediatek-mt8173.aarch64 4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710 fix-mmc1-speed.patch c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849 fix-mmc-order.patch caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de fix-spi-nor-max-frequency.patch -9842da152a3dd95054f6f0110c8b942935645ab5c6fbd07300021212ce477e70c85da56d54ceecc189378c0b4adc7a699068d6bc86bd5a67140565b1535f3af5 temp-fix-build-error.patch " diff --git a/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64 b/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64 index 65f834f03..445dc3594 100644 --- a/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64 +++ b/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64 @@ -1,18 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.10.6 Kernel Configuration +# Linux/arm64 6.10.10 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0" +CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -251,7 +254,6 @@ CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y @@ -757,6 +759,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y +CONFIG_RELR=y CONFIG_HAVE_PREEMPT_DYNAMIC=y CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y diff --git a/device/community/linux-postmarketos-mediatek-mt8173/temp-fix-build-error.patch b/device/community/linux-postmarketos-mediatek-mt8173/temp-fix-build-error.patch deleted file mode 100644 index ceba18dbe..000000000 --- a/device/community/linux-postmarketos-mediatek-mt8173/temp-fix-build-error.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 7258fdd7d7459616b3fe1a603e33900584b10c13 Mon Sep 17 00:00:00 2001 -From: Masahiro Yamada -Date: Sat, 10 Aug 2024 01:07:20 +0900 -Subject: [PATCH] tty: vt: conmakehash: remove non-portable code printing - comment header - -Commit 6e20753da6bc ("tty: vt: conmakehash: cope with abs_srctree no -longer in env") included , which invoked another -(wrong) patch that tried to address a build error on macOS. - -According to the specification [1], the correct header to use PATH_MAX -is . - -The minimal fix would be to replace with . - -However, the following commits seem questionable to me: - - - 3bd85c6c97b2 ("tty: vt: conmakehash: Don't mention the full path of the input in output") - - 6e20753da6bc ("tty: vt: conmakehash: cope with abs_srctree no longer in env") - -These commits made too many efforts to cope with a comment header in -drivers/tty/vt/consolemap_deftbl.c: - - /* - * Do not edit this file; it was automatically generated by - * - * conmakehash drivers/tty/vt/cp437.uni > [this file] - * - */ - -With this commit, the header part of the generate C file will be -simplified as follows: - - /* - * Automatically generated file; Do not edit. - */ - -BTW, another series of excessive efforts for a comment header can be -seen in the following: - - - 5ef6dc08cfde ("lib/build_OID_registry: don't mention the full path of the script in output") - - 2fe29fe94563 ("lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat") - -[1]: https://pubs.opengroup.org/onlinepubs/009695399/basedefs/limits.h.html - -Fixes: 6e20753da6bc ("tty: vt: conmakehash: cope with abs_srctree no longer in env") -Cc: stable -Reported-by: Daniel Gomez -Closes: https://lore.kernel.org/all/20240807-macos-build-support-v1-11-4cd1ded85694@samsung.com/ -Signed-off-by: Masahiro Yamada -Link: https://lore.kernel.org/r/20240809160853.1269466-1-masahiroy@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/vt/conmakehash.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c -index 82d9db68b2ce81..a931fcde7ad98d 100644 ---- a/drivers/tty/vt/conmakehash.c -+++ b/drivers/tty/vt/conmakehash.c -@@ -11,8 +11,6 @@ - * Copyright (C) 1995-1997 H. Peter Anvin - */ - --#include --#include - #include - #include - #include -@@ -79,7 +77,6 @@ int main(int argc, char *argv[]) - { - FILE *ctbl; - const char *tblname; -- char base_tblname[PATH_MAX]; - char buffer[65536]; - int fontlen; - int i, nuni, nent; -@@ -245,20 +242,15 @@ int main(int argc, char *argv[]) - for ( i = 0 ; i < fontlen ; i++ ) - nuni += unicount[i]; - -- strncpy(base_tblname, tblname, PATH_MAX); -- base_tblname[PATH_MAX - 1] = 0; - printf("\ - /*\n\ -- * Do not edit this file; it was automatically generated by\n\ -- *\n\ -- * conmakehash %s > [this file]\n\ -- *\n\ -+ * Automatically generated file; Do not edit.\n\ - */\n\ - \n\ - #include \n\ - \n\ - u8 dfont_unicount[%d] = \n\ --{\n\t", basename(base_tblname), fontlen); -+{\n\t", fontlen); - - for ( i = 0 ; i < fontlen ; i++ ) - {