Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
Date: Wed, 13 Oct 2021 21:27:54
Message-Id: 1634160460.de580e661b67ed840324286b2895426741e9c570.mgorny@gentoo
1 commit: de580e661b67ed840324286b2895426741e9c570
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 13 19:02:37 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 13 21:27:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de580e66
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.153
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 2 +
13 .../vanilla-kernel/vanilla-kernel-5.4.153.ebuild | 108 +++++++++++++++++++++
14 2 files changed, 110 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index c2f322e9446..aebca2674bc 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -53,3 +53,5 @@ DIST linux-5.4.151.tar.sign 991 BLAKE2B 26cc28a8ea886acbd2bf16e23be6e5368958a91f
21 DIST linux-5.4.151.tar.xz 109163992 BLAKE2B 12c2d24acab896ccf0d6edeea3d38fbfecda4621dddce4d5ef916b6face70a509cde8ae35ada5a65eb08c79afdbe4c84544a63e52c712d8d42682dd8559df296 SHA512 e210b9cdb47e5dc294688e23dffdd853bca96bdd613d6f476c291e1c949e185be2047735c69c01602c46d0bf767367975bf08b7b6976297b6a486529b0418982
22 DIST linux-5.4.152.tar.sign 991 BLAKE2B 4ba252d2e4b245f6249dac83ca180ba48a3892262ebd5d721cd95e2ebbcae4b62fdfeb23d5cc7c15b0b52c9d6ad43839534a9fa2423d52c58a408cccb9efee2f SHA512 9aa21b4f04bbe79f06e5f44d4a6bb9a5e67946ceb6a0ae87693dd2ff4a2530e9d5f4d6fe051b8c62e28c49aba5a7cb984b44a427cc970d925cb762e3a611b821
23 DIST linux-5.4.152.tar.xz 109160584 BLAKE2B 9fd0af5bb6319237471ca9dcfec8a5b8601dd4fc51e55ef9cfd956044ddafef0bfb017e2d19d277927c89b3dd1d1da09c10dfe88752b1032e5ffe81f331ce881 SHA512 183f70bb44ae2c8e0684b640fa733e9db5e0cf29e78bdd3156602cfc337f968ab308444f3671acff40ab674498d4879ded620c8f8c82a506f0d1512a24dace2b
24 +DIST linux-5.4.153.tar.sign 991 BLAKE2B f7b80216c2afaf39b8060df5f3a5323863bd0ed6b2591dbf210cb20bfe5d7a62adcd40e31d08c1f87012270f8ce7ca879bd14d65e439c82a58379e3da375ac79 SHA512 9faff3aceb0b2e18dc52185bd6e32ee991da98a26e8338f0af98934ba740871a8365c105b745c3dbf920eb1d0d28b7b093754685dea015ad97d71a3bdc842dd1
25 +DIST linux-5.4.153.tar.xz 109167756 BLAKE2B 850ea9fe0b25b4016edfe151bead709f5d1600dce0dca03e72adfbc6e9322d756b7b5bcb1143b4e2561e4c87daf2527c00874764b7a4f65000f38227c066c369 SHA512 63c937238dacf027ec9b78f62253b55731571101daa92b8b55d9fbf4937552372f296c80944216269271ee35214406ad63f4769fc29f3d32f60c2c73b76aad08
26
27 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.153.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.153.ebuild
28 new file mode 100644
29 index 00000000000..dc33930084a
30 --- /dev/null
31 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.153.ebuild
32 @@ -0,0 +1,108 @@
33 +# Copyright 2020-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit kernel-build verify-sig
39 +
40 +MY_P=linux-${PV}
41 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
42 +CONFIG_VER=5.4.21
43 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
44 +GENTOO_CONFIG_VER=5.4.114
45 +
46 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
47 +HOMEPAGE="https://www.kernel.org/"
48 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
49 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
50 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
51 + verify-sig? (
52 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
53 + )
54 + amd64? (
55 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
56 + -> kernel-x86_64.config.${CONFIG_VER}
57 + )
58 + arm64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
60 + -> kernel-aarch64.config.${CONFIG_VER}
61 + )
62 + ppc64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
64 + -> kernel-ppc64le.config.${CONFIG_VER}
65 + )
66 + x86? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
68 + -> kernel-i686.config.${CONFIG_VER}
69 + )"
70 +S=${WORKDIR}/${MY_P}
71 +
72 +LICENSE="GPL-2"
73 +KEYWORDS="~amd64 ~arm64 ~x86"
74 +IUSE="debug"
75 +
76 +RDEPEND="
77 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
78 +BDEPEND="
79 + debug? ( dev-util/pahole )
80 + verify-sig? ( app-crypt/openpgp-keys-kernel )"
81 +PDEPEND="
82 + >=virtual/dist-kernel-${PV}"
83 +
84 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
85 +
86 +pkg_pretend() {
87 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
88 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
89 +
90 + kernel-install_pkg_pretend
91 +}
92 +
93 +src_unpack() {
94 + if use verify-sig; then
95 + einfo "Unpacking linux-${PV}.tar.xz ..."
96 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
97 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
98 + assert "Unpack failed"
99 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
100 + else
101 + default
102 + fi
103 +}
104 +
105 +src_prepare() {
106 + default
107 +
108 + # prepare the default config
109 + case ${ARCH} in
110 + amd64)
111 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
112 + ;;
113 + arm64)
114 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
115 + ;;
116 + ppc64)
117 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
118 + ;;
119 + x86)
120 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
121 + ;;
122 + *)
123 + die "Unsupported arch ${ARCH}"
124 + ;;
125 + esac
126 +
127 + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
128 + local merge_configs=(
129 + "${T}"/version.config
130 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
131 + )
132 + use debug || merge_configs+=(
133 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
134 + )
135 + [[ ${ARCH} == x86 ]] && merge_configs+=(
136 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
137 + )
138 +
139 + kernel-build_merge_configs "${merge_configs[@]}"
140 +}