[oe] [PATCH 1/2] commit ddf8890a51d2fe5cee15cb2f18638036c0adb43b

[Martyn Welch]

Hmm, that's not right. I'll try again.

Martyn

Martyn Welch wrote:
> Fix mktemp to use update-alternatives
>
>     As suggested in the original version, this patch makes mktemp use
>     update-alternatives.
>
> Signed-off-by: Martyn Welch <martyn.welch at ge.com>
> ---
>
>  recipes/mktemp/mktemp_1.6.bb |   15 +++++++++++----
>  1 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/recipes/mktemp/mktemp_1.6.bb b/recipes/mktemp/mktemp_1.6.bb
> index bd9c4ca..33c1cf1 100644
> --- a/recipes/mktemp/mktemp_1.6.bb
> +++ b/recipes/mktemp/mktemp_1.6.bb
> @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mktemp.org/"
>  SECTION = "console/utils"
>  LICENSE = "GPLv2 BSD"
>  
> -inherit autotools
> +inherit autotools update-alternatives
>  
>  EXTRA_OECONF = "--with-libc"
>  
> @@ -12,6 +12,13 @@ SRC_URI = "\
>    file://add_destdir.patch;patch=1 \
>    file://disable-strip.patch;patch=1 \
>  "
> -	 	 	
> -# FIXME should rather use update-alternatives
> -RCONFLICTS_${PN} = "coreutils"
> +
> +do_install_append () {
> +	mkdir ${D}${base_bindir}
> +	mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp.${PN}
> +}
> +
> +ALTERNATIVE_NAME = "mktemp"
> +ALTERNATIVE_LINK = "${base_bindir}/mktemp"
> +ALTERNATIVE_PATH = "${base_bindir}/mktemp.${PN}"
> +ALTERNATIVE_PRIORITY = "100"
>
>
> --
> Martyn Welch (Principal Software Engineer)   |   Registered in England and
> GE Intelligent Platforms                     |   Wales (3828642) at 100
> T +44(0)127322748                            |   Barbirolli Square, Manchester,
> E martyn.welch at ge.com                        |   M2 3AB  VAT:GB 927559189
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>   


-- 
Martyn Welch (Principal Software Engineer)   |   Registered in England and
GE Intelligent Platforms                     |   Wales (3828642) at 100
T +44(0)127322748                            |   Barbirolli Square, Manchester,
E martyn.welch at ge.com                        |   M2 3AB  VAT:GB 927559189