[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/ - 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, 29 Dec 2021 18:57:03
Message-Id:	`1640804208.aabf7372d14f6dd1da8f81fabfec013cfc8344c2.mgorny@gentoo`

1

commit:     aabf7372d14f6dd1da8f81fabfec013cfc8344c2

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Wed Dec 29 14:27:41 2021 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Wed Dec 29 18:56:48 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabf7372

7

8

sys-kernel/gentoo-kernel: Bump to 5.15.12

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.15.12.ebuild     | 123 +++++++++++++++++++++

14

 2 files changed, 125 insertions(+)

15

16

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest

17

index a966d48d2d43..eb3de1d70e2d 100644

18

--- a/sys-kernel/gentoo-kernel/Manifest

19

+++ b/sys-kernel/gentoo-kernel/Manifest

20

@@ -4,6 +4,8 @@ DIST genpatches-5.14-24.base.tar.xz 865892 BLAKE2B 5855b54e7ad2fe9fec353706d026b

21

 DIST genpatches-5.14-24.extras.tar.xz 3844 BLAKE2B b11a8019a920d12c848fdc34514ed7352217e41f659bb7935c6211132897e8f948a8ebfd281b89e67e3993e3e5a03f2f32b0b4d3b73f5d1228e65812cf6cbeea SHA512 a2b757955740078aa3891a6a696bd50fa35606bfc6dac0e739abe2869d5322554417b4bfd6a989d23a2d31bea14c06294747578025ffac3d77e8a91ea16f4ee6

22

 DIST genpatches-5.15-13.base.tar.xz 604984 BLAKE2B c674c2eefbc18f2a8d182fa95606714b9a74420d7a3ebb32138b714743f11a7c7b278d77d33747bd1fa1a46e8f8e8364a9238ce3acee6134f889fae267ab0239 SHA512 0741c183cf8def586fc17fcb2a44d81dd5494ac9430a5ca07d239079f41a7a24bb686406e0ecfccdeb8a38e33e99831d2b355d0e8e65e8dd2e30db5f4b0bbe4d

23

 DIST genpatches-5.15-13.extras.tar.xz 3852 BLAKE2B 131550ddf5d1d67808b98040e88bb75d9020ee99b7907d0b79839a366c52e83c5bee6a322f12363ca0cfa9816d17b36002b5ace1620ef80b386ee8c09fd23866 SHA512 79fe958fcd5b3c4c7406374431e28a482b7512214c0ddbbf24d5f4a42e7feafb3f235f266b0023e666348c2c1888d1c678d726403b2f873d55991e5aaef4b74c

24

+DIST genpatches-5.15-14.base.tar.xz 639672 BLAKE2B 93976aee6245c420aa654981538f3dbdbeaa9898410d0ffef103158e3856b18dfebba293aba62e4adfcb0c402d803428637c7a7c7b78a6483b64ab816f3fe355 SHA512 37f506d21264ac54d3075890fdb5f6267039518f083961f13a1859e1c20a390be12071a95091d9b01f5aaff11623569f0bc663180e4b6741b765e64ff45af361

25

+DIST genpatches-5.15-14.extras.tar.xz 3852 BLAKE2B 09bb1bd3fffd353fe5454a033000632f9c76ede889e8550ddcdd507651e427e6b55fc65329ba89753b8b0d4e4bf4988d3c3e54a54cdf01e54b0e200d38fcbb68 SHA512 61bfb0e5d1f66b0b6b689c8e4474f22b8d2dbebd9233ea139c6da870cdb76c9a1559eb1469f91f4c3cc0eab5f2688dc7b843601ac10bf989bcdc3129510e06b2

26

 DIST genpatches-5.4-172.base.tar.xz 4281140 BLAKE2B 438ad10331e709a85f1ee2a8907a982cd545579940431220f763b1f68280d007d344627b0d1cf4406e2a439b76d20497e1f4aa6d103bb5569f119bc5174c545f SHA512 faa28b056e48873b41b78b540afe7db3200020f85f1ae516f7949f3cef453eccae9b6b8631d594ba8b1dc1b4d6b55b1e9c9379c4880eb4697bed956b0217bef4

27

 DIST genpatches-5.4-172.extras.tar.xz 1784 BLAKE2B 9d185d1ff33c56417bf9cfbe33efc6ce4b743a0ab9bdf419dbee14cde34d7c2d6d17884ace56880f75cc28a16b7e18a5e7b87f110c64bc7c84ceb81c7df85831 SHA512 cee6e49804ebc200dd7e308d2a59bfa0e381428caf69678bb6d406357a86398327a354bc2900096f82a77b47beea7fca7e5709cb390fbc1e0b7575c01d062024

28

 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c

29

30

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild

31

new file mode 100644

32

index 000000000000..6af5d253a073

33

--- /dev/null

34

+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild

35

@@ -0,0 +1,123 @@

36

+# Copyright 2020-2021 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

42

+

43

+MY_P=linux-${PV%.*}

44

+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))

