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: Fri, 04 Nov 2022 05:40:59
Message-Id: 1667540441.7afa0d5700085d9f894022b21607fdebc00546cb.mgorny@gentoo
1 commit: 7afa0d5700085d9f894022b21607fdebc00546cb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 3 16:29:25 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 4 05:40:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7afa0d57
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.223
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.4.223.ebuild | 108 +++++++++++++++++++++
14 2 files changed, 110 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index c3108d2b1f9f..8318a4fc30f8 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -36,6 +36,8 @@ DIST linux-5.4.220.tar.sign 991 BLAKE2B 6296bf42826c849af68331ba32a8e84c892b54f2
21 DIST linux-5.4.220.tar.xz 112966272 BLAKE2B 6e1afe278f7d31cc34d73dcd87b807c6c3c790ff635918a54528bbece8861e60be06645fe7425e947a876969c44e63aca83663b0de9b0585033e23413c097410 SHA512 a09565da5da4fcd08ec9c6050908040fe86fabbb47375988764774acea9d5a6604c93407264a2de6a5b2e3805934884b505dde5e7405a772b3bcd35299ff3175
22 DIST linux-5.4.221.tar.sign 991 BLAKE2B 2cf1cfc63cb33e94426e686ab77d75a158fadc8aa25d173e74b253fbe697b04e34ae0cc59a41b6809df020312ebe285f9dc074a44c625e06a08eeee097d810a5 SHA512 8c8b99b961eb8f00543ebe7456fc7fd5e72e73bd33ae8a5c1dc9b6b553d382c51b673244e4efe42dddbabbc0f8390ce5aadb010bade691b3da161741c5ee6eb5
23 DIST linux-5.4.221.tar.xz 112938464 BLAKE2B 20f9ed759ed7a295973ac8c6a9a4d71695cb39cc0dc05a2a788389e7bcfad9f07b2a9568736da08f2a76f2ebceb7f5f1381f3eed13462e804d3dfacd24437b22 SHA512 85346f42bff7c283e6b006f624fd515e0950309e02db6f6c060cbac762a432754342816d2378dbb9e451c9c2cc74e54e3a660274c0d1b04a45b24c9b85508d0c
24 +DIST linux-5.4.223.tar.sign 991 BLAKE2B 83aff68008cb382f7d6a9be93ecf6737cd3dc7d7291da646b24d74f9930bcc072bb4033a54d4c9cf0a3088ab908995f61186ae84c05a4b9f3834ffed271ed7ff SHA512 e9fb0e7fa915ffa1b72a9f9e447fb4afb834611921bb5e12ee6b7291385bf8e3d6113f7d9c3587cacaacb14acd8fbeb067eef1f44ef90be40ce8ea6b1cfd3e09
25 +DIST linux-5.4.223.tar.xz 112946132 BLAKE2B e5669ba0e0e05d468eb8671da24fac4188a6cdbf66201d3a4c66759435997be541994dee2e3f297f6968857c675dd9c6485efde87f9421f7cc0618b692b005ac SHA512 45fb543b2ef59be495106e253bbb2249fe71f9727a9a7d7a16738820db12f9fb5f580594699f736d157f930cf3a712e09595689a3f9954cfebbfa99f04ffc681
26 DIST linux-6.0.5.tar.sign 987 BLAKE2B d8c7ceab01ab36ade7322ff141fab940fc95b4126d808edd59d823de4a338341fe8c1aa3500b8647540982feaa44c8c3be4de92b2c2ca2ea64b576b7dc258f38 SHA512 95af989dd78485d3405de63a2ec77ddb20cb6438b415b7c276e7d8c16bf0a5505affe06f9b21ffa8bbc2af835f1582c6fe0031e7115a5dd40408b8a223c37ed8
27 DIST linux-6.0.5.tar.xz 133898040 BLAKE2B 71afe2e227bbab9b40ccbd3dda4aacbe1ba7f45b85c863c57a759a91d18d215cdc16c8bfd28e2d2bcd2a510c49b7fc84531d21695ad81895172ca6997ffe0f5a SHA512 90c0610be2bbca8841ff757b09d71c5d1efdcbc3cf0840d3f1d7a1b9a4854aa1eca36cfec0926dc191d35c5cbf71fea214097d831af2a34036c9a598f0ac55ad
28 DIST linux-6.0.6.tar.sign 987 BLAKE2B 5501a11c6d3d9edac1b96a6fc17df93de7469473d1bb041c8a15e52aed2e3b748b596fe05d60efc4e594ec84d0feb10882f4f8f169707bdee16dda517174a8a9 SHA512 cc76cbcdf8e62393b207bb62bdc760b27486e2ed3b2178f1d1b5e8868aa62a0bd9a99211e28c51515f713ac161d5fe4c5eafcc762e835278f2bd29928faf323f
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.223.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.223.ebuild
31 new file mode 100644
32 index 000000000000..ae90752d5ab5
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.223.ebuild
35 @@ -0,0 +1,108 @@
36 +# Copyright 2020-2022 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=8
40 +
41 +inherit kernel-build verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.4.21
46 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
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.config
60 + -> kernel-x86_64.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
64 + -> kernel-aarch64.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
68 + -> kernel-ppc64le.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
72 + -> kernel-i686.config.${CONFIG_VER}
73 + )
74 +"
75 +S=${WORKDIR}/${MY_P}
76 +
77 +LICENSE="GPL-2"
78 +KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
79 +IUSE="debug"
80 +
81 +BDEPEND="
82 + debug? ( dev-util/pahole )
83 + verify-sig? ( sec-keys/openpgp-keys-kernel )
84 +"
85 +PDEPEND="
86 + >=virtual/dist-kernel-${PV}
87 +"
88 +
89 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
90 +
91 +src_unpack() {
92 + if use verify-sig; then
93 + einfo "Unpacking linux-${PV}.tar.xz ..."
94 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
95 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
96 + assert "Unpack failed"
97 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
98 + else
99 + default
100 + fi
101 +}
102 +
103 +src_prepare() {
104 + default
105 +
106 + # prepare the default config
107 + case ${ARCH} in
108 + amd64)
109 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
110 + ;;
111 + arm64)
112 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
113 + ;;
114 + ppc)
115 + # assume powermac/powerbook defconfig
116 + # we still package.use.force savedconfig
117 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
118 + ;;
119 + ppc64)
120 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
121 + ;;
122 + x86)
123 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
124 + ;;
125 + *)
126 + die "Unsupported arch ${ARCH}"
127 + ;;
128 + esac
129 +
130 + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
131 + local merge_configs=(
132 + "${T}"/version.config
133 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
134 + )
135 + use debug || merge_configs+=(
136 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
137 + )
138 + [[ ${ARCH} == x86 ]] && merge_configs+=(
139 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
140 + )
141 +
142 + kernel-build_merge_configs "${merge_configs[@]}"
143 +}