[meta-oe][PATCH] htop: Update 1.0.2 -> 1.0.3

[meta-oe][PATCH] htop: Update 1.0.2 -> 1.0.3

[Khem Raj]

Update to latest and at the same time fix
building when S != B

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-support/htop/{htop_1.0.2.bb => htop_1.0.3.bb} |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-support/htop/{htop_1.0.2.bb => htop_1.0.3.bb} (54%)

diff --git a/meta-oe/recipes-support/htop/htop_1.0.2.bb b/meta-oe/recipes-support/htop/htop_1.0.3.bb
similarity index 54%
rename from meta-oe/recipes-support/htop/htop_1.0.2.bb
rename to meta-oe/recipes-support/htop/htop_1.0.3.bb
index 234978b..4e445c8 100644
--- a/meta-oe/recipes-support/htop/htop_1.0.2.bb
+++ b/meta-oe/recipes-support/htop/htop_1.0.3.bb
@@ -8,12 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3"
 DEPENDS = "ncurses"
 RDEPENDS_${PN} = "ncurses-terminfo"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz"
+SRC_URI = "http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz"
 
-LDFLAGS_append_libc-uclibc = " -lubacktrace"
+SRC_URI[md5sum] = "e768b9b55c033d9c1dffda72db3a6ac7"
+SRC_URI[sha256sum] = "055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829"
 
-inherit autotools
+LDFLAGS_append_libc-uclibc = " -lubacktrace"
 
-SRC_URI[md5sum] = "0d01cca8df3349c74569cefebbd9919e"
-SRC_URI[sha256sum] = "ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1"
+do_configure_prepend () {
+	rm -rf ${S}/config.h
+}
 
+inherit autotools
-- 
1.7.10.4

Re: [meta-oe][PATCH] htop: Update 1.0.2 -> 1.0.3

[Martin Jansa]

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

On Fri, Apr 25, 2014 at 11:24:25AM -0700, Khem Raj wrote:
> Update to latest and at the same time fix
> building when S != B

Please compare with
"[oe] [meta-oe][PATCH 1/4] htop: upgrade to 1.0.3 and apply brokensep"

sent today by Jack.

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../recipes-support/htop/{htop_1.0.2.bb => htop_1.0.3.bb} |   13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
>  rename meta-oe/recipes-support/htop/{htop_1.0.2.bb => htop_1.0.3.bb} (54%)
> 
> diff --git a/meta-oe/recipes-support/htop/htop_1.0.2.bb b/meta-oe/recipes-support/htop/htop_1.0.3.bb
> similarity index 54%
> rename from meta-oe/recipes-support/htop/htop_1.0.2.bb
> rename to meta-oe/recipes-support/htop/htop_1.0.3.bb
> index 234978b..4e445c8 100644
> --- a/meta-oe/recipes-support/htop/htop_1.0.2.bb
> +++ b/meta-oe/recipes-support/htop/htop_1.0.3.bb
> @@ -8,12 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3"
>  DEPENDS = "ncurses"
>  RDEPENDS_${PN} = "ncurses-terminfo"
>  
> -SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz"
> +SRC_URI = "http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz"
>  
> -LDFLAGS_append_libc-uclibc = " -lubacktrace"
> +SRC_URI[md5sum] = "e768b9b55c033d9c1dffda72db3a6ac7"
> +SRC_URI[sha256sum] = "055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829"
>  
> -inherit autotools
> +LDFLAGS_append_libc-uclibc = " -lubacktrace"
>  
> -SRC_URI[md5sum] = "0d01cca8df3349c74569cefebbd9919e"
> -SRC_URI[sha256sum] = "ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1"
> +do_configure_prepend () {
> +	rm -rf ${S}/config.h
> +}
>  
> +inherit autotools
> -- 
> 1.7.10.4
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe][PATCH] htop: Update 1.0.2 -> 1.0.3

[Khem Raj]

On Fri, Apr 25, 2014 at 11:26 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> "[oe] [meta-oe][PATCH 1/4] htop: upgrade to 1.0.3 and apply brokensep"

inheriting autotools-brokensep is a workaround until we have fixed the
 package proper intention should be to not use autotools-brokensep and
fix the packages and use autotools-brokensep as last resort.

Re: [meta-oe][PATCH] htop: Update 1.0.2 -> 1.0.3

[Jack Mitchell]

On 25/04/2014 19:56, Khem Raj wrote:
> On Fri, Apr 25, 2014 at 11:26 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> "[oe] [meta-oe][PATCH 1/4] htop: upgrade to 1.0.3 and apply brokensep"
>
> inheriting autotools-brokensep is a workaround until we have fixed the
>   package proper intention should be to not use autotools-brokensep and
> fix the packages and use autotools-brokensep as last resort.
>

I agree, my fixes were just quick ones today which got me building. I 
would take Khems patch over mine as it seems to actually address the 
problem.

Cheers,