[Buildroot] [PATCH] package/flannel: Bump to version 0.25.1

[Thomas Petazzoni]

On Wed, 1 May 2024 11:53:05 +0900
Geoff Levand <geoff at infradead.org> wrote:

> Signed-off-by: Geoff Levand <geoff at infradead.org>
> 
> diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash
> index 2e0198debe..97700d37ec 100644
> --- a/package/flannel/flannel.hash
> +++ b/package/flannel/flannel.hash
> @@ -1,3 +1,3 @@
>  # Locally computed:
> -sha256  98dde4eda016fec9aa6394cb4b283bdd972deda6ef9e1f2c3669dd2719ea1fe9  flannel-0.24.4.tar.gz
> +sha256  c0de130efa2b14bc0f057a17df07bfd61154b30ce4a5eca24594c5b533ce661d  flannel-0.25.1.tar.gz
>  sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
> diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk
> index 5cdfa0e09e..aa24644764 100644
> --- a/package/flannel/flannel.mk
> +++ b/package/flannel/flannel.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -FLANNEL_VERSION = 0.24.4
> +FLANNEL_VERSION = 0.25.1

This was not applying on master, because you created this commit on top
of your previous 0.24.2 -> 0.24.4 bump, which still had not been
applied to master. So when something like this happen, we ideally
expect you to mark your previous patch as Changes Requested, and then
submit a brand new patch that does the 0.24.2 -> 0.25.1 in one go.

I fixed up the conflicts when applying, and pushed to master. Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com