Skip to contentSkip to conversation

sbsa-acs: fix patch not applying issue

PATCH New Jon Mason 1 participant 1 message May 17, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 sbsa-acs: fix patch not applying issue

---
 .../0001-BaseTools-fix-gcc12-warning-1.patch  | 32 ++++++-------
 .../0001-BaseTools-fix-gcc12-warning.patch    | 45 +++++++++++--------
 2 files changed, 42 insertions(+), 35 deletions(-)
meta-arm/recipes-bsp/uefi/sbsa-acs/0001-BaseTools-fix-gcc12-warning-1.patch +16 -16
index 565ba111..ba41cb23 100644
@@ -1,4 +1,4 @@
-From b0a0b7b605aeb8106e7b50d1efeb746f401498cc Mon Sep 17 00:00:00 2001
+From 85021f8cf22d1bd4114803c6c610dea5ef0059f1 Mon Sep 17 00:00:00 2001
 From: Gerd Hoffmann <[email protected]>
 Date: Thu, 24 Mar 2022 20:04:35 +0800
 Subject: [PATCH] BaseTools: fix gcc12 warning
@@ -32,20 +32,20 @@ index 4e9b499f8d..4b9f5fa692 100644
 --- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
 +++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
 @@ -2825,12 +2825,13 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
- 
-   nowPos64 = p->nowPos64;
-   RangeEnc_Init(&p->rc);
--  p->rc.outStream = &outStream.vt;
- 
-   if (desiredPackSize == 0)
-     return SZ_ERROR_OUTPUT_EOF;
- 
-+  p->rc.outStream = &outStream.vt;
-   res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
-+  p->rc.outStream = NULL;
- 
-   *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
-   *destLen -= outStream.rem;
+ 
+   nowPos64 = p->nowPos64;
+   RangeEnc_Init(&p->rc);
+-  p->rc.outStream = &outStream.vt;
+ 
+   if (desiredPackSize == 0)
+     return SZ_ERROR_OUTPUT_EOF;
+ 
++  p->rc.outStream = &outStream.vt;
+   res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
++  p->rc.outStream = NULL;
+ 
+   *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
+   *destLen -= outStream.rem;
 -- 
-2.36.1
+2.30.2
 
meta-arm/recipes-bsp/uefi/sbsa-acs/0001-BaseTools-fix-gcc12-warning.patch +26 -19

55 lines not on this page · raw message

Signature · 1 line
2.17.1