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, 19 Aug 2020 21:29:26
Message-Id: 1597872553.eb7b93aa4ddad87559ed8964df5f85d999bd1203.mgorny@gentoo
1 commit: eb7b93aa4ddad87559ed8964df5f85d999bd1203
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 19 14:54:14 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 19 21:29:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7b93aa
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.59
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.59.ebuild | 91 ++++++++++++++++++++++
14 2 files changed, 93 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 6e8e3522807..6f309fffd42 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -10,6 +10,8 @@ DIST genpatches-5.4-57.base.tar.xz 2072976 BLAKE2B 6b1c954075b2cb45c90c091514d60
21 DIST genpatches-5.4-57.extras.tar.xz 1768 BLAKE2B e3850182da8254aa5a13c9ea0208bdadc873ea7014892fd20abeb960e0f1a228d44d1cc8687c4be192c0064136a007507611439b66bdeb142133687da46f8b39 SHA512 87d6b85c69c52426ca93d117b0b68029a5ec11c7ad58f9a352b446c22c75147f33f92dcd0db4ba297053d1e701d62f3730a61f374b60fbfed172e376fec242ef
22 DIST genpatches-5.4-59.base.tar.xz 2093144 BLAKE2B 7f7404c7c0a468e00633eb64440f094421d36649ee6e99d7d6578464fa14dcd7a574b292d0cd301d5e8779334d125f7be51e73234a53ce0a3c55525766cc1bba SHA512 89303be05d33affee93cd276add1a5604ad72412acdffdeddb66a0a295721313fa28e30120d45b498c54dd9939db7efd7c1ae6576926f49f016ba7f6c7cd8d3b
23 DIST genpatches-5.4-59.extras.tar.xz 1768 BLAKE2B e72c4e9302649fd7c7d82b51d7f4faec00de404e874be2cd9ca61b830afddd6fa62a0958a16ffa888be9151470755aa3244f00ded83740fe0d5cc7f242849a3c SHA512 086e7cef176dbd4544235a10c4ceda955f6c273ff8a1be0267a8168c770bdbdec06a4a5f6454efad59c01eff068d7f738ed1d984f63eb26ae748ac92d0a550de
24 +DIST genpatches-5.4-60.base.tar.xz 2150948 BLAKE2B e6aa62049f3e73241c82e3a8794adb03c49dc3ad74368f849191cb8b7b640962ff9bc0e921262374a2db959eaab469d379abab860af093c3d484e5349ad3502b SHA512 f014d9dc8b1adc45137afed6b3e0d099f5cc08c0a71d2ac87ef9a5397a7e2ee6750254d4573336a4ac868c4cb207ce2e96437a876aabc45434758cfba2c70167
25 +DIST genpatches-5.4-60.extras.tar.xz 1764 BLAKE2B 30ec9ee0ded28c8517649a3ea2346128e173fd8287632eb5e2ba1fc5d212eb39cd5c36f82a02b2933ee64d85a52ae95936b276f10e2a50cb72e18b6b0af8089c SHA512 f8b47d63f46ce68775897690d072f92410ac2b5477e8885ec2b03ed6fe563c4b4930ca21ae84f157391d07b1a6a0e222affdd8b4493a116094158b351c6b1ec7
26 DIST genpatches-5.7-11.base.tar.xz 532736 BLAKE2B 9f5b5d8304c22cac1e081be759a6731c5902e2afc241c79dad2518083b9d56edb34f5ca2d9b39fea84cbe0e6569314e0db84eb69027830b997a6e318b6e27c13 SHA512 43bd55fef87afc5e97fc9d4d13705f6790eca5c1874fd266da2109ea0ac913e812e156cd231d67d3494f743f2263d33292770c4be9a8009e0c6f85704d77b21e
27 DIST genpatches-5.7-11.extras.tar.xz 1764 BLAKE2B 655bba046d32ee61d8b026f462e35c4e58536afbfdb37de32380a253fedceeac2da42a1366ecbe0b7e156f25319f67ad61a5eb51ba762fd8958068f1f1c0d0bf SHA512 b26c720473ffdef3ac40955692660ee4645a93e2cb86a76d1583d878c3832f3c8bdcbdc23bc6838c1d0255ec86a5671d4e205cb6e99dd5a1d64405fe0081a355
28 DIST genpatches-5.7-13.base.tar.xz 581360 BLAKE2B 16841cdedf5ac9fd897e6c3ea6f428a4bbde48dca1c5f6d432d1c63248d6cec9157d4f0680cf340cc08703715afb32db342aa837a978c29b1874917d13454dd6 SHA512 aa15be557a74258476d777575cbe98148bb99104f221206e5d1589dfee89ab7ed2637a4e6dd044f477e3c5b0388faf399dc7241951c37a1df405981927f9973c
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.59.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.59.ebuild
31 new file mode 100644
32 index 00000000000..5c7d8392a2d
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.59.ebuild
35 @@ -0,0 +1,91 @@
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##*.} + 1 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.4.21
47 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
48 +
49 +DESCRIPTION="Linux kernel built with Gentoo patches"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
52 + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
53 + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
54 + amd64? (
55 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
56 + -> kernel-x86_64.config.${CONFIG_VER}
57 + )
58 + arm64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
60 + -> kernel-aarch64.config.${CONFIG_VER}
61 + )
62 + x86? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
64 + -> kernel-i686.config.${CONFIG_VER}
65 + )"
66 +S=${WORKDIR}/${MY_P}
67 +
68 +LICENSE="GPL-2"
69 +KEYWORDS="~amd64 ~arm64 ~x86"
70 +IUSE="debug"
71 +
72 +RDEPEND="
73 + !sys-kernel/vanilla-kernel:${SLOT}
74 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
75 +BDEPEND="
76 + debug? ( dev-util/dwarves )"
77 +
78 +pkg_pretend() {
79 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
80 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
81 +
82 + kernel-install_pkg_pretend
83 +}
84 +
85 +src_prepare() {
86 + local PATCHES=(
87 + # meh, genpatches have no directory
88 + "${WORKDIR}"/*.patch
89 + )
90 + default
91 +
92 + # prepare the default config
93 + case ${ARCH} in
94 + amd64)
95 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
96 + ;;
97 + arm64)
98 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
99 + ;;
100 + x86)
101 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
102 + ;;
103 + *)
104 + die "Unsupported arch ${ARCH}"
105 + ;;
106 + esac
107 +
108 + local config_tweaks=(
109 + # shove arch under the carpet!
110 + -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
111 + # we do support x32
112 + -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
113 + # disable signatures
114 + -e '/CONFIG_MODULE_SIG/d'
115 + -e '/CONFIG_SECURITY_LOCKDOWN/d'
116 + )
117 + use debug || config_tweaks+=(
118 + -e '/CONFIG_DEBUG_INFO/d'
119 + )
120 + [[ ${ARCH} == x86 ]] && config_tweaks+=(
121 + # fix autoenabling 64bit
122 + -e '2i\
123 +# CONFIG_64BIT is not set'
124 + )
125 + sed -i "${config_tweaks[@]}" .config || die
126 +}