45

+CONFIG_VER=5.15.10

46

+CONFIG_HASH=4882b85cc85fb2b7df396c4d671cc6432596eca0

47

+GENTOO_CONFIG_VER=5.15.5

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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz

53

+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz

54

+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz

55

+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz

56

+	amd64? (

57

+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config

58

+			-> kernel-x86_64-fedora.config.${CONFIG_VER}

59

+	)

60

+	arm64? (

61

+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config

62

+			-> kernel-aarch64-fedora.config.${CONFIG_VER}

63

+	)

64

+	ppc64? (

65

+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config

66

+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}

67

+	)

68

+	x86? (

69

+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config

70

+			-> kernel-i686-fedora.config.${CONFIG_VER}

71

+	)"

72

+S=${WORKDIR}/${MY_P}

73

+

74

+LICENSE="GPL-2"

75

+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"

76

+IUSE="debug hardened"

77

+REQUIRED_USE="arm? ( savedconfig )"

78

+

79

+RDEPEND="

80

+	!sys-kernel/gentoo-kernel-bin:${SLOT}"

81

+BDEPEND="

82

+	debug? ( dev-util/pahole )"

83

+PDEPEND="

84

+	>=virtual/dist-kernel-${PV}"

85

+

86

+QA_FLAGS_IGNORED="

87

+	usr/src/linux-.*/scripts/gcc-plugins/.*.so

88

+	usr/src/linux-.*/vmlinux

89

+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg

90

+"

91

+

92

