[v2,1/2] package/armadillo: temporarily update the site URL
diff mbox series

Message ID 20240901064509.3505801-1-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [v2,1/2] package/armadillo: temporarily update the site URL
Related show

Commit Message

Dario Binacchi Sept. 1, 2024, 6:45 a.m. UTC 
Following an email exchange with Conrad Sand, one of the maintainers of
the project, I learned that version 9.900.2 has been moved to
https://sourceforge.net/projects/arma/files/retired/.

This patch fixes the package download error, waiting for a subsequent
patch that will restore the previous URL to bump to a more recent
version.

Adding the .RETIRED suffix to the downloaded tarball generated the
following error:

armadillo-9.900.2.tar.xz.RETIRED: OK (sha256: d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05)
>>> armadillo 9.900.2 Extracting
buildroot/dl/armadillo/armadillo-9.900.2.tar.xz.RETIRED | buildroot/output/host/bin/tar --strip-components=1 -C buildroot/output/build/armadillo-9.900.2   -xf -
/bin/bash: line 1: buildroot/dl/armadillo/armadillo-9.900.2.tar.xz.RETIRED: Permission denied
buildroot/output/host/bin/tar: This does not look like a tar archive
buildroot/output/host/bin/tar: Exiting with failure status due to previous errors
make[1]: *** [package/pkg-generic.mk:213: buildroot/output/build/armadillo-9.900.2/.stamp_extracted] Error 2

which required the addition of ARMADILLO_EXTRACT_CMDS to be fixed.

Finally, it was also necessary to modify the tarball's hash.

Fixes:
- http://autobuild.buildroot.org/results/d4e9e7b453960a4f62a199344b30b729a4f235bc

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes v1 -> v2:
  - Don't bump to 10.1.0 but update the URL site to continue to download and
    build the current version (e. g. 9.900.2).

 package/armadillo/armadillo.hash | 2 +-
 package/armadillo/armadillo.mk   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

Comments

'Krzysztof Kozlowski' via Amarula Linux Sept. 3, 2024, 8:10 p.m. UTC | #1 
On Sun,  1 Sep 2024 08:45:08 +0200
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:

> Following an email exchange with Conrad Sand, one of the maintainers of
> the project, I learned that version 9.900.2 has been moved to
> https://sourceforge.net/projects/arma/files/retired/.
> 
> This patch fixes the package download error, waiting for a subsequent
> patch that will restore the previous URL to bump to a more recent
> version.
> 
> Adding the .RETIRED suffix to the downloaded tarball generated the
> following error:
> 
> armadillo-9.900.2.tar.xz.RETIRED: OK (sha256: d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05)
> >>> armadillo 9.900.2 Extracting  
> buildroot/dl/armadillo/armadillo-9.900.2.tar.xz.RETIRED | buildroot/output/host/bin/tar --strip-components=1 -C buildroot/output/build/armadillo-9.900.2   -xf -
> /bin/bash: line 1: buildroot/dl/armadillo/armadillo-9.900.2.tar.xz.RETIRED: Permission denied
> buildroot/output/host/bin/tar: This does not look like a tar archive
> buildroot/output/host/bin/tar: Exiting with failure status due to previous errors
> make[1]: *** [package/pkg-generic.mk:213: buildroot/output/build/armadillo-9.900.2/.stamp_extracted] Error 2
> 
> which required the addition of ARMADILLO_EXTRACT_CMDS to be fixed.
> 
> Finally, it was also necessary to modify the tarball's hash.
> 
> Fixes:
> - http://autobuild.buildroot.org/results/d4e9e7b453960a4f62a199344b30b729a4f235bc
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> Changes v1 -> v2:
>   - Don't bump to 10.1.0 but update the URL site to continue to download and
>     build the current version (e. g. 9.900.2).

Thanks, series applied to master:

Thomas
Peter Korsgaard Sept. 18, 2024, 8:29 p.m. UTC | #2 
>>>>> "Dario" == Dario Binacchi <dario.binacchi@amarulasolutions.com> writes:

 > Following an email exchange with Conrad Sand, one of the maintainers of
 > the project, I learned that version 9.900.2 has been moved to
 > https://sourceforge.net/projects/arma/files/retired/.

 > This patch fixes the package download error, waiting for a subsequent
 > patch that will restore the previous URL to bump to a more recent
 > version.

 > Adding the .RETIRED suffix to the downloaded tarball generated the
 > following error:

 > armadillo-9.900.2.tar.xz.RETIRED: OK (sha256: d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05)
 >>>> armadillo 9.900.2 Extracting
 > buildroot/dl/armadillo/armadillo-9.900.2.tar.xz.RETIRED | buildroot/output/host/bin/tar --strip-components=1 -C buildroot/output/build/armadillo-9.900.2   -xf -
 > /bin/bash: line 1: buildroot/dl/armadillo/armadillo-9.900.2.tar.xz.RETIRED: Permission denied
 > buildroot/output/host/bin/tar: This does not look like a tar archive
 > buildroot/output/host/bin/tar: Exiting with failure status due to previous errors
 > make[1]: *** [package/pkg-generic.mk:213: buildroot/output/build/armadillo-9.900.2/.stamp_extracted] Error 2

 > which required the addition of ARMADILLO_EXTRACT_CMDS to be fixed.

 > Finally, it was also necessary to modify the tarball's hash.

 > Fixes:
 > - http://autobuild.buildroot.org/results/d4e9e7b453960a4f62a199344b30b729a4f235bc

 > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 > ---
 > Changes v1 -> v2:
 >   - Don't bump to 10.1.0 but update the URL site to continue to download and
 >     build the current version (e. g. 9.900.2).

Committed to 2024.02.x, thanks.

Patch
diff mbox series 

diff --git a/package/armadillo/armadillo.hash b/package/armadillo/armadillo.hash
index cc91fb456aa0..9b19b8c8c4a2 100644
--- a/package/armadillo/armadillo.hash
+++ b/package/armadillo/armadillo.hash
@@ -1,4 +1,4 @@ 
 # Locally computed:
-sha256  d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05  armadillo-9.900.2.tar.xz
+sha256  d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05  armadillo-9.900.2.tar.xz.RETIRED
 # License files, locally calculated
 sha256  3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  LICENSE.txt
diff --git a/package/armadillo/armadillo.mk b/package/armadillo/armadillo.mk
index 8661bfd9da87..81684a44f72f 100644
--- a/package/armadillo/armadillo.mk
+++ b/package/armadillo/armadillo.mk
@@ -5,8 +5,8 @@ 
 ################################################################################
 
 ARMADILLO_VERSION = 9.900.2
-ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz
-ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma
+ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz.RETIRED
+ARMADILLO_SITE = https://sourceforge.net/projects/arma/files/retired
 ARMADILLO_INSTALL_STAGING = YES
 ARMADILLO_LICENSE = Apache-2.0
 ARMADILLO_LICENSE_FILES = LICENSE.txt
@@ -30,4 +30,8 @@  ARMADILLO_CONF_OPTS += -DLAPACK_FOUND=ON
 ARMADILLO_DEPENDENCIES += lapack
 endif
 
+define ARMADILLO_EXTRACT_CMDS
+	$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) $($(PKG)_DL_DIR)/$(ARMADILLO_SOURCE)
+endef
+
 $(eval $(cmake-package))