From: Romain Naour <romain.naour@gmail.com>
To: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH] boot/edk2: fix gcc 11 Werror
Date: Mon, 30 May 2022 21:04:10 +0200 [thread overview]
Message-ID: <f76f9cc6-4188-e92a-a753-b962849f2230@gmail.com> (raw)
In-Reply-To: <20220528100508.GE301044@scaer>
[-- Attachment #1: Type: text/plain, Size: 4263 bytes --]
Hello Yann,
Le 28/05/2022 à 12:05, Yann E. MORIN a écrit :
> Romain, All,
>
> On 2022-05-27 13:21 +0200, Romain Naour spake thusly:
>> Backport a patch [1] included in edk2-stable202202 release.
>>
>> Fixes:
>> https://gitlab.com/kubu93/buildroot/-/jobs/2510255569
>>
>> [1] https://github.com/tianocore/edk2/commit/ae8272ef787d80950803c521a13a308651bdc62e
>>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> Cc: Dick Olsson <hi@senzilla.io>
>
> Applied to master, thanks.
It seems the patch file has been corrupted by patchwork:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2520605886
https://gitlab.com/buildroot.org/buildroot/-/jobs/2520605881
https://gitlab.com/buildroot.org/buildroot/-/jobs/2520605757
The sha256 should be
c07a0514942c886bbbe42645b8d10f65c4891f1d48a584c01cd92526fcfa04ca
not
296f7ef2e8da828487763a779d5154f1ab90add71aaf1150c9f262596cda0585
It's due to line ending.
See attachment file.
Best regards,
Romain
>
> Regards,
> Yann E. MORIN.
>
>> ---
>> ...ePkg-UsbBusDxe-fix-NOOPT-build-error.patch | 48 +++++++++++++++++++
>> 1 file changed, 48 insertions(+)
>> create mode 100644 boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
>>
>> diff --git a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch b/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
>> new file mode 100644
>> index 0000000000..f4f1b1565a
>> --- /dev/null
>> +++ b/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
>> @@ -0,0 +1,48 @@
>> +From 59aa67f7a4d8efc564b46fe467aaf6eccec17183 Mon Sep 17 00:00:00 2001
>> +From: Gerd Hoffmann <kraxel@redhat.com>
>> +Date: Mon, 20 Dec 2021 22:32:38 +0800
>> +Subject: [PATCH] MdeModulePkg/UsbBusDxe: fix NOOPT build error
>> +
>> +gcc-11 (fedora 35):
>> +
>> +/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c: In function ?UsbIoBulkTransfer?:
>> +/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c:277:12: error: ?UsbHcBulkTransfer? accessing 80 bytes in a region of size 8 [-Werror=stringop-overflow=]
>> +
>> +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> +Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
>> +(cherry picked from commit ae8272ef787d80950803c521a13a308651bdc62e)
>> +Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> +---
>> + MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 2 +-
>> + MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h | 2 +-
>> + 2 files changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
>> +index 7529e03e85..b2ce97ca37 100644
>> +--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
>> ++++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
>> +@@ -285,7 +285,7 @@ UsbHcBulkTransfer (
>> + IN UINT8 DevSpeed,
>> + IN UINTN MaxPacket,
>> + IN UINT8 BufferNum,
>> +- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
>> ++ IN OUT VOID *Data[],
>> + IN OUT UINTN *DataLength,
>> + IN OUT UINT8 *DataToggle,
>> + IN UINTN TimeOut,
>> +diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
>> +index 1d2b8a6174..1316a5981f 100644
>> +--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
>> ++++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
>> +@@ -149,7 +149,7 @@ UsbHcBulkTransfer (
>> + IN UINT8 DevSpeed,
>> + IN UINTN MaxPacket,
>> + IN UINT8 BufferNum,
>> +- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
>> ++ IN OUT VOID *Data[],
>> + IN OUT UINTN *DataLength,
>> + IN OUT UINT8 *DataToggle,
>> + IN UINTN TimeOut,
>> +--
>> +2.35.3
>> +
>> --
>> 2.35.3
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
>
[-- Attachment #2: 0001-boot-edk2-fix-patch-line-ending.patch --]
[-- Type: text/x-patch, Size: 3267 bytes --]
From ec9aebca61bee4fdd058f9985bbb602d2b16d490 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Mon, 30 May 2022 20:59:27 +0200
Subject: [PATCH] boot/edk2: fix patch line ending
The patch 0001 from [1] has been corrupted on the
ML or patchwork.
[1] http://patchwork.ozlabs.org/project/buildroot/patch/20220527112146.387164-1-romain.naour@gmail.com/
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
...ePkg-UsbBusDxe-fix-NOOPT-build-error.patch | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch b/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
index 15abdb2840..f4f1b1565a 100644
--- a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
+++ b/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
@@ -22,27 +22,27 @@ index 7529e03e85..b2ce97ca37 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -285,7 +285,7 @@ UsbHcBulkTransfer (
- IN UINT8 DevSpeed,
- IN UINTN MaxPacket,
- IN UINT8 BufferNum,
-- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
-+ IN OUT VOID *Data[],
- IN OUT UINTN *DataLength,
- IN OUT UINT8 *DataToggle,
- IN UINTN TimeOut,
+ IN UINT8 DevSpeed,
+ IN UINTN MaxPacket,
+ IN UINT8 BufferNum,
+- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
++ IN OUT VOID *Data[],
+ IN OUT UINTN *DataLength,
+ IN OUT UINT8 *DataToggle,
+ IN UINTN TimeOut,
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
index 1d2b8a6174..1316a5981f 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
@@ -149,7 +149,7 @@ UsbHcBulkTransfer (
- IN UINT8 DevSpeed,
- IN UINTN MaxPacket,
- IN UINT8 BufferNum,
-- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
-+ IN OUT VOID *Data[],
- IN OUT UINTN *DataLength,
- IN OUT UINT8 *DataToggle,
- IN UINTN TimeOut,
+ IN UINT8 DevSpeed,
+ IN UINTN MaxPacket,
+ IN UINT8 BufferNum,
+- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
++ IN OUT VOID *Data[],
+ IN OUT UINTN *DataLength,
+ IN OUT UINT8 *DataToggle,
+ IN UINTN TimeOut,
--
2.35.3
--
2.35.3
[-- Attachment #3: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-05-30 19:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 11:21 [Buildroot] [PATCH] boot/edk2: fix gcc 11 Werror Romain Naour
2022-05-28 10:05 ` Yann E. MORIN
2022-05-30 19:04 ` Romain Naour [this message]
2022-05-30 20:23 ` Yann E. MORIN
2022-05-30 20:30 ` Yann E. MORIN
2022-06-06 10:06 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f76f9cc6-4188-e92a-a753-b962849f2230@gmail.com \
--to=romain.naour@gmail.com \
--cc=buildroot@buildroot.org \
--cc=yann.morin.1998@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox