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, 30 Mar 2022 10:44:12
Message-Id: 1648627070.cd117090c43f37dcedb6940377d5eb88990e2b18.mgorny@gentoo
1 commit: cd117090c43f37dcedb6940377d5eb88990e2b18
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 30 07:57:50 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 30 07:57:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd117090
7
8 sys-kernel/gentoo-kernel: Bump genpatches in 5.16.18
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel/Manifest | 2 +
13 .../gentoo-kernel/gentoo-kernel-5.16.18-r1.ebuild | 131 +++++++++++++++++++++
14 2 files changed, 133 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index c9839ace3d21..cfc77ea5fb51 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -20,6 +20,8 @@ DIST genpatches-5.16-18.base.tar.xz 761144 BLAKE2B f4d4b5225a2ef03e4222304978617
21 DIST genpatches-5.16-18.extras.tar.xz 3800 BLAKE2B df1212d36eec642a4c5eff67afe7b531b1ff85ee74e594f7ca3ff1274a85ac380c986458f40a5d378392c36600a122a929b0ff5bd730e9442e34d77f625671df SHA512 14700769fb872ab062cccd49e45fb530aeb75198bf9f5715a98c2d106ba088230282d120d71d694e3aa405a6aac1bd23fcff11864ff738cd38aa766862edefc9
22 DIST genpatches-5.16-19.base.tar.xz 770100 BLAKE2B 2633ec6c3161c7d58e778b8bc20b125e511973204371f2642b73a01b5195729be3d0ffe1a63677afaba2331538d2f45b3cf14380f9395cc8c59c39b7582617fc SHA512 c05e9e41b8bf259ae75c429a1014818bd517620fcdc3873343cda29c1b6338d8776af0ae97e24c75d79bf8382b3fac84dff8c3b066ec95a428de60569ee5e123
23 DIST genpatches-5.16-19.extras.tar.xz 3800 BLAKE2B a833a2ebd95684ff8f56b6ef78198353a06df41b41d41003b34a551e8ab901b34bece5f79132550c2d167a4bab782cd13fe4b4e22115cbc8306c5d48ed197f06 SHA512 0c82d90d8fd749c33b79c84171fa11c55b18d2f907bd97c544d08ab8a622b31d025930b9f93c4b43f669ac0f75e066fbdd06c169e7ff0ed3648901bcbc78f78e
24 +DIST genpatches-5.16-20.base.tar.xz 772164 BLAKE2B f29e052926e6c72417d93b7e114f7dd688def99891508b358414ea3930e3761d6e79e7d09722c4479ab7e0d495d53cbc1084270f8782a579d4ed56f58caa157c SHA512 00a034d6a2a79daf856c0cf8e6dd30753d89b95fb9de9a5aff4f5a0dad651eb53eea24aef7c582f866749ad3fc533ed7087f7dfd11600fef8cebf85d2cc9c58b
25 +DIST genpatches-5.16-20.extras.tar.xz 3800 BLAKE2B c815ea22d067c98f82650726a6c8a2e937c7bddb8b941e9d54c3014f4d8ea173cb1e54e76e23b6f767ae247fafbe02a8def6f39e5c6523e8c8cb12f098b8a34e SHA512 788ad08dfb0639c5ad42bb761d99bb534fdc5a9be54e9cededf90e0da34f13089b82609d8c7ccddc6fc1a28b913d4012c0e44b6768c84927e582f3a04be7ae55
26 DIST genpatches-5.4-189.base.tar.xz 4492528 BLAKE2B 9fc86ea4e71968c77f4fe705f5e01220545becc1f062a53875e4cc451a880a2482d70c1830b98ba447c77131422cd8305f2636c702737a94cda749f0927b2706 SHA512 f4c9946b88d8b61df0d267d915fa047de8774603c0e98fa6ef2cbd930e5c3d83fe4755327dce54739a580d674260ce45c3cffef9180369821f947170398a5de7
27 DIST genpatches-5.4-189.extras.tar.xz 1812 BLAKE2B 04e839c3c648cebfa8e15aa956670ecfd1c7a830960e7facff9015ad37c9b8ec0a85f510a559846163a277da9b669a0512d22b45b6ac7c1dfc9fdde99acbe9da SHA512 9357b36b51ffc30e92197affa4e60e0e01180c218cfdd17c91538b2ac12ca79fc534ca0b4f6a019ff3db97c8d41298fbd383d8c4c7fd0d8b1baaaac0494a330e
28 DIST genpatches-5.4-190.base.tar.xz 4508904 BLAKE2B 89aa6c02b3f145a6b5efc42fc880c297e1a4f685f622d6554c3a8a3a614c980bbc3d76b7b4e57e54d98db7279cc4a979a441d1ce4a0812380a677dc99aed48db SHA512 b9955dcc6ef00928b0dfd0ee4e13c5646068c488f0b4ded998a47d73532aa6fcb615c34415eefa8f70a2a850b42fc13f0c0b753ddadece6a10737c628238af7b
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.18-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.18-r1.ebuild
31 new file mode 100644
32 index 000000000000..b1e4cfe50e93
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.18-r1.ebuild
35 @@ -0,0 +1,131 @@
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
42 +
43 +MY_P=linux-${PV%.*}
44 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
45 +CONFIG_VER=5.16.16
46 +CONFIG_HASH=95484c155424c62930acc1c61803f608af3f1cbc
47 +GENTOO_CONFIG_VER=g1
48 +
49 +DESCRIPTION="Linux kernel built with Gentoo patches"
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://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
54 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
55 + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
56 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
57 + amd64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
59 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
63 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
67 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
71 + -> kernel-i686-fedora.config.${CONFIG_VER}
72 + )
73 +"
74 +S=${WORKDIR}/${MY_P}
75 +
76 +LICENSE="GPL-2"
77 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
78 +IUSE="debug hardened"
79 +REQUIRED_USE="arm? ( savedconfig )"
80 +
81 +RDEPEND="
82 + !sys-kernel/gentoo-kernel-bin:${SLOT}
83 +"
84 +BDEPEND="
85 + debug? ( dev-util/pahole )
86 +"
87 +PDEPEND="
88 + >=virtual/dist-kernel-${PV}
89 +"
90 +
91 +QA_FLAGS_IGNORED="
92 + usr/src/linux-.*/scripts/gcc-plugins/.*.so
93 + usr/src/linux-.*/vmlinux
94 + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
95 +"
96 +
97 +src_prepare() {
98 + local PATCHES=(
99 + # meh, genpatches have no directory
100 + "${WORKDIR}"/*.patch
101 + )
102 + default
103 +
104 + local biendian=false
105 +
106 + # prepare the default config
107 + case ${ARCH} in
108 + amd64)
109 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
110 + ;;
111 + arm)
112 + return
113 + ;;
114 + arm64)
115 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
116 + biendian=true
117 + ;;
118 + hppa)
119 + return
120 + ;;
121 + ppc)
122 + # assume powermac/powerbook defconfig
123 + # we still package.use.force savedconfig
124 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
125 + ;;
126 + ppc64)
127 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
128 + biendian=true
129 + ;;
130 + x86)
131 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
132 + ;;
133 + *)
134 + die "Unsupported arch ${ARCH}"
135 + ;;
136 + esac
137 +
138 + local myversion="-gentoo-dist"
139 + use hardened && myversion+="-hardened"
140 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
141 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
142 +
143 + local merge_configs=(
144 + "${T}"/version.config
145 + "${dist_conf_path}"/base.config
146 + )
147 + use debug || merge_configs+=(
148 + "${dist_conf_path}"/no-debug.config
149 + )
150 + if use hardened; then
151 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
152 +
153 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
154 +
155 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
156 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
157 + fi
158 + fi
159 +
160 + # this covers ppc64 and aarch64_be only for now
161 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
162 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
163 + fi
164 +
165 + kernel-build_merge_configs "${merge_configs[@]}"
166 +}