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 | |
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>
-rw-r--r-- | meta/recipes-bsp/alsa-state/alsa-state.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd_3.2.2-14.bb | 1 | ||||
-rw-r--r-- | meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.4p1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_208.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/distcc/distcc_3.1.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 | ||||
-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 | ||||
-rw-r--r-- | meta/recipes-kernel/oprofile/oprofileui-server_git.bb | 2 |
17 files changed, 22 insertions, 11 deletions
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb index 552fcfc022..4be74aa036 100644 --- a/meta/recipes-bsp/alsa-state/alsa-state.bb +++ b/meta/recipes-bsp/alsa-state/alsa-state.bb | |||
@@ -37,7 +37,7 @@ PACKAGES += "alsa-states" | |||
37 | 37 | ||
38 | RRECOMMENDS_alsa-state = "alsa-states" | 38 | RRECOMMENDS_alsa-state = "alsa-states" |
39 | 39 | ||
40 | RDEPENDS_${PN} = "alsa-utils-alsactl" | 40 | RDEPENDS_${PN} = "alsa-utils-alsactl initscripts-functions" |
41 | FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" | 41 | FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" |
42 | CONFFILES_${PN} = "${sysconfdir}/asound.conf" | 42 | CONFFILES_${PN} = "${sysconfdir}/asound.conf" |
43 | 43 | ||
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb index 8c4b75eb6d..d5ddc174f5 100644 --- a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb +++ b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb | |||
@@ -8,6 +8,7 @@ LICENSE = "GPLv2+" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
9 | file://apm.h;beginline=6;endline=18;md5=7d4acc1250910a89f84ce3cc6557c4c2" | 9 | file://apm.h;beginline=6;endline=18;md5=7d4acc1250910a89f84ce3cc6557c4c2" |
10 | DEPENDS = "libtool-cross" | 10 | DEPENDS = "libtool-cross" |
11 | RDEPENDS_${PN} = "initscripts-functions" | ||
11 | PR = "r2" | 12 | PR = "r2" |
12 | 13 | ||
13 | SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \ | 14 | SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \ |
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb index 7f216ac704..59c9b6acce 100644 --- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb +++ b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb | |||
@@ -24,6 +24,8 @@ inherit autotools update-rc.d | |||
24 | INITSCRIPT_NAME = "irattach" | 24 | INITSCRIPT_NAME = "irattach" |
25 | INITSCRIPT_PARAMS = "defaults 20" | 25 | INITSCRIPT_PARAMS = "defaults 20" |
26 | 26 | ||
27 | RDEPENDS_${PN} += "initscripts-functions" | ||
28 | |||
27 | do_compile () { | 29 | do_compile () { |
28 | oe_runmake -e -C irattach | 30 | oe_runmake -e -C irattach |
29 | oe_runmake -e -C irdaping | 31 | oe_runmake -e -C irdaping |
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb index 45eacd970e..fd44ea1b20 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb | |||
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" | |||
9 | 9 | ||
10 | # util-linux for libblkid | 10 | # util-linux for libblkid |
11 | DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3" | 11 | DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3" |
12 | RDEPENDS_${PN}-client = "rpcbind bash" | 12 | RDEPENDS_${PN}-client = "rpcbind bash initscripts-functions" |
13 | RDEPENDS_${PN} = "${PN}-client bash" | 13 | RDEPENDS_${PN} = "${PN}-client bash initscripts-functions" |
14 | RRECOMMENDS_${PN} = "kernel-module-nfsd" | 14 | RRECOMMENDS_${PN} = "kernel-module-nfsd" |
15 | 15 | ||
16 | inherit useradd | 16 | inherit useradd |
diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb index 4f8d70aa2f..c61d16f6c6 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb | |||
@@ -122,7 +122,7 @@ FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" | |||
122 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" | 122 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" |
123 | 123 | ||
124 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" | 124 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" |
125 | RDEPENDS_${PN}-sshd += "${PN}-keygen" | 125 | RDEPENDS_${PN}-sshd += "${PN}-keygen initscripts-functions" |
126 | 126 | ||
127 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" | 127 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" |
128 | CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" | 128 | CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" |
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index 52bab4fc43..ed1a3910a6 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb | |||
@@ -5,6 +5,7 @@ SECTION = "console/network" | |||
5 | HOMEPAGE = "http://samba.org/ppp/" | 5 | HOMEPAGE = "http://samba.org/ppp/" |
6 | BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" | 6 | BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" |
7 | DEPENDS = "libpcap" | 7 | DEPENDS = "libpcap" |
8 | RDEPENDS_${PN} = "initscripts-functions" | ||
8 | LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD" | 9 | LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD" |
9 | LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ | 10 | LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ |
10 | file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ | 11 | file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ |
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index ae80cb0540..9bdb48959e 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -6,7 +6,7 @@ LICENSE = "AFL-2 | GPLv2+" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ |
7 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" | 7 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" |
8 | DEPENDS = "expat virtual/libintl" | 8 | DEPENDS = "expat virtual/libintl" |
9 | RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" | 9 | RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)} initscripts-functions" |
10 | RDEPENDS_dbus_class-native = "" | 10 | RDEPENDS_dbus_class-native = "" |
11 | RDEPENDS_dbus_class-nativesdk = "" | 11 | RDEPENDS_dbus_class-nativesdk = "" |
12 | 12 | ||
diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index dcf68dcde3..6590235ca7 100644 --- a/meta/recipes-core/systemd/systemd_208.bb +++ b/meta/recipes-core/systemd/systemd_208.bb | |||
@@ -229,7 +229,7 @@ PACKAGES =+ "udev-dbg udev udev-utils udev-hwdb" | |||
229 | 229 | ||
230 | FILES_udev-dbg += "/lib/udev/.debug" | 230 | FILES_udev-dbg += "/lib/udev/.debug" |
231 | 231 | ||
232 | RDEPENDS_udev += "udev-utils" | 232 | RDEPENDS_udev += "udev-utils initscripts-functions" |
233 | RPROVIDES_udev = "hotplug" | 233 | RPROVIDES_udev = "hotplug" |
234 | RRECOMMENDS_udev += "udev-hwdb" | 234 | RRECOMMENDS_udev += "udev-hwdb" |
235 | 235 | ||
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index dd25f71530..a84448aadb 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
7 | file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" | 7 | file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" |
8 | PR = "r11" | 8 | PR = "r11" |
9 | 9 | ||
10 | RDEPENDS_${PN} = "${PN}-inittab" | 10 | RDEPENDS_${PN} = "${PN}-inittab initscripts-functions" |
11 | 11 | ||
12 | SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \ | 12 | SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \ |
13 | file://install.patch \ | 13 | file://install.patch \ |
diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb index 5c889fa9bc..e351a58192 100644 --- a/meta/recipes-devtools/distcc/distcc_3.1.bb +++ b/meta/recipes-devtools/distcc/distcc_3.1.bb | |||
@@ -6,6 +6,7 @@ LICENSE = "GPLv2" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
7 | 7 | ||
8 | DEPENDS = "avahi" | 8 | DEPENDS = "avahi" |
9 | RDEPENDS_${PN} = "initscripts-functions" | ||
9 | 10 | ||
10 | GTKCONFIG = "gtk" | 11 | GTKCONFIG = "gtk" |
11 | GTKCONFIG_libc-uclibc = "" | 12 | GTKCONFIG_libc-uclibc = "" |
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 1eb0021eec..6d0fbb6c36 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git \ | |||
15 | " | 15 | " |
16 | 16 | ||
17 | DEPENDS = "util-linux openssl" | 17 | DEPENDS = "util-linux openssl" |
18 | RDEPENDS_${PN} = "bash" | 18 | RDEPENDS_${PN} = "bash initscripts-functions" |
19 | 19 | ||
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
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 \ |
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb index dbb559965a..63f33e2e60 100644 --- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "git://git.yoctoproject.org/oprofileui \ | |||
11 | 11 | ||
12 | EXTRA_OECONF += "--disable-client --enable-server" | 12 | EXTRA_OECONF += "--disable-client --enable-server" |
13 | 13 | ||
14 | RDEPENDS_${PN} = "oprofile" | 14 | RDEPENDS_${PN} = "oprofile initscripts-functions" |
15 | 15 | ||
16 | do_install_append() { | 16 | do_install_append() { |
17 | install -d ${D}${sysconfdir}/init.d | 17 | install -d ${D}${sysconfdir}/init.d |