From 87bc648720bb4e79ac99beff8a807019ac930233 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 24 Aug 2023 23:28:10 +0200 Subject: [PATCH] package/check: don't conflict with release archive In commit ee93213d18bc (package/check: fix compile issue due to missing source file), we switched from using the released tarball, to using the autogenerated tarball from github. However, that means that the filename of the archive did not change, while its content did change. The hash was promptly updated, but that means that the archive we cache on s.b.o (and possibly the one users may also already have locally) will not match the new hash (and conversely). So we switch to using the sha1-hash of the commit corresponding to the tag. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Waldemar Brodkorb Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/check/check.hash | 2 +- package/check/check.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/check/check.hash b/package/check/check.hash index 9b380ddc28..a8cec60d16 100644 --- a/package/check/check.hash +++ b/package/check/check.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 998d355294bb94072f40584272cf4424571c396c631620ce463f6ea97aa67d2e check-0.15.2.tar.gz +sha256 20e7360f5774844c09fde696e5bf71d061e9f53b3d763d886d3318d8893fdda4 check-11970a7e112dfe243a2e68773f014687df2900e8.tar.gz # License files, locally calculated sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER diff --git a/package/check/check.mk b/package/check/check.mk index 0bdc9b93ef..95fe5c9d57 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -4,7 +4,9 @@ # ################################################################################ -CHECK_VERSION = 0.15.2 +# This is the same as tag 0.15.2, but we can't use it, as to avoid conflict +# with the released tarball that was incomplete +CHECK_VERSION = 11970a7e112dfe243a2e68773f014687df2900e8 CHECK_SITE = $(call github,libcheck,check,$(CHECK_VERSION)) CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf