diff --git a/buildroot-patches/003-rpi-bt-firmware-bump.patch b/buildroot-patches/003-rpi-bt-firmware-bump.patch index d3ce656d..27db82f5 100644 --- a/buildroot-patches/003-rpi-bt-firmware-bump.patch +++ b/buildroot-patches/003-rpi-bt-firmware-bump.patch @@ -16,7 +16,7 @@ index a3c7281d75..22712dcae6 100644 # Locally computed -sha256 cf806f6bdba0f803b90bc210f524a6ac37bac7ad19306c61474bb2dc59875e87 rpi-bt-firmware-9c0ffe9a7f0753b36ed88f7981905a989d940ea9.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx -+sha256 5f5dad1f1a3e90948893fcca2d19cac4f280e4baf76b6ff3e7d57f8218a97583 rpi-bt-firmware-e7fd166981ab4bb9a36c2d1500205a078a35714d.tar.gz ++sha256 301f5dada7f0e8716aa7c057822f60448e3aebdf049cfd727549516470eb9d9c rpi-bt-firmware-e7fd166981ab4bb9a36c2d1500205a078a35714d.tar.gz +sha256 092aaac7a0743f6e98ef224dfd68cac7554aa267581121fadcace8599b7d29dd broadcom/BCM-LEGAL.txt diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 23923453c4..48856fefad 100644 diff --git a/buildroot-patches/006-bump-genimage-version-to-14.patch b/buildroot-patches/006-bump-genimage-version-to-14.patch index cf74f7d8..8d32be6a 100644 --- a/buildroot-patches/006-bump-genimage-version-to-14.patch +++ b/buildroot-patches/006-bump-genimage-version-to-14.patch @@ -1,3 +1,46 @@ +diff --git a/package/genimage/0001-util-add-fiemap-fallback-for-errno-ENOTTY.patch b/package/genimage/0001-util-add-fiemap-fallback-for-errno-ENOTTY.patch +deleted file mode 100644 +index 4ce91ed1..00000000 +--- a/package/genimage/0001-util-add-fiemap-fallback-for-errno-ENOTTY.patch ++++ /dev/null +@@ -1,37 +0,0 @@ +-From 6b61b55807fdce5d09ea470e7b5c8ca1e40f724f Mon Sep 17 00:00:00 2001 +-From: Peter Seiderer +-Date: Wed, 12 Aug 2020 21:10:36 +0200 +-Subject: [PATCH] util: add fiemap fallback for errno ENOTTY +- +-On WSL-1, genimage fails with (see [1] for details): +- +- ERROR: hdimage(sdcard.img): fiemap .../boot.vfat: 25 Inappropriate ioctl for device +- +-This is because WSL-1 is a limited Linux emulation layer, where the fiemap +-ioctl incorrectly returns ENOTTY instead of the expected EOPNOTSUPP. +- +-[1] https://bugs.busybox.net/show_bug.cgi?id=13146 +- +-Signed-off-by: Peter Seiderer +-[From https://github.com/pengutronix/genimage/commit/4c2b02df0861e06ca9320d80ad60994d4a239ad6.patch] +-Signed-off-by: Peter Seiderer +---- +- util.c | 2 +- +- 1 file changed, 1 insertion(+), 1 deletion(-) +- +-diff --git a/util.c b/util.c +-index 381c5d9..2dcf396 100644 +---- a/util.c +-+++ b/util.c +-@@ -387,7 +387,7 @@ err_out: +- free(fiemap); +- +- /* If failure is due to no filesystem support, return a single extent */ +-- if (ret == -EOPNOTSUPP) +-+ if (ret == -EOPNOTSUPP || ret == -ENOTTY) +- return whole_file_exent(size, extents, extent_count); +- +- image_error(image, "fiemap %s: %d %s\n", filename, errno, strerror(errno)); +--- +-2.30.1 +- diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index fb5d2355..03f8bee6 100644 --- a/package/genimage/genimage.hash diff --git a/buildroot/package/genimage/0001-util-add-fiemap-fallback-for-errno-ENOTTY.patch b/buildroot/package/genimage/0001-util-add-fiemap-fallback-for-errno-ENOTTY.patch deleted file mode 100644 index 4ce91ed1..00000000 --- a/buildroot/package/genimage/0001-util-add-fiemap-fallback-for-errno-ENOTTY.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6b61b55807fdce5d09ea470e7b5c8ca1e40f724f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Wed, 12 Aug 2020 21:10:36 +0200 -Subject: [PATCH] util: add fiemap fallback for errno ENOTTY - -On WSL-1, genimage fails with (see [1] for details): - - ERROR: hdimage(sdcard.img): fiemap .../boot.vfat: 25 Inappropriate ioctl for device - -This is because WSL-1 is a limited Linux emulation layer, where the fiemap -ioctl incorrectly returns ENOTTY instead of the expected EOPNOTSUPP. - -[1] https://bugs.busybox.net/show_bug.cgi?id=13146 - -Signed-off-by: Peter Seiderer -[From https://github.com/pengutronix/genimage/commit/4c2b02df0861e06ca9320d80ad60994d4a239ad6.patch] -Signed-off-by: Peter Seiderer ---- - util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.c b/util.c -index 381c5d9..2dcf396 100644 ---- a/util.c -+++ b/util.c -@@ -387,7 +387,7 @@ err_out: - free(fiemap); - - /* If failure is due to no filesystem support, return a single extent */ -- if (ret == -EOPNOTSUPP) -+ if (ret == -EOPNOTSUPP || ret == -ENOTTY) - return whole_file_exent(size, extents, extent_count); - - image_error(image, "fiemap %s: %d %s\n", filename, errno, strerror(errno)); --- -2.30.1 - diff --git a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash index 5649ccf1..645dbc73 100644 --- a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5f5dad1f1a3e90948893fcca2d19cac4f280e4baf76b6ff3e7d57f8218a97583 rpi-bt-firmware-e7fd166981ab4bb9a36c2d1500205a078a35714d.tar.gz +sha256 301f5dada7f0e8716aa7c057822f60448e3aebdf049cfd727549516470eb9d9c rpi-bt-firmware-e7fd166981ab4bb9a36c2d1500205a078a35714d.tar.gz sha256 092aaac7a0743f6e98ef224dfd68cac7554aa267581121fadcace8599b7d29dd broadcom/BCM-LEGAL.txt