+src_prepare() {

93

+	local PATCHES=(

94

+		# meh, genpatches have no directory

95

+		"${WORKDIR}"/*.patch

96

+	)

97

+	default

98

+

99

+	local biendian=false

100

+

101

+	# prepare the default config

102

+	case ${ARCH} in

103

+		amd64)

104

+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die

105

+			;;

106

+		arm)

107

+			return

108

+			;;

109

+		arm64)

110

+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die

111

+			biendian=true

112

+			;;

113

+		ppc)

114

+			# assume powermac/powerbook defconfig

115

+			# we still package.use.force savedconfig

116

+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die

117

+			;;

118

+		ppc64)

119

+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die

120

+			biendian=true

121

+			;;

122

+		x86)

123

+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die

124

+			;;

125

+		*)

126

+			die "Unsupported arch ${ARCH}"

127

+			;;

128

+	esac

129

+

130

+	local myversion="-gentoo-dist"

131

+	use hardened && myversion+="-hardened"

132

+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die

133

+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"

134

+

135

+	local merge_configs=(

136

+		"${T}"/version.config

137

+		"${dist_conf_path}"/base.config

138

+	)

139

+	use debug || merge_configs+=(

140

+		"${dist_conf_path}"/no-debug.config

141

+	)

142

+	if use hardened; then

143

+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )

144

+

145

+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )

146

+

147

+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then

148

+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )

149

+		fi

150

+	fi

151

+

152

+	# this covers ppc64 and aarch64_be only for now

153

+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then

154

+		merge_configs+=( "${dist_conf_path}/big-endian.config" )

155

+	fi

156

+

157

+	kernel-build_merge_configs "${merge_configs[@]}"

158

+}

1	commit: aabf7372d14f6dd1da8f81fabfec013cfc8344c2
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Wed Dec 29 14:27:41 2021 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Wed Dec 29 18:56:48 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabf7372
7
8	sys-kernel/gentoo-kernel: Bump to 5.15.12
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.15.12.ebuild \| 123 +++++++++++++++++++++
14	2 files changed, 125 insertions(+)
15
16	diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17	index a966d48d2d43..eb3de1d70e2d 100644
18	--- a/sys-kernel/gentoo-kernel/Manifest
19	+++ b/sys-kernel/gentoo-kernel/Manifest
20	@@ -4,6 +4,8 @@ DIST genpatches-5.14-24.base.tar.xz 865892 BLAKE2B 5855b54e7ad2fe9fec353706d026b
21	DIST genpatches-5.14-24.extras.tar.xz 3844 BLAKE2B b11a8019a920d12c848fdc34514ed7352217e41f659bb7935c6211132897e8f948a8ebfd281b89e67e3993e3e5a03f2f32b0b4d3b73f5d1228e65812cf6cbeea SHA512 a2b757955740078aa3891a6a696bd50fa35606bfc6dac0e739abe2869d5322554417b4bfd6a989d23a2d31bea14c06294747578025ffac3d77e8a91ea16f4ee6
22	DIST genpatches-5.15-13.base.tar.xz 604984 BLAKE2B c674c2eefbc18f2a8d182fa95606714b9a74420d7a3ebb32138b714743f11a7c7b278d77d33747bd1fa1a46e8f8e8364a9238ce3acee6134f889fae267ab0239 SHA512 0741c183cf8def586fc17fcb2a44d81dd5494ac9430a5ca07d239079f41a7a24bb686406e0ecfccdeb8a38e33e99831d2b355d0e8e65e8dd2e30db5f4b0bbe4d
23	DIST genpatches-5.15-13.extras.tar.xz 3852 BLAKE2B 131550ddf5d1d67808b98040e88bb75d9020ee99b7907d0b79839a366c52e83c5bee6a322f12363ca0cfa9816d17b36002b5ace1620ef80b386ee8c09fd23866 SHA512 79fe958fcd5b3c4c7406374431e28a482b7512214c0ddbbf24d5f4a42e7feafb3f235f266b0023e666348c2c1888d1c678d726403b2f873d55991e5aaef4b74c
24	+DIST genpatches-5.15-14.base.tar.xz 639672 BLAKE2B 93976aee6245c420aa654981538f3dbdbeaa9898410d0ffef103158e3856b18dfebba293aba62e4adfcb0c402d803428637c7a7c7b78a6483b64ab816f3fe355 SHA512 37f506d21264ac54d3075890fdb5f6267039518f083961f13a1859e1c20a390be12071a95091d9b01f5aaff11623569f0bc663180e4b6741b765e64ff45af361
25	+DIST genpatches-5.15-14.extras.tar.xz 3852 BLAKE2B 09bb1bd3fffd353fe5454a033000632f9c76ede889e8550ddcdd507651e427e6b55fc65329ba89753b8b0d4e4bf4988d3c3e54a54cdf01e54b0e200d38fcbb68 SHA512 61bfb0e5d1f66b0b6b689c8e4474f22b8d2dbebd9233ea139c6da870cdb76c9a1559eb1469f91f4c3cc0eab5f2688dc7b843601ac10bf989bcdc3129510e06b2
26	DIST genpatches-5.4-172.base.tar.xz 4281140 BLAKE2B 438ad10331e709a85f1ee2a8907a982cd545579940431220f763b1f68280d007d344627b0d1cf4406e2a439b76d20497e1f4aa6d103bb5569f119bc5174c545f SHA512 faa28b056e48873b41b78b540afe7db3200020f85f1ae516f7949f3cef453eccae9b6b8631d594ba8b1dc1b4d6b55b1e9c9379c4880eb4697bed956b0217bef4
27	DIST genpatches-5.4-172.extras.tar.xz 1784 BLAKE2B 9d185d1ff33c56417bf9cfbe33efc6ce4b743a0ab9bdf419dbee14cde34d7c2d6d17884ace56880f75cc28a16b7e18a5e7b87f110c64bc7c84ceb81c7df85831 SHA512 cee6e49804ebc200dd7e308d2a59bfa0e381428caf69678bb6d406357a86398327a354bc2900096f82a77b47beea7fca7e5709cb390fbc1e0b7575c01d062024
28	DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
29
30	diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild
31	new file mode 100644
32	index 000000000000..6af5d253a073
33	--- /dev/null
34	+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12.ebuild
35	@@ -0,0 +1,123 @@
36	+# Copyright 2020-2021 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
42	+
43	+MY_P=linux-${PV%.*}
44	+GENPATCHES_P=genpatches-${PV%.}-$(( ${PV##.} + 2 ))
45	+CONFIG_VER=5.15.10
46	+CONFIG_HASH=4882b85cc85fb2b7df396c4d671cc6432596eca0
47	+GENTOO_CONFIG_VER=5.15.5
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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
53	+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
54	+ https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
55	+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
56	+ amd64? (
57	+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
58	+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
59	+ )
60	+ arm64? (
61	+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
62	+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
63	+ )
64	+ ppc64? (
65	+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
66	+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
67	+ )
68	+ x86? (
69	+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
70	+ -> kernel-i686-fedora.config.${CONFIG_VER}
71	+ )"
72	+S=${WORKDIR}/${MY_P}
73	+
74	+LICENSE="GPL-2"
75	+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
76	+IUSE="debug hardened"
77	+REQUIRED_USE="arm? ( savedconfig )"
78	+
79	+RDEPEND="
80	+ !sys-kernel/gentoo-kernel-bin:${SLOT}"
81	+BDEPEND="
82	+ debug? ( dev-util/pahole )"
83	+PDEPEND="
84	+ >=virtual/dist-kernel-${PV}"
85	+
86	+QA_FLAGS_IGNORED="
87	+ usr/src/linux-./scripts/gcc-plugins/..so
88	+ usr/src/linux-.*/vmlinux
89	+ usr/src/linux-./arch/powerpc/kernel/vdso./vdso.*.so.dbg
90	+"
91	+
92	+src_prepare() {
93	+ local PATCHES=(
94	+ # meh, genpatches have no directory
95	+ "${WORKDIR}"/*.patch
96	+ )
97	+ default
98	+
99	+ local biendian=false
100	+
101	+ # prepare the default config
102	+ case ${ARCH} in
103	+ amd64)
104	+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config \|\| die
105	+ ;;
106	+ arm)
107	+ return
108	+ ;;
109	+ arm64)
110	+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config \|\| die
111	+ biendian=true
112	+ ;;
113	+ ppc)
114	+ # assume powermac/powerbook defconfig
115	+ # we still package.use.force savedconfig
116	+ cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config \|\| die
117	+ ;;
118	+ ppc64)
119	+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config \|\| die
120	+ biendian=true
121	+ ;;
122	+ x86)
123	+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config \|\| die
124	+ ;;
125	+ *)
126	+ die "Unsupported arch ${ARCH}"
127	+ ;;
128	+ esac
129	+
130	+ local myversion="-gentoo-dist"
131	+ use hardened && myversion+="-hardened"
132	+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config \|\| die
133	+ local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
134	+
135	+ local merge_configs=(
136	+ "${T}"/version.config
137	+ "${dist_conf_path}"/base.config
138	+ )
139	+ use debug \|\| merge_configs+=(
140	+ "${dist_conf_path}"/no-debug.config
141	+ )
142	+ if use hardened; then
143	+ merge_configs+=( "${dist_conf_path}"/hardened-base.config )
144	+
145	+ tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
146	+
147	+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
148	+ merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
149	+ fi
150	+ fi
151	+
152	+ # this covers ppc64 and aarch64_be only for now
153	+ if [[ ${biendian} == true && $(tc-endian) == big ]]; then
154	+ merge_configs+=( "${dist_conf_path}/big-endian.config" )
155	+ fi
156	+
157	+ kernel-build_merge_configs "${merge_configs[@]}"
158	+}

Gentoo Archives: gentoo-commits