From b25d8b99704c9df38e95ae23aeda6e2c00059e8e Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:12:04 +0200 Subject: [PATCH 01/10] sys-apps/asahi-scripts: stabilize 20240429 for arm64 Signed-off-by: Janne Grunau --- sys-apps/asahi-scripts/asahi-scripts-20240429.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/asahi-scripts/asahi-scripts-20240429.ebuild b/sys-apps/asahi-scripts/asahi-scripts-20240429.ebuild index 2b7ab70..82ba297 100644 --- a/sys-apps/asahi-scripts/asahi-scripts-20240429.ebuild +++ b/sys-apps/asahi-scripts/asahi-scripts-20240429.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://asahilinux.org/" SRC_URI="https://github.com/AsahiLinux/${PN}/archive/refs/tags/${PV}.tar.gz -> ${PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~arm64" +KEYWORDS="arm64" BDEPEND=" dev-build/make" From 5974cb1ffcc97a23a8cd8d00e8215c9d868c18da Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:12:30 +0200 Subject: [PATCH 02/10] sys-apps/asahi-scripts: drop 20240411-r1 Signed-off-by: Janne Grunau --- sys-apps/asahi-scripts/Manifest | 1 - .../asahi-scripts-20240411-r1.ebuild | 53 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 sys-apps/asahi-scripts/asahi-scripts-20240411-r1.ebuild diff --git a/sys-apps/asahi-scripts/Manifest b/sys-apps/asahi-scripts/Manifest index ced97e6..e44b152 100644 --- a/sys-apps/asahi-scripts/Manifest +++ b/sys-apps/asahi-scripts/Manifest @@ -1,2 +1 @@ -DIST asahi-scripts-20240411.tar.gz 10700 BLAKE2B a625556f8bf1636c187705012ade561e83edc5ab358cd22c8d5b8b9f36cf8c1c1abf4087978c87e44eafb625b8513eeefb846155b7e3d68f5397dc3580bd971a SHA512 7757a929de535c0c506655daa03cce2d34c2608bd3a2d012772e6de0c1e5a9cae5717b421fecc54c66a44c3983535013116ba1205c7555eed6bb58f958c46e17 DIST asahi-scripts-20240429.tar.gz 10899 BLAKE2B f024151d59a260f9e7b6104a0be4814f456a5952e21da59176c196685bd85702374c79c804b0c08d60538b37dedaa053e53ec094f0d7fd64eb1fd286ebe41d4a SHA512 c722c82b0bf4f41114129d5b88cb269e0a4c9143acae7c7ba23b2b21c86428d8fdbb38bbdd6cd2f81b631e8ca5d0617b2d0ce3efe5d72986d2e9dc01bbe4cb5d diff --git a/sys-apps/asahi-scripts/asahi-scripts-20240411-r1.ebuild b/sys-apps/asahi-scripts/asahi-scripts-20240411-r1.ebuild deleted file mode 100644 index 82ba297..0000000 --- a/sys-apps/asahi-scripts/asahi-scripts-20240411-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2022 James Calligeros -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -DESCRIPTION="Apple Silicon support scripts" -HOMEPAGE="https://asahilinux.org/" -SRC_URI="https://github.com/AsahiLinux/${PN}/archive/refs/tags/${PV}.tar.gz -> ${PN}-${PV}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="arm64" - -BDEPEND=" - dev-build/make" - -src_prepare() { - default -} - -src_compile() { - emake || die "Could not invoke emake" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" SYS_PREFIX="" install-dracut - - # install gentoo sys config - insinto /etc/default - newins "${FILESDIR}"/update-m1n1.gentoo.conf update-m1n1 -} - -pkg_postinst() { - if [[ ! -e ${ROOT}/usr/lib/asahi-boot ]]; then - ewarn "These scripts are intended for use on Apple Silicon" - ewarn "machines with the Asahi tooling installed! Please" - ewarn "install sys-boot/m1n1, sys-boot/u-boot and" - ewarn "sys-firmware/asahi-firmware!" - fi - - elog "Asahi scripts have been installed to /usr/. For more" - elog "information on how to use them, please visit the Wiki." - - if [[ -e ${ROOT}/usr/local/share/asahi-scripts/functions.sh ]]; then - ewarn "You have upgraded to a new version of ${PN}. Please" - ewarn "remove /usr/local/share/asahi-scripts/," - ewarn " /usr/local/bin/update-m1n1, and" - ewarn "/usr/local/bin/update-vendor-firmware." - fi - - if [[ -e ${ROOT}/etc/dracut.conf.d/10-apple.conf ]]; then - ewarn "Please remove /etc/dracut.conf.d/10-apple.conf" - fi -} From 61f3471957ebb72e5e079214434f470c6aaa06fb Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:13:19 +0200 Subject: [PATCH 03/10] sys-boot/m1n1: stabilize 1.4.12 for arm64 Signed-off-by: Janne Grunau --- sys-boot/m1n1/m1n1-1.4.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-boot/m1n1/m1n1-1.4.12.ebuild b/sys-boot/m1n1/m1n1-1.4.12.ebuild index 27b5e61..ba8d675 100644 --- a/sys-boot/m1n1/m1n1-1.4.12.ebuild +++ b/sys-boot/m1n1/m1n1-1.4.12.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://asahilinux.org/" SRC_URI="https://github.com/AsahiLinux/m1n1/archive/refs/tags/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~arm64" +KEYWORDS="arm64" IUSE="clang" BDEPEND=" From 28319fd8dec0886fa6783273953204f01c2f5511 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:13:38 +0200 Subject: [PATCH 04/10] sys-boot/m1n1: drop 1.4.11 Signed-off-by: Janne Grunau --- sys-boot/m1n1/Manifest | 1 - sys-boot/m1n1/m1n1-1.4.11.ebuild | 62 -------------------------------- 2 files changed, 63 deletions(-) delete mode 100644 sys-boot/m1n1/m1n1-1.4.11.ebuild diff --git a/sys-boot/m1n1/Manifest b/sys-boot/m1n1/Manifest index dcdbc21..341cfbb 100644 --- a/sys-boot/m1n1/Manifest +++ b/sys-boot/m1n1/Manifest @@ -1,2 +1 @@ -DIST m1n1-1.4.11.tar.gz 825748 BLAKE2B 84f311b5da34cb0502103fd439a22ef068db7c77d25f6e4e2de539d23ed28d3468a554fae1905b99d09dc27391a797f6cbf88efbf1b4720dad13fe7b00bbe551 SHA512 38a7c7d3b11e8543a9f89afaca008ed711152f6d91f2ab20e6ce4023fa90cf1ba0b406bcf0ba033b500caaefcfe6aa35cbcdf9cbcbf976e642f7b1689187d8bb DIST m1n1-1.4.12.tar.gz 836287 BLAKE2B 2c192294daaeb9371e98d1cda596e7fbadc3cb35021fbc527f70a1a8076f84afe391190a620deb007e837f1a97b1fe9ca36bc194d1173debaff3c9f269a3f4f9 SHA512 2537c06523e133c169cd8a21cce0f644d004c8d9aa25ea08a8c5f0781851f68f832b4ac44011f5541ad6ab61271ece7c9d7337fa252f068673850090622659f3 diff --git a/sys-boot/m1n1/m1n1-1.4.11.ebuild b/sys-boot/m1n1/m1n1-1.4.11.ebuild deleted file mode 100644 index ba8d675..0000000 --- a/sys-boot/m1n1/m1n1-1.4.11.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2022 James Calligeros -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Apple Silicon bootloader and experimentation playground" -HOMEPAGE="https://asahilinux.org/" -SRC_URI="https://github.com/AsahiLinux/m1n1/archive/refs/tags/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="arm64" -IUSE="clang" - -BDEPEND=" - dev-build/make - sys-apps/dtc" - -RDEPEND=" - sys-boot/u-boot - || ( - sys-kernel/asahi-sources - sys-kernel/asahi-kernel - ) -" - -BDEPEND="${BDEPEND} - clang? ( sys-devel/clang ) -" - -src_compile() { - cd "${S}" || die - if use clang; then - emake USE_CLANG=1 \ - RELEASE=1 \ - ARCH="${CHOST}-" - else - emake USE_CLANG=0 \ - RELEASE=1 \ - ARCH="${CHOST}-" - fi -} - -src_install() { - dodir /usr/lib/asahi-boot - cp "${S}"/build/m1n1.bin "${ED}"/usr/lib/asahi-boot/m1n1.bin || die -} - -pkg_postinst() { - elog "m1n1 has been installed at /usr/lib/asahi-boot/m1n1.bin" - elog "You must run update-m1n1 for the new version to be installed" - elog "in the ESP." - elog "Please see the Asahi Linux Wiki for more information." - if [ -e "${ROOT}"/bin/update-m1n1 ]; then - ewarn "You need to remove /bin/update-m1n1." - fi -} - -pkg_postrm() { - elog "m1n1 has been removed from /usr/lib/asahi-boot/ but has not" - elog "been removed from the ESP. You need to do this manually, though" - elog "you really shouldn't." -} From f040964e4fbb9d2ad584221d4d909d563d6fc0c2 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:14:11 +0200 Subject: [PATCH 05/10] sys-boot/u-boot: stabilize 2024.04_p1 for arm64 Signed-off-by: Janne Grunau --- sys-boot/u-boot/u-boot-2024.04_p1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-boot/u-boot/u-boot-2024.04_p1.ebuild b/sys-boot/u-boot/u-boot-2024.04_p1.ebuild index c55b0df..5646736 100644 --- a/sys-boot/u-boot/u-boot-2024.04_p1.ebuild +++ b/sys-boot/u-boot/u-boot-2024.04_p1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/AsahiLinux/u-boot/archive/refs/tags/${MY_P}.tar.gz - LICENSE="GPL-2" SLOT="0" -KEYWORDS="~arm64" +KEYWORDS="arm64" PATCHES=( ) From 8fb8e794c8032677aaa326ad7719b37c5dda3a03 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:17:03 +0200 Subject: [PATCH 06/10] sys-boot/u-boot: drop 2023.07.02_p4-r1 Signed-off-by: Janne Grunau --- .../sys-boot/u-boot-2023.07.02_p4-r1 | 11 --- sys-boot/u-boot/Manifest | 1 - .../u-boot/u-boot-2023.07.02_p4-r1.ebuild | 69 ------------------- 3 files changed, 81 deletions(-) delete mode 100644 metadata/md5-cache/sys-boot/u-boot-2023.07.02_p4-r1 delete mode 100644 sys-boot/u-boot/u-boot-2023.07.02_p4-r1.ebuild diff --git a/metadata/md5-cache/sys-boot/u-boot-2023.07.02_p4-r1 b/metadata/md5-cache/sys-boot/u-boot-2023.07.02_p4-r1 deleted file mode 100644 index 956492f..0000000 --- a/metadata/md5-cache/sys-boot/u-boot-2023.07.02_p4-r1 +++ /dev/null @@ -1,11 +0,0 @@ -BDEPEND=app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex dev-build/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig sys-apps/dtc dev-vcs/git -DEFINED_PHASES=compile configure install postinst postrm unpack -DESCRIPTION=Asahi Linux fork of Das U-Boot -EAPI=8 -HOMEPAGE=https://asahilinux.org/ -KEYWORDS=arm64 -LICENSE=GPL-2 -RDEPEND=app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex dev-build/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig sys-apps/dtc dev-vcs/git sys-apps/asahi-scripts -SLOT=0 -SRC_URI=https://github.com/AsahiLinux/u-boot/archive/refs/tags/.tar.gz -> u-boot-2023.07.02_p4.tar.gz -_md5_=67b4901c71926b69842cd002171013b3 diff --git a/sys-boot/u-boot/Manifest b/sys-boot/u-boot/Manifest index 2e5fefd..31e3753 100644 --- a/sys-boot/u-boot/Manifest +++ b/sys-boot/u-boot/Manifest @@ -1,2 +1 @@ -DIST u-boot-2023.07.02_p4.tar.gz 25087946 BLAKE2B 693c4181df35fc26fa4b753014a127c93a5662bdaf7be2391ba2541a9ce4abf988b28e10a90cfb3949ebc5c931060d2313bc59b15a6f12b876326e9f76e59cfb SHA512 7ef733b7a40dff53a2e8cd961de218e65b2812cd058471a80876da78b0b229adeae1629222d99d2efcbf17c4b6aa9e8dfdd39faac053aba1d4f312d64363b5ca DIST u-boot-2024.04_p1.tar.gz 26187861 BLAKE2B 42325ebadcebda56b38f6abce213ee7bbdce73101498e90a44cbe354e1af61cfc8285f5290db713431887d60b4750cfacd2eafa7606ec423688af8c01903276c SHA512 47ac7b4972d460de12035971e721c636591851df8145bb6c1d1c340a43211c7efa22a4ce9e0a46089462151da47a78f0272a72e7404b8d3dc935a8e4d37d1333 diff --git a/sys-boot/u-boot/u-boot-2023.07.02_p4-r1.ebuild b/sys-boot/u-boot/u-boot-2023.07.02_p4-r1.ebuild deleted file mode 100644 index 40c53c7..0000000 --- a/sys-boot/u-boot/u-boot-2023.07.02_p4-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2023 James Calligeros -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -PYTHON_COMPAT=( python3_{10..11} ) - -# $PV is expected to be of following form: 2023.07.02_p2 -MY_TAG="$(ver_cut 5)" -MY_P="asahi-v$(ver_cut 1-3)-${MY_TAG}" - -DESCRIPTION="Asahi Linux fork of Das U-Boot" -HOMEPAGE="https://asahilinux.org/" -SRC_URI="https://github.com/AsahiLinux/u-boot/archive/refs/tags/${MY_P}.tar.gz -> ${PN}-${PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="arm64" - -PATCHES=( - "${FILESDIR}/u-boot-2023.07.02_p4-font-size.patch" -) - -BDEPEND=" - app-arch/cpio - dev-lang/perl - sys-devel/bc - sys-devel/bison - sys-devel/flex - dev-build/make - >=sys-libs/ncurses-5.2 - virtual/libelf - virtual/pkgconfig - sys-apps/dtc - dev-vcs/git" - -RDEPEND="${BDEPEND} - sys-apps/asahi-scripts" - -src_unpack() { - unpack ${PN}-${PV}.tar.gz - mv u-boot-${MY_P} ${PN}-${PV} -} - -src_configure() { - emake apple_m1_defconfig -} - -src_compile() { - cd "${S}" || die - emake -} - -src_install() { - dodir /usr/lib/asahi-boot - cp "${S}"/u-boot-nodtb.bin "${ED}"/usr/lib/asahi-boot/u-boot-nodtb.bin || die -} - -pkg_postinst() { - elog "U-Boot has been installed to /usr/lib/asahi-boot/u-boot-nodtb.bin." - elog "You must run update-m1n1 for the new version to be installed" - elog "in the ESP." - elog "Please see the Asahi Linux Wiki for more information." -} - -pkg_postrm() { - elog "U-Boot has been removed from /usr/lib/asahi-boot/ but has not" - elog "been removed from the ESP. You need to do this manually, though" - elog "you really shouldn't." -} From 4fb8e2c578d5998619a311f302c5d0dc3cedfca8 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:18:33 +0200 Subject: [PATCH 07/10] sys-kernel/asahi-kernel: stabilize 6.8.8_p2 for arm64 Signed-off-by: Janne Grunau --- sys-kernel/asahi-kernel/asahi-kernel-6.8.8_p2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-kernel/asahi-kernel/asahi-kernel-6.8.8_p2.ebuild b/sys-kernel/asahi-kernel/asahi-kernel-6.8.8_p2.ebuild index 3a51fcf..044e522 100644 --- a/sys-kernel/asahi-kernel/asahi-kernel-6.8.8_p2.ebuild +++ b/sys-kernel/asahi-kernel/asahi-kernel-6.8.8_p2.ebuild @@ -42,7 +42,7 @@ SRC_URI="${KERNEL_URI} S="${WORKDIR}/linux-${MY_P}" LICENSE="GPL-2" -KEYWORDS="~arm64" +KEYWORDS="arm64" IUSE="debug" From 0b3465c89ba8c009f3926180be22b50d9180af4f Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:18:43 +0200 Subject: [PATCH 08/10] virtual/dist-kernel: stabilize 6.8.8_p2 for arm64 Signed-off-by: Janne Grunau --- virtual/dist-kernel/dist-kernel-6.8.8_p2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtual/dist-kernel/dist-kernel-6.8.8_p2.ebuild b/virtual/dist-kernel/dist-kernel-6.8.8_p2.ebuild index 321b24d..42c67e8 100644 --- a/virtual/dist-kernel/dist-kernel-6.8.8_p2.ebuild +++ b/virtual/dist-kernel/dist-kernel-6.8.8_p2.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="Virtual to depend on any Distribution Kernel" SLOT="0/${PVR}" -KEYWORDS="~arm64" +KEYWORDS="arm64" RDEPEND=" ~sys-kernel/asahi-kernel-${PV} From eb7ac20ab8adb671cba6c61e34f3a41355dc6757 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:19:13 +0200 Subject: [PATCH 09/10] sys-kernel/asahi-kernel: drop 6.6.0_p16-r2, 6.8.6_p4 Signed-off-by: Janne Grunau --- sys-kernel/asahi-kernel/Manifest | 3 - .../asahi-kernel-6.6.0_p16-r2.ebuild | 126 ----------------- .../asahi-kernel/asahi-kernel-6.8.6_p4.ebuild | 131 ------------------ 3 files changed, 260 deletions(-) delete mode 100644 sys-kernel/asahi-kernel/asahi-kernel-6.6.0_p16-r2.ebuild delete mode 100644 sys-kernel/asahi-kernel/asahi-kernel-6.8.6_p4.ebuild diff --git a/sys-kernel/asahi-kernel/Manifest b/sys-kernel/asahi-kernel/Manifest index ea9f2df..fcad876 100644 --- a/sys-kernel/asahi-kernel/Manifest +++ b/sys-kernel/asahi-kernel/Manifest @@ -1,6 +1,3 @@ -DIST asahi-kernel-6.6.0_p16.tar.gz 229861406 BLAKE2B e8f90373fe3cfb0ee8824158c59d548af05d1e68626715a65dcf086b35cfe7f4d44b184f02bbfad33474040b86f488e4fa99c8886ae329cf138933161658f94c SHA512 fc62cf346b95229aa31bc1483c9fcffaeacf94d09d13801a3e8e50ed3ba7f3d1b1d4dd8083051879955e1f99bffa61bf411cd38fcc45e176d372fc1d205b9c76 DIST gentoo-kernel-config-g11.tar.gz 5077 BLAKE2B dc17ded74f79baddd703a78084113b85e7130877b300b5fe60453cde515fe37c52ece7877049bb0ef384f74ecfc73d59d7d4a513f8fef7bf4f651599946383e8 SHA512 e91156765ef2a48396370f884fdecd7bb1d600e5167f6bad51130520f886e9198adae375adf3e40fa803abc5d5482057775fb0275ab2589bd8f94d8af4a03c4e -DIST kernel-aarch64-16k-fedora.config-6.6.3-414-gentoo 272164 BLAKE2B 27de91eb46c467015d18eac1fe3c96c71112caae73c9818ee4a5c476f57732e7a7b1fd18feaf008e61d1fc775e1b1cb32b32c0fdda3b3ebfeb8e6f7e79a34e6d SHA512 e4196f46f92e5c8d0e681d42fe6392ac2a150530a71e189d7abeff877c76a0a86c4619d794f181ea784f12ad0a1d1f6d639bbcd4209396436b03b5baa4d6998b DIST kernel-aarch64-16k-fedora.config-6.8.7-402-gentoo 279185 BLAKE2B 84ce67080186723d9a8a47141d7a66e031fc39f6f02ac55352f34e05e7d5a288354c046fb87a8c21b04870736ec0d813173a05cefa7a24598d07fd30393b36a7 SHA512 ff8e0ac754ade12fcdfe96fa98318c8b42e21da3ed165ed28808752212f0507a0d94e4a0b54ee992a307577e02a10696d3a0cd2d74cfa9840eb634bbbd3217fe -DIST linux-asahi-6.8.6-4.tar.gz 235255308 BLAKE2B 47b789a1cd0284d722937001ce934ef4ed0eab3f25dbc6f1add5fdf2aac58c60b2c9b24f71d34f2f1cc7044c1bca50fa0cab2d2d6f2d7acc0789c0ae05be778d SHA512 a3b2041754ae7b73a8612b3623683229788744652037983bc092f77dc9371938a82f4641a93e4f909d5cd4b0ea25d77714ffe05f686ff92a96efbe23e3dfe4c6 DIST linux-asahi-6.8.8-2.tar.gz 235265018 BLAKE2B cf543955971865d65c048b7021a8bf4d9711294afd49e4ce31bf3e4761dea8724950a52a7b6b852645760e0abb1ca2abe1ac6c3feafbcb933a53e56dcc4044e4 SHA512 101566de3777517d151effcdd2e38b6a5d5961754734cdabfae7c359bbf0f35e2c7a4ecb912d4c300adb3f09ecaa31eafaf076d849171e0e5244ec29a0bf30a4 diff --git a/sys-kernel/asahi-kernel/asahi-kernel-6.6.0_p16-r2.ebuild b/sys-kernel/asahi-kernel/asahi-kernel-6.6.0_p16-r2.ebuild deleted file mode 100644 index eeb8d43..0000000 --- a/sys-kernel/asahi-kernel/asahi-kernel-6.6.0_p16-r2.ebuild +++ /dev/null @@ -1,126 +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-build - -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)" - MY_P="asahi-$(ver_cut 1-2)-${MY_TAG}" -fi -CONFIG_VER=6.6.3-414-gentoo -GENTOO_CONFIG_VER=g11 - -DESCRIPTION="Asahi Linux kernel sources" -HOMEPAGE="https://asahilinux.org" -KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> ${PN}-${PV}.tar.gz" -SRC_URI="${KERNEL_URI} - https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz - -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz - https://copr-dist-git.fedorainfracloud.org/cgit/@asahi/kernel/kernel.git/plain/kernel-aarch64-16k-fedora.config?id=be420b20d9a73b16a6ee7b6cdb34194efd89bb91 - -> kernel-aarch64-16k-fedora.config-${CONFIG_VER} -" - -S="${WORKDIR}/linux-${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.75.0[rust-src,rustfmt] - dev-lang/rust:stable/1.75[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 -" - -PATCHES=( - "${FILESDIR}/${P}-enable-speakers-stage1.patch" - "${FILESDIR}/${P}-enable-speakers-stage2.patch" - "${FILESDIR}/${P}-rust-alloc-fix.patch" -) - -src_prepare() { - 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 - ) - - # deselect all non APPLE arm64 ARCHs - merge_configs+=( - "${FILESDIR}"/linux-$(ver_cut 1-2)_arm64_deselect_non_apple_arch.config - ) - # adjust base config for Apple silicon systems - merge_configs+=( - "${FILESDIR}"/linux-$(ver_cut 1-2)_arch_apple_overrides.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 - local dir_ver=${PV}${KV_LOCALVERSION} - local kernel_dir=/usr/src/linux-${dir_ver} - local relfile=${ED}${kernel_dir}/include/config/kernel.release - local module_ver - module_ver=$(<"${relfile}") || die - - for dtb in /boot/dtbs/${module_ver}/apple/*.dtb; do - dosym ${dtb} /${kernel_dir}/arch/arm64/boot/dts/apple/$(basename ${dtb}) - 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 -} diff --git a/sys-kernel/asahi-kernel/asahi-kernel-6.8.6_p4.ebuild b/sys-kernel/asahi-kernel/asahi-kernel-6.8.6_p4.ebuild deleted file mode 100644 index 3a51fcf..0000000 --- a/sys-kernel/asahi-kernel/asahi-kernel-6.8.6_p4.ebuild +++ /dev/null @@ -1,131 +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-build - -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 -CONFIG_VER=6.8.7-402-gentoo -GENTOO_CONFIG_VER=g11 -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=647ffd915dc8351fd69790ee708b1ae8638ccc95 - -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} - 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}/linux-${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 -" - -PATCHES=( - "${FILESDIR}/${PN}-$(ver_cut 1-2)-enable-speakers.patch" -) - -src_prepare() { - 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 - ) - - # deselect all non APPLE arm64 ARCHs - merge_configs+=( - "${FILESDIR}"/linux-$(ver_cut 1-2)_arm64_deselect_non_apple_arch.config - ) - # adjust base config for Apple silicon systems - merge_configs+=( - "${FILESDIR}"/linux-$(ver_cut 1-2)_arch_apple_overrides.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 - local dir_ver=${PV}${KV_LOCALVERSION} - local kernel_dir=/usr/src/linux-${dir_ver} - local relfile=${ED}${kernel_dir}/include/config/kernel.release - local module_ver - module_ver=$(<"${relfile}") || die - - for dtb in /boot/dtbs/${module_ver}/apple/*.dtb; do - dosym ${dtb} /${kernel_dir}/arch/arm64/boot/dts/apple/$(basename ${dtb}) - 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 -} From edea9fcdcf206ae13ef02149ddd5f4df7e2ed359 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 8 May 2024 22:19:50 +0200 Subject: [PATCH 10/10] virtual/dist-kernel: drop 6.6.0_p16, 6.8.6_p4 Signed-off-by: Janne Grunau --- virtual/dist-kernel/dist-kernel-6.6.0_p16.ebuild | 12 ------------ virtual/dist-kernel/dist-kernel-6.8.6_p4.ebuild | 12 ------------ 2 files changed, 24 deletions(-) delete mode 100644 virtual/dist-kernel/dist-kernel-6.6.0_p16.ebuild delete mode 100644 virtual/dist-kernel/dist-kernel-6.8.6_p4.ebuild diff --git a/virtual/dist-kernel/dist-kernel-6.6.0_p16.ebuild b/virtual/dist-kernel/dist-kernel-6.6.0_p16.ebuild deleted file mode 100644 index 42c67e8..0000000 --- a/virtual/dist-kernel/dist-kernel-6.6.0_p16.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual to depend on any Distribution Kernel" -SLOT="0/${PVR}" -KEYWORDS="arm64" - -RDEPEND=" - ~sys-kernel/asahi-kernel-${PV} -" diff --git a/virtual/dist-kernel/dist-kernel-6.8.6_p4.ebuild b/virtual/dist-kernel/dist-kernel-6.8.6_p4.ebuild deleted file mode 100644 index 321b24d..0000000 --- a/virtual/dist-kernel/dist-kernel-6.8.6_p4.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual to depend on any Distribution Kernel" -SLOT="0/${PVR}" -KEYWORDS="~arm64" - -RDEPEND=" - ~sys-kernel/asahi-kernel-${PV} -"