[PATCH] sed: Cope with ${bindir} and ${base_bindir} being the same

[PATCH] sed: Cope with ${bindir} and ${base_bindir} being the same

[Mike Crowe]

${bindir} and ${base_bindir} may be the same. If they are don't try and
move files onto themselves.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
 meta/recipes-extended/sed/sed_4.2.2.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb
index 72976de..bbfa238 100644
--- a/meta/recipes-extended/sed/sed_4.2.2.bb
+++ b/meta/recipes-extended/sed/sed_4.2.2.bb
@@ -22,8 +22,10 @@ EXTRA_OECONF = "--disable-acl \
 do_install () {
 	autotools_do_install
 	install -d ${D}${base_bindir}
-	mv ${D}${bindir}/sed ${D}${base_bindir}/sed
-	rmdir ${D}${bindir}/
+	if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then
+	    mv ${D}${bindir}/sed ${D}${base_bindir}/sed
+	    rmdir ${D}${bindir}/
+	fi
 }
 
 ALTERNATIVE_${PN} = "sed"
-- 
2.1.4

Re: [PATCH] sed: Cope with ${bindir} and ${base_bindir} being the same

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

On 5 February 2015 at 17:02, Mike Crowe <mac@mcrowe.com> wrote:

> ${bindir} and ${base_bindir} may be the same. If they are don't try and
> move files onto themselves.
>

Funnily enough I did the same fix last week but didn't send it to the list
yet as I needed to rewrite the message.

Can you update this to change both versions of sed?

Ross

[-- Attachment #2: Type: text/html, Size: 822 bytes --]

Re: [PATCH] sed: Cope with ${bindir} and ${base_bindir} being the same

[Mike Crowe]

On Thursday 05 February 2015 at 17:38:07 +0000, Burton, Ross wrote:
> On 5 February 2015 at 17:02, Mike Crowe <mac@mcrowe.com> wrote:
> 
> > ${bindir} and ${base_bindir} may be the same. If they are don't try and
> > move files onto themselves.
> >
> 
> Funnily enough I did the same fix last week but didn't send it to the list
> yet as I needed to rewrite the message.
> 
> Can you update this to change both versions of sed?

Oh, I spotted there were two versions of sed but managed to forget that by
the time I'd tested the patch. :(

I'll send an updated patch.

Thanks.

Mike.

[PATCHv2] sed: Cope with ${bindir} and ${base_bindir} being the same

[Mike Crowe]

${bindir} and ${base_bindir} may be the same. If they are don't try and
move files onto themselves.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
 meta/recipes-extended/sed/sed_4.1.2.bb | 6 ++++--
 meta/recipes-extended/sed/sed_4.2.2.bb | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 4c0f345..40e3a53 100644
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
@@ -23,8 +23,10 @@ do_configure_prepend () {
 do_install () {
 	autotools_do_install
 	install -d ${D}${base_bindir}
-	mv ${D}${bindir}/sed ${D}${base_bindir}/sed
-	rmdir ${D}${bindir}/
+	if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then
+	    mv ${D}${bindir}/sed ${D}${base_bindir}/sed
+	    rmdir ${D}${bindir}/
+	fi
 }
 
 ALTERNATIVE_${PN} = "sed"
diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb
index 72976de..bbfa238 100644
--- a/meta/recipes-extended/sed/sed_4.2.2.bb
+++ b/meta/recipes-extended/sed/sed_4.2.2.bb
@@ -22,8 +22,10 @@ EXTRA_OECONF = "--disable-acl \
 do_install () {
 	autotools_do_install
 	install -d ${D}${base_bindir}
-	mv ${D}${bindir}/sed ${D}${base_bindir}/sed
-	rmdir ${D}${bindir}/
+	if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then
+	    mv ${D}${bindir}/sed ${D}${base_bindir}/sed
+	    rmdir ${D}${bindir}/
+	fi
 }
 
 ALTERNATIVE_${PN} = "sed"
-- 
2.1.4

Re: [PATCHv2] sed: Cope with ${bindir} and ${base_bindir} being the same

[Mike Crowe]

On Thursday 05 February 2015 at 17:50:23 +0000, Mike Crowe wrote:
> ${bindir} and ${base_bindir} may be the same. If they are don't try and
> move files onto themselves.
> 
> Signed-off-by: Mike Crowe <mac@mcrowe.com>
> ---
>  meta/recipes-extended/sed/sed_4.1.2.bb | 6 ++++--
>  meta/recipes-extended/sed/sed_4.2.2.bb | 6 ++++--
>  2 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
> index 4c0f345..40e3a53 100644
> --- a/meta/recipes-extended/sed/sed_4.1.2.bb
> +++ b/meta/recipes-extended/sed/sed_4.1.2.bb
> @@ -23,8 +23,10 @@ do_configure_prepend () {
>  do_install () {
>  	autotools_do_install
>  	install -d ${D}${base_bindir}
> -	mv ${D}${bindir}/sed ${D}${base_bindir}/sed
> -	rmdir ${D}${bindir}/
> +	if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then
> +	    mv ${D}${bindir}/sed ${D}${base_bindir}/sed
> +	    rmdir ${D}${bindir}/
> +	fi
>  }
>  
>  ALTERNATIVE_${PN} = "sed"
> diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb
> index 72976de..bbfa238 100644
> --- a/meta/recipes-extended/sed/sed_4.2.2.bb
> +++ b/meta/recipes-extended/sed/sed_4.2.2.bb
> @@ -22,8 +22,10 @@ EXTRA_OECONF = "--disable-acl \
>  do_install () {
>  	autotools_do_install
>  	install -d ${D}${base_bindir}
> -	mv ${D}${bindir}/sed ${D}${base_bindir}/sed
> -	rmdir ${D}${bindir}/
> +	if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then
> +	    mv ${D}${bindir}/sed ${D}${base_bindir}/sed
> +	    rmdir ${D}${bindir}/
> +	fi
>  }
>  
>  ALTERNATIVE_${PN} = "sed"
> -- 
> 2.1.4

It doesn't look like this patch has been merged. Is there something wrong
with it than I need to attend to?

Thanks.

Mike.

Re: [PATCHv2] sed: Cope with ${bindir} and ${base_bindir} being the same

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

On 3 March 2015 at 16:56, Mike Crowe <mac@mcrowe.com> wrote:

> It doesn't look like this patch has been merged. Is there something wrong
> with it than I need to attend to?
>

My fault - I didn't pull it into MUT as I had a local branch with an
identical commit in, but then I failed to merge that branch.  I'll sort
that now.

Ross

[-- Attachment #2: Type: text/html, Size: 759 bytes --]