gentoo auto-resync : 16:10:2023 - 16:00:40

2 files changed, 140 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 2ed81b94fadb..49cff29c6af3 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -27,6 +27,8 @@ DIST linux-5.15.135.tar.sign 993 BLAKE2B a3558f5e466ce41ad38ddf0da970ef87614630d
 DIST linux-5.15.135.tar.xz 126555708 BLAKE2B 13579733de339520faafd1e80fa0a8c7e43c7321483f0519de713864b44699f64a439e819c9901e60921973b6db182063517cd4c4ac0aa876c68a7c50cecd967 SHA512 c5993103523ddda31893fe69a1bb6c77d6f20e9cacefc6041453072ac8c0294353ddc4eeaea0464b097d7c41c0a6339a225b3b029da771dce0652c637fd19777
 DIST linux-6.1.57.tar.sign 989 BLAKE2B 90c9f151c97c1794632cbb60a94ecf4071ea566bebe0dfd676455f7f90145bd96711bc8679f1bcd86f859c775e22c00ed36e5bc95acb9bdae8e6ab98b65d749a SHA512 c49065affd1fec362a677b7aa17fa428ca9ed4008951525d14c47764fdf759151643d416321237856fc120898d382c0bb7db6d715103c2308c416eaeb2f17426
 DIST linux-6.1.57.tar.xz 134983816 BLAKE2B 9fd3b4ffdc392d2bedf1b9366fdd773e006c7148756420ae621285874bb2ec9461199871579ba713ce5df1831ace7392969a97f2d5b90b08695f632b97655f9d SHA512 4ab0c0d2b2c6879c044fe18a1fe8472207f27bb596f7cc12d530aab7910fcbd5d672aa8cedfcecb7794d6a4dfff9d60746f19958703af472e5ecbd3287b67f08
+DIST linux-6.1.58.tar.sign 989 BLAKE2B 122d097f99a6697f767aa4023bcf3b46cac6d139654d3259741aa55c6b13533e7db932cc069866d544199d1afed89e536c1700f761d5649e6c615071df66de92 SHA512 67c926518b5549d9446559568e860299d15abd9f656b3ab49329c4cd6ee281f17a0676b9b97b95edb42cc86949b042e99808864ad83448f130a84187e9537a29
+DIST linux-6.1.58.tar.xz 134984500 BLAKE2B 64d90b1be8b75385f3019d4f9e1bf807c7e2b0923d3575abe2ccef05a451b5742719ab6c76bcb03765ab7ea0dd15e8dc372d1841dc3132011cf04512c62b0182 SHA512 bbf1e0a41d10ec23485bf99d239dd08f2914660fc8ae6858ca01cea8689d9a3ccbb5e9dfae6d5b8283485055f9b1aaf35f98ff3ef80599a654885b317527121a
 DIST linux-6.5.7.tar.sign 987 BLAKE2B e6cdbc33ee1f522ed3f30e144902f3a62bc10763e55047637c647445db29faa4014eefdd7beb92d700ba79d6bbbcf22b682883afbb2a1f16a6541c854c061d7d SHA512 35ef9733fd0233ba60c693f49d7b8c7d08ef9bf6eabe601ac37fbb6310ed2174813b3b4f8cb0804a1e80d276e8871b249b0fdca4f730d26b96472dbd0269b333
 DIST linux-6.5.7.tar.xz 138955500 BLAKE2B a9bed9907bf4b22c08df8a8beaaf923648e4f0f1a4b00c11012871094e7c06a127e54bc1935edb8afc92999456c01ebabd04bc542a0e2fa16de0852a5f4be681 SHA512 38eeff75ad99f43cf230cc440e53988646b86a5f06c08b8390722fa765c12cb97bd51ef39d28d7c2fcd982712bf76aec41e8dab9c3774d148dd9f0a33de10c8d
 EBUILD vanilla-kernel-5.10.198.ebuild 3776 BLAKE2B f43197769241eec89b3e665fe6f85eafccf9b384f1541772bd93b9b0b4a224cf23264414b19d2421cac936a4ec4decf91fbc00e13e670a8c126b5e6f556cacd4 SHA512 76bc8ae507d638f7e24d48566b4045a6dc5e4b100b3f2f82206ff67ff3512df2e1779bfad053590b11185c36af93f8f4474cf3bcbb059e5013048adc3253c03a
