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: Sat, 29 Oct 2022 15:31:12
Message-Id: 1667057425.b0806893964715b39f82ef4f92d87b6ea30a5c30.mgorny@gentoo
1 commit: b0806893964715b39f82ef4f92d87b6ea30a5c30
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 29 11:29:39 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 29 15:30:25 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0806893
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.221
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.221.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 9480b51a9f70..a4e29373e79a 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -28,5 +28,7 @@ DIST linux-5.19.17.tar.sign 991 BLAKE2B 5f2a7a6e4bdc66f4803b03ba3e9c0b88f5eee798
21 DIST linux-5.19.17.tar.xz 131698200 BLAKE2B c672df8169c4b237b00759510fa5582089a92129bd60cb712faa94a14070c867a821aee088ccf75df136a728ff71a3fdaa3aaf4baebe9aa62ea8ad15ff5bc76d SHA512 aa1b471be303cbe470df7d8b681144f4352f677bed27b98056477f24c93684f8fc4e45bf91611b38f4798bacd3568b6e4bd3eb7641d618200815953ea05f441c
22 DIST linux-5.4.220.tar.sign 991 BLAKE2B 6296bf42826c849af68331ba32a8e84c892b54f299b9ee7b84ade2d52b5773a3488f189de1f4f7e2580a13bf8ac4af256b0d18fbecc9ed9a69bf1a1a94aa89ff SHA512 21c05e660eb0f55a2138eed952ccda9860ebffbdecfe81240c89ef32904f060aefd7c01846d614de6f1dd30986f0eab0ac85f2c31b0805f4bc578ba83ca82ab1
23 DIST linux-5.4.220.tar.xz 112966272 BLAKE2B 6e1afe278f7d31cc34d73dcd87b807c6c3c790ff635918a54528bbece8861e60be06645fe7425e947a876969c44e63aca83663b0de9b0585033e23413c097410 SHA512 a09565da5da4fcd08ec9c6050908040fe86fabbb47375988764774acea9d5a6604c93407264a2de6a5b2e3805934884b505dde5e7405a772b3bcd35299ff3175
24 +DIST linux-5.4.221.tar.sign 991 BLAKE2B 2cf1cfc63cb33e94426e686ab77d75a158fadc8aa25d173e74b253fbe697b04e34ae0cc59a41b6809df020312ebe285f9dc074a44c625e06a08eeee097d810a5 SHA512 8c8b99b961eb8f00543ebe7456fc7fd5e72e73bd33ae8a5c1dc9b6b553d382c51b673244e4efe42dddbabbc0f8390ce5aadb010bade691b3da161741c5ee6eb5
25 +DIST linux-5.4.221.tar.xz 112938464 BLAKE2B 20f9ed759ed7a295973ac8c6a9a4d71695cb39cc0dc05a2a788389e7bcfad9f07b2a9568736da08f2a76f2ebceb7f5f1381f3eed13462e804d3dfacd24437b22 SHA512 85346f42bff7c283e6b006f624fd515e0950309e02db6f6c060cbac762a432754342816d2378dbb9e451c9c2cc74e54e3a660274c0d1b04a45b24c9b85508d0c
26 DIST linux-6.0.5.tar.sign 987 BLAKE2B d8c7ceab01ab36ade7322ff141fab940fc95b4126d808edd59d823de4a338341fe8c1aa3500b8647540982feaa44c8c3be4de92b2c2ca2ea64b576b7dc258f38 SHA512 95af989dd78485d3405de63a2ec77ddb20cb6438b415b7c276e7d8c16bf0a5505affe06f9b21ffa8bbc2af835f1582c6fe0031e7115a5dd40408b8a223c37ed8
27 DIST linux-6.0.5.tar.xz 133898040 BLAKE2B 71afe2e227bbab9b40ccbd3dda4aacbe1ba7f45b85c863c57a759a91d18d215cdc16c8bfd28e2d2bcd2a510c49b7fc84531d21695ad81895172ca6997ffe0f5a SHA512 90c0610be2bbca8841ff757b09d71c5d1efdcbc3cf0840d3f1d7a1b9a4854aa1eca36cfec0926dc191d35c5cbf71fea214097d831af2a34036c9a598f0ac55ad
28
29 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.221.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.221.ebuild
30 new file mode 100644
31 index 000000000000..ae90752d5ab5
32 --- /dev/null
33 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.221.ebuild
34 @@ -0,0 +1,108 @@
35 +# Copyright 2020-2022 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=8
39 +
40 +inherit kernel-build verify-sig
41 +
42 +MY_P=linux-${PV}
43 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
44 +CONFIG_VER=5.4.21
45 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
46 +GENTOO_CONFIG_VER=g1
47 +
48 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
49 +HOMEPAGE="https://www.kernel.org/"
50 +SRC_URI+="
51 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
52 + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
53 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
54 + verify-sig? (
55 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
56 + )
57 + amd64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
59 + -> kernel-x86_64.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
63 + -> kernel-aarch64.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
67 + -> kernel-ppc64le.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
71 + -> kernel-i686.config.${CONFIG_VER}
72 + )
73 +"
74 +S=${WORKDIR}/${MY_P}
75 +
76 +LICENSE="GPL-2"
77 +KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
78 +IUSE="debug"
79 +
80 +BDEPEND="
81 + debug? ( dev-util/pahole )
82 + verify-sig? ( sec-keys/openpgp-keys-kernel )
83 +"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}
86 +"
87 +
88 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
89 +
90 +src_unpack() {
91 + if use verify-sig; then
92 + einfo "Unpacking linux-${PV}.tar.xz ..."
93 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
94 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
95 + assert "Unpack failed"
96 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
97 + else
98 + default
99 + fi
100 +}
101 +
102 +src_prepare() {
103 + default
104 +
105 + # prepare the default config
106 + case ${ARCH} in
107 + amd64)
108 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
109 + ;;
110 + arm64)
111 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
112 + ;;
113 + ppc)
114 + # assume powermac/powerbook defconfig
115 + # we still package.use.force savedconfig
116 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
117 + ;;
118 + ppc64)
119 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
120 + ;;
121 + x86)
122 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
123 + ;;
124 + *)
125 + die "Unsupported arch ${ARCH}"
126 + ;;
127 + esac
128 +
129 + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
130 + local merge_configs=(
131 + "${T}"/version.config
132 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
133 + )
134 + use debug || merge_configs+=(
135 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
136 + )
137 + [[ ${ARCH} == x86 ]] && merge_configs+=(
138 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
139 + )
140 +
141 + kernel-build_merge_configs "${merge_configs[@]}"
142 +}