commit: d07534377f1444674ee8b0955a7b107c4fa03eb6 Author: Janne Grunau <j <AT> jannau <DOT> net> AuthorDate: Fri Mar 21 07:46:53 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 21 22:00:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0753437
sys-kernel/asahi-sources: add 6.14.4_p1 This kernel supports the mesa OpenGL, OpenCL and Vulkan driver of the soon to be released mesa-25.1.0. As of 2025-05-2 =media-libs/mesa-9999[video_cards_asahi] will have working drivers. Both genpatches and the Asahi Linux tree carry the change from 1740_x86-insn-decoder-test-allow-longer-symbol-names.patch. So revert it after applying genpatches so that the Asahi Linux diff applies cleanly. Switch the Asahi Linux kernel patchset to '.diff' github URLs since the Asahi Linux tree has duplicate rust commits to ease change management. The duplicate commits are unfortunately reproduced in URLs like https://github.com/AsahiLinux/linux/compare/v6.14.4...asahi-6.14.4-1.patch. The '.diff' ones produce a simple diff between the two tags. Signed-off-by: Janne Grunau <j <AT> jannau.net> Part-of: https://github.com/gentoo/gentoo/pull/41901 Closes: https://github.com/gentoo/gentoo/pull/41901 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-kernel/asahi-sources/Manifest | 4 ++ .../asahi-sources/asahi-sources-6.14.4_p1.ebuild | 72 ++++++++++++++++++++++ ...sn-decoder-test-allow-longer-symbol-names.patch | 11 ++++ 3 files changed, 87 insertions(+) diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest index e3bf061a12c3..c54fa19a7d16 100644 --- a/sys-kernel/asahi-sources/Manifest +++ b/sys-kernel/asahi-sources/Manifest @@ -1,4 +1,8 @@ DIST genpatches-6.11-8.base.tar.xz 639004 BLAKE2B 218ff37e8fb82b4bff3baa5b197b4c42ec19a4c5480620982f7befe8313f0f226324a629d6c15eee230faa3fc7c5bb558a58ac94e2e9b0259823c813220681b1 SHA512 cccc58e7ed24b90db88b14f9a693ccd021b1fa1beb9568511e344807673d2e518a66b2ffb48773a5d68da03ad15671181b7dc53bf2161ad1a88e95b555389116 DIST genpatches-6.11-8.extras.tar.xz 4056 BLAKE2B 33f594ef302fe78ec07e146dc0603ecb3eb0b61c6f3639dfd4f89885cd5533c53b1d0ef30618bf8c1fb749499721f668e28161890835725b4e62240f2bfd2646 SHA512 6424792e0f38d94d19d4849552597c5f44df4a47d09c237b49f084c4d780501c2119beb9d45e9027526423175e7e7fe9939c59eb242da5462bd4b6331edb15fb +DIST genpatches-6.14-5.base.tar.xz 478484 BLAKE2B b4a07d4eb4efd31162d0c6880d826535f894806a664690c4648314df4ba70f374a0e8091bc8d7a7193ca2e75fe57fe730ff6867f171c2b4a90af4788272e3888 SHA512 00aefb9d59b0bb4d6361e59e8e92d141f8f5e2b033a7418fe5625ad2fcb1aac247606a3e54f7cb791f02591d57362e84c61511c896cd17be1013b23e43f70e73 +DIST genpatches-6.14-5.extras.tar.xz 4052 BLAKE2B 131ba26cfcc2f1218a79b33069f5d01a1bdb016315f85913b557429999a17c414640246e2a95c1d79cfcdfcf60577f4bb614b728e56d725dc808cb5785795a3a SHA512 746e312955ab745c901c653d2f64fdbf075a80388ee1618072e52225f7fa6163e5cc65ea41791ffea89dc1b61f242317a1b3179e85647ba9dd7c9de27937d4c9 DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea +DIST linux-6.14.tar.xz 149408504 BLAKE2B 11835719804b406fe281ea1c276a84dc0cbaa808552ddcca9233d3eaeb1c001d0455c7205379b02de8e8db758c1bae6fe7ceb6697e63e3cf9ae7187dc7a9715e SHA512 71dcaa3772d8d9797c3ae30cae9c582b11a7047a3bbcb8dfd479a4dffb40ff0da74cf3d45175f50cc9992e338bcadd46c9c570f54054ca3bde6661768d3d22eb DIST linux-asahi-6.11.6-2.patch 5521305 BLAKE2B a253d400e8800bc8b2db9dbec19253bac730a6a54ec01d3fe525ad5c88f51ecaee1288b5bf87f22e154c835728bd3bc438dfb8804ec53d15163d74be9073c0e0 SHA512 b283086d9a6650ea64c88b2358035138b536278685552f501f1ac2aaeb5d3b32c7cb2607406cf5298cca56a4df77bbf2afd51bf6459b760aca022d1881fec4f8 +DIST linux-asahi-6.14.4-1.diff 3495474 BLAKE2B a97aec8aabd1206ebc3a9ed686afdcb634409f00c17e2668db23b4407b6411fa80085cadea0d12f2de9e7174600796800c444c9af83027d7aedcd4115a27654c SHA512 5ac6f5be84ffb5ca66e45eb23a70bb7b13f9c336196fa00e02e7a4952bf4e3096f2180330fffd370d2ff48a94a2ef8a97ee49b6d1d3d630a4cc2a67838cc9eb6 diff --git a/sys-kernel/asahi-sources/asahi-sources-6.14.4_p1.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.14.4_p1.ebuild new file mode 100644 index 000000000000..b8279ad7019e --- /dev/null +++ b/sys-kernel/asahi-sources/asahi-sources-6.14.4_p1.ebuild @@ -0,0 +1,72 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +ETYPE="sources" + +CKV="$(ver_cut 1-3)" +K_SECURITY_UNSUPPORTED="1" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="5" +K_NODRYRUN="1" + +RUST_MIN_VER="1.84.0" +RUST_REQ_USE='rust-src,rustfmt' + +inherit kernel-2 rust +detect_version +detect_arch + +if [[ ${PV} != ${PV/_rc} ]] ; then + # $PV is expected to be of following form: 6.0_rc5_p1 + MY_TAG="$(ver_cut 6)" + MY_BASE="$(ver_rs 2 - $(ver_cut 1-4))" +else + # $PV is expected to be of following form: 5.19.0_p1 + MY_TAG="$(ver_cut 5)" + if [[ "$(ver_cut 3)" == "0" ]] ; then + MY_BASE="$(ver_cut 1-2)" + else + MY_BASE="$(ver_cut 1-3)" + fi +fi + +EXTRAVERSION="-asahi-${MY_TAG}" + +ASAHI_TAG="asahi-${MY_BASE}-${MY_TAG}" + +DESCRIPTION="Asahi Linux kernel sources" +HOMEPAGE="https://asahilinux.org"; +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} + https://github.com/AsahiLinux/linux/compare/v${MY_BASE}...${ASAHI_TAG}.diff + -> linux-${ASAHI_TAG}.diff +" +KV_FULL="${PVR/_p/-asahi-}" +S="${WORKDIR}/linux-${KV_FULL}" + +KEYWORDS="~arm64" + +DEPEND=" + ${DEPEND} + dev-util/bindgen +" + +UNIPATCH_STRICTORDER="yes" +UNIPATCH_LIST=" + ${FILESDIR}/1740_revert_x86-insn-decoder-test-allow-longer-symbol-names.patch + ${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch + ${DISTDIR}/linux-${ASAHI_TAG}.diff +" + +src_prepare() { + default + + # remove asahi upstream set localversion, use EXTRAVERSION instead + rm localversion.05-asahi +} + +pkg_postinst() { + einfo "For more information about Asahi Linux please visit ${HOMEPAGE}," + einfo "or consult the Wiki at https://github.com/AsahiLinux/docs/wiki."; + kernel-2_pkg_postinst +} diff --git a/sys-kernel/asahi-sources/files/1740_revert_x86-insn-decoder-test-allow-longer-symbol-names.patch b/sys-kernel/asahi-sources/files/1740_revert_x86-insn-decoder-test-allow-longer-symbol-names.patch new file mode 100644 index 000000000000..d0f1b18cca2e --- /dev/null +++ b/sys-kernel/asahi-sources/files/1740_revert_x86-insn-decoder-test-allow-longer-symbol-names.patch @@ -0,0 +1,11 @@ +--- b/arch/x86/tools/insn_decoder_test.c ++++ a/arch/x86/tools/insn_decoder_test.c +@@ -106,7 +106,7 @@ + } + } + ++#define BUFSIZE 256 +-#define BUFSIZE 4096 + + int main(int argc, char **argv) + {
