Gentoo Archives: gentoo-dev

From: Mike Pagano <mpagano@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 1/1] kernel-2.eclass: Support EAPI 6 when applying user patches.
Date: Mon, 28 Nov 2016 00:23:41
Message-Id: 785907d9-afee-c67d-6114-6bf236d963e3@gentoo.org
1 If kernel-2_src_unpack() is called in EAPI6, epatch_user() function
2 inherited from eutils.eclass is undefined.
3 See bug #579188
4
5 ---
6 eclass/kernel-2.eclass | 8 ++++++--
7 1 file changed, 6 insertions(+), 2 deletions(-)
8
9 diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
10 index c171940..3f5fb3b 100644
11 --- a/eclass/kernel-2.eclass
12 +++ b/eclass/kernel-2.eclass
13 @@ -1260,8 +1260,12 @@ kernel-2_src_unpack() {
14 # we run misc `make` functions below
15 [[ $(type -t kernel-2_hook_premake) == "function" ]] &&
16 kernel-2_hook_premake
17
18 - debug-print "Doing epatch_user"
19 - epatch_user
20 + debug-print "Applying user patches if they exist"
21 + # apply any user patches
22 + case ${EAPI:-0} in
23 + 0|1|2|3|4|5) epatch_user ;;
24 + 6) eapply_user ;;
25 + esac
26
27 debug-print "Doing unpack_set_extraversion"
28
29 --
30 2.7.3

Attachments

File name MIME type
signature.asc application/pgp-signature

Replies