[Buildroot] [PATCH 1/1] package/bdwgc: bump to version 8.2.6

[Buildroot] [PATCH 1/1] package/bdwgc: bump to version 8.2.6

[Pedro Aguilar]

Signed-off-by: Pedro Aguilar <paguilar@paguilar.org>
---
 package/bdwgc/bdwgc.hash | 4 ++++
 package/bdwgc/bdwgc.mk   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash
index 917089da08..1e8cc6df98 100644
--- a/package/bdwgc/bdwgc.hash
+++ b/package/bdwgc/bdwgc.hash
@@ -1,3 +1,7 @@
 # Locally computed
+<<<<<<< Updated upstream
 sha256  f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0  gc-8.2.2.tar.gz
+=======
+sha256  b9183fe49d4c44c7327992f626f8eaa1d8b14de140f243edb1c9dcff7719a7fc  gc-8.2.6.tar.gz
+>>>>>>> Stashed changes
 sha256  a9b077aeb4e9e1aaf9742119d8023ef26f52f445cdc3f60d390bf59e1647f54a  README.QUICK
diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk
index e776fb7458..e1cdbce62c 100644
--- a/package/bdwgc/bdwgc.mk
+++ b/package/bdwgc/bdwgc.mk
@@ -4,7 +4,11 @@
 #
 ################################################################################

+<<<<<<< Updated upstream
 BDWGC_VERSION = 8.2.2
+=======
+BDWGC_VERSION = 8.2.6
+>>>>>>> Stashed changes
 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz
 BDWGC_SITE = https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION)
 BDWGC_INSTALL_STAGING = YES
--
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/bdwgc: bump to version 8.2.6

[Thomas Petazzoni via buildroot]

On Fri, 13 Sep 2024 23:03:01 +0200
Pedro Aguilar <paguilar@paguilar.org> wrote:

> Signed-off-by: Pedro Aguilar <paguilar@paguilar.org>
> ---
>  package/bdwgc/bdwgc.hash | 4 ++++
>  package/bdwgc/bdwgc.mk   | 4 ++++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash
> index 917089da08..1e8cc6df98 100644
> --- a/package/bdwgc/bdwgc.hash
> +++ b/package/bdwgc/bdwgc.hash
> @@ -1,3 +1,7 @@
>  # Locally computed
> +<<<<<<< Updated upstream
>  sha256  f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0  gc-8.2.2.tar.gz
> +=======
> +sha256  b9183fe49d4c44c7327992f626f8eaa1d8b14de140f243edb1c9dcff7719a7fc  gc-8.2.6.tar.gz
> +>>>>>>> Stashed changes 

Well... your patch has issue it seems :-)

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot