summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2016-12-01 18:10:27 -0500
committerMike Pagano <mpagano@gentoo.org>2016-12-01 18:10:27 -0500
commit926da9a17e6e78c74a5c0466527cf0ad9c26d167 (patch)
tree85fe8499708d7a8c8fe34fc1d447ef8232fcca47 /eclass
parenttmpfiles.eclass: fix 'if' statement syntax (diff)
downloadgentoo-926da9a17e6e78c74a5c0466527cf0ad9c26d167.tar.gz
gentoo-926da9a17e6e78c74a5c0466527cf0ad9c26d167.tar.bz2
gentoo-926da9a17e6e78c74a5c0466527cf0ad9c26d167.zip
kernel-2.eclass: Fix eapply_user as per PMS spec and execute in src_prepare. Support older EAPIs with epatch_user.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kernel-2.eclass35
1 files changed, 26 insertions, 9 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 3f5fb3b0863..547153c0769 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -90,12 +90,18 @@
# If you do change them, there is a chance that we will not fix resulting bugs;
# that of course does not mean we're not willing to help.
-has "${EAPI:-0}" 0 1 2 3 4 5 || die "kernel-2.eclass is unsupported for EAPI ${EAPI}"
-
PYTHON_COMPAT=( python{2_6,2_7} )
inherit eutils toolchain-funcs versionator multilib python-any-r1
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
+case ${EAPI:-0} in
+ 0|1)
+ EXPORT_FUNCTIONS src_{unpack,compile,install,test} \
+ pkg_{setup,preinst,postinst,postrm} ;;
+ 2|3|4|5)
+ EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \
+ pkg_{setup,preinst,postinst,postrm} ;;
+ *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+esac
# Added by Daniel Ostrow <dostrow@gentoo.org>
# This is an ugly hack to get around an issue with a 32-bit userland on ppc64.
@@ -1260,12 +1266,9 @@ kernel-2_src_unpack() {
# we run misc `make` functions below
[[ $(type -t kernel-2_hook_premake) == "function" ]] && kernel-2_hook_premake
- debug-print "Applying any user patches"
- # apply any user patches
- case ${EAPI:-0} in
- 0|1|2|3|4|5) epatch_user ;;
- 6) eapply_user ;;
- esac
+ case ${EAPI:-0} in
+ 0|1) kernel-2_src_prepare ;;
+ esac
debug-print "Doing unpack_set_extraversion"
@@ -1305,6 +1308,20 @@ kernel-2_src_unpack() {
fi
}
+# @FUNCTION: kernel-2_src_prepare
+# @DESCRIPTION:
+# Apply any user patches
+kernel-2_src_prepare() {
+
+ debug-print "Applying any user patches"
+
+ # apply any user patches
+ case ${EAPI:-0} in
+ 0|1|2|3|4|5) epatch_user ;;
+ 6) eapply_user ;;
+ esac
+}
+
kernel-2_src_compile() {
cd "${S}"
[[ ${ETYPE} == headers ]] && compile_headers