@@ -35,6 +37,7 @@ EBUILD vanilla-kernel-5.15.135.ebuild 3776 BLAKE2B feefcd555725c663855b505767cbf
 EBUILD vanilla-kernel-5.15.9999.ebuild 3295 BLAKE2B 1e2783cbee7e2750f9f89f6ac90245535f427c85ee9cd00aff625e3e2f0dcbb6c978c63d0801b3ee491956fe71d005c1db12d799daccc1273862f27eaf0c4c18 SHA512 1f658d769c4baebe9582a309942e10d2c4edb289753f17344941a1ac429057b031a9b16cb17c5c23ea3a0f549f689cc55729f97e772c497f56054525f954ab25
 EBUILD vanilla-kernel-5.19.9999.ebuild 3415 BLAKE2B fccd59b033a2c78ed80927aef1fb8c2e56ac60ae94cdc29569ab038af25d7d4a3234e978eb5ceb63f4527a2ec65682ea1a7fec076a3f63ababab520f3ccd1889 SHA512 7e7d154e927d8617e9fac062242388cd5372632cc9d7fb9183315d5ab2e0e116ce3531cc9965ed132b911a72bd956969ab9bfc39f999805b82a96a3320d3d7d4
 EBUILD vanilla-kernel-6.1.57.ebuild 3894 BLAKE2B 769408641b3afa15173a2148a3a709c4b562d3b3c5575f47aedf26ab14b7eef34a96df18bcbc8c29653f11d05cf305da36eea3016932ac6d575f680d47a51e3f SHA512 5b5f63b762855421d898f575078bf2e0a226e3d12c750fe900653bc470f8233ad6e1c74a6f64e0527c3121a852a94baeda8dce454ecd8f0b5a7ca830db535f80
+EBUILD vanilla-kernel-6.1.58.ebuild 3894 BLAKE2B 769408641b3afa15173a2148a3a709c4b562d3b3c5575f47aedf26ab14b7eef34a96df18bcbc8c29653f11d05cf305da36eea3016932ac6d575f680d47a51e3f SHA512 5b5f63b762855421d898f575078bf2e0a226e3d12c750fe900653bc470f8233ad6e1c74a6f64e0527c3121a852a94baeda8dce454ecd8f0b5a7ca830db535f80
 EBUILD vanilla-kernel-6.1.9999.ebuild 3413 BLAKE2B 3e286878f8ad61cd41dfab86e7f5a143f3e165af8fbffa7277d1c5b0a712fbdde55440d069383e273b029967c108ee02caeddf5b6782d966ff3d47bc13763a01 SHA512 4adf01bafd3116668c406ab443e3b45bb37c182ad01931d32ce08eadea26d66df7657eba9f4f199009fb80adca108cb2401fb0a6e3c1c94b2dd77399303dc818
 EBUILD vanilla-kernel-6.5.7.ebuild 3998 BLAKE2B 3d01083449fead7f4458bb799355e44c55f13455e79dfdc1a71124a70b49ac83d661bbe361bea64c172238a211b324b2fc94f6f23c609e1b655d91538b1842ed SHA512 08a5572e357d904223cedea675fb5a4ee82df89442f2ee8e7bdd960cb13fd7216d60fd2a65bc4fdd03005e8a643c6f9114c39f07adae4a25fe63c4ef9a914ee5
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.58.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.58.ebuild
new file mode 100644
index 000000000000..aaebef705bd8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.58.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g9
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	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
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}