-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: Buildroot 2021.02.1 build fixes
- Removed old genimage patch which is now included - Fixed rpi-bt-firmware hash
- Loading branch information
Showing
4 changed files
with
45 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <[email protected]> | ||
| -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 <[email protected]> | ||
| -[From https://github.com/pengutronix/genimage/commit/4c2b02df0861e06ca9320d80ad60994d4a239ad6.patch] | ||
| -Signed-off-by: Peter Seiderer <[email protected]> | ||
| ---- | ||
| - 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 | ||
|
|
||
37 changes: 0 additions & 37 deletions
37
buildroot/package/genimage/0001-util-add-fiemap-fallback-for-errno-ENOTTY.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |