1 |
2nd round. As per mgorny's advice, fix eapply_user as per PMS spec and |
2 |
execute in src_prepare. Support older EAPIs with epatch_user. |
3 |
|
4 |
--- |
5 |
eclass/kernel-2.eclass | 25 ++++++++++++++++++------- |
6 |
1 file changed, 18 insertions(+), 7 deletions(-) |
7 |
|
8 |
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
9 |
index 3f5fb3b..e516aff 100644 |
10 |
--- a/eclass/kernel-2.eclass |
11 |
+++ b/eclass/kernel-2.eclass |
12 |
@@ -95,7 +95,7 @@ has "${EAPI:-0}" 0 1 2 3 4 5 || die "kernel-2.eclass |
13 |
is unsupported for EAPI ${E |
14 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
15 |
|
16 |
inherit eutils toolchain-funcs versionator multilib python-any-r1 |
17 |
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install |
18 |
pkg_preinst pkg_postinst pkg_postrm |
19 |
+EXPORT_FUNCTIONS pkg_setup src_prepare src_unpack src_compile src_test |
20 |
src_install pkg_preinst pkg_postinst pkg_postrm |
21 |
|
22 |
# Added by Daniel Ostrow <dostrow@g.o> |
23 |
# This is an ugly hack to get around an issue with a 32-bit userland on |
24 |
ppc64. |
25 |
@@ -1260,12 +1260,9 @@ kernel-2_src_unpack() { |
26 |
# we run misc `make` functions below |
27 |
[[ $(type -t kernel-2_hook_premake) == "function" ]] && |
28 |
kernel-2_hook_premake |
29 |
|
30 |
- debug-print "Applying any user patches" |
31 |
- # apply any user patches |
32 |
- case ${EAPI:-0} in |
33 |
- 0|1|2|3|4|5) epatch_user ;; |
34 |
- 6) eapply_user ;; |
35 |
- esac |
36 |
+ case ${EAPI:-0} in |
37 |
+ 0|1) kernel-2_src_prepare ;; |
38 |
+ esac |
39 |
|
40 |
debug-print "Doing unpack_set_extraversion" |
41 |
|
42 |
@@ -1305,6 +1302,20 @@ kernel-2_src_unpack() { |
43 |
fi |
44 |
} |
45 |
|
46 |
+# @FUNCTION: kernel-2_src_prepare |
47 |
+# @DESCRIPTION: |
48 |
+# Apply any user patches |
49 |
+kernel-2_src_prepare() { |
50 |
+ |
51 |
+ debug-print "Applying any user patches" |
52 |
+ |
53 |
+ # apply any user patches |
54 |
+ case ${EAPI:-0} in |
55 |
+ 0|1|2|3|4|5) epatch_user ;; |
56 |
+ 6) eapply_user ;; |
57 |
+ esac |
58 |
+} |
59 |
+ |
60 |
kernel-2_src_compile() { |
61 |
cd "${S}" |
62 |
[[ ${ETYPE} == headers ]] && compile_headers |
63 |
-- |
64 |
2.7.3 |