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, 02 Dec 2020 20:21:50
Message-Id: 1606940498.e78e1e9f82ba0fab8ad7fe9d669adb30f03055c7.mgorny@gentoo
1 commit: e78e1e9f82ba0fab8ad7fe9d669adb30f03055c7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 2 15:09:36 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 2 20:21:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78e1e9f
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.81
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.4.81.ebuild | 94 ++++++++++++++++++++++
14 2 files changed, 96 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 87082dc1530..73f8d18c259 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -10,6 +10,8 @@ DIST genpatches-5.4-81.base.tar.xz 2591356 BLAKE2B 63c0ef166e2691c6747a2b2a8317a
21 DIST genpatches-5.4-81.extras.tar.xz 1772 BLAKE2B 93bedfbb023ab9d3913751cd242a4221b204685751f57d0ac31494fa8f8caf8e5faeb3ae10eed5332016f9a40b20670a6af6c4198eeae1136b14a3b28174beb7 SHA512 8776735a73aad4672d4b857d750f985ff6681f8e565a906106e2cfcd4d7839fa518d8fa19b39a0ac948736a3384656be44aad239ce2516786c797303f492ce01
22 DIST genpatches-5.4-82.base.tar.xz 2792480 BLAKE2B 39960646116f5f85ee657a29557d8fd9e809ae9bc60aac349c91e7680f2a0565800ba37a478573098dbad41b686336a058985d2925e5046fa68eeaea8df25477 SHA512 6a76eebd7178e2ccc522477f53c36f74e6fd691f87c547dffa2602a516ad9a6a01f05c953e12bbe6ba9aa2ce34b176a6a081a22da40c7d86855e5dfc34098059
23 DIST genpatches-5.4-82.extras.tar.xz 1772 BLAKE2B 8eff7ca01490badd5dad15497f77bf43c268ccb494db9eb4c18f4f59219f1a5d79ef2a6f35caee87e3c423b0fff1ef94a6d6477e5074397f78e4bd23b9c40d95 SHA512 bdcc7eb08c1cdb599e69b254f55685f7beec83f256518d42c31d0df9a4e1c6376c184145ce47d28e0b688d2166e139445ef5f9f284e817ba9f37eaf812852a88
24 +DIST genpatches-5.4-83.base.tar.xz 2815436 BLAKE2B 5bf3a971d5c14baca0b21a8aad8ffc4e470f91b179b5e03779be4f588b43a671fd2f261325ca0525139c3c7e9c2b7c1020a803045eb809b2857c61134d919db2 SHA512 96735cb1c2107eee8a7d475f6558e418264dc1aba7f2f803b59db5ed7a9a249d5d0b79689a539b46e8922ce1b278b578d4194b20f20962c2b3aae83ac58954e3
25 +DIST genpatches-5.4-83.extras.tar.xz 1772 BLAKE2B 9bccf13ea0eb0aae0d0b84302b9e9c82986bd60de4e85ee3703c570a5338474b08580095a952749d43104b53d3c07dbb558473e707a13ae12f7da5e5020ddf3e SHA512 0b536e4f8961513f181c5d9c4c01b51656c1e53707cf19c26d858e1a40bb1e8bc9e0bd0b314f82252047fe45a8df3e306e06abdb88f67a6116736e89236bbbcf
26 DIST genpatches-5.9-10.base.tar.xz 521384 BLAKE2B ea65c4e0977bc07459297883aabba1589b746de718c054127b1cb5fb2d79702798dccd918e8f5542d439d316d3c6c3ae38514155ff2cd5f61c7916eacfaf5177 SHA512 54836cd45b62fc97c857f85bd96ebcb99d5f5d80b3c80c31e70a48e3aa8e54eca5eae802e9a8780c0eb0a1d166c190f39751512580ab10eb122a887d31ad3a57
27 DIST genpatches-5.9-10.extras.tar.xz 1768 BLAKE2B 8177c3e2b8d92785b9ee71a7733432c783977a4c18f2db282c3c5b079219a911f6c302cad0dc3bf14c886bd3765ffdb2808f353ba0ecb89bb01d522f24f54c0b SHA512 462b35b3ff7a142877d11ddf02992a50043ba677f9f10619a308424f3e4df54d45436bc148fc503581c1c707a2a936ee278b18d95c02c6d5cdfec08f94257171
28 DIST genpatches-5.9-11.base.tar.xz 580544 BLAKE2B 59989b81c77e174e421b4fd6f570b7b8daf3649c4869eb61808607c98999467c60f9fe0a9f1c798807e9395ee064fd183a3110482536f1061b80349156af1b83 SHA512 5f5570bb06e62220304c235d5cd93c0d7f738bcc978cd1215ba262dd6bc9a0b0d43cf8d51cf36f2f0a66996b79f656463c7a0323e14f8c46899f28b0420155cf
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81.ebuild
31 new file mode 100644
32 index 00000000000..0c806189a34
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81.ebuild
35 @@ -0,0 +1,94 @@
36 +# Copyright 2020 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build
42 +
43 +MY_P=linux-${PV%.*}
44 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.4.21
47 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
48 +GENTOO_CONFIG_VER=5.4.77-r1
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.config
59 + -> kernel-x86_64.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
63 + -> kernel-aarch64.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
67 + -> kernel-ppc64le.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
71 + -> kernel-i686.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
77 +IUSE="debug"
78 +
79 +RDEPEND="
80 + !sys-kernel/vanilla-kernel:${SLOT}
81 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
82 +BDEPEND="
83 + debug? ( dev-util/dwarves )"
84 +
85 +pkg_pretend() {
86 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
87 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
88 +
89 + kernel-install_pkg_pretend
90 +}
91 +
92 +src_prepare() {
93 + local PATCHES=(
94 + # meh, genpatches have no directory
95 + "${WORKDIR}"/*.patch
96 + )
97 + default
98 +
99 + # prepare the default config
100 + case ${ARCH} in
101 + amd64)
102 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
103 + ;;
104 + arm64)
105 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
106 + ;;
107 + ppc64)
108 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
109 + ;;
110 + x86)
111 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
112 + ;;
113 + *)
114 + die "Unsupported arch ${ARCH}"
115 + ;;
116 + esac
117 +
118 + local merge_configs=(
119 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
120 + )
121 + use debug || merge_configs+=(
122 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
123 + )
124 + [[ ${ARCH} == x86 ]] && merge_configs+=(
125 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
126 + )
127 +
128 + kernel-build_merge_configs "${merge_configs[@]}"
129 +}