commit:     a7eefd15e7a23f996ad88e94cf3b36c2fc11a0c1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 12:54:51 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 16:15:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7eefd15

sys-kernel/vanilla-kernel: Bump to 5.15.163

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.15.163.ebuild  | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 8f9b3a32fa27..51ff397e614d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,6 +28,8 @@ DIST linux-5.15.161.tar.sign 993 BLAKE2B 
e6464f00b905ab861421e87a96dfb2e54d433e9
 DIST linux-5.15.161.tar.xz 126661488 BLAKE2B 
4f7787ad6b08c3248df0b665b494c52966f93f5131455cd8f90b86c16b5f9ac30653778ec7e1003887700961ab1e6082347ef272570147f7629845b10080e72f
 SHA512 
64ff65b0b15ee2f51609129ca92132c25618e76cbca204d5cb19d0239f58e6470aac782448466e8b0d776c0e4ac85a2342e6b053fbe2982b8e99100784ceaf5b
 DIST linux-5.15.162.tar.sign 993 BLAKE2B 
45a891b3b1dd9d671cfd0f089c79bbad0b89525a3f20bed1db4056a4713967833018d0b0e721b3053bf08ed09b40722613f1aac33be7784b5aa1b5a79bdc77d8
 SHA512 
0c5c7ff16d78619c884bc6a02866ec8837d99bc35f806e9006814856bafd1edf1c460bd48d9a1f04e1a486ea01f3859a704b0ec69984d535e8759f4deef73caf
 DIST linux-5.15.162.tar.xz 126680364 BLAKE2B 
8a82c9cfc3e1c0e89b59929b6721271c393627b64322371f3f832821f0a857b28e8ae5f2cf8cc59fe8d230b1e05b5b273e54f470b45e415700590c29f687fd84
 SHA512 
b3e846b4c3c18b8967057d2eb13bdec55a68cdf3ae8613b5937ae7975d53fe54036d8e97ba3bda36cd651f0350fed5bd0b2e7c1c402ccaf6e752d0e66ef76c2c
+DIST linux-5.15.163.tar.sign 993 BLAKE2B 
c7b726dfaa4ad159c7c55454577892d111f03f13d95367acb741f71f7dfcb0d17bf8ac5b6684a384494d6340290d21f9546c7b407499e741c90b6e6fbd285e31
 SHA512 
5868c9e671fcbb1134abc25bbe8ff3563021fbc79a4f550046a060eeb27024887600e0932c05812f92b78b946b769cff9720e5edf684766e1582017e15b57b14
+DIST linux-5.15.163.tar.xz 126680944 BLAKE2B 
ae8b721b2835d158fc6610f68bdff8d95e458a2ab1f6ebf4a53b3056d251d44253cd060f817a1e853dcdb333d91abbb44fea9bc9fa5302d5ecf90b5f5546db91
 SHA512 
8145c55476e56355bc785fd999ae514ebfb6426d9d0d9ef937f7a8c55d6c2734e9b2221013b596cee5e01b69340533353f80d99b59a4fbbd297c37acd57be3b0
 DIST linux-6.1.100.tar.sign 991 BLAKE2B 
35f2d1dbe55d66536bdab3d20f15a5b2783e972c648bb05f2edb2d8a55c1fdbfac4c79bb0ac601692e899f59d9becdba6ebfc579067b656110469ff7f3d39ded
 SHA512 
0fd653474c3fc276ecf17e22cf95f6e6f41ba30fb70a9b98e1e9d3e67a18771cdada2fcaeb1a3597e16f0ecb44c0752c8d014a5024bac83653884b4dce01787f
 DIST linux-6.1.100.tar.xz 135166716 BLAKE2B 
c7201bd15c48d611c0eea2cb3bab528bd0fdd3e725ce1ccbcf0ecc9525f28b1a587ca9c083d6ea7e13b6df6894883764eeec5324dfd62f60bab9d7891e17e177
 SHA512 
842c5ee1109f6414b0173b83abf9ae0655a8bf1bf36299d86d83db1dd2a70147f7f637afe202c3899984fe340ce4633e4e5d3cb9d7b0b89014226a413bc79d8d
 DIST linux-6.1.95.tar.sign 989 BLAKE2B 
abd402b54ac2dca9b1e6d7df1fd4db8690d584c13d214d4234182da12eeaa71903201aa7bd34538de3f498230ac7b71ff4626132c30629f8905256c7423c5804
 SHA512 
2ae944acb2482ce1bce854478e0800eeeb7970a1bd8ddf47e872f8334e818c1607a98f11f401928e07ea1f105cc5508460c1caf2b62a68ed0266d4085755b888

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.163.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.163.ebuild
new file mode 100644
index 000000000000..75273ad670d7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.163.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g13
+
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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=/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[@]}"
+}

Reply via email to