Skip to contentSkip to conversation

package/picotool, pico-sdk: Bump version to 2.1.1

PATCH In review Jesse Taube 2 participants 5 messages Aug 5, 2025 – Jan 12

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/picotool, pico-sdk: Bump version to 2.1.1

pico-sdk and picotool 2.x.x adds support for the rp2350 bump package to latest version.

---
 package/pico-sdk/pico-sdk.hash | 2 +-
 package/pico-sdk/pico-sdk.mk   | 2 +-
 package/picotool/picotool.hash | 2 +-
 package/picotool/picotool.mk   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
package/pico-sdk/pico-sdk.hash +1 -1
index 5db7e8bdb4..6d40417f3a 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  95f5e522be3919e36a47975ffd3b208c38880c14468bd489ac672cfe3cec803c  pico-sdk-1.5.1.tar.gz
+sha256  979af5c5aa5a07990544bc65e24a2121c096abd72ad0e6a03e7c524302e0f26e  pico-sdk-2.1.1.tar.gz
 sha256  483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6  LICENSE.TXT
package/pico-sdk/pico-sdk.mk +1 -1
index 27930651b9..cf487ac568 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PICO_SDK_VERSION = 1.5.1
+PICO_SDK_VERSION = 2.1.1
 PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION))
 PICO_SDK_LICENSE = BSD-3-Clause
 PICO_SDK_LICENSE_FILES = LICENSE.TXT
package/picotool/picotool.hash +1 -1
index 26b790d968..3ebd592430 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  f1746ead7815c13be1152f0645db8ea3b277628eb0110d42a0a186db37d40a91  picotool-1.1.2.tar.gz
+sha256  19200c6dc4be5acd6fb53de3d7f35c826af596c18879d56f214b795300100260  picotool-2.1.1.tar.gz
 sha256  483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6  LICENSE.TXT
package/picotool/picotool.mk +1 -1
index 42f74fb244..bc76900c07 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PICOTOOL_VERSION = 1.1.2
+PICOTOOL_VERSION = 2.1.1
 PICOTOOL_SITE = $(call github,raspberrypi,picotool,$(PICOTOOL_VERSION))
 PICOTOOL_CONF_OPTS = -DPICO_SDK_PATH=$(STAGING_DIR)/usr/share/pico-sdk
 PICOTOOL_DEPENDENCIES = libusb pico-sdk
Signature · 6 lines
2.49.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/pico-sdk: Clone submodules for picotool

picotool needs mbedtls for --hash --sign and --offset. Clone submodules in pico-sdk to provide the nessasaary files for picotool to build and link mbedtls and other optional libraries.

---
 package/pico-sdk/pico-sdk.hash | 2 +-
 package/pico-sdk/pico-sdk.mk   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
package/pico-sdk/pico-sdk.hash +1 -1
index 6d40417f3a..a7028cfa1d 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  979af5c5aa5a07990544bc65e24a2121c096abd72ad0e6a03e7c524302e0f26e  pico-sdk-2.1.1.tar.gz
+sha256  9f50e041d5f5afa7d7d0dd0d7dad46e524e9702c7d07ea3f445556c35afa226d  pico-sdk-refs_tags_2.1.1-git4.tar.gz
 sha256  483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6  LICENSE.TXT
package/pico-sdk/pico-sdk.mk +4 -2
index cf487ac568..45db495623 100644
@@ -4,8 +4,10 @@
 #
 ################################################################################
 
-PICO_SDK_VERSION = 2.1.1
-PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION))
+PICO_SDK_VERSION = refs/tags/2.1.1
+PICO_SDK_SITE = https://[email protected]/raspberrypi/pico-sdk.git
+PICO_SDK_SITE_METHOD = git
+PICO_SDK_GIT_SUBMODULES = YES
 PICO_SDK_LICENSE = BSD-3-Clause
 PICO_SDK_LICENSE_FILES = LICENSE.TXT
 PICO_SDK_INSTALL_STAGING = YES
Signature · 6 lines
2.49.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 2/2] package/pico-sdk: Clone submodules for picotool

Quoted 2 lines · On Mon, 4 Aug 2025 20:03:52 -0400 Jesse Taube <[email protected]> wrote:

picotool needs mbedtls for --hash --sign and --offset. Clone submodules in pico-sdk to provide the nessasaary files for

                                              ^^^^^^^^^^ typo
Quoted 3 lines

picotool to build and link mbedtls and other optional libraries.

But then does that mean that your PATCH 1/2, without PATCH 2/2, breaks the build of picotool?

If that's the case, then you should do this change to use submodules directly in PATCH 1/2, as part of the bump, so that the build works between every patch we apply.

package/pico-sdk/pico-sdk.mk line 7

Quoted 3 lines
package/pico-sdk/pico-sdk.mk +1 -2
-PICO_SDK_VERSION = 2.1.1
-PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION))
+PICO_SDK_VERSION = refs/tags/2.1.1

Just "2.1.1" should be fine here

Quoted 1 line

+PICO_SDK_SITE = https://[email protected]/raspberrypi/pico-sdk.git

Should be just https://github.com/raspberrypi/pico-sdk.git

Has anyone reported to upstream that their release tarball should contain the submodules?

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#3 lore raw

Re: [Buildroot] [PATCH 2/2] package/pico-sdk: Clone submodules for picotool

Quoted 7 lines · Thomas Petazzoni
Quoted 2 lines · On Mon, 4 Aug 2025 20:03:52 -0400 Jesse Taube <[email protected]> wrote:

picotool needs mbedtls for --hash --sign and --offset. Clone submodules in pico-sdk to provide the nessasaary files for

Quoted 8 lines
                                              ^^^^^^^^^^ typo
Quoted 3 lines

picotool to build and link mbedtls and other optional libraries.

But then does that mean that your PATCH 1/2, without PATCH 2/2, breaks the build of picotool?

No. Picotool will compile and work without the submodules. This just allows optional features for picotool. The reason I want them is because when building a project for the pi pico 2 it requires them, whereas for the original pico it doesn't.

As for why I sent two patches is because the first bumps both picosdk and picotool while this only adds submodules to pico-sdk. I can squash them though.

Quoted 11 lines

If that's the case, then you should do this change to use submodules directly in PATCH 1/2, as part of the bump, so that the build works between every patch we apply.

package/pico-sdk/pico-sdk.mk line 7

Quoted 3 lines
package/pico-sdk/pico-sdk.mk +1 -2
-PICO_SDK_VERSION = 2.1.1
-PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION))
+PICO_SDK_VERSION = refs/tags/2.1.1

Just "2.1.1" should be fine here

I put that because git warns
"warning: refname '2.1.1' is ambiguous."

Quoted 7 lines
Quoted 2 lines

+PICO_SDK_SITE = https://[email protected]/raspberrypi/pico-sdk.git

Should be just https://github.com/raspberrypi/pico-sdk.git

Has anyone reported to upstream that their release tarball should contain the submodules?

I honestly didn't think that I'll make an issue for it. Also don't worry about the late reply, it coincided with me working on this project again.

Thanks,
Jesse Taube

Quoted 8 lines

Thanks!

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

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#4 lore raw
In reply to Jesse Taube

Hello Jesse,

Sorry for the delay in getting back to you.

Quoted 4 lines · On Mon, 4 Aug 2025 20:03:51 -0400 Jesse Taube <[email protected]> wrote:

pico-sdk and picotool 2.x.x adds support for the rp2350 bump package to latest version.

This commit breaks the download:

ERROR: while checking hashes from package/pico-sdk/pico-sdk.hash
ERROR: pico-sdk-2.1.1.tar.gz has wrong sha256 hash:
ERROR: expected: 979af5c5aa5a07990544bc65e24a2121c096abd72ad0e6a03e7c524302e0f26e
ERROR: got : 179c5531e75ac7f82d0679e70b6e8881f871738dc0ef17baf3b4ff4679291c41
ERROR: Incomplete download, or man-in-the-middle (MITM) attack

Also, I'll reply to PATCH 2/2, because I'm not sure it should be a separate patch.

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot