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: Sun, 26 Jun 2022 09:08:35
Message-Id: 1656234499.562e4edb00b3ccf7b299e1bf8b464b569b50a3f2.mgorny@gentoo
1 commit: 562e4edb00b3ccf7b299e1bf8b464b569b50a3f2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 26 04:01:56 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 26 09:08:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562e4edb
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.50
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.15.50.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 94b37682a03b..51a739036806 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -25,6 +25,8 @@ DIST linux-5.15.48.tar.sign 991 BLAKE2B 763026ae690c17bc2e1fee512fa792425a9bdc3a
21 DIST linux-5.15.48.tar.xz 126357096 BLAKE2B a23dd33dfac22741e5112961d92543a895c858be62c4e82a60b639e47c7b05e623c41a13a6c5157ec7b71ae1f152b381b7729f2bbaf03734cd40dfc0c27923f8 SHA512 6eee3ff3352a864a5d98295527056da0d6d52b5f566fd7858b2e12a5d0094efea0af484a7e8cdcb344bba343c5d95b5d19c0d2756dd3f38531712438223755b6
22 DIST linux-5.15.49.tar.sign 991 BLAKE2B 18117df94ba81e7581b1e20d9e97dbbc219680a7f14306e6943ab7165b93feb49bdb0f491e5a0b34f921c729bf368d475fbb4745b29ebc9130bb50583fac061d SHA512 f64b92e792ba1834ad9604f756189bba6179f76257c58b69fe5121594584f413e44e4a77f0826461c23e0e9795ca4fd1f0a54bb562514d991552a7351c7abfb7
23 DIST linux-5.15.49.tar.xz 126357836 BLAKE2B 0f78d980b2d6ec189865a85f3bf65e015365034f797ffda88077a77162d3bc30aec5f44a5257aa2aee0a97ee12e4c38b796bc8fddbe9f6ff6067b0c17ff0207e SHA512 50df71d9cbc2be09348d89a89f50543e9022c88b71ace9e93274aa49530825980661ead4cbe726a3ee899b6965d16b1bd1324e754d9b546eb8d8ad6232250caf
24 +DIST linux-5.15.50.tar.sign 991 BLAKE2B 1a4e2ae2c9a0553569ccfdfb49719ad753e3c3864d7db59f309bc1d408da130544e9c5377e0b1c2447e974af38ff7a6fc61d49b592afbb5830bbfe7443c285ff SHA512 05c2da0d77b129b3618dd7f7574522a08f207f27c56dc36ac3ad9368555ee210ed47b20c44049a87113a493ac5913e83846b07c492fa13413a34e184c44c742c
25 +DIST linux-5.15.50.tar.xz 126347764 BLAKE2B 1eb594e89c8f1c7dea5dbe88ff5e0669cacceb78868fa052c774dc81d6b4161b4834a7528451eeaef11dfeb2faac3a54a70d962f8aa23a671a69f8a62979b068 SHA512 6b7ca8bb91ad748206b2c587d4fe8e2b972381d9c7c29931ad4904086177c5190657be147f0af01c9d1ff5e513782d073b189dccc33dbbce76c250a84d948b58
26 DIST linux-5.18.5.tar.sign 989 BLAKE2B 558168c1828b1d3960e8e4f5e0f5c72b2b3ad556db722db234dcfd7da71a6f01226a951b3426292ba08104b6aaaa468f4f43199e6400928c801850bf492bf8ff SHA512 3018e8046fc9ce248952fff1c4c2df821306f68e639ec5ad6b9728f72974e3c589166da823fd9e0a751a5681567c6e84beee3a20735608bcf54566be30a3ae4d
27 DIST linux-5.18.5.tar.xz 129825940 BLAKE2B d2670e53d72fc5f0cf637394452a701c7ab41473be526d29deba7b60789dc56e1c369f3ae05a76f67890822588a36d0b497f267b4b75c33d0a98ad5131c697c9 SHA512 1872e2cf8cdd6e0033ce69f26f25526a30c237d220c02b20829fca31d6068fb816de2f2e5fd41f6807648cef8f28ddda392b199c7b1c3b48b2460c840fa1e150
28 DIST linux-5.18.6.tar.sign 989 BLAKE2B bc5164b6e60c406a87f9792e06cc7dc3e8a3ba82d98a11097667485d3b943cb52b17ec955d711e8939c450bbc568df15dd4a4cf04886f5ad8668c5fe7f96f66c SHA512 d3ca6093bf5a608ea6b107dc564a375c8058a7d733af28fb9a05f6a72ae618f66ca49a92587c52fd33f39af04fd9cc7e95d102f010317f006337404c4b3a9e8c
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.50.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.50.ebuild
31 new file mode 100644
32 index 000000000000..0ef902726d5d
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.50.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.15.19
46 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
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/mgorny/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 +}