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: Thu, 18 Aug 2022 06:18:51
Message-Id: 1660803510.e3c8aacbd0a71177fa7f6cffbd594b56b0409276.mgorny@gentoo
1 commit: e3c8aacbd0a71177fa7f6cffbd594b56b0409276
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 17 16:26:00 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 18 06:18:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c8aacb
7
8 sys-kernel/gentoo-kernel: Bump to 5.18.18
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.18.18.ebuild | 137 +++++++++++++++++++++
14 2 files changed, 143 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 1f879c647fef..5fe914240e99 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -12,6 +12,8 @@ DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ff
21 DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
22 DIST genpatches-5.18-21.base.tar.xz 786248 BLAKE2B 60d007f0ad81b8c8af63789f98613850edc92836672a743bf543c2e7078b666a41f4f277d5b9f001a018811733f266d87651198e3c087c00f8bc8239b2b89236 SHA512 0018fdc5805dff2f92b0f3c2e78e0a30359eb5a02b8b24cc4ced7c42d90e6fa904e8b43982ffdf9bc5c55b9faed1c003bfd6510f3f9c8042180884aa3a87ba2b
23 DIST genpatches-5.18-21.extras.tar.xz 3924 BLAKE2B 582b7320bf607d925d9b2e88094032b161cc08df1d5118777454f4f6b966812b333235f2bcf016957d7bcecde6d77b4dc7b76047b8374e34b9262e2aad5e4708 SHA512 26aed20e6cc179d10bb017b1707d5bf5d76a92aadd9ab73acc655352dea8c6fd03cc4848da953800077bf43d1d5e1dddeff01ba486d5c2f6524707a236a956b9
24 +DIST genpatches-5.18-22.base.tar.xz 1204144 BLAKE2B ba4067fe632a1d27f3ac63c5bccbd7bd8d96e43436d67bae0162ef1a7b32a05a8b8ee301cdaf00765450a4c83939c11bdee27ebbd31267896bb30f5ee7d0e794 SHA512 83ba19dcbc7e1308039c4352527cdcf21caac9fa0c0e90206ef855d46e4f5d828e8f9a9e7c36a3a043f0789493d6e8df739ce97a225dad00a46e1c94c570dcc4
25 +DIST genpatches-5.18-22.extras.tar.xz 3924 BLAKE2B 757c3a9db4b9f293a2ba903354e4ff2e922f256107a5b050fc4fdf9a0d04c5597761aa4c8c2e015da0d16af2b577521d17f437d3dd796cd0d2ccc74386141e20 SHA512 526a738627ff17c811250aa18b3e10243c0dd492822db60516bf3ce0430bc276a881548f9c6e424398ebb1da3f44270e092692332322ffa9c04457801439e774
26 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
27 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
28 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
29 @@ -22,18 +24,22 @@ DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba
30 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
31 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
32 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
33 +DIST kernel-aarch64-fedora.config.5.18.18-gentoo 242571 BLAKE2B fdc6876156c2a280d94551e64ba9427f634573390717558326d7afca34b8f5dc331929aa1cd4097d66b3ea916d3dd6c91977b70bbdb259ae4b95139f38f2334e SHA512 33b4ce891feea2dbb76c42a8ec24fcb7082e453e87ec7eafb56763f4778af6e460a9a9e92b18dabcd284741cd0856ffbf8069417a130190a0443e054ab83c76c
34 DIST kernel-aarch64-fedora.config.5.18.9-gentoo 242551 BLAKE2B 6ee62379bf28cc3d77eedeceb8437762e43cde6953828c23554f98b3de3236a808317a268d0885ba92720c59d25f3a1d8cdfda63bc51717f53574d3e7be988c2 SHA512 8aecbf9c1dc43e0c848890ebe38748fb6ccbc61000d5a22a36067d3f7baa9e52faf159c9a071c84195a624303eed6fac468eaeaf633ac25d33290277aaee36e3
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.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
38 +DIST kernel-i686-fedora.config.5.18.18-gentoo 221018 BLAKE2B d317cd62903839c19bc8a601c67016b9663ecba640df353a6d161175de84b7154da7cc316c06c7a2765543989933066a26c3b257a1db30a1d726d5a57959bf2b SHA512 4cdfb0a0c9d6c8152f2c7f5aae3aa31bdbcabeaa8d3400d96407fa462ad8d922908520f804cb6db434012a1048e4bfdfe9ea6aa70bf1e456f6137b1a7a99726f
39 DIST kernel-i686-fedora.config.5.18.9-gentoo 220827 BLAKE2B f73a4fb7d46e9275b5a0ab119aa8915cb7897a5652664efbd71596b5b3be6ee4cf9f9c7907ef3fe45ab2a2868512fad7b4b11213534d6260815ca4eca7593ae0 SHA512 afce5864ea980c1a7b53c187b483c6fa8eb88d11af9114d71b6177b4347d534d7f9dd68240c0cbb729e0da3cc01a5783b6e150d94708f1aabaa6c9956bacf06e
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.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
43 +DIST kernel-ppc64le-fedora.config.5.18.18-gentoo 211967 BLAKE2B cc39a3fa68e738242f9e49f9d9e5d66cb983a3b8ed9d5575b3b3602c169b41f1c0048bcd02a4e052441bc94ee1679b3e68e0623426dd8de61253fb114b359405 SHA512 ddb1418c1d8d4978aaa29464bbd8925bee847b037b7c96b27ef9c4c70eefd0678800580dcb6db2c64263304541c7ab896b23be9d97f0ff56dcde18d5366d7923
44 DIST kernel-ppc64le-fedora.config.5.18.9-gentoo 211942 BLAKE2B f92e988198b08bd7a30976d92ba152ac2986324c223202dc73bb733c903015095498b529cb5dd3b3d86d678c7ca0adba7f4807e9046b8c8215b2e1ebd06e53d5 SHA512 4f1d85a3f858a6e240e0bc34b37a77f78cf128b19de78404de9f0463d0d3fa6e87b84e5710b7ce501b92e162d798b372fb6843e83b3821a77a73ead2385e9014
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.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
48 +DIST kernel-x86_64-fedora.config.5.18.18-gentoo 221988 BLAKE2B 05e85bc4b71b4a904ad248f1c779c666e765d67729e48c590d36247fd62d5a2bf0245731e015eedca809db76d21af41ea409f8566b985892be1681d87738a62e SHA512 8c769c76359a25db5030f6309ec911afc0e50b3a0f8d6886d45993f5dbe3738b262f6ca4275d3bae9ae26d279b94911234d5f6edf4065c9446344e84b17a35a7
49 DIST kernel-x86_64-fedora.config.5.18.9-gentoo 221797 BLAKE2B 1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3 SHA512 7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
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.18.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18.ebuild
54 new file mode 100644
55 index 000000000000..fe9fbe9a2de6
56 --- /dev/null
57 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18.ebuild
58 @@ -0,0 +1,137 @@
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##*.} + 4 ))
68 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
69 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
70 +CONFIG_VER=5.18.18-gentoo
71 +GENTOO_CONFIG_VER=g2
72 +
73 +DESCRIPTION="Linux kernel built with Gentoo patches"
74 +HOMEPAGE="https://www.kernel.org/"
75 +SRC_URI+="
76 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
77 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
78 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
79 + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
80 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
81 + amd64? (
82 + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
83 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
84 + )
85 + arm64? (
86 + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
87 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
88 + )
89 + ppc64? (
90 + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
91 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
92 + )
93 + x86? (
94 + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
95 + -> kernel-i686-fedora.config.${CONFIG_VER}
96 + )
97 +"
98 +S=${WORKDIR}/${MY_P}
99 +
100 +LICENSE="GPL-2"
101 +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
102 +IUSE="debug hardened"
103 +REQUIRED_USE="arm? ( savedconfig )
104 + hppa? ( savedconfig )
105 + riscv? ( savedconfig )"
106 +
107 +RDEPEND="
108 + !sys-kernel/gentoo-kernel-bin:${SLOT}
109 +"
110 +BDEPEND="
111 + debug? ( dev-util/pahole )
112 +"
113 +PDEPEND="
114 + >=virtual/dist-kernel-${PV}
115 +"
116 +
117 +QA_FLAGS_IGNORED="
118 + usr/src/linux-.*/scripts/gcc-plugins/.*.so
119 + usr/src/linux-.*/vmlinux
120 + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
121 +"
122 +
123 +src_prepare() {
124 + local PATCHES=(
125 + # meh, genpatches have no directory
126 + "${WORKDIR}"/*.patch
127 + )
128 + default
129 +
130 + local biendian=false
131 +
132 + # prepare the default config
133 + case ${ARCH} in
134 + amd64)
135 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
136 + ;;
137 + arm)
138 + return
139 + ;;
140 + arm64)
141 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
142 + biendian=true
143 + ;;
144 + hppa)
145 + return
146 + ;;
147 + ppc)
148 + # assume powermac/powerbook defconfig
149 + # we still package.use.force savedconfig
150 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
151 + ;;
152 + ppc64)
153 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
154 + biendian=true
155 + ;;
156 + riscv)
157 + return
158 + ;;
159 + x86)
160 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
161 + ;;
162 + *)
163 + die "Unsupported arch ${ARCH}"
164 + ;;
165 + esac
166 +
167 + local myversion="-gentoo-dist"
168 + use hardened && myversion+="-hardened"
169 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
170 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
171 +
172 + local merge_configs=(
173 + "${T}"/version.config
174 + "${dist_conf_path}"/base.config
175 + )
176 + use debug || merge_configs+=(
177 + "${dist_conf_path}"/no-debug.config
178 + )
179 + if use hardened; then
180 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
181 +
182 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
183 +
184 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
185 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
186 + fi
187 + fi
188 +
189 + # this covers ppc64 and aarch64_be only for now
190 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
191 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
192 + fi
193 +
194 + kernel-build_merge_configs "${merge_configs[@]}"
195 +}