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: Sat, 18 Sep 2021 21:03:41
Message-Id: 1631998615.05ee556d7af1ff8853b445a3e84949ddacd82370.mgorny@gentoo
1 commit: 05ee556d7af1ff8853b445a3e84949ddacd82370
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 18 19:47:46 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 18 20:56:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ee556d
7
8 sys-kernel/gentoo-kernel: Bump to 5.14.6
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel/Manifest | 7 ++
13 .../gentoo-kernel/gentoo-kernel-5.14.6.ebuild | 105 +++++++++++++++++++++
14 2 files changed, 112 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index cc545d26c6e..f96fae72c00 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -30,6 +30,8 @@ DIST genpatches-5.13-20.base.tar.xz 835172 BLAKE2B c7b4581e62524f1ee85ece2a4079f
21 DIST genpatches-5.13-20.extras.tar.xz 3848 BLAKE2B 8f320148d5abdeaa9be678232a4e6de2be1f732f9abd9468366f055d7f956f988399d9aef0148acedc82a847d471677c18c99b6bd9580e4d42341949dc0fd6da SHA512 73433d4ca28cfc3cb3d52a5d72526bf8b0c5c995ca4549c9590267188c1b7a60f9a0e30c13b68a17e0e78aab5e1adf34129d8434e8f06956bd1e830d0b6fcbc7
22 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
23 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
24 +DIST genpatches-5.14-7.base.tar.xz 268172 BLAKE2B 6873eee65c1beb1466980fcbc67fdceb94251a16e5c776f7127b8369d09b1d1e8b1d5b4a2afcfaad43c3c9e73a3cf0918552a7f5847a46c441e9ffdb13cc5932 SHA512 6684ff9f118f36f072cf04daed75f5683b5544ab98a7e1faf4e0ef8b911c6c6ac41d6f672d41ca9eb179eb6ca5d6113f69ff5d83fbfe8e423975adc651d3231f
25 +DIST genpatches-5.14-7.extras.tar.xz 3852 BLAKE2B 6c01e3c6933c874f3c8cdf3ba1648c1bec45393849a3961865fbf5933484d3f910da31d2174e2df46d905d1c51d4ebd6ab6937f1d1b0e4f49ffd91770d914fa1 SHA512 4a0d5179e515607b08a347c0bf8dc3bfbf93e3f814c2b10f85b76ec5dd19328fa96e0d62668613f4e564224bd9548f4d42fb66a26baa24f2ee5f2d698ed9a41d
26 DIST genpatches-5.4-146.base.tar.xz 3857908 BLAKE2B fe3119842aeb3f1f8ba9af26d4db1773380400397b132235db8071c9c05d395502c8fb08cc690842cbde5c5fc8dd5fa456218d2f95434ca84422c6398889cb03 SHA512 d293600dbcc8ad83641d4866e4998b1b4fa3bb254bca9e0aabd4d94bdf6270b7757f69874e754a38afb8426e91a4072e5c135e12c2a597008cef77f6fd74b7dd
27 DIST genpatches-5.4-146.extras.tar.xz 1784 BLAKE2B e3b75e9f8f29bcf441dececc62a46cd5db846859bb9fb01462846333dfb42f35c559b5b6533035b891062de619dac678b9467fd0432423bcd8505385c0beae47 SHA512 0923ebf0da182eef762653b282fad6d50862c3d520ee1888bf8fb2257b96bb4cb06a3e88ec0b6a8587f17c97f9660ffbaf4695eb0d0d0f46fb59861b49949e35
28 DIST genpatches-5.4-147.base.tar.xz 3875304 BLAKE2B 98cc4815b004967ef7a00b2b8af96cf002c09b22d54222e0f932e1ef83731846011bb3c4b8f972c85aeb086b0bcd6a0ce0f2ed390dd5f0225b137b33bb2255bf SHA512 999f5e9a99cf8dea0c8da91b0e365703064620b04bcc48909d89af73f551a0da3785201b4a4fd0edfd184872f81109dbb78ca57d95d1c2759a1cac111fe1066d
29 @@ -48,20 +50,25 @@ 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.12.5 229203 BLAKE2B 056ab111c4bf623f4476ebb38d409048198442040611af2d84801106875e5ec05506ac0c4e1c1124bf9f3700e59cbf94e6d467be22c2c9e1a95619461a1867b0 SHA512 a2495ab8ec406a3b29a099b0e2285420940b1dfffeefcaf8bb69e4ed54fb2714b537e40eb2818468be2d1d2e8217cf8d7b9f123b791676866a2a79a98407e4c3
32 DIST kernel-aarch64-fedora.config.5.13.9 232105 BLAKE2B a9583f9f74b3c086d04bc028f09d47f6ceb9e32d56caf9ed2ac12b362f46e14d9c5c05782e547ae463cf91d3663077d0d1077892b073ead70728cc47e18fe3ea SHA512 cf92721c71331da2c4be3a765f8196c0a6bda174bc518692c364a2847c5522cc84ee753a6a0971ad82747f093dc465ef36d8aceb498a901404aec1aba746d52c
33 +DIST kernel-aarch64-fedora.config.5.14.6 239152 BLAKE2B 0cbdfeef291cf34a761074e6b83adddf4c0c268878a7b11ac384b9c43cf5ffb26d4e5eb80996c43d63d4a143d9d03e4c4351d087819bae69199a1f593bfd1c6d SHA512 3c9348a35aa8b2279414e03e4b13db849ca1dde0d0a8ee76daae01df93a869749dd90d4d64eefcc5bf345f1c4baf212dc0fce6f54666d3faa126cb65c6dde813
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.12.5 210160 BLAKE2B d06f57b85b9f7d65da47817e5143af804cdbf34625f74d27b7598f3fd0fdec090f7b46479c991d2ec00a35bd5780120ad7b698b89269266e905a135098b40f24 SHA512 21b0fe9c600c5f5302edcc850717872dc8707d1791f87029075be4ab30f2f2fe28b1b042dd9d5b5dfcedc020e4f192a3083c1780dfb3d275aa47fc0f9b1a7908
37 DIST kernel-i686-fedora.config.5.13.9 212571 BLAKE2B 27a5b22855d55a06ee52000736fa7b883ce596dd7c4e602cd9af2c8aeb3dd17c21e7a6b6ca083da58400ce8f9879093ed17a11d551bc3c1300a9d6dc5771b319 SHA512 65764268e52be561df5d744dc6cda1b59d9eb98562b97692ec055c0e1dee621bf82a68df23b1b3d3a23bb537ac731f9c913c1f4fd757815bf665ec81520cd6cf
38 +DIST kernel-i686-fedora.config.5.14.6 219466 BLAKE2B 1c5a12ac56acbc02f289b0f3a76af845e85d9511bb4ae1e8420dbde3afb9a4e963229ea7e223e5abd5d38bf5bc7fb3130fd231c47acb0f23bef2c4f5e12ba686 SHA512 2a4cf8ad0a6b4aaa2468f98aaedc8d789c19c73f3274786aaa70576999594d5d6974efb18a50d2b01b3d88601d0251ca8cbc67bc9710f4d1c9f7073d5638392d
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.12.5 197238 BLAKE2B e273514c3b4eb29309bf35351127cdc00903e4642f0a4f75633f80041d8c953046f734eaa0f6e8c7e2aecfbbafee86bf945f5a18399a668253fba225c2edb999 SHA512 bb6f71858a41b833491e2cea22a3d724512b41d04bd6b17d16087f4b7747b340354c41e32d7bf234d8dd1a64adc500206d67a030948100483791dc1ec0732a41
42 DIST kernel-ppc64le-fedora.config.5.13.9 199766 BLAKE2B a382e59e1b75b0cf6154074fd3a449d07c96a32f098405a47bbb34cbdbe145143827ac632ec075b929a77da41d65c6a42867222f5478f9319b3e80d66a3fa2bc SHA512 6cdc5c5bf12ee3614128fc98dc6aefb192ea4bb47b5b687e17257453fbb92b5b9d5259c3b1c5bd706329cfcfc83e2cf0ac69d929d9a2a6e95073cf448bf42572
43 +DIST kernel-ppc64le-fedora.config.5.14.6 210256 BLAKE2B 02d11487c386c26147258dca832f801061a0249161859a1ae7217eb1adb2e22429bb4a629c7e75d9bb78de229db8f3d9ec666c492317fc49fa0ab3e91be5d4dd SHA512 2347e846754ffd1de829ff0740e67bd249baa3d52b6dc73a98718ed1e68ae56912c4f9323414ae900ab9b7dcde24e252fb36c5edc6be5f52259e8e260a55f54b
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.12.5 211204 BLAKE2B 6276cd8eca1d82933cbd3e95608e334730b739936c27a922ac0a7319f64acbe46294c5920b67213b694ff9ccda5b0ca99e6e2519b496e608ddaa35b27e26ed3f SHA512 c6955e7cc1ad874a3af42136b7ed958f04905de8f337d83fc36d59fdde5a469f260f8f29e9f6ac516b3c138679de0e37949b144773e24a4892ebcc8f729845de
47 DIST kernel-x86_64-fedora.config.5.13.9 213604 BLAKE2B 9f594a498744e03f8f87bb434d362aeff326b34b1bd4d0a6b0027ec3bd3d15bee554be4883a75d3c19ba2174481f3dfd23bb9d9d713485f6f8474f608515d5e2 SHA512 c11abe0a6a81221bfbd2af0ede4358b464a5bcc72eb46e153ef513b4f7e85e2beb9159234b264e5fccccb8767a89efccc6eb1abcaffcb10f6d3fa5cef6415405
48 +DIST kernel-x86_64-fedora.config.5.14.6 220488 BLAKE2B 15e295e91452c12b7feebc2047e0f116c3f464be81f9f3d866bbcd42c38e522748f70f74e6eac12a9b34b97957f93174ca90187d8c0befcfb1a3e4c63f240c57 SHA512 0a2375c440f3308f46ee4cfc04b328387576193cb5320e608f1f98c038e802fb01cb48a382d05c8cccc91b13f49d55e66bcfe4e625e2ab1d6edc89a9ee61291f
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.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
52 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
53 +DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
54 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
55
56 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.6.ebuild
57 new file mode 100644
58 index 00000000000..b7a0d9f3417
59 --- /dev/null
60 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.6.ebuild
61 @@ -0,0 +1,105 @@
62 +# Copyright 2020-2021 Gentoo Authors
63 +# Distributed under the terms of the GNU General Public License v2
64 +
65 +EAPI=7
66 +
67 +inherit kernel-build toolchain-funcs
68 +
69 +MY_P=linux-${PV%.*}
70 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
71 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
72 +CONFIG_VER=5.14.6
73 +CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
74 +GENTOO_CONFIG_VER=5.13.4
75 +
76 +DESCRIPTION="Linux kernel built with Gentoo patches"
77 +HOMEPAGE="https://www.kernel.org/"
78 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
79 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
80 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
81 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
82 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
83 + amd64? (
84 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
85 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
86 + )
87 + arm64? (
88 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
89 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
90 + )
91 + ppc64? (
92 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
93 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
94 + )
95 + x86? (
96 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
97 + -> kernel-i686-fedora.config.${CONFIG_VER}
98 + )"
99 +S=${WORKDIR}/${MY_P}
100 +
101 +LICENSE="GPL-2"
102 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
103 +IUSE="debug hardened"
104 +REQUIRED_USE="arm? ( savedconfig )"
105 +
106 +RDEPEND="
107 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
108 +BDEPEND="
109 + debug? ( dev-util/pahole )"
110 +PDEPEND="
111 + >=virtual/dist-kernel-${PV}"
112 +
113 +QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
114 +
115 +src_prepare() {
116 + local PATCHES=(
117 + # meh, genpatches have no directory
118 + "${WORKDIR}"/*.patch
119 + )
120 + default
121 +
122 + # prepare the default config
123 + case ${ARCH} in
124 + amd64)
125 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
126 + ;;
127 + arm)
128 + return
129 + ;;
130 + arm64)
131 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
132 + ;;
133 + ppc64)
134 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
135 + ;;
136 + x86)
137 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
138 + ;;
139 + *)
140 + die "Unsupported arch ${ARCH}"
141 + ;;
142 + esac
143 +
144 + local myversion="-gentoo-dist"
145 + use hardened && myversion+="-hardened"
146 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
147 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
148 +
149 + local merge_configs=(
150 + "${T}"/version.config
151 + "${dist_conf_path}"/base.config
152 + )
153 + use debug || merge_configs+=(
154 + "${dist_conf_path}"/no-debug.config
155 + )
156 + if use hardened; then
157 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
158 +
159 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
160 +
161 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
162 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
163 + fi
164 + fi
165 + kernel-build_merge_configs "${merge_configs[@]}"
166 +}