[Buildroot] [PATCH v2 1/1] package/htop: fix sources location

[Buildroot] [PATCH v2 1/1] package/htop: fix sources location

[Daniil Stas]

Change sources location from bintray to github since bintray doesn't
work anymore.
Use commit hash for version instead of git tag to avoid breaking
existing source caches.

Signed-off-by: Daniil Stas <daniil.stas@posteo.net>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
Backport to: 2021.02.x, 2021.05.x

Changes v1 -> v2:
  - Use commit hash instead of git tag for the package version
---
 package/htop/htop.hash |  2 +-
 package/htop/htop.mk   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/htop/htop.hash b/package/htop/htop.hash
index 647feabb8e..34d95eb7a1 100644
--- a/package/htop/htop.hash
+++ b/package/htop/htop.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  19535f8f01ac08be2df880c93c9cedfc50fa92320d48e3ef92a30b6edc4d1917  htop-3.0.5.tar.gz
+sha256  123476d56a5e6a219654eebb6b2ec747dfa364f39c01a6475bf8030a25c81bff  htop-ce6d60e7def146c13d0b8bca4642e7401a0a8995.tar.gz
 sha256  c228cc14df980a23ea0c3c9ac957b904dd6a8514f6283db403de22e9179471be  COPYING
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index aa2ff24750..bb2bcb29ae 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -4,9 +4,15 @@
 #
 ################################################################################
 
-HTOP_VERSION = 3.0.5
-HTOP_SITE = https://dl.bintray.com/htop/source
+# This commit hash corresponds to version 3.0.5.
+# htop sources were moved from bintray to github and the sources tar archive
+# was also changed (the build process requires `HTOP_AUTORECONF = YES` now). We
+# use commit hash instead of git tag here to avoid breaking existing source
+# caches
+HTOP_VERSION = ce6d60e7def146c13d0b8bca4642e7401a0a8995
+HTOP_SITE = $(call github,htop-dev,htop,$(HTOP_VERSION))
 HTOP_DEPENDENCIES = ncurses
+HTOP_AUTORECONF = YES
 # Prevent htop build system from searching the host paths
 HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
 HTOP_LICENSE = GPL-2.0
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/htop: fix sources location

[Thomas Petazzoni]

On Sun, 25 Jul 2021 12:57:46 +0000
Daniil Stas <daniil.stas@posteo.net> wrote:

> Change sources location from bintray to github since bintray doesn't
> work anymore.
> Use commit hash for version instead of git tag to avoid breaking
> existing source caches.
> 
> Signed-off-by: Daniil Stas <daniil.stas@posteo.net>
> Cc: Baruch Siach <baruch@tkos.co.il>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> Backport to: 2021.02.x, 2021.05.x

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/htop: fix sources location

[Yann E. MORIN]

Daniil, All,

On 2021-07-28 21:43 +0000, Daniil Stas spake thusly:
> On Mon, 26 Jul 2021 23:58:21 +0200
> Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
> > On Sun, 25 Jul 2021 12:57:46 +0000
> > Daniil Stas <daniil.stas@posteo.net> wrote:
> > > Change sources location from bintray to github since bintray doesn't
> > > work anymore.
> > Applied to master, thanks.
> I think the original htop-3.0.5.tar.gz was overwritten after Yann
> applied the first version of my patch. And looks like now it's removed
> from http://sources.buildroot.net/htop/.
> That means that htop package is broken for the released versions of
> buildroot...

Indeed, I can't see the archive there...

Peter, Thomas: did you happen to remove the tarball from s.b.o ?

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/htop: fix sources location

[Thomas Petazzoni]

On Thu, 29 Jul 2021 22:32:47 +0200
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Daniil, All,
> 
> On 2021-07-28 21:43 +0000, Daniil Stas spake thusly:
> > On Mon, 26 Jul 2021 23:58:21 +0200
> > Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:  
> > > On Sun, 25 Jul 2021 12:57:46 +0000
> > > Daniil Stas <daniil.stas@posteo.net> wrote:  
> > > > Change sources location from bintray to github since bintray doesn't
> > > > work anymore.  
> > > Applied to master, thanks.  
> > I think the original htop-3.0.5.tar.gz was overwritten after Yann
> > applied the first version of my patch. And looks like now it's removed
> > from http://sources.buildroot.net/htop/.
> > That means that htop package is broken for the released versions of
> > buildroot...  
> 
> Indeed, I can't see the archive there...
> 
> Peter, Thomas: did you happen to remove the tarball from s.b.o ?

No, I didn't do anything related to s.b.o.

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/htop: fix sources location

[Yann E. MORIN]

Daniil, All,

On 2021-07-28 21:43 +0000, Daniil Stas spake thusly:
> On Mon, 26 Jul 2021 23:58:21 +0200
> Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
> > On Sun, 25 Jul 2021 12:57:46 +0000
> > Daniil Stas <daniil.stas@posteo.net> wrote:
> > > Change sources location from bintray to github since bintray doesn't
> > > work anymore.
> > > Use commit hash for version instead of git tag to avoid breaking
> > > existing source caches.
> I think the original htop-3.0.5.tar.gz was overwritten after Yann
> applied the first version of my patch. And looks like now it's removed
> from http://sources.buildroot.net/htop/.

Indeed, we finally understood why the original tarball was missing.

Thing is (which I was oblivious to), the caching process directly runs
on s.b.o, directly using the cache directory as BR2_DL_DIR.

So, when we download a file, and its hash is wrong, we ermove the file,
and continue the download to the next location (primary mirror, uptream
location, backup mirror).

However, in the s.b.o filling process, there is no backup mirror,
because we are the backup mirror already...

So, because the htop 3.0.5 archive had the wrong hash, it got removed.

And when I reverted the change, we had no other location where to grab
it from.

Thomas has now restored the archive on s.b.o:

    http://sources.buildroot.org/htop/htop-3.0.5.tar.gz

The CDN-backed s.b.n will eventually catch up...

Thanks for letting us now! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot