diff options
author | Changqing Li <changqing.li@windriver.com> | 2025-04-28 13:51:06 +0800 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2025-05-02 08:20:12 -0700 |
commit | f587cfcb8aac3c53f1c029e7809bfcc8f30a4f05 (patch) | |
tree | 9739e6c87ef5f6e5a195cf58e29d0f9756d4be7c | |
parent | 1feef3d75dc32300b60f2f99112eae42dbc6722f (diff) | |
download | poky-f587cfcb8aac3c53f1c029e7809bfcc8f30a4f05.tar.gz |
initscripts: add function log_success_msg/log_failure_msg/log_warning_msg
* add function log_success_msg/log_failure_msg/log_warning_msg, some
packages still use these functions, like mariadb, refer [1], without
these function, with sysV init manager, mariadb will report error:
root@qemux86-64:~# /etc/init.d/mysqld status
/etc/init.d/mysqld: line 383: log_success_msg: command not found
* remove RCONFLICTS with lsbinitscripts, LSB support already remove in
[2]
[1] https://github.com/MariaDB/server/blob/main/support-files/mysql.server.sh#L104
[2] https://git.openembedded.org/openembedded-core/commit/?id=fb064356af615d67d85b65942103bf943d84d290
[3] https://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/iniscrptfunc.html
(From OE-Core rev: 90cf409ba74c4bb398199667ea2819759a720373)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rwxr-xr-x | meta/recipes-core/initscripts/initscripts-1.0/functions | 21 | ||||
-rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 1 |
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/functions b/meta/recipes-core/initscripts/initscripts-1.0/functions index 35aebd4a55..7fc19c808b 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/functions +++ b/meta/recipes-core/initscripts/initscripts-1.0/functions | |||
@@ -92,3 +92,24 @@ passed() { | |||
92 | echo -n -e "${BRACKET}[${SUCCESS} PASS ${BRACKET}]${NORMAL}" | 92 | echo -n -e "${BRACKET}[${SUCCESS} PASS ${BRACKET}]${NORMAL}" |
93 | return $rc | 93 | return $rc |
94 | } | 94 | } |
95 | |||
96 | log_success_msg() | ||
97 | { | ||
98 | echo -n $@ | ||
99 | success | ||
100 | echo | ||
101 | } | ||
102 | |||
103 | log_failure_msg() | ||
104 | { | ||
105 | echo -n $@ | ||
106 | failure | ||
107 | echo | ||
108 | } | ||
109 | |||
110 | log_warning_msg() | ||
111 | { | ||
112 | echo -n $@ | ||
113 | warning | ||
114 | echo | ||
115 | } | ||
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index e61ac554f3..56ee65ac5b 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
@@ -53,7 +53,6 @@ RDEPENDS:${PN} = "initd-functions \ | |||
53 | # Recommend pn-functions so that it will be a preferred default provider for initd-functions | 53 | # Recommend pn-functions so that it will be a preferred default provider for initd-functions |
54 | RRECOMMENDS:${PN} = "${PN}-functions" | 54 | RRECOMMENDS:${PN} = "${PN}-functions" |
55 | RPROVIDES:${PN}-functions = "initd-functions" | 55 | RPROVIDES:${PN}-functions = "initd-functions" |
56 | RCONFLICTS:${PN}-functions = "lsbinitscripts" | ||
57 | FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" | 56 | FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" |
58 | FILES:${PN}-sushell = "${base_sbindir}/sushell" | 57 | FILES:${PN}-sushell = "${base_sbindir}/sushell" |
59 | 58 | ||