Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
Date: Mon, 16 May 2022 19:57:07
Message-Id: 1652730953.973098f3d831e8656408761caedc3e70cf95c30e.sam@gentoo
1 commit: 973098f3d831e8656408761caedc3e70cf95c30e
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 16 01:15:30 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 16 19:55:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973098f3
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.40
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 2 +
13 .../vanilla-kernel/vanilla-kernel-5.15.40.ebuild | 134 +++++++++++++++++++++
14 2 files changed, 136 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 81eda4ff5b4d..bb7e8691f6f9 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -25,6 +25,8 @@ DIST linux-5.15.37.tar.sign 991 BLAKE2B 224f222dda3d7221a32b575ae52fe0ea36cf5315
21 DIST linux-5.15.37.tar.xz 126314716 BLAKE2B 41fa48151cf9ba20aaf9161ff1bc48a890a165107784e41e9e7535093ea7fb833ed5d0ff75534bd721ff1c80dc52d55b3585c3473917c665ee4d0f107d7e1e41 SHA512 afc84a10b96e70b859ec328f8d803d7e270264c8649492899292b92650840586c08e1df3196af41c09185e68f2d400cdc302bd0a474cd4ee86c34979098fae48
22 DIST linux-5.15.39.tar.sign 991 BLAKE2B e1b9446d695c20140108320471fe9f6d9c95a0d525ae1e88b5a4acfbb082afde83272461befca10e253799b088cbabd856256d83856ac03aca0e5cfb4c787f63 SHA512 30951a220de1f8cef56d2f4267d12fd78f03a966b11af0bf74b4521c746147549215a6d435c130f230685f2bd90500ba47fe1b178cf5aa560e3024ba10b7de8f
23 DIST linux-5.15.39.tar.xz 126317316 BLAKE2B c2b7e8e944e30aca07b70355a89b86e15756226e8a13826e749b330668cca28e0caf758c1a4f8166590d5a26ecda49f665ad0caab4c800c599e857fdf281ce3e SHA512 712608b95a53ff3ae31313c518614c1376a809d621d845bc23f096243f3ea509a11e451b14709ce4ed48b964547f177bcb20d57e62806938d129e0187a2cd296
24 +DIST linux-5.15.40.tar.sign 991 BLAKE2B 0fc23aa789af5570448d723f11e6503c508e9485a32dd675cb9bc45b3685294a6b175d6f95d5976ca0996c6d2d738cca8720f68df27bc57cee84a02ecea763e5 SHA512 ca2e4d86175736613e6529d97e2be6fd3b06300aa902c21fce3b8ad809f3085fdd4cd3ca3e0fea40fc86439238ff3422b9950ee82c6cc7c5bd642bd453f275c3
25 +DIST linux-5.15.40.tar.xz 126329200 BLAKE2B 5e6b6948a137542594011918d059fcef49fb13b35b99a3eff57838257a97749534a568a2caac7f97ca9d8d0685a6e73be9c6b5494e0a67bf45db49e922c37069 SHA512 2cd0ef9f0932bf5a2a400a467687937cc5164cedd79ec0cf726921249e1d540a9ecc99cd8edb3e8ee74ebaa7a131dbf19886f5e858bf7834b59779f0d110dbf8
26 DIST linux-5.17.7.tar.sign 989 BLAKE2B 8e83a92b4be4a20521051e04ca6229aa72441ea1634e7140ce28049f569a8e9a91a963f3aad816d8ffc89e1e43ac7f0346f9230dfb7eea6b67f8ec4f6dd7b36a SHA512 8c3de748ca7d1ddc25932acca0d4dfb1e355ff77cdde9add0f6f9f911313b0a6ea797e44e8c9813bf97d7cc4bbf4d34e71c19b940daa0bf226bbba082fe09666
27 DIST linux-5.17.7.tar.xz 128454448 BLAKE2B 1c1b1f59404becef201c28d6677a2a52a828a51903d0fe5b38a931fa25694d766eeb222b02f674d95ea8c67c29e0f3420b88f94bdccfc2f9bd575c2605e8f229 SHA512 c70ce704b65bba14237e1ca042add6ca075b08d65e9b90d5441962ee2e6a70a58da72ee847a17917e5d170021933eea6b681a5774454f2228b2153e76b440c97
28 DIST linux-5.4.191.tar.sign 991 BLAKE2B 0897c615b6b49b0d18c2c3f3bd6767b706c5fde582c6cf2954f4ef91756b11d8d10fbe5c83ad616208ab5fbd2bceb64b358b3aaf87f4678538e85096dc9b22cc SHA512 f18cf2d5bdc7d2c60bf5d2057073e4a0afffbb0673b809b98ab80ed203a4ff292fab45ac8a6faf1853715f5e3155afefbc663aff28f31166ad17a629157c6a31
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.40.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.40.ebuild
31 new file mode 100644
32 index 000000000000..0ef902726d5d
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.40.ebuild
35 @@ -0,0 +1,134 @@
36 +# Copyright 2020-2022 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build toolchain-funcs verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.15.19
46 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
47 +GENTOO_CONFIG_VER=g1
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+="
52 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
53 + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
54 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
55 + verify-sig? (
56 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
57 + )
58 + amd64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
60 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
64 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
68 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
72 + -> kernel-i686-fedora.config.${CONFIG_VER}
73 + )
74 +"
75 +S=${WORKDIR}/${MY_P}
76 +
77 +LICENSE="GPL-2"
78 +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
79 +IUSE="debug hardened"
80 +REQUIRED_USE="arm? ( savedconfig )"
81 +
82 +BDEPEND="
83 + debug? ( dev-util/pahole )
84 + verify-sig? ( sec-keys/openpgp-keys-kernel )
85 +"
86 +PDEPEND="
87 + >=virtual/dist-kernel-${PV}
88 +"
89 +
90 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
91 +
92 +src_unpack() {
93 + if use verify-sig; then
94 + einfo "Unpacking linux-${PV}.tar.xz ..."
95 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
96 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
97 + assert "Unpack failed"
98 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
99 + else
100 + default
101 + fi
102 +}
103 +
104 +src_prepare() {
105 + default
106 +
107 + local biendian=false
108 +
109 + # prepare the default config
110 + case ${ARCH} in
111 + amd64)
112 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
113 + ;;
114 + arm)
115 + return
116 + ;;
117 + arm64)
118 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
119 + biendian=true
120 + ;;
121 + hppa)
122 + return
123 + ;;
124 + ppc)
125 + # assume powermac/powerbook defconfig
126 + # we still package.use.force savedconfig
127 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
128 + ;;
129 + ppc64)
130 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
131 + biendian=true
132 + ;;
133 + x86)
134 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
135 + ;;
136 + *)
137 + die "Unsupported arch ${ARCH}"
138 + ;;
139 + esac
140 +
141 + local myversion="-dist"
142 + use hardened && myversion+="-hardened"
143 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
144 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
145 +
146 + local merge_configs=(
147 + "${T}"/version.config
148 + "${dist_conf_path}"/base.config
149 + )
150 + use debug || merge_configs+=(
151 + "${dist_conf_path}"/no-debug.config
152 + )
153 + if use hardened; then
154 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
155 +
156 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
157 +
158 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
159 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
160 + fi
161 + fi
162 +
163 + # this covers ppc64 and aarch64_be only for now
164 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
165 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
166 + fi
167 +
168 + kernel-build_merge_configs "${merge_configs[@]}"
169 +}