diff --git a/sys-kernel/asahi-kernel/Manifest b/sys-kernel/asahi-kernel/Manifest index b820372..939b9af 100644 --- a/sys-kernel/asahi-kernel/Manifest +++ b/sys-kernel/asahi-kernel/Manifest @@ -2,13 +2,9 @@ DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B 6311b976880a1fe3cb902ba6e4d39 DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a SHA512 a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4 DIST genpatches-6.10-12.base.tar.xz 602316 BLAKE2B 6cd02be7fbe2322d246e826d04236dba2ec5b40acc9c8575fd7a5d0d745cd0629778176e97db920ea198e939d332407d9dfa2f369ea4e075be05197a1ba7ef8a SHA512 595e302e05256994ad0077f41c6d6c3677eeb64a7cd1b11c823c689822d4d257bdd8b722b22542fc779e777ffc28f782f7bf69e8a0bb6ec3f3d2b111aaa789fb DIST genpatches-6.10-12.extras.tar.xz 4060 BLAKE2B 77b8b8cc0ed8af03ca45e1224e6de1f14d59682aeb411488e4c5eb6f9f4252a50ae442d60eeba496491c62013c7f1cb7af9f7e40622e1f48de7f0b85c4686c28 SHA512 95cf8c15fab7ea99e7c55166d445494d85cf843d9bc32e3055789ac20d725b52687d1077890c22aa39719a9d0fc7745b0d3346d014077171b1009a3a353f04f0 -DIST genpatches-6.10-8.base.tar.xz 391536 BLAKE2B 636997da732776bccbfd9dc0543a452bd38a42876bfa46b4ec97034880fab320017de72c50b87ee2e7813d1231babed5b2649e65f603dd65dc4280f119ba94e5 SHA512 f2b23a7a244c8cead4b5644d3c7b34bd1ac890e8822f673a663f44902bcbf85b00ddc3dee25664636f3ccc6893bcc89358fbe7733d89c8b2f681c4e6b6076da2 -DIST genpatches-6.10-8.extras.tar.xz 4060 BLAKE2B 62f1c87268953d69bc08bb9a601d8b446c31c5d76a50d0c3f67d8048b24e1fa5327fe5ec8cfcad95bc83a39dfe7daec856a23775e9f797241cca30fe8935c13e SHA512 a2925de9fba3d5bfcefa81a01ddc919e8dda835a433b952deb455a1c7065f4272cb26e363408b2fa92ca9b2039fb596a4b99395546b04b3ea96129176f5613e1 DIST gentoo-kernel-config-g6.tar.gz 4562 BLAKE2B ad9e1b28f84916f12cd8b21feb2f4396d3d63f4cfae3e6b6fe93f919c98b0b4523b205711ab7acafa7121360f696eecb63b9f162dd12950e56dab1429cc13633 SHA512 d180122eb00d40126ea7d79224559904eb0ea574314f9a8d6be6b10f0f6a49f526eba1366ae8cd0a4fe23cd8ff5e292c8cab7e856a2c915d4162b75a03f8076b -DIST kernel-aarch64-16k-fedora.config-6.10.5-400-gentoo 282947 BLAKE2B 0ccee6037434351167e2897e8eedcec83b267b3304105ad9ea9e7af69c19974456c9347603bbdbfad592489e8ddb664ba3d7cd863c0ce2e0315001af9573565a SHA512 b9dc907f1b83ef97c6d92c693be6165282403c2f910f1f1d8278d7c893f40e232a297e6e586cb7f79b22a28e4842936c906713e465708b6c4f3a80e1e5aa12f6 DIST kernel-aarch64-16k-fedora.config-6.10.7-401-gentoo 282947 BLAKE2B 0ccee6037434351167e2897e8eedcec83b267b3304105ad9ea9e7af69c19974456c9347603bbdbfad592489e8ddb664ba3d7cd863c0ce2e0315001af9573565a SHA512 b9dc907f1b83ef97c6d92c693be6165282403c2f910f1f1d8278d7c893f40e232a297e6e586cb7f79b22a28e4842936c906713e465708b6c4f3a80e1e5aa12f6 DIST kernel-aarch64-16k-fedora.config-6.10.9-401-gentoo 282947 BLAKE2B 0ccee6037434351167e2897e8eedcec83b267b3304105ad9ea9e7af69c19974456c9347603bbdbfad592489e8ddb664ba3d7cd863c0ce2e0315001af9573565a SHA512 b9dc907f1b83ef97c6d92c693be6165282403c2f910f1f1d8278d7c893f40e232a297e6e586cb7f79b22a28e4842936c906713e465708b6c4f3a80e1e5aa12f6 DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2 -DIST linux-asahi-6.10.5-1.patch 5618454 BLAKE2B 8eb20fb22c11b11774dbb5ba51d72439155b95fdd667e6c33d86159f10a8e5b34c2c706419f733892449d035b19d29ce45142493f232d88c0bbc40d10e291d1b SHA512 fe54abaf190e87cf3c2d2ff7853113800d2e8ba455d96ce74c356f9b137c4144c0650d51075bb33b3de5696923a0a33868cf299b52042fdf7472108236bbc9f1 DIST linux-asahi-6.10.7-2.patch 5658186 BLAKE2B 0c287e51f0fe73336b94e78d8163e1217876390ce036729f6c40051be5aa880c1fce88613adb710d516a8784cee8f1e6d0e4298018a4fb279a093673eb94786d SHA512 be2abef8fadba64f17d1d5b2ad338ba4d4664e50f61652d549b6dfb1857295e780b7dc5d73a82f1b51354b78b51037cd0adf2ef0e97c381b1b0b23f92869a108 DIST linux-asahi-6.10.9-1.patch 5600799 BLAKE2B e88f57e575c4fb546fad0469f194e127d7ae10aa4f5d11863fcccb2137365e6b597483114fabf188452ca2e608adf63b656e9b4eb5d19035b65cbc2638940d92 SHA512 0355b3d6b6664040fc4491b57a9b15778b7e6e897bb58ad82f2dba99185d402609d08a8b372bcbe812761b575a76fd0c1df4c9095e5b90570cef5bdf8a873fe9 diff --git a/sys-kernel/asahi-kernel/asahi-kernel-6.10.5_p1-r1.ebuild b/sys-kernel/asahi-kernel/asahi-kernel-6.10.5_p1-r1.ebuild deleted file mode 100644 index 85251bf..0000000 --- a/sys-kernel/asahi-kernel/asahi-kernel-6.10.5_p1-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -K_SECURITY_UNSUPPORTED="1" -ETYPE="sources" -K_NODRYRUN="1" - -inherit kernel-build - -MY_P=linux-${PV%.*} -GENPATCHES_P="genpatches-$(ver_cut 1-2)-8" - -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 - -# BASE_ASAHI_TAG is the first used TAG of specific release, i.e. usually -# the first tag of a linux 6.x or linux stable 6.x.y release -ASAHI_TAG="asahi-${MY_BASE}-${MY_TAG}" - -CONFIG_VER=6.10.5-400-gentoo -GENTOO_CONFIG_VER=g6 -FEDORA_CONFIG_DISTGIT="copr-dist-git.fedorainfracloud.org/cgit/@asahi/kernel" -# FEDORA_CONFIG_DISTGIT="copr-dist-git.fedorainfracloud.org/cgit/ngompa/fedora-asahi-dev" -FEDORA_CONFIG_SHA1=ec9dd1038d53e056ee24bddc3dda08bc9d5e9214 - -DESCRIPTION="Asahi Linux kernel sources" -HOMEPAGE="https://asahilinux.org" -SRC_URI=" - https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz - https://github.com/AsahiLinux/linux/compare/v${MY_BASE}...${ASAHI_TAG}.patch - -> linux-${ASAHI_TAG}.patch - https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz - https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz - https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz - -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz - https://${FEDORA_CONFIG_DISTGIT}/kernel.git/plain/kernel-aarch64-16k-fedora.config?id=${FEDORA_CONFIG_SHA1} - -> kernel-aarch64-16k-fedora.config-${CONFIG_VER} -" - -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -KEYWORDS="arm64" - -IUSE="debug" - -# Rust is non-negotiable for the dist kernel -DEPEND=" - ${DEPEND} - virtual/rust - || ( - >=dev-lang/rust-bin-1.76[rust-src,rustfmt] - >=dev-lang/rust-1.76[rust-src,rustfmt] - ) - dev-util/bindgen - debug? ( dev-util/pahole ) -" - -PDEPEND=" - ~virtual/dist-kernel-${PV} -" - -QA_FLAGS_IGNORED=" - usr/src/linux-.*/scripts/gcc-plugins/.*.so - usr/src/linux-.*/vmlinux - usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg -" - -src_prepare() { - local PATCHES=( - # meh, genpatches have no directory - "${WORKDIR}"/*.patch - "${DISTDIR}/linux-${ASAHI_TAG}.patch" - "${FILESDIR}/${PN}-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch" - ) - default - - # prepare the default config - cp "${DISTDIR}/kernel-aarch64-16k-fedora.config-${CONFIG_VER}" ".config" || die - - # ensure a consistant version across kernel and gentoo - # this passes the ${PV}-as-release check in kernel-install_pkg_preinst() - # override "-asahi" in localversion.05-asahi with "_pX" to override the - # kernel's base varsion to gentoo's ${PV} - echo "-p${MY_TAG}" > localversion.05-asahi - # use CONFIG_LOCALVERSION to provide "asahi" and "dist" annotations. - local myversion="-asahi-dist" - echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die - local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" - - local merge_configs=( - "${T}"/version.config - "${dist_conf_path}"/base.config - ) - use debug || merge_configs+=( - "${dist_conf_path}"/no-debug.config - "${FILESDIR}"/linux-6.10_disable_debug_info_btf.config - ) - - # deselect all non APPLE arm64 ARCHs - merge_configs+=( - "${FILESDIR}"/linux-6.8_arm64_deselect_non_apple_arch.config - ) - # adjust base config for Apple silicon systems - merge_configs+=( - "${FILESDIR}"/linux-6.8_arch_apple_overrides.config - ) - - # amdgpu no longer builds with clang (issue #113) - merge_configs+=( - "${FILESDIR}"/linux-6.10_drop_amdgpu.config - ) - - kernel-build_merge_configs "${merge_configs[@]}" -} - -src_install() { - # call kernel-build's scr_install - kernel-build_src_install - - # symlink installed *.dtbs back into kernel "source" directory - for dtb in ${ED}/boot/dtbs/${KV_FULL}/apple/*.dtb; do - local basedtb=$(basename ${dtb}) - dosym -r ${EROOT}/boot/dtbs/${KV_FULL}/apple/${basedtb} ${EROOT}/usr/src/linux-${KV_FULL}/arch/arm64/boot/dts/apple/${basedtb} - done -} - -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-build_pkg_postinst -}