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: Wed, 27 Oct 2021 17:01:57
Message-Id: 1635354100.308c46c29dbb58c50ed598693157b64f3eb58bdd.mgorny@gentoo
1 commit: 308c46c29dbb58c50ed598693157b64f3eb58bdd
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 27 14:05:13 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 27 17:01:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308c46c2
7
8 sys-kernel/gentoo-kernel: Bump to 5.14.15
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.14.15.ebuild | 105 +++++++++++++++++++++
14 2 files changed, 111 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 7c42cec49bf..85d7168dd68 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f9
21 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
22 DIST genpatches-5.14-15.base.tar.xz 544344 BLAKE2B 5315b7c850517e559fda958cb73d9bccd97945fd23833f901f81f21ec0b6a114ecbcdc6188b7283f3daf2c2dbb77b470fe4dbd15e6197dbecf1c026aba0f09b5 SHA512 963eb0f6ee49360b041e748bf096ccb4e92a075de029fa65884553f3372c34181f3cd1b1d10c55893df0efda0d4e265cc410ee2d5bfbb6a4dac0be98dc86a638
23 DIST genpatches-5.14-15.extras.tar.xz 3840 BLAKE2B 824c2a15749f6e83b03669df117a0838ef955430c4781f5b1423d6a5eb4d3b594c99bda3220ceff3875b00601bf2564eb211ee470a04a7e221f5300d0552adf0 SHA512 197bbcb69a9e79f7938342a7ec2d8b6baa55b48f121ff5bef6d8a3969e41a646fa357cf394e9fb3e8ac6c43338749e8be8b50319020564eff5c30b49786978f1
24 +DIST genpatches-5.14-16.base.tar.xz 591456 BLAKE2B 5c2faa9bbbc7c35b2c81d2cc3f11e61f3e69964187abfc70301c33fa58bd4762beceab0c298c0b16468def49482d4a0b32c93add83f94bde6e930284f7fc2922 SHA512 860f2cea8a95cfdc0e1524baa5baf168dcd06309a44319503ca0768b611118cc9a654eafc6ac22c2fe5d1a33954a27e7c53a55480e64310442a9a8e279f3e2ba
25 +DIST genpatches-5.14-16.extras.tar.xz 3840 BLAKE2B c36321060c45651af5fe20fd7bffb8cc2c2cede11a9880997381acd9ab74a2ce99b89632c1061aa1542a6451a87ec4d7ad2536725bf429c243418e6c551d342c SHA512 bf77ba8560347ffd328b97e234d07bd1a8a22378e0209807b21b9cd78d458d4c3bb7a721583d5fffe919ff72fd3c74936dc5a97c911de1ffb35e8db696ff0b5b
26 DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432 SHA512 bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
27 DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92 SHA512 cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
28 DIST genpatches-5.4-159.base.tar.xz 4064516 BLAKE2B c2c8350597d7cbe7652cea4b5a3fa92376259f1f4f15c3387f80f24b31d571cbb1094a27f52b099f0c61ce0187c3f498ccd4898cbb63f03c7367df39fdc475b0 SHA512 31116496b8d570d596a91e3408db055cbc602af2608ce579f5ce5ff41c084f629edde49c1efdf6220289451286f8a0b68d2937b916886f51b9a7d0529f130d2c
29 @@ -15,18 +17,22 @@ DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de0905
30 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
31 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
32 DIST kernel-aarch64-fedora.config.5.13.9 232105 BLAKE2B a9583f9f74b3c086d04bc028f09d47f6ceb9e32d56caf9ed2ac12b362f46e14d9c5c05782e547ae463cf91d3663077d0d1077892b073ead70728cc47e18fe3ea SHA512 cf92721c71331da2c4be3a765f8196c0a6bda174bc518692c364a2847c5522cc84ee753a6a0971ad82747f093dc465ef36d8aceb498a901404aec1aba746d52c
33 +DIST kernel-aarch64-fedora.config.5.14.14 239141 BLAKE2B 694ab65aa00880dbce213645114e5f0b751036db23f4ec17d45d46edff4e597ffd716f52e158f278fe0eb70ee254be6530040dffd613c0e9cc403348736a8940 SHA512 b5f19b136462e162375a0dfc17415280d83a910797c8e383781dcc61610cb2842cf9543ffb208ad4a90a9d32222322ef049ccce9ca6d9c2b6aa7ba2f8cea7a50
34 DIST kernel-aarch64-fedora.config.5.14.6 239152 BLAKE2B 0cbdfeef291cf34a761074e6b83adddf4c0c268878a7b11ac384b9c43cf5ffb26d4e5eb80996c43d63d4a143d9d03e4c4351d087819bae69199a1f593bfd1c6d SHA512 3c9348a35aa8b2279414e03e4b13db849ca1dde0d0a8ee76daae01df93a869749dd90d4d64eefcc5bf345f1c4baf212dc0fce6f54666d3faa126cb65c6dde813
35 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
36 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
37 DIST kernel-i686-fedora.config.5.13.9 212571 BLAKE2B 27a5b22855d55a06ee52000736fa7b883ce596dd7c4e602cd9af2c8aeb3dd17c21e7a6b6ca083da58400ce8f9879093ed17a11d551bc3c1300a9d6dc5771b319 SHA512 65764268e52be561df5d744dc6cda1b59d9eb98562b97692ec055c0e1dee621bf82a68df23b1b3d3a23bb537ac731f9c913c1f4fd757815bf665ec81520cd6cf
38 +DIST kernel-i686-fedora.config.5.14.14 219455 BLAKE2B 7e70512be2276e33e6f3ad7f229bc2001fb176b36fe37073c99c9415201de24b4c81af6d3b55ecf47fb194311c654bc0631e7cf3d0f1fbcc605d69ec19a96fcf SHA512 2f49e512a752dd4d691e6b3b1bc5c6021ac484b07d3eca2876f249f423ffef6236ced4cb2572c746335acba1f543690c805b0a7516022572d1f48878948f1cd8
39 DIST kernel-i686-fedora.config.5.14.6 219466 BLAKE2B 1c5a12ac56acbc02f289b0f3a76af845e85d9511bb4ae1e8420dbde3afb9a4e963229ea7e223e5abd5d38bf5bc7fb3130fd231c47acb0f23bef2c4f5e12ba686 SHA512 2a4cf8ad0a6b4aaa2468f98aaedc8d789c19c73f3274786aaa70576999594d5d6974efb18a50d2b01b3d88601d0251ca8cbc67bc9710f4d1c9f7073d5638392d
40 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
41 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
42 DIST kernel-ppc64le-fedora.config.5.13.9 199766 BLAKE2B a382e59e1b75b0cf6154074fd3a449d07c96a32f098405a47bbb34cbdbe145143827ac632ec075b929a77da41d65c6a42867222f5478f9319b3e80d66a3fa2bc SHA512 6cdc5c5bf12ee3614128fc98dc6aefb192ea4bb47b5b687e17257453fbb92b5b9d5259c3b1c5bd706329cfcfc83e2cf0ac69d929d9a2a6e95073cf448bf42572
43 +DIST kernel-ppc64le-fedora.config.5.14.14 210245 BLAKE2B d9c9ed660d5a525d53c9192cc8e00a484364ac34d8fb6f228e751f6ad35ad8ead111b3c7863fa29f99b6bdde1de64296745a5b39621fad83b2fcee7dcd2a93a0 SHA512 c04582e579025ffce63d1cda81c45fe097d5d0c811324aa86d53a28c398c4eb0175d621846bf26d037ff552378e8dbda4e05afb280d75f45ac83530588eb7630
44 DIST kernel-ppc64le-fedora.config.5.14.6 210256 BLAKE2B 02d11487c386c26147258dca832f801061a0249161859a1ae7217eb1adb2e22429bb4a629c7e75d9bb78de229db8f3d9ec666c492317fc49fa0ab3e91be5d4dd SHA512 2347e846754ffd1de829ff0740e67bd249baa3d52b6dc73a98718ed1e68ae56912c4f9323414ae900ab9b7dcde24e252fb36c5edc6be5f52259e8e260a55f54b
45 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
46 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
47 DIST kernel-x86_64-fedora.config.5.13.9 213604 BLAKE2B 9f594a498744e03f8f87bb434d362aeff326b34b1bd4d0a6b0027ec3bd3d15bee554be4883a75d3c19ba2174481f3dfd23bb9d9d713485f6f8474f608515d5e2 SHA512 c11abe0a6a81221bfbd2af0ede4358b464a5bcc72eb46e153ef513b4f7e85e2beb9159234b264e5fccccb8767a89efccc6eb1abcaffcb10f6d3fa5cef6415405
48 +DIST kernel-x86_64-fedora.config.5.14.14 220477 BLAKE2B 3495230f6de14ee07e6a03d889b8f27dc509ce2a1babe4a5a8bc525e3007325fb6814c7c078146eb7da61778ea179d84b0128fdc7bec55aaa33aacc0ab3b52e4 SHA512 66f9fad1fec43b6aa0e8c4214966290369296eac6780c10a7c1dd50134736529a3dfd5653d0f62b39c6bf56ddb4ca71c353bd8b0924172833f90910074c16df2
49 DIST kernel-x86_64-fedora.config.5.14.6 220488 BLAKE2B 15e295e91452c12b7feebc2047e0f116c3f464be81f9f3d866bbcd42c38e522748f70f74e6eac12a9b34b97957f93174ca90187d8c0befcfb1a3e4c63f240c57 SHA512 0a2375c440f3308f46ee4cfc04b328387576193cb5320e608f1f98c038e802fb01cb48a382d05c8cccc91b13f49d55e66bcfe4e625e2ab1d6edc89a9ee61291f
50 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
51 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
52
53 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15.ebuild
54 new file mode 100644
55 index 00000000000..e3f5ae1d9d4
56 --- /dev/null
57 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15.ebuild
58 @@ -0,0 +1,105 @@
59 +# Copyright 2020-2021 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##*.} + 1 ))
68 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
69 +CONFIG_VER=5.14.14
70 +CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
71 +GENTOO_CONFIG_VER=5.13.4
72 +
73 +DESCRIPTION="Linux kernel built with Gentoo patches"
74 +HOMEPAGE="https://www.kernel.org/"
75 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
76 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
77 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
78 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
79 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
80 + amd64? (
81 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
82 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
83 + )
84 + arm64? (
85 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
86 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
87 + )
88 + ppc64? (
89 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
90 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
91 + )
92 + x86? (
93 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
94 + -> kernel-i686-fedora.config.${CONFIG_VER}
95 + )"
96 +S=${WORKDIR}/${MY_P}
97 +
98 +LICENSE="GPL-2"
99 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
100 +IUSE="debug hardened"
101 +REQUIRED_USE="arm? ( savedconfig )"
102 +
103 +RDEPEND="
104 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
105 +BDEPEND="
106 + debug? ( dev-util/pahole )"
107 +PDEPEND="
108 + >=virtual/dist-kernel-${PV}"
109 +
110 +QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
111 +
112 +src_prepare() {
113 + local PATCHES=(
114 + # meh, genpatches have no directory
115 + "${WORKDIR}"/*.patch
116 + )
117 + default
118 +
119 + # prepare the default config
120 + case ${ARCH} in
121 + amd64)
122 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
123 + ;;
124 + arm)
125 + return
126 + ;;
127 + arm64)
128 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
129 + ;;
130 + ppc64)
131 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
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="-gentoo-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 + kernel-build_merge_configs "${merge_configs[@]}"
163 +}