diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-01-06 15:27:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 22:17:28 +0000 |
commit | 16080a3485bd793edd66ed8361f1e8b86a9e19ea (patch) | |
tree | 33ec875f6059305aed8b44de757b192920ea3230 /meta/recipes-extended | |
parent | acaf650aa4d458120038ba431c2d1ea563f90f77 (diff) | |
download | poky-16080a3485bd793edd66ed8361f1e8b86a9e19ea.tar.gz |
Add missing RDEPENDS of initscripts-functions
Now that the initscripts-functions has been packaged separately,
packages which may use the functions script should have a runtime
dependency on it.
(From OE-Core rev: 6690c12cb1977f6bf93f3eb6d471dbd7db81bf28)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/at/at_3.1.14.bb | 3 | ||||
-rw-r--r-- | meta/recipes-extended/cronie/cronie_1.4.11.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/sysklogd/sysklogd.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 1 |
5 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-extended/at/at_3.1.14.bb b/meta/recipes-extended/at/at_3.1.14.bb index 1eb18b3028..0a1315726e 100644 --- a/meta/recipes-extended/at/at_3.1.14.bb +++ b/meta/recipes-extended/at/at_3.1.14.bb | |||
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" | |||
7 | DEPENDS = "flex flex-native \ | 7 | DEPENDS = "flex flex-native \ |
8 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 8 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
9 | 9 | ||
10 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" | ||
11 | RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ | 10 | RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ |
12 | ${VIRTUAL-RUNTIME_initscripts} \ | 11 | initscripts-functions \ |
13 | " | 12 | " |
14 | 13 | ||
15 | PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" | 14 | PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" |
diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.11.bb index d98d0d9167..c698181280 100644 --- a/meta/recipes-extended/cronie/cronie_1.4.11.bb +++ b/meta/recipes-extended/cronie/cronie_1.4.11.bb | |||
@@ -39,6 +39,8 @@ PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" | |||
39 | INITSCRIPT_NAME = "crond" | 39 | INITSCRIPT_NAME = "crond" |
40 | INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." | 40 | INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." |
41 | 41 | ||
42 | RDEPENDS_${PN} = "initscripts-functions" | ||
43 | |||
42 | USERADD_PACKAGES = "${PN}" | 44 | USERADD_PACKAGES = "${PN}" |
43 | GROUPADD_PARAM_${PN} = "--system crontab" | 45 | GROUPADD_PARAM_${PN} = "--system crontab" |
44 | 46 | ||
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb index 6043501b5b..c1c34037c6 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb | |||
@@ -33,6 +33,8 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" | |||
33 | INITSCRIPT_NAME = "rpcbind" | 33 | INITSCRIPT_NAME = "rpcbind" |
34 | INITSCRIPT_PARAMS = "start 12 2 3 4 5 . stop 60 0 1 6 ." | 34 | INITSCRIPT_PARAMS = "start 12 2 3 4 5 . stop 60 0 1 6 ." |
35 | 35 | ||
36 | RDEPENDS_${PN} = "initscripts-functions" | ||
37 | |||
36 | SYSTEMD_SERVICE_${PN} = "rpcbind.service" | 38 | SYSTEMD_SERVICE_${PN} = "rpcbind.service" |
37 | SYSTEMD_AUTO_ENABLE = "disable" | 39 | SYSTEMD_AUTO_ENABLE = "disable" |
38 | 40 | ||
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 3a518103ea..ef7004429c 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc | |||
@@ -24,6 +24,8 @@ SRC_URI_append_e500v2 = " file://no-vectorization.patch" | |||
24 | INITSCRIPT_NAME = "syslog" | 24 | INITSCRIPT_NAME = "syslog" |
25 | CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}" | 25 | CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}" |
26 | 26 | ||
27 | RDEPENDS_${PN} = "initscripts-functions" | ||
28 | |||
27 | CFLAGS_append = " -DSYSV" | 29 | CFLAGS_append = " -DSYSV" |
28 | 30 | ||
29 | do_install () { | 31 | do_install () { |
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb index 1928949e94..c43892c719 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb | |||
@@ -7,6 +7,7 @@ LICENSE = "BSD" | |||
7 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8" | 7 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8" |
8 | 8 | ||
9 | DEPENDS = "" | 9 | DEPENDS = "" |
10 | RDEPENDS_${PN} = "initscripts-functions" | ||
10 | PR = "r2" | 11 | PR = "r2" |
11 | 12 | ||
12 | SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ | 13 | SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ |