[PATCH 1/2] commit ddf8890a51d2fe5cee15cb2f18638036c0adb43b

[PATCH 1/2] commit ddf8890a51d2fe5cee15cb2f18638036c0adb43b

[Martyn Welch]

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@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@ge.com                        |   M2 3AB  VAT:GB 927559189

[PATCH 2/2] commit cad79f3dc9193233042d8494b864375f9b07c7ac

[Martyn Welch]

Correct SRC_URL for fftw-3.1.2

    The fftw-3.1.2 tarball has been moved to a sub-directory. Over-ride the
    SRC_URL provided in the .inc file.

Signed-off-by: Martyn Welch <martyn.welch@ge.com>
---

 conf/checksums.ini          |    2 +-
 recipes/fftw/fftw_3.1.2.bb  |    2 ++
 recipes/fftw/fftwf_3.1.2.bb |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 63cf415..b21a35a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6918,7 +6918,7 @@ sha256=16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 md5=e67e1c2eb134d2fba50a524188b6a3b4
 sha256=61ba89c0deaaf324485b2bf480fdb90941b74e2c47b4810e34f530b77005bb8c
 
-[http://www.fftw.org/fftw-3.1.2.tar.gz]
+[ftp://ftp.fftw.org/pub/fftw/old/fftw-3.1.2.tar.gz]
 md5=08f2e21c9fd02f4be2bd53a62592afa4
 sha256=e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf
 
diff --git a/recipes/fftw/fftw_3.1.2.bb b/recipes/fftw/fftw_3.1.2.bb
index bb58aac..b170179 100644
--- a/recipes/fftw/fftw_3.1.2.bb
+++ b/recipes/fftw/fftw_3.1.2.bb
@@ -1,5 +1,7 @@
 require fftw.inc
 
+SRC_URI = "ftp://ftp.fftw.org/pub/fftw/old/fftw-${PV}.tar.gz"
+
 EXTRA_OECONF = "--disable-fortran --enable-shared"
 
 
diff --git a/recipes/fftw/fftwf_3.1.2.bb b/recipes/fftw/fftwf_3.1.2.bb
index a0bba2c..83a7f4b 100644
--- a/recipes/fftw/fftwf_3.1.2.bb
+++ b/recipes/fftw/fftwf_3.1.2.bb
@@ -1,4 +1,6 @@
 require fftw.inc
 
+SRC_URI = "ftp://ftp.fftw.org/pub/fftw/old/fftw-${PV}.tar.gz"
+
 EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared"
 


--
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@ge.com                        |   M2 3AB  VAT:GB 927559189

Re: [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@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@ge.com                        |   M2 3AB  VAT:GB 927559189
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@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@ge.com                        |   M2 3AB  VAT:GB 927559189