mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 14:59:55 +00:00
Code Issues Projects Releases Wiki Activity

fluentbit: Drop redundant patch

Browse Source 
Instead of applying one and then reverting it via another patch, its
better to apply SRC_URI:remove on the original patch for x86 (32bit)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2022-09-03 01:01:47 -07:00
parent fcdeff5b23
commit 3ab3b08ad9
2 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/fluentbit/fluentbit/0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch
-42
View File
@@ -1,42 +0,0 @@
From af6cefba8c2675f58b75f93785337ab23054568c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 18 Aug 2022 23:35:23 -0700
Subject: [PATCH] Revert Remove unused variable in mpi_mul_hlp()
This reverts
https://github.com/Mbed-TLS/mbedtls/commit/e7f14a3090e6595eb3c8d821704ad9c90f6d3712
Which helps in compiling the x86 asm code.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/mbedtls-2.28.0/library/bignum.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/mbedtls-2.28.0/library/bignum.c b/lib/mbedtls-2.28.0/library/bignum.c
index 9c256ae..62e7f76 100644
--- a/lib/mbedtls-2.28.0/library/bignum.c
+++ b/lib/mbedtls-2.28.0/library/bignum.c
@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i,
mbedtls_mpi_uint *d,
mbedtls_mpi_uint b )
{
- mbedtls_mpi_uint c = 0;
+ mbedtls_mpi_uint c = 0, t = 0;
#if defined(MULADDC_HUIT)
for( ; i >= 8; i -= 8 )
@@ -1443,6 +1443,8 @@ void mpi_mul_hlp( size_t i,
}
#endif /* MULADDC_HUIT */
+ t++;
+
while( c != 0 )
{
*d += c; c = ( *d < c ); d++;
--
2.37.2
meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
+1 -1
View File
@@ -22,8 +22,8 @@ SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-b
file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \
file://0005-stackdriver-Fix-return-type-mismatch.patch \
file://0006-monkey-Fix-TLS-detection-testcase.patch \
file://0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch \
"
SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch"
SRC_URI:append:libc-musl = "\
file://0001-Use-posix-strerror_r-with-musl.patch \
file://0002-chunkio-Link-with-fts-library-with-musl.patch \