* [Buildroot] [PATCH 1/2] package/bitcoin: bump to version 28.0
@ 2024-10-13 16:47 Julien Olivain
2024-10-13 16:47 ` [Buildroot] [PATCH 2/2] support/testing: package: bitcoin: fix test by increasing timeouts Julien Olivain
2024-10-26 16:22 ` [Buildroot] [PATCH 1/2] package/bitcoin: bump to version 28.0 Thomas Petazzoni via buildroot
0 siblings, 2 replies; 4+ messages in thread
From: Julien Olivain @ 2024-10-13 16:47 UTC (permalink / raw)
To: buildroot; +Cc: Fabio Urquiza, Julien Olivain, Bernd Kuhls
For change log since 26.2, see:
https://bitcoincore.org/en/releases/27.0/
https://bitcoincore.org/en/releases/27.1/
https://bitcoincore.org/en/releases/28.0/
A notable change in version 28.0 is that bitcoin code now needs
gcc >= 11.1. This change is reflected in the package Kconfig
Config.in file.
License file hash changed, due to year update in upstream commit:
https://github.com/bitcoin/bitcoin/commit/1f8450f066724dfbb5c5bc4060843e2f3340ed88
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
Patch tested in:
https://gitlab.com/jolivain/buildroot/-/jobs/8072857206
---
package/bitcoin/Config.in | 6 +++---
package/bitcoin/bitcoin.hash | 8 ++++----
package/bitcoin/bitcoin.mk | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in
index 060cae24f5..425e99ce8b 100644
--- a/package/bitcoin/Config.in
+++ b/package/bitcoin/Config.in
@@ -12,7 +12,7 @@ config BR2_PACKAGE_BITCOIN
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread, boost-filesystem
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_11
depends on BR2_TOOLCHAIN_HAS_THREADS # boost
depends on BR2_USE_WCHAR
select BR2_PACKAGE_BOOST
@@ -46,9 +46,9 @@ config BR2_PACKAGE_BITCOIN_WALLET
endif
-comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9"
+comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 11"
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_9
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_11
diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash
index 9bd0843085..c7dad34d0a 100644
--- a/package/bitcoin/bitcoin.hash
+++ b/package/bitcoin/bitcoin.hash
@@ -1,7 +1,7 @@
-# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.2/SHA256SUMS
+# Hash from: https://bitcoincore.org/bin/bitcoin-core-28.0/SHA256SUMS
# After checking pgp signature from:
-# https://bitcoincore.org/bin/bitcoin-core-26.2/SHA256SUMS.asc
-sha256 78d59418741f45cbdaa9bf20ebc49a5e95ff9f7172f72fc78d14307eaf341b3c bitcoin-26.2.tar.gz
+# https://bitcoincore.org/bin/bitcoin-core-28.0/SHA256SUMS.asc
+sha256 700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f bitcoin-28.0.tar.gz
# Hash for license file
-sha256 a6331cd1f889397adfc0c3b0535682a20950c6cf8e5c712e9997a15ce98324e1 COPYING
+sha256 779d9beab4eef2340bb1e86e91f8f55dea9b0985a2d03fbcbb52bd713e091e1b COPYING
diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk
index 9ca29092ad..9a5f4d6494 100644
--- a/package/bitcoin/bitcoin.mk
+++ b/package/bitcoin/bitcoin.mk
@@ -4,7 +4,7 @@
#
################################################################################
-BITCOIN_VERSION = 26.2
+BITCOIN_VERSION = 28.0
BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION)
BITCOIN_AUTORECONF = YES
BITCOIN_LICENSE = MIT
--
2.47.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] support/testing: package: bitcoin: fix test by increasing timeouts
2024-10-13 16:47 [Buildroot] [PATCH 1/2] package/bitcoin: bump to version 28.0 Julien Olivain
@ 2024-10-13 16:47 ` Julien Olivain
2024-11-11 15:56 ` Peter Korsgaard
2024-10-26 16:22 ` [Buildroot] [PATCH 1/2] package/bitcoin: bump to version 28.0 Thomas Petazzoni via buildroot
1 sibling, 1 reply; 4+ messages in thread
From: Julien Olivain @ 2024-10-13 16:47 UTC (permalink / raw)
To: buildroot; +Cc: Fabio Urquiza, Julien Olivain, Bernd Kuhls
Generating Bitcoins to an address can take longer than the current
timeout, on slow runners. This commit fixes this issue by increasing
the timeout on specific commands. This issue was also observed more
frequently on newer bitcoin-core version 28.0.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/7782083081
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
support/testing/tests/package/test_bitcoin.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/support/testing/tests/package/test_bitcoin.py b/support/testing/tests/package/test_bitcoin.py
index 93aa9383ab..1f00345a12 100644
--- a/support/testing/tests/package/test_bitcoin.py
+++ b/support/testing/tests/package/test_bitcoin.py
@@ -130,7 +130,7 @@ class TestBitcoin(infra.basetest.BRTest):
# #1. We should receive the 50 BTC reward at this address.
cmd = self.cli_cmd
cmd += f" generatetoaddress {req_blk_count} {btc_addr1}"
- self.assertRunOk(cmd)
+ self.assertRunOk(cmd, timeout=30)
# We should now see the previously created blocks.
cur_blk_cnt = self.get_block_count()
@@ -169,7 +169,7 @@ class TestBitcoin(infra.basetest.BRTest):
# the previous transaction (but this will not give the 50 BTC
# reward).
cmd = f"{self.cli_cmd} generatetoaddress 1 {btc_addr2}"
- self.assertRunOk(cmd)
+ self.assertRunOk(cmd, timeout=30)
# We should see one more block.
cur_blk_cnt = self.get_block_count()
--
2.47.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Buildroot] [PATCH 1/2] package/bitcoin: bump to version 28.0
2024-10-13 16:47 [Buildroot] [PATCH 1/2] package/bitcoin: bump to version 28.0 Julien Olivain
2024-10-13 16:47 ` [Buildroot] [PATCH 2/2] support/testing: package: bitcoin: fix test by increasing timeouts Julien Olivain
@ 2024-10-26 16:22 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-10-26 16:22 UTC (permalink / raw)
To: Julien Olivain; +Cc: buildroot, Fabio Urquiza, Bernd Kuhls
On Sun, 13 Oct 2024 18:47:58 +0200
Julien Olivain <ju.o@free.fr> wrote:
> For change log since 26.2, see:
> https://bitcoincore.org/en/releases/27.0/
> https://bitcoincore.org/en/releases/27.1/
> https://bitcoincore.org/en/releases/28.0/
>
> A notable change in version 28.0 is that bitcoin code now needs
> gcc >= 11.1. This change is reflected in the package Kconfig
> Config.in file.
>
> License file hash changed, due to year update in upstream commit:
> https://github.com/bitcoin/bitcoin/commit/1f8450f066724dfbb5c5bc4060843e2f3340ed88
>
> Signed-off-by: Julien Olivain <ju.o@free.fr>
> ---
> Patch tested in:
> https://gitlab.com/jolivain/buildroot/-/jobs/8072857206
> ---
> package/bitcoin/Config.in | 6 +++---
> package/bitcoin/bitcoin.hash | 8 ++++----
> package/bitcoin/bitcoin.mk | 2 +-
> 3 files changed, 8 insertions(+), 8 deletions(-)
Series applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-11 15:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-13 16:47 [Buildroot] [PATCH 1/2] package/bitcoin: bump to version 28.0 Julien Olivain
2024-10-13 16:47 ` [Buildroot] [PATCH 2/2] support/testing: package: bitcoin: fix test by increasing timeouts Julien Olivain
2024-11-11 15:56 ` Peter Korsgaard
2024-10-26 16:22 ` [Buildroot] [PATCH 1/2] package/bitcoin: bump to version 28.0 Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox