From b3b92de25c3fc5f6bddc5e513027140591a0b2a5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 23 May 2024 00:06:40 +0100 Subject: gentoo auto-resync : 23:05:2024 - 00:06:39 --- sys-kernel/asahi-sources/Manifest | 6 +- .../asahi-sources/asahi-sources-6.8.8_p2.ebuild | 76 -------------------- .../asahi-sources/asahi-sources-6.8.9_p5.ebuild | 76 -------------------- .../asahi-sources/asahi-sources-6.8.9_p7.ebuild | 82 ++++++++++++++++++++++ 4 files changed, 84 insertions(+), 156 deletions(-) delete mode 100644 sys-kernel/asahi-sources/asahi-sources-6.8.8_p2.ebuild delete mode 100644 sys-kernel/asahi-sources/asahi-sources-6.8.9_p5.ebuild create mode 100644 sys-kernel/asahi-sources/asahi-sources-6.8.9_p7.ebuild (limited to 'sys-kernel/asahi-sources') diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest index 292b2a903ddf..0adc553f93f7 100644 --- a/sys-kernel/asahi-sources/Manifest +++ b/sys-kernel/asahi-sources/Manifest @@ -5,12 +5,10 @@ AUX asahi-sources-6.6.0_p16-enable-speakers-stage2.patch 1609 BLAKE2B eb51b5aeca DIST genpatches-6.8-12.base.tar.xz 687664 BLAKE2B 3c27ee511c258f3659d7f8cd5b6d470ffa10a2fc95bd536b272e0bb20c368dfc8c512f23fdc025e85ad90d6f628a58c80d8d15ec0ef8898caf7461162cf2dec2 SHA512 cd845b49341366190834b9782c9ffa270608a35e616ff483b40094913f6d01809421b80a7830117b606e57e6bb0ed9b0ed6dc14220826364fc9d2ee6a5916ad6 DIST genpatches-6.8-12.extras.tar.xz 3736 BLAKE2B 15a15ca3097dc42ac5855e59fe61c961854c1afa8adc719c761ac58bb7c869d3240c228b0963a91927a9bc0af6998b4c40e4d286faf7d2defc2f21029d11c114 SHA512 4f1c8c07e81c0d1ed110bd4512d2a16c3e202c47d8ab6bedf5213cf6c2f8675e9b543e52dbce50fbbf550d88252e2c1c19c2465ddd7907f11a2979fa92466a7c DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068 -DIST linux-asahi-6.8.8-2.tar.gz 235265018 BLAKE2B cf543955971865d65c048b7021a8bf4d9711294afd49e4ce31bf3e4761dea8724950a52a7b6b852645760e0abb1ca2abe1ac6c3feafbcb933a53e56dcc4044e4 SHA512 101566de3777517d151effcdd2e38b6a5d5961754734cdabfae7c359bbf0f35e2c7a4ecb912d4c300adb3f09ecaa31eafaf076d849171e0e5244ec29a0bf30a4 DIST linux-asahi-6.8.9-3.tar.gz 235275610 BLAKE2B 8ee3ff2572a02851d66239c65187312a0f67aa492d9c3b3a734e291b250acbf9450960c745687ff98a339e4cc14a2eab7675c08d39f88de0c0aa7c320d20bdc8 SHA512 ebd854b357a1d0a7663129f48956da559bc23a4347836dd0c3a3eb8cd47013ed86d83711dc2b7a221c28f51bd0c42c0b1ea2302ef45ee4a2ddfbfacf33e6efc2 -DIST linux-asahi-6.8.9-5.tar.gz 235264452 BLAKE2B 5a08d3df1d0e1fc274a68f29ab592c790421d58dafa5533b7f526f13c5046d668e0c864b9a71f2c5b736a1890a65ba0877694b11bbde9acf5ff873f7a8a5a167 SHA512 e592959bfd546588df26bcec6b6de86dc3450d6ae89b073b272dd41b9927a7c2b09b9f8ff77b3cc80393b65821062eddabe351f177bfc1f732f11d685594412f +DIST linux-asahi-6.8.9-6..asahi-6.8.9-7.patch 6483 BLAKE2B 7a50c83ce70f50f7ac27ca55406edae8941d271d89270eeb3c97fe446f14fb8fd07ef4f9aa3288af24ab8958aff0d250a6762edd87b7453592147216cb65e2f9 SHA512 7d26833d6ca717c48caec655fd78107367c67112b04181be781fb5746d8a00d7927198d67cdd22a4e57b131b0738125087972cd0ba7b0e7e16f04bb3d3301378 DIST linux-asahi-6.8.9-6.patch 5163031 BLAKE2B de6411c7f6bb95fec4162648c89d6bf6be5e863d4647877c4cbbb9e4c8540b12b1dacd42c26a1d3561a36fe6c79650caf5e0481338764a10101cec53921043c7 SHA512 0cc24bf50c16cb6fc59bf9bd025babcdca081bc789da5791d0fd914c65d31342cc632998fe4a667296ee3ed067b311dc105e994e2a77d569bac3a8ed48fb5ecc -EBUILD asahi-sources-6.8.8_p2.ebuild 2006 BLAKE2B d2d171d67b32a49b2d7f5ece2d401b2db5313234f4627d9a48472966beddc5e68864ab3a3dfe432248e0fcc3246c0ccd755ced7a9c417e989d95fce52973e842 SHA512 2953fa7747bc02df18301ebd5f159b4e49da25a7d2efa70029d3b4c00ed062ba8fd4632c29b976e482823c9b4f91d9c2320231330a5eba8adc04d5cc043da1b6 EBUILD asahi-sources-6.8.9_p3.ebuild 2006 BLAKE2B d2d171d67b32a49b2d7f5ece2d401b2db5313234f4627d9a48472966beddc5e68864ab3a3dfe432248e0fcc3246c0ccd755ced7a9c417e989d95fce52973e842 SHA512 2953fa7747bc02df18301ebd5f159b4e49da25a7d2efa70029d3b4c00ed062ba8fd4632c29b976e482823c9b4f91d9c2320231330a5eba8adc04d5cc043da1b6 -EBUILD asahi-sources-6.8.9_p5.ebuild 2007 BLAKE2B bb3d2444c0f91b947e5b291de414e043c210cf74a40abaa7f303a7f711b6522b2819bfbd4be7f344a205ef5df06568bddd642dbfeae2d2f448ea0da351b41ed2 SHA512 3acac73ff517637cd471bac15da0e1c0f60792f69ae9550179de54854ce1899594ddf5ad036cc4b7bee3e4410472d64185e203c51d4dfa2d962ad9021c6d58f1 EBUILD asahi-sources-6.8.9_p6.ebuild 1857 BLAKE2B b82b3d2159cc22bcf8758d690166b0059d6b3ceaec5fdf55c3f0b6a3111b00ca24e07452645585bc01e844e28baa81adea1b44b7223136346c6d0166ef7ca0f3 SHA512 af2256bd0b6e8dd24e8ac18de6f1f0d9c8240f1499caa80968f4a3fe45cb68ed3b82dc0b2996a5cf5f165c9e76d4cafa4e7b358d3c9679b3a9f8a218f45ce0c5 +EBUILD asahi-sources-6.8.9_p7.ebuild 2096 BLAKE2B dae5f47b023ec53259b1f93ca1b38f3f936177128b9a02655b8f5c1c994c3a14cab699477207a8286e74f784204649d2f5f2a555e2d682fa7c4466096173002a SHA512 92209bc607792dc4b72328f133a7d623229f6fd2c5fd72dc4165f7fbbe1f3328818860cf2a4f07dddc806bd02c8971c7f04033b43383fc2b49fd70aad8310bc2 MISC metadata.xml 606 BLAKE2B 81abc1eb15c66fbc4b2039b161e0bc06e8c6ce5e58727fca8ef80778db4dd04bc48486479d795c91e6181cd4e3f974b3ff7e3f6479e98e8271ccf4bdfd22b02e SHA512 c5e3349ebbbd7d04a0ac261c93df705b34882a3ed2472f28d90ef902377f5a89d3b5454e94b7f40c39c5d1745aedbd1267a607c189ff09917e77f0ed78009395 diff --git a/sys-kernel/asahi-sources/asahi-sources-6.8.8_p2.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.8.8_p2.ebuild deleted file mode 100644 index ac1ab4ff4d6f..000000000000 --- a/sys-kernel/asahi-sources/asahi-sources-6.8.8_p2.ebuild +++ /dev/null @@ -1,76 +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_WANT_GENPATCHES="base extras experimental" -#K_GENPATCHES_VER="5" -K_NODRYRUN="1" - -inherit kernel-2 -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_P="asahi-$(ver_rs 2 - $(ver_cut 1-4))-${MY_TAG}" -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_P="asahi-$(ver_cut 1-2)-${MY_TAG}" - else - MY_P="asahi-$(ver_cut 1-3)-${MY_TAG}" - fi -fi - -DESCRIPTION="Asahi Linux kernel sources" -HOMEPAGE="https://asahilinux.org" -KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> linux-${MY_P}.tar.gz" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} -" - -KEYWORDS="arm64" -IUSE="rust" - -DEPEND=" - ${DEPEND} - rust? ( - || ( - >=dev-lang/rust-bin-1.76[rust-src,rustfmt] - >=dev-lang/rust-1.76[rust-src,rustfmt] - ) - dev-util/bindgen - ) -" - -PATCHES=( - "${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch" - "${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch" -) - -src_unpack() { - unpack linux-${MY_P}.tar.gz - mv linux-${MY_P} linux-${KV_FULL} || die "Could not move source tree" -} - -src_prepare() { - default - cd "${WORKDIR}/linux-${KV-FULL}" || die - # XXX: Genpatches do not yet work with Rust kernels - #handle_genpatches --set-unipatch-list - #[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_GENPATCHES} || -n ${UNIPATCH_LIST_DEFAULT} ]] && \ - # unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}" - #unpack_fix_install_path - #env_setup_xmakeopts - echo "-${MY_TAG}" > localversion.10-pkgrel || die - cd "${S}" || die -} - -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/asahi-sources-6.8.9_p5.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.8.9_p5.ebuild deleted file mode 100644 index f975144c1b51..000000000000 --- a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p5.ebuild +++ /dev/null @@ -1,76 +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_WANT_GENPATCHES="base extras experimental" -#K_GENPATCHES_VER="5" -K_NODRYRUN="1" - -inherit kernel-2 -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_P="asahi-$(ver_rs 2 - $(ver_cut 1-4))-${MY_TAG}" -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_P="asahi-$(ver_cut 1-2)-${MY_TAG}" - else - MY_P="asahi-$(ver_cut 1-3)-${MY_TAG}" - fi -fi - -DESCRIPTION="Asahi Linux kernel sources" -HOMEPAGE="https://asahilinux.org" -KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> linux-${MY_P}.tar.gz" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} -" - -KEYWORDS="~arm64" -IUSE="rust" - -DEPEND=" - ${DEPEND} - rust? ( - || ( - >=dev-lang/rust-bin-1.76[rust-src,rustfmt] - >=dev-lang/rust-1.76[rust-src,rustfmt] - ) - dev-util/bindgen - ) -" - -PATCHES=( - "${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch" - "${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch" -) - -src_unpack() { - unpack linux-${MY_P}.tar.gz - mv linux-${MY_P} linux-${KV_FULL} || die "Could not move source tree" -} - -src_prepare() { - default - cd "${WORKDIR}/linux-${KV-FULL}" || die - # XXX: Genpatches do not yet work with Rust kernels - #handle_genpatches --set-unipatch-list - #[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_GENPATCHES} || -n ${UNIPATCH_LIST_DEFAULT} ]] && \ - # unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}" - #unpack_fix_install_path - #env_setup_xmakeopts - echo "-${MY_TAG}" > localversion.10-pkgrel || die - cd "${S}" || die -} - -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/asahi-sources-6.8.9_p7.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.8.9_p7.ebuild new file mode 100644 index 000000000000..2303feb47dc1 --- /dev/null +++ b/sys-kernel/asahi-sources/asahi-sources-6.8.9_p7.ebuild @@ -0,0 +1,82 @@ +# Copyright 2023-2024 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="12" +K_NODRYRUN="1" + +inherit kernel-2 +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}" + +PREV_ASAHI_TAG="asahi-${MY_BASE}-6" +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}...${PREV_ASAHI_TAG}.patch + -> linux-${PREV_ASAHI_TAG}.patch + https://github.com/AsahiLinux/linux/compare/${PREV_ASAHI_TAG}...${ASAHI_TAG}.patch + -> linux-${PREV_ASAHI_TAG}..${ASAHI_TAG}.patch +" +KV_FULL="${PVR/_p/-asahi-}" +S="${WORKDIR}/linux-${KV_FULL}" + +KEYWORDS="~arm64" +IUSE="rust" + +DEPEND=" + ${DEPEND} + rust? ( + || ( + >=dev-lang/rust-bin-1.76[rust-src,rustfmt] + >=dev-lang/rust-1.76[rust-src,rustfmt] + ) + dev-util/bindgen + ) +" + +UNIPATCH_STRICTORDER="yes" +UNIPATCH_LIST=" + ${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch + ${FILESDIR}/asahi-6.8.2_revert_spi_stable_asahi.patch + ${DISTDIR}/linux-${PREV_ASAHI_TAG}.patch + ${DISTDIR}/linux-${PREV_ASAHI_TAG}..${ASAHI_TAG}.patch + ${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch + ${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch +" + +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 +} -- cgit v1.2.3