commit:     c47080440de1c32217e8b7edcffb619e03146bab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 14:36:43 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 20:01:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4708044

sys-kernel/vanilla-kernel: Bump to 5.15.49

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 763905306992..eb49ff216ad5 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -21,6 +21,8 @@ DIST linux-5.10.124.tar.sign 993 BLAKE2B 
cc0cd95e6c6a3ad78f802d2a2192b718a4a0ef9
 DIST linux-5.10.124.tar.xz 120409020 BLAKE2B 
b2e775ec64ee45c5e17e2a35badeb5f76b948057eacd90a6b1a3232de91c64a3d3381310c9628fa6ac8258bd2df2be460704236e6d72774c2105a938585f3dad
 SHA512 
98454c50b382c94d88e24942a87d91cac053ae5c888bac94eb167261c9cd3268367734f8d61eed77bc7dde3d8bc96586b83be6a7bc3289e13c26a90874df6405
 DIST linux-5.15.48.tar.sign 991 BLAKE2B 
763026ae690c17bc2e1fee512fa792425a9bdc3ac15f35ffefb32d99adda90e1a0acb4bfa96528b1f90f50127b5a4cb86cb5a7b44fd8ad78f4d31312ed8ca9dd
 SHA512 
160bcdb7aa692c5413ac7b13bb6548c73b0d5256df8eda25d02d910d8de3b9afa27820da4c4273f7f7244265c92e1dca88f70ce7deeab7d9f670af49f1cd03ae
 DIST linux-5.15.48.tar.xz 126357096 BLAKE2B 
a23dd33dfac22741e5112961d92543a895c858be62c4e82a60b639e47c7b05e623c41a13a6c5157ec7b71ae1f152b381b7729f2bbaf03734cd40dfc0c27923f8
 SHA512 
6eee3ff3352a864a5d98295527056da0d6d52b5f566fd7858b2e12a5d0094efea0af484a7e8cdcb344bba343c5d95b5d19c0d2756dd3f38531712438223755b6
+DIST linux-5.15.49.tar.sign 991 BLAKE2B 
18117df94ba81e7581b1e20d9e97dbbc219680a7f14306e6943ab7165b93feb49bdb0f491e5a0b34f921c729bf368d475fbb4745b29ebc9130bb50583fac061d
 SHA512 
f64b92e792ba1834ad9604f756189bba6179f76257c58b69fe5121594584f413e44e4a77f0826461c23e0e9795ca4fd1f0a54bb562514d991552a7351c7abfb7
+DIST linux-5.15.49.tar.xz 126357836 BLAKE2B 
0f78d980b2d6ec189865a85f3bf65e015365034f797ffda88077a77162d3bc30aec5f44a5257aa2aee0a97ee12e4c38b796bc8fddbe9f6ff6067b0c17ff0207e
 SHA512 
50df71d9cbc2be09348d89a89f50543e9022c88b71ace9e93274aa49530825980661ead4cbe726a3ee899b6965d16b1bd1324e754d9b546eb8d8ad6232250caf
 DIST linux-5.18.5.tar.sign 989 BLAKE2B 
558168c1828b1d3960e8e4f5e0f5c72b2b3ad556db722db234dcfd7da71a6f01226a951b3426292ba08104b6aaaa468f4f43199e6400928c801850bf492bf8ff
 SHA512 
3018e8046fc9ce248952fff1c4c2df821306f68e639ec5ad6b9728f72974e3c589166da823fd9e0a751a5681567c6e84beee3a20735608bcf54566be30a3ae4d
 DIST linux-5.18.5.tar.xz 129825940 BLAKE2B 
d2670e53d72fc5f0cf637394452a701c7ab41473be526d29deba7b60789dc56e1c369f3ae05a76f67890822588a36d0b497f267b4b75c33d0a98ad5131c697c9
 SHA512 
1872e2cf8cdd6e0033ce69f26f25526a30c237d220c02b20829fca31d6068fb816de2f2e5fd41f6807648cef8f28ddda392b199c7b1c3b48b2460c840fa1e150
 DIST linux-5.4.199.tar.sign 991 BLAKE2B 
546df4e420a5908a653cfb2cbae8d13b6716149868f1e8ebd1c902578c3e81dc8ea8ece91af5488b1c83038e505d84e0e48b360e139e2b4600337fb544338655
 SHA512 
7598d840f9535fa872a610f617b6ed242a3eba9ac15e34d725ef117ee8b19336bbc130222582c201a8e09a4b8afbc206cbf44eaa9907ed5c05f24b537dfee13b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.49.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.49.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.49.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