summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-23 08:38:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 13:40:46 (GMT)
commit349c6e7d51b2339683a79bcc752053610e0c5ff7 (patch)
tree15b73ed593cb1fb644d9141ef52e977acdfb81f5
parente7dd47dcdfdba9c34ddab37d0021dc8266d4b2c6 (diff)
downloadpoky-349c6e7d51b2339683a79bcc752053610e0c5ff7.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) 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>
-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 8ead016..3159f93 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 24b50ba..67af3e2 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 \