1 |
On 5/16/22 08:19, Mike Pagano wrote: |
2 |
> Updates based on Ulm's review. Thanks for the review. |
3 |
> |
4 |
> Signed-off-by: Mike Pagano <mpagano@g.o> |
5 |
> --- |
6 |
> eclass/linux-info.eclass | 35 ++++++++++++++++++++++++++++++----- |
7 |
> 1 file changed, 30 insertions(+), 5 deletions(-) |
8 |
> |
9 |
> diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass |
10 |
> index d2003874d..7e130062a 100644 |
11 |
> --- a/eclass/linux-info.eclass |
12 |
> +++ b/eclass/linux-info.eclass |
13 |
> @@ -169,10 +169,9 @@ set_arch_to_portage() { |
14 |
> # Set the env ARCH to match what the package manager expects. |
15 |
> set_arch_to_pkgmgr() { export ARCH=$(tc-arch); } |
16 |
> |
17 |
> -# qeinfo "Message" |
18 |
> -# ------------------- |
19 |
> -# qeinfo is a quiet einfo call when EBUILD_PHASE |
20 |
> -# should not have visible output. |
21 |
> +# @FUNCTION: qout |
22 |
> +# @DESCRIPTION: |
23 |
> +# qout <einfo | ewarn | eerror> is a quiet call when EBUILD_PHASE should not have visible output. |
24 |
> qout() { |
25 |
> local outputmsg type |
26 |
> type=${1} |
27 |
> @@ -186,8 +185,21 @@ qout() { |
28 |
> [ -n "${outputmsg}" ] && ${type} "${outputmsg}" |
29 |
> } |
30 |
> |
31 |
> +# @FUNCTION: qeinfo |
32 |
> +# @DESCRIPTION: |
33 |
> +# qeinfo is a quiet einfo call when EBUILD_PHASE should not have visible output. |
34 |
> qeinfo() { qout einfo "${@}" ; } |
35 |
> + |
36 |
> +# @FUNCTION: qewarn |
37 |
> +# @DESCRIPTION: |
38 |
> +# qewarn is a quiet ewarn call when EBUILD_PHASE |
39 |
> +# should not have visible output. |
40 |
> qewarn() { qout ewarn "${@}" ; } |
41 |
> + |
42 |
> +# @FUNCTION: qeerror |
43 |
> +# @DESCRIPTION: |
44 |
> +# qeerror is a quiet error call when EBUILD_PHASE |
45 |
> +# should not have visible output. |
46 |
> qeerror() { qout eerror "${@}" ; } |
47 |
> |
48 |
> # File Functions |
49 |
> @@ -269,6 +281,10 @@ getfilevar_noexec() { |
50 |
> # config is available at all. |
51 |
> _LINUX_CONFIG_EXISTS_DONE= |
52 |
> |
53 |
> +# @FUNCTION: linux_config_qa_check |
54 |
> +# @INTERNAL |
55 |
> +# @DESCRIPTION: |
56 |
> +# Helper funciton which returns an error before the function argument is run if no config exists |
57 |
> linux_config_qa_check() { |
58 |
> local f="$1" |
59 |
> if [ -z "${_LINUX_CONFIG_EXISTS_DONE}" ]; then |
60 |
> @@ -438,6 +454,9 @@ kernel_is() { |
61 |
> "${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}" |
62 |
> } |
63 |
> |
64 |
> +# @FUNCTION: get_makefile_extract_function |
65 |
> +# @INTERNAL |
66 |
> +# @DESCRIPTION: |
67 |
> # Check if the Makefile is valid for direct parsing. |
68 |
> # Check status results: |
69 |
> # - PASS, use 'getfilevar' to extract values |
70 |
> @@ -453,7 +472,10 @@ get_makefile_extract_function() { |
71 |
> echo "${mkfunc}" |
72 |
> } |
73 |
> |
74 |
> -# internal variable, so we know to only print the warning once |
75 |
> +# @ECLASS_VARIABLE: get_version_warning_done |
76 |
> +# @INTERNAL |
77 |
> +# @DESCRIPTION: |
78 |
> +# Internal variable, so we know to only print the warning once. |
79 |
> get_version_warning_done= |
80 |
> |
81 |
> # @FUNCTION: get_version |
82 |
> @@ -870,6 +892,9 @@ check_extra_config() { |
83 |
> export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}" |
84 |
> } |
85 |
> |
86 |
> +# @FUNCTION: check_zlibinflate |
87 |
> +# @DESCRIPTION: |
88 |
> +# Function to make sure a ZLIB_INFLATE configuration has the required symbols. |
89 |
> check_zlibinflate() { |
90 |
> if ! use kernel_linux; then |
91 |
> die "${FUNCNAME}() called on non-Linux system, please fix the ebuild" |
92 |
|
93 |
committed |