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/gentoo-kernel/
Date: Tue, 11 Jan 2022 20:52:14
Message-Id: 1641934275.70283ddb87802074193efac21f228610bfd64fa1.mgorny@gentoo
1 commit: 70283ddb87802074193efac21f228610bfd64fa1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 11 17:22:17 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 11 20:51:15 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70283ddb
7
8 sys-kernel/gentoo-kernel: Bump to 5.15.14
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel/Manifest | 6 +
13 .../gentoo-kernel/gentoo-kernel-5.15.14.ebuild | 123 +++++++++++++++++++++
14 2 files changed, 129 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 14ee4b6a7311..f727a1ff9151 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -12,6 +12,8 @@ DIST genpatches-5.15-14.base.tar.xz 639672 BLAKE2B 93976aee6245c420aa654981538f3
21 DIST genpatches-5.15-14.extras.tar.xz 3852 BLAKE2B 09bb1bd3fffd353fe5454a033000632f9c76ede889e8550ddcdd507651e427e6b55fc65329ba89753b8b0d4e4bf4988d3c3e54a54cdf01e54b0e200d38fcbb68 SHA512 61bfb0e5d1f66b0b6b689c8e4474f22b8d2dbebd9233ea139c6da870cdb76c9a1559eb1469f91f4c3cc0eab5f2688dc7b843601ac10bf989bcdc3129510e06b2
22 DIST genpatches-5.15-15.base.tar.xz 662744 BLAKE2B 8eed543eaa9a3c4778d4fb196877820305dd0fae7857c719fd68f04b2fe7fb0d6b7e19ae7a157adc7cd301f0e7f35e8c0fee7bf58f4104c0a802a6e2e2f6204c SHA512 f0253d9cc063a8d29f3796dfe1eba7109ba89340d1e4178149c4786e36bc01e12f00a48968b9109438ea349b1ca1f486ae35d0103c08577892fcb83befa514cf
23 DIST genpatches-5.15-15.extras.tar.xz 3852 BLAKE2B 0329c5eb48a8a7abaa686d62fae617d2a4066577aeaebc787ed2547de293f7203576fbbe9075d6289c774a2c95f26c085b3011df84dbd1d36d6b652644db3656 SHA512 b5930766e7f7b0adbea14d44526f570e058d8121b14b548e50ce185c1c49a1c5d20d2cd9b21c196066b8291b782693cbe38cac9f822ec1c015729e3edbb787f6
24 +DIST genpatches-5.15-16.base.tar.xz 681884 BLAKE2B 49b0e8eb54e610648cc101eb889ecd1eac2277a221e1329092502cf387504c07aa4d9c32fda5c32f3801019457fb56847a56725ae54dd48d72f97d2ab2646844 SHA512 5f566308d29bb960a034e4e1817a9c5879f327c728a35d78516a913bbb7ef54044874ff0333827f06ff5a825fcf8fa22d06535f5827867a69a1b725524fe7aae
25 +DIST genpatches-5.15-16.extras.tar.xz 3852 BLAKE2B 8e4e3c1404ca66fd2e0c5587d08f000fa40a68f11e7717b1ee5b2c74ce28269da0ff0dabe59235ca4d2581e71bf3b642cbf0346101bba1c6ebb4b214cfa452fa SHA512 5ab2818e93612703d5c39e37eb9f7dea773a104280fcb1c09cf643ef24c691c337cf139d2f59060597f3cb4528efc31793bb577e8cae4ea7d6d3a6a4686bc83e
26 DIST genpatches-5.4-172.base.tar.xz 4281140 BLAKE2B 438ad10331e709a85f1ee2a8907a982cd545579940431220f763b1f68280d007d344627b0d1cf4406e2a439b76d20497e1f4aa6d103bb5569f119bc5174c545f SHA512 faa28b056e48873b41b78b540afe7db3200020f85f1ae516f7949f3cef453eccae9b6b8631d594ba8b1dc1b4d6b55b1e9c9379c4880eb4697bed956b0217bef4
27 DIST genpatches-5.4-172.extras.tar.xz 1784 BLAKE2B 9d185d1ff33c56417bf9cfbe33efc6ce4b743a0ab9bdf419dbee14cde34d7c2d6d17884ace56880f75cc28a16b7e18a5e7b87f110c64bc7c84ceb81c7df85831 SHA512 cee6e49804ebc200dd7e308d2a59bfa0e381428caf69678bb6d406357a86398327a354bc2900096f82a77b47beea7fca7e5709cb390fbc1e0b7575c01d062024
28 DIST genpatches-5.4-173.base.tar.xz 4294304 BLAKE2B 7622b34b82e901d2823f84ef4ccf282a9224dadf5a5248bbdc9b1328aaf476b50df5ea6d359af64507c30623d57a0a61f9205b5d48eb1137a404ef2ca4ec31c4 SHA512 34ce4139ccc9119546a88efb71f46b1172039f536e5072337270ab93b83429b2975a3c9cf4f112f280e62eaf506e62b48f775a4fb772a1a4de8681333be76a02
29 @@ -24,18 +26,22 @@ DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e
30 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
31 DIST kernel-aarch64-fedora.config.5.14.20 239144 BLAKE2B c0338596572c41326cab4248f7cd8cfd3e4bbee2298ac672d83fa3a9551c3f1cd571f4cf1b3e9ba9ed39b73d724f0810062f33a98462079dafea0795232a0280 SHA512 62ff676bbf2e218236c7b19fef388c1b9cda640a690e4482617b565f0c08778bbc69be8d807fb1f3ada3ab6c2dd578f53058b8c1c49ff2d08a6de21b394fa531
32 DIST kernel-aarch64-fedora.config.5.15.10 243077 BLAKE2B ee19d6963cfa977b40ac7cf621c03f0095f2dc538bbb0c075e6a273750032870312b42df0bf63affd1077215f671156a129ee3f670174b0c9dd6027839125f7b SHA512 1a5f254391201dd047a07419e5b83bcdc10abd34e5408b9b649119cdf34d1e2320d4aeaa0e57c11254c612a37ac6991282d8a1b82957ac877e4f8573de28d4b3
33 +DIST kernel-aarch64-fedora.config.5.15.14 242650 BLAKE2B b5587c0e365a00a5283ea3a5184b473783ad6296a6516372c6c79305d2837e782d18fae8ed8e852eb6d946d1dac6c6159231f2249f3360dd1651e4f1f06d5694 SHA512 2a8447d8128a881c08745f58704a9fe46fcfd2048c5d5775a518e16b6f5b5603e22bcd4f04c192d541fc83e6253be3b29a5f0f39ddec96c8668bc801d9356a9a
34 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
35 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
36 DIST kernel-i686-fedora.config.5.14.20 219422 BLAKE2B 11aad144bbce274c52f4210f0fccb1edddd1bdb32f24845c34f07ec969b2da65f57656e56de99ca32a35639c210440eed7ec5ac6e18c26ec14230b2969f45466 SHA512 585000275c4afc45c5f35b9767271115f1b0de4b7a1fc8f111076895a07bc9ce31a912c50730ad6fc6cdb145639da664a44ce550a476982c14f6c8a89d10e15e
37 DIST kernel-i686-fedora.config.5.15.10 222607 BLAKE2B d5c99b44d9bf5e76a91850c342702ad5db8337abc7deba0a089c53e296cc043ba1403de696408bd444e781903e303a3cdb1640f6d279598df625d7b758ec7b37 SHA512 6eacc314cd1770a7bf935d26537c3c9f88d0cf4069817f1fff355f5dafe22794fdaddf14c2cebe5757fab85d3731e1969e92ed1a7a1c7a778a54513aef00910b
38 +DIST kernel-i686-fedora.config.5.15.14 222268 BLAKE2B 96e283052369a936fbe0f415d7176bb922bc0e22925fc25a56e6e0c36a723bf7e9ae29bbc661c0a8a6c44a218482896f25c529f9cf7a0d3bc31de8ea88f50a5a SHA512 b5ec452458b04ab316622239ffd98782a10eab17a02697d15359efdc18dfaf8052a189c66729157d2e9eed20aee25a47fa9b81f1da78d42150f10b0746f57938
39 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
40 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
41 DIST kernel-ppc64le-fedora.config.5.14.20 210212 BLAKE2B a79cad7e602acfeac644c2d0070bd6262e1d87b0681362ca0b6f9cdb5f9a174f8d4839e94e33a944344427024d44e10cdee36c285a42da4a78a89225bec0da88 SHA512 c07350360bf6457cd3b4fa2c822a347b3108fd79bcd314cad32cb6b4390efa9bd474e05112df48caa5e99675cc0333583fde668ec48ae341b68022c9c6952c60
42 DIST kernel-ppc64le-fedora.config.5.15.10 213801 BLAKE2B 29ca7ebc0470c954fb4ff282efbbb27b5552c6db54342bb9e3a3b8086518f724bfbbff4948ddf9729f179f227a06e1167e93558169be9f3a73186efef6ab6924 SHA512 f3d276dd44bb8adcaa5713e7e4e54a7199c9dd51d6891ca25d904190ad6fc07fa8a5e4d1416b7f25ed944f6f3004776e1748de8b3b79a977b398d0f448a74fbf
43 +DIST kernel-ppc64le-fedora.config.5.15.14 213374 BLAKE2B 527fcc240988d111f41a366dcbeb1a04938e8cb1c83406557fd9fefc64677ee7d2539fa21fb78ea66859c428870fd54b1d3827deafec17569cdba9991913c960 SHA512 9db1d852c9385a5771cf9992b1b3ba34a44d95abdee929ae85b6e6ff8baf6b1c7a4a6c4b2446ae7ce7d1bb59b4b915d5793b505e21d643e24dcb408afd60457e
44 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
45 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
46 DIST kernel-x86_64-fedora.config.5.14.20 220444 BLAKE2B 7cd8a820ce47d8f9fa6271df0ed4330cdf43345676a5baadd6d32da22f7962bd4fc0ea436e0e86a82e1a35d585b509379e6c40d6a0065b44839e6db76c3950ff SHA512 3229eeaebd52a8f57790c23c8ac027a2cce3eb43a8ef9b6cb8e54cd8b24405dc31d203a81188dbfb4bade814adffba471051f434e2b947f3cce1fda5645e489c
47 DIST kernel-x86_64-fedora.config.5.15.10 223671 BLAKE2B f45dcf49155b383c2b04ebcf0964355e1fd2a306a3523bf1d1dab57e456edccedd6701051d6de5d9b2e0d12b3e5409546ed1034261af656d2a929b3af4eaa6ec SHA512 a9860e58a1005fd2a437fe1e4e99d60cbde71b251ae13daa49aaa60b8081515fb20e0d930b2ffcf78b65ad6453b8be9815d91a1b0d59c96301d0e3bb553a9a74
48 +DIST kernel-x86_64-fedora.config.5.15.14 223321 BLAKE2B 7605b06ba48c40841927a4f384d6b078b9b333ea5fb4b2cfee68a7ac9510daecd6e9e3555badae23f93b072a8d08b9503ef110dfbe35ebb058cd9a0c57437310 SHA512 e5ef924333714165d0afe5c33720920bf277ca341e939a99bc058f9ea52377a583fdd7aeb45a4060c6426c240fbeb9a6b80fc3dad19c75b112b507bd65369c98
49 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
50 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
51 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
52
53 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.14.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.14.ebuild
54 new file mode 100644
55 index 000000000000..3da5419311e1
56 --- /dev/null
57 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.14.ebuild
58 @@ -0,0 +1,123 @@
59 +# Copyright 2020-2022 Gentoo Authors
60 +# Distributed under the terms of the GNU General Public License v2
61 +
62 +EAPI=7
63 +
64 +inherit kernel-build toolchain-funcs
65 +
66 +MY_P=linux-${PV%.*}
67 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
68 +CONFIG_VER=5.15.14
69 +CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
70 +GENTOO_CONFIG_VER=5.15.5
71 +
72 +DESCRIPTION="Linux kernel built with Gentoo patches"
73 +HOMEPAGE="https://www.kernel.org/"
74 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
75 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
76 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
77 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
78 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
79 + amd64? (
80 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
81 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
82 + )
83 + arm64? (
84 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
85 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
86 + )
87 + ppc64? (
88 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
89 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
90 + )
91 + x86? (
92 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
93 + -> kernel-i686-fedora.config.${CONFIG_VER}
94 + )"
95 +S=${WORKDIR}/${MY_P}
96 +
97 +LICENSE="GPL-2"
98 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
99 +IUSE="debug hardened"
100 +REQUIRED_USE="arm? ( savedconfig )"
101 +
102 +RDEPEND="
103 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
104 +BDEPEND="
105 + debug? ( dev-util/pahole )"
106 +PDEPEND="
107 + >=virtual/dist-kernel-${PV}"
108 +
109 +QA_FLAGS_IGNORED="
110 + usr/src/linux-.*/scripts/gcc-plugins/.*.so
111 + usr/src/linux-.*/vmlinux
112 + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
113 +"
114 +
115 +src_prepare() {
116 + local PATCHES=(
117 + # meh, genpatches have no directory
118 + "${WORKDIR}"/*.patch
119 + )
120 + default
121 +
122 + local biendian=false
123 +
124 + # prepare the default config
125 + case ${ARCH} in
126 + amd64)
127 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
128 + ;;
129 + arm)
130 + return
131 + ;;
132 + arm64)
133 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
134 + biendian=true
135 + ;;
136 + ppc)
137 + # assume powermac/powerbook defconfig
138 + # we still package.use.force savedconfig
139 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
140 + ;;
141 + ppc64)
142 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
143 + biendian=true
144 + ;;
145 + x86)
146 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
147 + ;;
148 + *)
149 + die "Unsupported arch ${ARCH}"
150 + ;;
151 + esac
152 +
153 + local myversion="-gentoo-dist"
154 + use hardened && myversion+="-hardened"
155 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
156 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
157 +
158 + local merge_configs=(
159 + "${T}"/version.config
160 + "${dist_conf_path}"/base.config
161 + )
162 + use debug || merge_configs+=(
163 + "${dist_conf_path}"/no-debug.config
164 + )
165 + if use hardened; then
166 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
167 +
168 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
169 +
170 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
171 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
172 + fi
173 + fi
174 +
175 + # this covers ppc64 and aarch64_be only for now
176 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
177 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
178 + fi
179 +
180 + kernel-build_merge_configs "${merge_configs[@]}"
181 +}