From bc933199e0a850afe54ae5372d68aa9b76137822 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 10 Mar 2025 13:08:31 +0100 Subject: [PATCH] package/raspberrypi-usbboot: bump version to 20250227-132106 32-bit mass-storage-gadget has been replaced with mass-storage-gadget64. Drop patch included upstream. Upstream diff: https://github.com/raspberrypi/usbboot/compare/20240926-102326...20250227-132106 Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - ...akefile-allow-passing-CFLAGS-LDFLAGS.patch | 34 ------------------- .../raspberrypi-usbboot.hash | 2 +- .../raspberrypi-usbboot.mk | 2 +- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch diff --git a/.checkpackageignore b/.checkpackageignore index 08285eadcc..e38d576a20 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1048,7 +1048,6 @@ package/qt5/qt5webkit/0006-Warnings-due-to-AppSinkCallbacks-struct-growth-https. package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch lib_patch.Upstream package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch lib_patch.Upstream package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch lib_patch.Upstream -package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch lib_patch.Upstream package/read-edid/0001-Fix-install-file-list.patch lib_patch.Upstream package/read-edid/0002-Fix-compiler-check.patch lib_patch.Upstream package/read-edid/0003-fix-build-with-gcc-10.patch lib_patch.Upstream diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch deleted file mode 100644 index fe2614d35e..0000000000 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d580bf031011d1e1e022ab1e1024f7cc5939f956 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Dec 2016 23:09:44 +0100 -Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS - -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 -[Rebased on 9324fd7] -Signed-off-by: Peter Seiderer -[Rebased on 20240926-102326-0-g82d8755] -Signed-off-by: Fiona Klute (WIWA) ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d2f7585..9812d6d 100755 ---- a/Makefile -+++ b/Makefile -@@ -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 decode_duid.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h -- $(CC) -Wall -Wextra -g -o $@ main.c bootfiles.c decode_duid.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 decode_duid.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.45.2 - diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 413fe88f03..e17be5f411 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2ce52a9f1de1aab39daa10fa487c55d20d34f679d11b1a1743d0ef81ffb3c726 raspberrypi-usbboot-20240926-102326-git4.tar.gz +sha256 339b1e2a0853ad700339206a2424c3fc9559518bc37ebfaac76b0484cf6f5bdb raspberrypi-usbboot-20250227-132106-git4.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 3135741e9b..dd7a2a1b24 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 20240926-102326 +RASPBERRYPI_USBBOOT_VERSION = 20250227-132106 RASPBERRYPI_USBBOOT_SITE = https://github.com/raspberrypi/usbboot.git RASPBERRYPI_USBBOOT_SITE_METHOD = git RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0