Patchwork dhcp: don't try to move files from ${sbindir} to ${base_sbindir} if they are the same

login
register
mail settings
Submitter Phil Blundell
Date June 16, 2011, 1:27 p.m.
Message ID <1308230863.25285.4590.camel@phil-desktop>
Download mbox | patch
Permalink /patch/6021/
State New, archived
Headers show

Comments

Phil Blundell - June 16, 2011, 1:27 p.m.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-connectivity/dhcp/dhcp4.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Phil Blundell - June 27, 2011, 3:26 p.m.
Ping?

p.

On Thu, 2011-06-16 at 14:27 +0100, Phil Blundell wrote:
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
>  meta/recipes-connectivity/dhcp/dhcp4.inc |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
> index 159ae89..885cc19 100644
> --- a/meta/recipes-connectivity/dhcp/dhcp4.inc
> +++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
> @@ -47,7 +47,9 @@ do_install_append () {
>  	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
>  
>  	install -d ${D}${base_sbindir}/
> -	mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
> +	if [ "${sbindir}" != "${base_sbindir}" ]; then
> +		mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
> +	fi
>  	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
>  }
>
Khem Raj - June 29, 2011, 12:31 a.m.
On 06/16/2011 06:27 AM, Phil Blundell wrote:
>
> Signed-off-by: Phil Blundell<philb@gnu.org>

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
>   meta/recipes-connectivity/dhcp/dhcp4.inc |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
> index 159ae89..885cc19 100644
> --- a/meta/recipes-connectivity/dhcp/dhcp4.inc
> +++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
> @@ -47,7 +47,9 @@ do_install_append () {
>   	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
>
>   	install -d ${D}${base_sbindir}/
> -	mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
> +	if [ "${sbindir}" != "${base_sbindir}" ]; then
> +		mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
> +	fi
>   	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
>   }
>
Saul Wold - June 29, 2011, 12:42 a.m.
On 06/16/2011 06:27 AM, Phil Blundell wrote:
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
>   meta/recipes-connectivity/dhcp/dhcp4.inc |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
> index 159ae89..885cc19 100644
> --- a/meta/recipes-connectivity/dhcp/dhcp4.inc
> +++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
> @@ -47,7 +47,9 @@ do_install_append () {
>   	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
>
>   	install -d ${D}${base_sbindir}/
> -	mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
> +	if [ "${sbindir}" != "${base_sbindir}" ]; then
> +		mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
> +	fi
>   	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
>   }
>

Appears to be merged in OE-Core, just no email yet.

Consider this your Merged email!  I think that RP is catching up Emails 
may not have yet.

Sau!

Patch

diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index 159ae89..885cc19 100644
--- a/meta/recipes-connectivity/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
@@ -47,7 +47,9 @@  do_install_append () {
 	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
 
 	install -d ${D}${base_sbindir}/
-	mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
+	if [ "${sbindir}" != "${base_sbindir}" ]; then
+		mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
+	fi
 	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
 }