Patchwork dhcp: remove dependency of dev/staticdev packages on main package

login
register
mail settings
Submitter Paul Eggleton
Date July 23, 2012, 8:38 a.m.
Message ID <1343032726-6310-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/32833/
State Accepted
Commit 5380c65e819d82f783cb75aa21db7c73bb445189
Headers show

Comments

Paul Eggleton - July 23, 2012, 8:38 a.m.
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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-connectivity/dhcp/dhcp.inc         |    2 ++
 meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
Saul Wold - July 26, 2012, 7:27 p.m.
On 07/23/2012 01:38 AM, Paul Eggleton wrote:
> 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.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>   meta/recipes-connectivity/dhcp/dhcp.inc         |    2 ++
>   meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb |    2 +-
>   2 files changed, 3 insertions(+), 1 deletion(-)
>
> 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 () {
>   PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
>
>   FILES_${PN} = ""
> +RDEPENDS_${PN}-dev = ""
> +RDEPENDS_${PN}-staticdev = ""
>
>   FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
>   RRECOMMENDS_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 @@
>   require dhcp.inc
>
> -PR = "r0"
> +PR = "r1"
>
>   SRC_URI += "file://fixincludes.patch \
>               file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
>

Merged into OE-Core

Thanks
	Sau!

Patch

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 () {
 PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
 
 FILES_${PN} = ""
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_${PN}-staticdev = ""
 
 FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
 RRECOMMENDS_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 @@ 
 require dhcp.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://fixincludes.patch \
             file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \