commit:     420873425b26bf6186201d6fe6f605b81689529c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 10:40:59 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 14:46:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42087342

sys-kernel/vanilla-kernel: Bump to 5.15.55

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.15.55.ebuild   | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 607d437bad8e..9297e999b4ec 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-5.15.53.tar.sign 991 BLAKE2B 
4d890ec6f124577094dfa178fd64dcbb99ef7f07
 DIST linux-5.15.53.tar.xz 126365736 BLAKE2B 
b07a628f944e8cc13cc3b3f4097f3578dd64aebc23dfe1b59b049f976e141699cf5ee8b809e9ca15bf087e1b0be4e7436f5e930d57f4a581a58f900f394a322e
 SHA512 
7a147bec74a8c390e24f5d61b34ce6f20c3d0f363f45f0bddf11da35aee035648d3ec71fffde01d47b56c49547c3b33cb22e987830b0acec38a90d78cffe25f2
 DIST linux-5.15.54.tar.sign 991 BLAKE2B 
f8cd7c5ae125768ae5b62903f39cb4048aa9480b683a9ff845ce9f67fe8599f383b66375de9a7757ad4f4e0dc267d8bc370242bf1f5cf2a5c2db347a758cd639
 SHA512 
49836d1db244d11b12e5ca9a2189377ae941ba55c83ed44595631892f8a0af5dbcf10851e1541e68582b0cab5514b6667c0778f08a2d7be7495ab986494919ca
 DIST linux-5.15.54.tar.xz 126388816 BLAKE2B 
19952126a0f7c2eb102545dddf1674b8b9abe2e57cbdc12bce8c148ba476e119fa34b9c03813a8613fc11d4822585597861f1470b1caaba6403040e58752ebf2
 SHA512 
9da760f36e355f952bc3864f15cfa5b1a29c584ea8a4a8c15d7c94ca86fb63a6ee50558f64e2a53364e18cc5d0e5651b8f9db47d659e4312e66d1e0acf19c142
+DIST linux-5.15.55.tar.sign 991 BLAKE2B 
8d290ba0b3769e7e92b4b19a068d7cab8fe9c73ae7d33fd41966473f2d9dbb02df0157f820317f0b8244b981a877d1d394f69cd9aa3227701a95a1f3bbd4a445
 SHA512 
872642846ec37b43634e2f9d1200d1e99595033aafc5f2dd8960e02f596d9a3634e1745a99dba2ad3d903d4ac3ad5083cfde1d0c74fcff4e28705588edb820b8
+DIST linux-5.15.55.tar.xz 126359560 BLAKE2B 
d69cb8bd89d7e867c5f1e507bcea1ad4b6d3e5e9151e72ede4b051e2292eaa7f07df0c6479d65d9ec4be76b37604a154d3962e21b861ad2dc0e14ca1fe01f9e9
 SHA512 
0407603bed7b2b447af883f952bd1a1422527b4c8f262155bf495e3a375583909fc14dfbe29f5dcaae60580964e7c431f65ee4e7c6c06c1fb5198f386072dfef
 DIST linux-5.18.10.tar.sign 991 BLAKE2B 
7ce361cbbd768cfbbda3744f8528a3b4115378029682efad4f0d785c156461ce17d012bdd149edeec56979f2b801d37f2c9f09c8610ce197a12fb2fae2c16af4
 SHA512 
4aae4d2bf37852ccada7709304b6e1f69447df961e947cf78c4d5914f610582958da28c6de2f9a51b9cb544d0addee241bb872d3fe4d50c0512f577a48ae30b5
 DIST linux-5.18.10.tar.xz 129830456 BLAKE2B 
71e1d666f2238bdf4c6a10d83c234b02b46dfa67ffbf73eea904254ddd7ded9ad5d520ec4713933388956d2e538e32911f4c99e16c5e3d0c19cbff0fbe38012e
 SHA512 
2140d9012fdc63979c6a737513da46ca59a58f4312e8a1b1cbf481088e03da4bc2eb04fe9cab7164339ef1fde8a2a8a6d5167896e45b061b04dba0ef7b1fb7bb
 DIST linux-5.18.11.tar.sign 991 BLAKE2B 
9132a1d3cd6c72930518136df59dbb0a88831921aed6fd21a09c7353ea0dbd7da037438efe8cd12fc4eafdf70a9fcc1eabeb92f8d34e9bffde92a6a5d29d864e
 SHA512 
9bcd4392212659bd9c03da33b9d7c81aee6c5d608ec29225b589d9c170771b8e0729c24d3eb4b649d8209dcf1c8847d12b5148d36808bf2ecdde879d251e6198

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.55.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.55.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.55.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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/mgorny/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=${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[@]}"
+}

Reply via email to