From patchwork Mon Jan 18 18:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1428281 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eB6z6qUP; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKKjv087Fz9sS8 for ; Tue, 19 Jan 2021 05:16:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 02A282046B; Mon, 18 Jan 2021 18:16:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uMMwa5BEir0z; Mon, 18 Jan 2021 18:16:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DEE0820408; Mon, 18 Jan 2021 18:16:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id EE9AB1BF360 for ; Mon, 18 Jan 2021 18:16:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EAF918502C for ; Mon, 18 Jan 2021 18:16:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l5HAfyqJ7GTb for ; Mon, 18 Jan 2021 18:16:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7F06284F8B for ; Mon, 18 Jan 2021 18:16:25 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id i63so14413279wma.4 for ; Mon, 18 Jan 2021 10:16:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bwlB6OGaxq8BeXv/WqBAGGDJ224qTydHdaZM9L1GcwM=; b=eB6z6qUPIS9FUTkms/7A5IhwNwXD9i+Jv9d/dr7d6mfAu3mTi27iQdT5TVGTM8b1pr TbtyAwI3ynlh1LABxnARpjwyrW9jkBk93gqWOZTERv4nhIxuSaizJDxC937krriBXUBy 5HHrKTDwclkqj/EL4e0VqgIrCm9kdY1+Tb41aoIVXZn6bZ73VDn52yRnjqomlDfLVRBD t7EaWRK40F47do/kCyzmld8ETyHlNae+LZiq3kAYH1/ypgId6eMKKzPD0Zrx+fBpuc+h 9JGafigQFNLSiYtOgMziDVd8DBFpFxpLYHvIK9gGuibMfSxohxKr9JBjOx78JYFEGJIc 2s5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=bwlB6OGaxq8BeXv/WqBAGGDJ224qTydHdaZM9L1GcwM=; b=stM5QrdXFfwgE0Y19uUZ4GogmoTFAqNSiDRNNvbBcBK+nLr3AT1iIb7UT5bClpoVbo 4t0fDMMJCzMSf0aJx6fqL3s96pkHkQImt1Eu837Tr+T3kncyoPJTStWi0vKJmi0Y0jJi /rWoS/qmICBXl/YpE2ShOz+4Adl95ZLW3LKMPyHkbcb4sUi1786nVviZmK3jdt8fstUl 8qbiMLno66GMq4LiWaqAo5ncSJxLx3Nsyy1HgE8fOCX91C/X+mz7R5ruO+iA3onzSQRv 2kY78xSHYZrJZsyea9O7f00AolnoXahv4POSV5IU8J6U/zz7J5l5QbvVw6lTIl3rjZCG h+Og== X-Gm-Message-State: AOAM530eoiRHYUtFs0cHX9Cpo5xAnGqEXoBc8ecJ1bf++IpbBiYARCLZ SdYH6UFqfGf63J7YwdJ0tN5Pdq48hDY= X-Google-Smtp-Source: ABdhPJzbbLDi1C+0yd3yK3Ql62IpyBA3Td+jdeYYwQ2dX0QUfFL3RaU7x657m9qGVtjfbqh2+chxNg== X-Received: by 2002:a1c:e919:: with SMTP id q25mr554287wmc.57.1610993783700; Mon, 18 Jan 2021 10:16:23 -0800 (PST) Received: from localhost.localdomain ([2a01:cb19:8b51:cb00:6c61:3bc9:526b:1de5]) by smtp.gmail.com with ESMTPSA id o13sm36493531wrh.88.2021.01.18.10.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 10:16:22 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 18 Jan 2021 19:16:12 +0100 Message-Id: <20210118181612.77863-1-yann.morin.1998@free.fr> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] packages: carry site-method archive format version when overriding _SOURCE X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Peter Korsgaard , "Yann E. MORIN" , "Stephane Viau \(OSS\)" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit 5b95a5dc2 (support/download: change format of archives generated from git) changed the way the archives generated from git repositories are named, adding a "format-version" identifier right between the package version and the file extension. Commit c043ecb20 (support/download: change format of archives generated from svn) did so for archives generated from a subversion checkout. However, for the a few packages, we manually force the _SOURCE variable, because we want to share the archive with another package, to avoid downloading and storing those archives twice. This is the case for: - linux-headers and linux - barebox-aux and barebox When the generated tarballs were renamed with the aforementioned commits, those packages were not updated accordingly. Fix that by manually propagating the per-site-method format-version. Reported-by: "Stephane Viau (OSS)" Signed-off-by: Yann E. MORIN Cc: "Stephane Viau (OSS)" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Peter Korsgaard --- boot/barebox/barebox.mk | 2 +- package/linux-headers/linux-headers.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 77550aaed6..8f02f9f9e1 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -28,7 +28,7 @@ $(1)_SITE_METHOD = git # Override the default value of _SOURCE to 'barebox-*' so that it is not # downloaded a second time for barebox-aux; also alows avoiding the hash # check: -$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.gz +$(1)_SOURCE = barebox-$$($(1)_VERSION)$$(BR_FMT_VERSION_git).tar.gz else # Handle stable official Barebox versions $(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2 diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk index 4496295f2a..69ab16c443 100644 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@ -34,7 +34,7 @@ ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y) LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION))) else ifeq ($(LINUX_HEADERS_CUSTOM_GIT),y) -LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION)$(BR_FMT_VERSION_git).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = git else ifeq ($(LINUX_HEADERS_CUSTOM_HG),y) @@ -42,7 +42,7 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = hg else ifeq ($(LINUX_HEADERS_CUSTOM_SVN),y) -LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION)$(BR_FMT_VERSION_svn).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = svn else ifeq ($(LINUX_HEADERS_CIP),y)