sys-kernel/xanmod-kernel/Manifest

@@ -1,7 +1,5 @@
 DIST genpatches-5.15-82.base.tar.xz 3300648 BLAKE2B 76afce0ccf8820124789ec68609a5479e27b7a5b3556410ce5cadee6c32d232a2f3ab44c30e862cb97b97c7715f18f25ac11505baea9cf66c807790f88c63cb8 SHA512 c057ed55a1a081fb94cbe8101b06ce28032355cc6c19913ee0a547987085fc774abe19f176b8c59ef5dbf8539934ae722c60cbbfd7feda26c5a88d322efd9aa2
 DIST genpatches-5.15-82.extras.tar.xz 3928 BLAKE2B fddcda7bbe9c39c07851f708ebfc2f9a7fe485e8fdd0ab4357df16c9e6fc2b951e6188798872e9d05dfa15f3d29676e2ed97ed9c9bf4397fbe96a8a99d3c809c SHA512 76700ad690ee799cf3842df6acb68bf3c3a25746462cc97010fe45036560d4b41c60fba839f80f12a165c96c0623ae6c11fbd994269bf153756456824f0f8a91
-DIST genpatches-6.0-10.base.tar.xz 546380 BLAKE2B faad43e3066e880e9074c57499eef61f85a8279cb37b7c999f41194588c766bfcb529cd6bd43b234e865c837ca970706935d6fea32fbcb46c49e9a67d274f262 SHA512 c4e37e027f8c9c7ce833d4b5c887b261bbe617222d4b1203bf0ccbb35b384bb185bfa5e3bccc187e7658baaa50a015a5ce2a41a6d9c8fa5ad883a46692b00d8c
-DIST genpatches-6.0-10.extras.tar.xz 3804 BLAKE2B 392620ebf627c7f480b0031b9e3e712ec0005b7e83596ef192908cde5740df06cec0605b09a15ba9420919b37a61136611a9e3e13f82caa63d0337f3d9b167e0 SHA512 86511fa64c02b703426450ade1811ce5b3614a6a232cba35f016837572e34a7ea0c751eb90ffe971f6a3321e0f9f61f8f032bd1cab5b0d55f8112acff42b4f61
 DIST genpatches-6.0-8.base.tar.xz 428744 BLAKE2B b8cc7442f3930b8f5a9b11e3722b991f049aba0c635e3e7c1ae3bf4df12470a1ba974a0459ac02c5dc5286a3ac3377704b583f241fb844e6ef34552d4bf5c2ce SHA512 cb0c4a2a100ea25f84fa5ef85a2a52ac3c42bc83b0b38b526e96d034d9433382f5b3edc958f0546dc0692874ecab252d19d58264376d60cf9338bc6ec8a6d7c4
 DIST genpatches-6.0-8.extras.tar.xz 3804 BLAKE2B 338f4ef5b88afc9a950ac47261b06010317c59c104819c9aaee6ec845c47b31982dd86a9e4e35ff3c21997931411235d8d6322190d96453c55c443d7de0cd893 SHA512 1d58df2e68935c50b25109a3e92a48d7ab703d97c536634b47ccdd958dedca458eed5c96d1c3a37f788a6576fb655e4c4446b95f3bb8ce38ef1ec008922a3e12
 DIST genpatches-6.0-9.base.tar.xz 478548 BLAKE2B 916f2b1b5d198adec6f73a0bb52029f4667132e7b7528ac5578134e3ed775d6aaac7989ec5e3827fe16db691f3321ef16b5a29088d2ad81e963f768f67cc2b61 SHA512 6b748f241e609d6191f83134f65bd9010122d5681b080c7ffeff8690f4cb1ab0f44b2681a135689d945de45f4ef25384411aea1d78a5b1c6248e547dc9e5297e
@@ -11,6 +9,5 @@ DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b296
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST patch-5.15.78-xanmod1.xz 3368160 BLAKE2B cd6f6fea1bdfb323bd37097bcd7c6031714f03207287094a51e3f81f3989108d76b637b211f4892b3110de4352b31cf4e0212faec92fd2a4176d7c4fe50f3813 SHA512 856b201475ea70099d4df6c10e689df92fd295f8281e6246f5774122cc5727b65f5ad4bb5d440c46ebac4678924d143f16e660404b7eeefc34f92aeb4b303415
-DIST patch-6.0.10-xanmod1.xz 896572 BLAKE2B 5e2f1d3e4ed9b410a641ecb192a212e773fcb31fff906d1b5c61cad519b4f5ce691dafe004362518d1742a3e691d85073fd143f30d41b9c6ded2f34a4edb1d64 SHA512 afa2194c35dc7f35a35c35af27529ac13b12a446cb079d786cd4770592d0e1db6633d64a8afad976aa770a10aab0ccc54a8be4328a56c7a3173a5f6c4754160a
 DIST patch-6.0.8-xanmod1.xz 786216 BLAKE2B d4b37e012eab41300330b7c7942dff863ea1cc5e250959618ffc8189ee58e1ede627a2887f95b977c0ecac980ebd730e43398288ee4016034e28106c0c5f579d SHA512 235208e945b21e0d186f591395f61df254e8d07f2e6a8354365d069f19508ff67d335c8ed4cf5db406f1e8c88bcb6fac2eb3f095ec7ebcf3a81ce530417f9ef6
 DIST patch-6.0.9-xanmod1.xz 835560 BLAKE2B 3ed92c5fffb5e858cb90d438008ff4f3f3e574df9ad6b4ed99d9de2ccece754ba35fcffe126fc798d2760a9cfb5539cbda896bf1c632a1d54768280220f519ed SHA512 ece5014bea4bdffb39c57feed1d5639b53512664e765c6f14ef68b4ca363e25ec785f2e1dd9eb13cec9b18c2972c3c79fe2910fc7bba7b8520549d5b4f388dd8

sys-kernel/xanmod-kernel/metadata.xml

@@ -2,9 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
+		<flag name="hardened">Use selection of hardening options recommended by Kernel Self Protection Project</flag>
 		<flag name="initramfs">Build initramfs along with the kernel.</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">xanmod/linux</remote-id>
-	</upstream>
 </pkgmetadata>

sys-kernel/xanmod-kernel/xanmod-kernel-6.0.10.ebuild

@@ -1,78 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
-GENTOO_CONFIG_VER=g3
-
-DESCRIPTION="Linux kernel built with XanMod and Gentoo patches"
-HOMEPAGE="https://www.kernel.org/ https://xanmod.org/"
-SRC_URI="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/xanmod/linux/releases/download/${PV}-xanmod1/patch-${PV}-xanmod1.xz
-	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/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/xanmod-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-"
-
-src_prepare() {
-	# Remove linux-stable patches (see 0000_README)
-	find "${WORKDIR}" -maxdepth 1 -name "1[0-4][0-9][0-9]*.patch" -exec rm {} + || die
-
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/patch-${PV}-xanmod1
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v1" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	rm "${S}/localversion" || die
-	local myversion="-xanmod1-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
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

virtual/dist-kernel/dist-kernel-6.0.10.ebuild

@@ -1,21 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-		~sys-kernel/xanmod-kernel-${PV}
-		~sys-kernel/xanmod-kernel-bin-${PV}
-		)"