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, 22 Sep 2021 17:27:07
Message-Id: 1632331610.56df7367ff9cca156a5bc147be389d1d18e7ea2d.mgorny@gentoo
1 commit: 56df7367ff9cca156a5bc147be389d1d18e7ea2d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 22 14:03:51 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 22 17:26:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56df7367
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.68
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.10.68.ebuild | 105 +++++++++++++++++++++
14 2 files changed, 107 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index afd68b96010..15249ddee59 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -14,6 +14,8 @@ DIST genpatches-5.10-72.base.tar.xz 2188200 BLAKE2B 7a7b204c451dcdcf9d55e015d44d
21 DIST genpatches-5.10-72.extras.tar.xz 3848 BLAKE2B 95774f94773c6ed5270b308d0602f4de4b088583fa6d1c4d9c36ffbfcbeb1fb979218581f3eeee34d54bd19363b81d84c7358749f1b6f2cee747d969947f3ea7 SHA512 a5d60e742bce8fc26c641eac9618a9b5ae0f8727419b83679ab2f660038ec72307fd7c523a1fe0e99f22735d33f813f401d4c5b821d690f0235b74670f9ed95f
22 DIST genpatches-5.10-73.base.tar.xz 2267536 BLAKE2B c52b695a38db52abe2fcd38b7d92f910a5d33d2ac7e71d9fb062b4efa24f81d4ecba73a8d121b295e4dc3e2e2fb87157f9392e1c08f398c8e76ccaf1d9a8d1cc SHA512 d3e822639404b58a1e8c18cee28745ad77dec01b3508062696f538393fde8ab82b5aac7e5fc7ca96e53423f863e0a633afc1e8b04ca0a4690aeab180cb7c82dc
23 DIST genpatches-5.10-73.extras.tar.xz 3848 BLAKE2B 8bb75fffe5597221023015e1512edfbe5cd77f1ed50723fea85717c758edefaedcc1e94134e73aabc780cc73f04b395bace1331f84d4351e77f0697b466de890 SHA512 d369b5199aa27bd76018568e7ed0c5326183fc7bfe2d30a0cf36f6c246af40b120262a03b67926619f248aa4a8a2beb6a3c48e80d1f36e289680e7eba083cd6e
24 +DIST genpatches-5.10-74.base.tar.xz 2293400 BLAKE2B 2650a20ec34fb977583e069168b374477e16c9eb0da2d6f2118f259034fe2d02b3941cb0a36780bb0e123f60b2b62bff89dd058aec5aa050f7ab407361aaa68b SHA512 3b5584878622d899256a554687822279f13944346c3be25b2836c480b2b19c9a875f93400bf34896855f29c28b31aa8b624c1802b99db7ef3469f3508f3476c4
25 +DIST genpatches-5.10-74.extras.tar.xz 3852 BLAKE2B a8410d8b87601e2f3531d42ba797e68d85e325763309657f7e701e8cf0ef9f1f25554efe9b02423ae6019b97167693f05c3a532178871b195e2a19efb3bb37a8 SHA512 5891aaaa160f0d1eabf6ff12b356492fa5fced698271ffd8c60416738a16e382467ec61d964a8f7a755a6ac6fae6670072429d8cc6833e01847889fe3fb3cc97
26 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
27 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
28 DIST genpatches-5.13-15.base.tar.xz 712312 BLAKE2B fa70753d96944bfe43ae352592be5fea8b8bccbac1f7412a241d951b5009e4643e12123ec3aa6864b9a884fffc744c8ec0be84dd499a29dcbf3c36446b013842 SHA512 814b3766c5330b5890e63ab47399e91981c18dccda37797983076ec860e8d2056f112706a07acd1f5c0f72a5417a8713d928b473695f6669fe734de025048015
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68.ebuild
31 new file mode 100644
32 index 00000000000..8a97f9b5278
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68.ebuild
35 @@ -0,0 +1,105 @@
36 +# Copyright 2020-2021 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##*.} + 6 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.10.12
47 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
48 +GENTOO_CONFIG_VER=5.10.42
49 +
50 +DESCRIPTION="Linux kernel built with Gentoo patches"
51 +HOMEPAGE="https://www.kernel.org/"
52 +SRC_URI+=" 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/v${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 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
77 +IUSE="debug hardened"
78 +REQUIRED_USE="arm? ( savedconfig )"
79 +
80 +RDEPEND="
81 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
82 +BDEPEND="
83 + debug? ( dev-util/pahole )"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}"
86 +
87 +QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
88 +
89 +src_prepare() {
90 + local PATCHES=(
91 + # meh, genpatches have no directory
92 + "${WORKDIR}"/*.patch
93 + )
94 + default
95 +
96 + # prepare the default config
97 + case ${ARCH} in
98 + amd64)
99 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
100 + ;;
101 + arm)
102 + return
103 + ;;
104 + arm64)
105 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
106 + ;;
107 + ppc64)
108 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
109 + ;;
110 + x86)
111 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
112 + ;;
113 + *)
114 + die "Unsupported arch ${ARCH}"
115 + ;;
116 + esac
117 +
118 + local myversion="-gentoo-dist"
119 + use hardened && myversion+="-hardened"
120 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
121 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
122 +
123 + local merge_configs=(
124 + "${T}"/version.config
125 + "${dist_conf_path}"/base.config
126 + )
127 + use debug || merge_configs+=(
128 + "${dist_conf_path}"/no-debug.config
129 + )
130 + if use hardened; then
131 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
132 +
133 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
134 +
135 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
136 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
137 + fi
138 + fi
139 + kernel-build_merge_configs "${merge_configs[@]}"
140 +}