From 5206e1dba2ccb8e65fc960362017c72799b0e5df Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 27 Jun 2024 22:53:32 +0200 Subject: [PATCH] package/am335x-pru-package: fix download issue am335x-pru-package is downloaded with the github helper, so the tarball is generated "on-the-fly" by github. It looks like the process to generate those tarballs has changed, again. The hash for the archive has recently changed. The delta is in the way directories are stored in the tarball: it looks like the "basename" of the directory path has been split off from the "dirname", into a separate field: @@ -270078,8 +270078,8 @@ 0041efd0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041efe0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041eff0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0041f000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0041f010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +0041f000 50 52 55 5f 50 52 55 74 6f 50 52 55 5f 49 6e 74 |PRU_PRUtoPRU_Int| +0041f010 65 72 72 75 70 74 2f 00 00 00 00 00 00 00 00 00 |errupt/.........| 0041f020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| @@ -270104,8 +270104,8 @@ 0041f170 34 61 64 35 37 63 63 31 39 35 66 32 38 62 66 35 |4ad57cc195f28bf5| 0041f180 65 35 38 35 63 33 64 34 34 36 61 62 61 36 65 65 |e585c3d446aba6ee| 0041f190 37 30 39 36 2f 70 72 75 5f 73 77 2f 65 78 61 6d |7096/pru_sw/exam| -0041f1a0 70 6c 65 5f 61 70 70 73 2f 50 52 55 5f 50 52 55 |ple_apps/PRU_PRU| -0041f1b0 74 6f 50 52 55 5f 49 6e 74 65 72 72 75 70 74 00 |toPRU_Interrupt.| +0041f1a0 70 6c 65 5f 61 70 70 73 00 00 00 00 00 00 00 00 |ple_apps........| +0041f1b0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1d0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| Switch to using a git download, which uses our reproducible way of generating archives. Once extracted, the files have been verified to be identical to the ones in the archive on s.b.o. Signed-off-by: Yann E. MORIN Cc: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/am335x-pru-package/am335x-pru-package.hash | 2 +- package/am335x-pru-package/am335x-pru-package.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/am335x-pru-package/am335x-pru-package.hash b/package/am335x-pru-package/am335x-pru-package.hash index ad386fe04b..157fa566eb 100644 --- a/package/am335x-pru-package/am335x-pru-package.hash +++ b/package/am335x-pru-package/am335x-pru-package.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a902f825ccc1885c5dccd83e1ccee104aa30e601c9964a24f49459f76f674b9 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096.tar.gz +sha256 bd90d57d210c2ec1835d701c5d12e228801cb41afebf591e2c146a4dc49c296f am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096-git4.tar.gz sha256 f0fcdf9b2090896389eb4b784f23be96d5544c5ce5282d84f82ae9a8e8331beb pru_sw/utils/LICENCE.txt diff --git a/package/am335x-pru-package/am335x-pru-package.mk b/package/am335x-pru-package/am335x-pru-package.mk index 24a5df4815..9c65ee1387 100644 --- a/package/am335x-pru-package/am335x-pru-package.mk +++ b/package/am335x-pru-package/am335x-pru-package.mk @@ -5,7 +5,8 @@ ################################################################################ AM335X_PRU_PACKAGE_VERSION = 5f374ad57cc195f28bf5e585c3d446aba6ee7096 -AM335X_PRU_PACKAGE_SITE = $(call github,beagleboard,am335x_pru_package,$(AM335X_PRU_PACKAGE_VERSION)) +AM335X_PRU_PACKAGE_SITE = https://github.com/beagleboard/am335x_pru_package +AM335X_PRU_PACKAGE_SITE_METHOD = git AM335X_PRU_PACKAGE_LICENSE = BSD-3-Clause AM335X_PRU_PACKAGE_LICENSE_FILES = pru_sw/utils/LICENCE.txt AM335X_PRU_PACKAGE_DEPENDENCIES = host-am335x-pru-package