summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-16 22:05:15 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 16:53:14 +0100
commit3c363a70aa6c73bcf4256f560dfd2d3367ae1736 (patch)
treef709c4c0373d3fdfe9f9638547bd776ef8773cd5 /meta
parent2fab410f2e0c25157bce6e9f5b2416338116ad5f (diff)
downloadpoky-3c363a70aa6c73bcf4256f560dfd2d3367ae1736.tar.gz
dhcp: remove dependency of dev/staticdev packages on main package
The main package is empty and is not produced, which leaves the dev and staticdev packages broken. Remove the dependencies (added in bitbake.conf by default) to fix this. (From OE-Core rev: 5380c65e819d82f783cb75aa21db7c73bb445189) (From OE-Core rev: 02dc5c9b7b1f21c9f8d9a9299933fa88dc16c542) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc2
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 8ead016901..3159f93850 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -56,6 +56,8 @@ do_install_append () {
56PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" 56PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
57 57
58FILES_${PN} = "" 58FILES_${PN} = ""
59RDEPENDS_${PN}-dev = ""
60RDEPENDS_${PN}-staticdev = ""
59 61
60FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" 62FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
61RRECOMMENDS_dhcp-server = "dhcp-server-config" 63RRECOMMENDS_dhcp-server = "dhcp-server-config"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
index 24b50ba2ab..67af3e2a82 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
@@ -1,6 +1,6 @@
1require dhcp.inc 1require dhcp.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI += "file://fixincludes.patch \ 5SRC_URI += "file://fixincludes.patch \
6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ 6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \