| Message ID | 20240603084617.38508-2-foss@athaariq.my.id |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/3] package/rpi-firmware: bump version to v1.20240529 | expand |
Hi Athaariq! Am 03.06.24 um 10:46 schrieb Athaariq Ardhiansyah: > Latest raspberrypi-usbboot package has Raspberry Pi 5 support. > > Signed-off-by: Athaariq Ardhiansyah <foss@athaariq.my.id> > > --- > Changes v1 -> v2: > - Fix missing description due to terminal issue > - Use the latest commit instead of the latest tag > --- > ...akefile-allow-passing-CFLAGS-LDFLAGS.patch | 25 ++++++++++--------- > .../raspberrypi-usbboot.hash | 2 +- > .../raspberrypi-usbboot.mk | 4 +-- > 3 files changed, 16 insertions(+), 15 deletions(-) > > diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch > index d482b0b9d4..ea53f8360a 100644 > --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch > +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch > @@ -1,30 +1,31 @@ > -From 38b730c00f45abf324caf687b5b00662ff4252c2 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > -Date: Fri, 2 Dec 2016 23:09:44 +0100 > +From e09c92d68efa4efbd48a3366f9053a4f8c275091 Mon Sep 17 00:00:00 2001 > +From: Athaariq Ardhiansyah <foss@athaariq.my.id> > +Date: Mon, 3 Jun 2024 15:35:49 +0700 > Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS > > -This might be needed to pass some custom CFLAGS/LDFLAGS when building > -rpiboot. > +This might be needed to pass some custom CFLAGS/LDFLAGS when building rpiboot. > > Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > -[Rebased on 9324fd7] > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > +Signed-off-by: Athaariq Ardhiansyah <foss@athaariq.my.id> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > -index 822e714..875e717 100755 > +index 4479b1b..076ae43 100755 > --- a/Makefile > +++ b/Makefile > -@@ -1,5 +1,5 @@ > - rpiboot: main.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h > -- $(CC) -Wall -Wextra -g -o $@ $< -lusb-1.0 > -+ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) > +@@ -3,7 +3,7 @@ GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "") > + INSTALL_PREFIX?=/usr > + > + rpiboot: main.c bootfiles.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h > +- $(CC) -Wall -Wextra -g -o $@ main.c bootfiles.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" > ++ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ main.c bootfiles.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(LDFLAGS) > > %.h: %.bin ./bin2c > ./bin2c $< $@ > -- > -2.31.1 > +2.45.2 > > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > index cedc5fb7e1..1a183bf47f 100644 > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz > +sha256 2182a6bf5ca9cd54ee3bca2d7667758ceac685fa78a3a6ae663762bde03e781a raspberrypi-usbboot-4a3d31171769f87d919340778e5aaeaba01e10b5.tar.gz > > # License files > sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > index 2e4194da0b..7eef7df600 100644 > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 > +RASPBERRYPI_USBBOOT_VERSION = 4a3d31171769f87d919340778e5aaeaba01e10b5 This commit is (as of typing) the latest commit on the master branch of the GitHub repository, not version 20221215-105525. I sent a patch to update to 20221215-105525 in late April because I need it for certain CM4 devices, so I noticed the difference. Including RPi 5 support as well makes sense to me, but the commit message should mention the actual version. Best regards, Fiona > RASPBERRYPI_USBBOOT_SITE = \ > - $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) > + $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) > RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 > RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE >
Hi Fiona!
> the commit message should mention the actual version.
The upstream maintainer won't tag the version anymore since December
18th, 2022. So, I have no idea what version of the latest commit. Last
tagged version has no Raspberry Pi 5 support, unfortunately. From your
perspective, should we ask the maintainer to tag again or we can safely
use the latest commit possible similar as rpi-firmware? Thanks.
Best regards,
Athaariq Ardhiansyah
Am 04.06.24 um 00:58 schrieb Athaariq Ardhiansyah: > > the commit message should mention the actual version. > > The upstream maintainer won't tag the version anymore since December > 18th, 2022. So, I have no idea what version of the latest commit. Last > tagged version has no Raspberry Pi 5 support, unfortunately. I hope one of the Buildroot maintainers can clarify what you should do here. Personally, I'd probably use the commit as version in the commit message too, and mention the reason (upstream hasn't done tags, this commit adds RPi 5 support, something like that). > From your > perspective, should we ask the maintainer to tag again or we can safely > use the latest commit possible similar as rpi-firmware? Thanks. Can't hurt, but I have no idea if they'll follow the request, and Buildroot shouldn't depend on it either way. The commit ID and source hash will ensure it's well-defined what version you're using. Mostly I just want an update that supports the CM4 version I have here merged ASAP so I can drop the patch from my work branch. :-) Best regards, Fiona
diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch index d482b0b9d4..ea53f8360a 100644 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch @@ -1,30 +1,31 @@ -From 38b730c00f45abf324caf687b5b00662ff4252c2 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Fri, 2 Dec 2016 23:09:44 +0100 +From e09c92d68efa4efbd48a3366f9053a4f8c275091 Mon Sep 17 00:00:00 2001 +From: Athaariq Ardhiansyah <foss@athaariq.my.id> +Date: Mon, 3 Jun 2024 15:35:49 +0700 Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS -This might be needed to pass some custom CFLAGS/LDFLAGS when building -rpiboot. +This might be needed to pass some custom CFLAGS/LDFLAGS when building rpiboot. Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -[Rebased on 9324fd7] Signed-off-by: Peter Seiderer <ps.report@gmx.net> +Signed-off-by: Athaariq Ardhiansyah <foss@athaariq.my.id> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 822e714..875e717 100755 +index 4479b1b..076ae43 100755 --- a/Makefile +++ b/Makefile -@@ -1,5 +1,5 @@ - rpiboot: main.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h -- $(CC) -Wall -Wextra -g -o $@ $< -lusb-1.0 -+ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) +@@ -3,7 +3,7 @@ GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "") + INSTALL_PREFIX?=/usr + + rpiboot: main.c bootfiles.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h +- $(CC) -Wall -Wextra -g -o $@ main.c bootfiles.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" ++ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ main.c bootfiles.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(LDFLAGS) %.h: %.bin ./bin2c ./bin2c $< $@ -- -2.31.1 +2.45.2 diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index cedc5fb7e1..1a183bf47f 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz +sha256 2182a6bf5ca9cd54ee3bca2d7667758ceac685fa78a3a6ae663762bde03e781a raspberrypi-usbboot-4a3d31171769f87d919340778e5aaeaba01e10b5.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 2e4194da0b..7eef7df600 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,9 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 +RASPBERRYPI_USBBOOT_VERSION = 4a3d31171769f87d919340778e5aaeaba01e10b5 RASPBERRYPI_USBBOOT_SITE = \ - $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) + $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE
Latest raspberrypi-usbboot package has Raspberry Pi 5 support. Signed-off-by: Athaariq Ardhiansyah <foss@athaariq.my.id> --- Changes v1 -> v2: - Fix missing description due to terminal issue - Use the latest commit instead of the latest tag --- ...akefile-allow-passing-CFLAGS-LDFLAGS.patch | 25 ++++++++++--------- .../raspberrypi-usbboot.hash | 2 +- .../raspberrypi-usbboot.mk | 4 +-- 3 files changed, 16 insertions(+), 15 deletions(-)