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/vanilla-kernel/
Date: Thu, 11 Aug 2022 20:36:11
Message-Id: 1660250161.bd03fca23a8e1ef990b14db3464c2fedd28a60b1.mgorny@gentoo
1 commit: bd03fca23a8e1ef990b14db3464c2fedd28a60b1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 11 13:29:51 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 11 20:36:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd03fca2
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.136
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 2 +
13 .../vanilla-kernel/vanilla-kernel-5.10.136.ebuild | 134 +++++++++++++++++++++
14 2 files changed, 136 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 78380c800ed5..813d3d5bf47b 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -17,6 +17,8 @@ DIST kernel-x86_64-fedora.config.5.18.9-gentoo 221797 BLAKE2B 1873ffeab78c7e9a81
21 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
22 DIST linux-5.10.135.tar.sign 993 BLAKE2B a544cdf24ef0f1dc5ddc5622d8f00dc3af0fc38604d955c7a8b54e0c1fa7f7d60197551710cc2ab0bad69fc06d2077e5b1b796259fe29665d558b5fe656beff1 SHA512 ef565e3ae98acf58fa871e701b8a4ad2a3fd1f5aae109685cf1bd5cf0d2fca3f8361ca5d0d14613311a1bfc5069013249ece0f6eec4b88b2c4157caeca0686d6
23 DIST linux-5.10.135.tar.xz 120470192 BLAKE2B 121edb3af02eb4c00195e2c4e1144636bd33fb89143fe5bf46acd924bfd00665ee17837dd2426b9a9b16ad0725f1a944350446cbd00276af30623baea84bda67 SHA512 6b945179f375db6d76e3761ddc5b64a987c27bdf9d52694ede3a158f265710fe5a8f4f4b2752641076e64a62160d501081b560675eb855305703e1fd79629d47
24 +DIST linux-5.10.136.tar.sign 993 BLAKE2B 2b81f6dd2520fe5b5ed78a583a8451bf5f9924466733b1920586e1250816d9d26bbd8a1bad8141bed69982e15eec2e94cf6785439b691b9afaee5e83290cd5a6 SHA512 9d46aee3bf910a95832d63422f74f15073a1c126ba5f056251e317989865dfb4ccf1fccfc8584ecc491e810f8cc021122e454a0854f0db67e3267ff845eac4c9
25 +DIST linux-5.10.136.tar.xz 120473116 BLAKE2B b68c62f0ba53c0cc839bb5be07f0e4f458a565c47c627b6274e50a4b95e08276a30b9bb821bd17074bdbc8ea4a6f463772922a0b6445adc3f64dd3e9858db108 SHA512 10196bfa692646cd60885524fa8dbbb0f401bef83f0bb85415d4b4838b259fb2ae446e76b7c211b46c19d9f11077ecde1d47de97be453e2f06826231764f147e
26 DIST linux-5.15.59.tar.sign 991 BLAKE2B 80fe92152ba1ec23c4cd3b1c3edf6ca8b4c381dcb4f8735daaa6dc1d417137b186a08d3d1af0fe9cdf7b3a562a7cd154b8bd9c9a28fe708613f1adbe932e56dd SHA512 34b52887f668c479f530120d0cbab7f4d30bb01cb204ff158b4908db5facf75d51722d2adab66b31dd2dbecf98c707ad0736e59d63ceeb3c27a4220c7633e027
27 DIST linux-5.15.59.tar.xz 126404076 BLAKE2B c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b SHA512 1dd5badf83bdde38dd43fe1f678b883200b6b4b52547281ebd0780ea1cc628138e5798e21a2eb4bd2fb71755808017fdff5c85259e2c3211da79fcc8fb87361c
28 DIST linux-5.18.16.tar.sign 991 BLAKE2B 5309ae0d80fbec35f4fcdfb82e3f1fd99c96ad53b82efe4ef95f0f7ee5f04be1e97f69bfe664080ff92fe21b327dc72e723515c0fe43fa52f6a43d1894454a34 SHA512 01edeffc25b4221907f0b57aca694361ff5cf5fd6235750422b23d95241b2a1b2cd3ba0fa4b8a895e1996df49d577654a16cb302c798e8c7365ec536088f6660
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.136.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.136.ebuild
31 new file mode 100644
32 index 000000000000..718e3ea82627
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.136.ebuild
35 @@ -0,0 +1,134 @@
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 verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.10.12
46 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
47 +GENTOO_CONFIG_VER=g1
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
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://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
54 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
55 + verify-sig? (
56 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
57 + )
58 + amd64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
60 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
64 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
68 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
72 + -> kernel-i686-fedora.config.${CONFIG_VER}
73 + )
74 +"
75 +S=${WORKDIR}/${MY_P}
76 +
77 +LICENSE="GPL-2"
78 +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
79 +IUSE="debug hardened"
80 +REQUIRED_USE="arm? ( savedconfig )"
81 +
82 +BDEPEND="
83 + debug? ( dev-util/pahole )
84 + verify-sig? ( sec-keys/openpgp-keys-kernel )
85 +"
86 +PDEPEND="
87 + >=virtual/dist-kernel-${PV}
88 +"
89 +
90 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
91 +
92 +src_unpack() {
93 + if use verify-sig; then
94 + einfo "Unpacking linux-${PV}.tar.xz ..."
95 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
96 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
97 + assert "Unpack failed"
98 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
99 + else
100 + default
101 + fi
102 +}
103 +
104 +src_prepare() {
105 + default
106 +
107 + local biendian=false
108 +
109 + # prepare the default config
110 + case ${ARCH} in
111 + amd64)
112 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
113 + ;;
114 + arm)
115 + return
116 + ;;
117 + arm64)
118 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
119 + biendian=true
120 + ;;
121 + hppa)
122 + return
123 + ;;
124 + ppc)
125 + # assume powermac/powerbook defconfig
126 + # we still package.use.force savedconfig
127 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
128 + ;;
129 + ppc64)
130 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
131 + biendian=true
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="-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 +
163 + # this covers ppc64 and aarch64_be only for now
164 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
165 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
166 + fi
167 +
168 + kernel-build_merge_configs "${merge_configs[@]}"
169 +}