diff mbox series

package/flannel: use the github helper

Message ID 20230213200604.2539630-1-yann.morin.1998@free.fr
State Accepted
Headers show
Series package/flannel: use the github helper | expand

Commit Message

Yann E. MORIN Feb. 13, 2023, 8:06 p.m. UTC
Currently, flannel uses an ad-hoc github URL and a version-only tarball
name, even though we already had the github helper (introduced in 2013)
when flannel was introduced (in 2016).

Switch to the github helper, which allows us to get a properly named
tarball.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Geoff Levand <geoff@infradead.org>
---
 package/flannel/flannel.hash | 2 +-
 package/flannel/flannel.mk   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Comments

Geoff Levand Feb. 14, 2023, 1:32 a.m. UTC | #1
On 2/13/23 12:06, Yann E. MORIN wrote:
> Currently, flannel uses an ad-hoc github URL and a version-only tarball
> name, even though we already had the github helper (introduced in 2013)
> when flannel was introduced (in 2016).
> 
> Switch to the github helper, which allows us to get a properly named
> tarball.
> 
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Geoff Levand <geoff@infradead.org>
> ---
>  package/flannel/flannel.hash | 2 +-
>  package/flannel/flannel.mk   | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash
> index 6a0223a20f..bafc453097 100644
> --- a/package/flannel/flannel.hash
> +++ b/package/flannel/flannel.hash
> @@ -1,3 +1,3 @@
>  # Locally computed:
> -sha256  e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca  v0.14.0.tar.gz
> +sha256  e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca  flannel-0.14.0.tar.gz
>  sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
> diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk
> index 231cf90dfd..b4e2b2f777 100644
> --- a/package/flannel/flannel.mk
> +++ b/package/flannel/flannel.mk
> @@ -5,8 +5,7 @@
>  ################################################################################
>  
>  FLANNEL_VERSION = 0.14.0
> -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive
> -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz
> +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION))
>  
>  FLANNEL_LICENSE = Apache-2.0
>  FLANNEL_LICENSE_FILES = LICENSE

Looks good.  Thanks for working it out.

Acked-by: Geoff Levand <geoff@infradead.org>
Thomas Petazzoni Feb. 15, 2023, 9:38 p.m. UTC | #2
On Mon, 13 Feb 2023 21:06:04 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Currently, flannel uses an ad-hoc github URL and a version-only tarball
> name, even though we already had the github helper (introduced in 2013)
> when flannel was introduced (in 2016).
> 
> Switch to the github helper, which allows us to get a properly named
> tarball.
> 
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Geoff Levand <geoff@infradead.org>
> ---
>  package/flannel/flannel.hash | 2 +-
>  package/flannel/flannel.mk   | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash
index 6a0223a20f..bafc453097 100644
--- a/package/flannel/flannel.hash
+++ b/package/flannel/flannel.hash
@@ -1,3 +1,3 @@ 
 # Locally computed:
-sha256  e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca  v0.14.0.tar.gz
+sha256  e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca  flannel-0.14.0.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk
index 231cf90dfd..b4e2b2f777 100644
--- a/package/flannel/flannel.mk
+++ b/package/flannel/flannel.mk
@@ -5,8 +5,7 @@ 
 ################################################################################
 
 FLANNEL_VERSION = 0.14.0
-FLANNEL_SITE = https://github.com/flannel-io/flannel/archive
-FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz
+FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION))
 
 FLANNEL_LICENSE = Apache-2.0
 FLANNEL_LICENSE_FILES = LICENSE