Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-dev] [PATCH 08/14] kernel-2.eclass: Move EXPORT_FUNCTIONS below inherit
Date: Thu, 02 Sep 2021 10:02:00
Message-Id: 20210902095911.25263-8-ulm@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/14] apache-module.eclass: Move EXPORT_FUNCTIONS below inherit by "Ulrich Müller"
1 Signed-off-by: Ulrich Müller <ulm@g.o>
2 ---
3 eclass/kernel-2.eclass | 14 ++++++++------
4 1 file changed, 8 insertions(+), 6 deletions(-)
5
6 diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
7 index c2f1e93dca68..ef70e250c179 100644
8 --- a/eclass/kernel-2.eclass
9 +++ b/eclass/kernel-2.eclass
10 @@ -199,12 +199,11 @@
11 # that of course does not mean we're not willing to help.
12
13 inherit estack toolchain-funcs
14 -[[ ${EAPI:-0} == 6 ]] && inherit eapi7-ver
15 -case ${EAPI:-0} in
16 - 6|7|8)
17 - EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \
18 - pkg_{setup,preinst,postinst,postrm} ;;
19 - *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
20 +[[ ${EAPI} == 6 ]] && inherit eapi7-ver
21 +
22 +case ${EAPI} in
23 + 6|7|8) ;;
24 + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
25 esac
26
27 # Added by Daniel Ostrow <dostrow@g.o>
28 @@ -1566,3 +1565,6 @@ kernel-2_pkg_postrm() {
29 ewarn "For more detailed kernel removal instructions, please see: "
30 ewarn "https://wiki.gentoo.org/wiki/Kernel/Removal"
31 }
32 +
33 +EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \
34 + pkg_{setup,preinst,postinst,postrm}
35 --
36 2.33.0