mirror of
https://git.yoctoproject.org/poky
synced 2026-03-10 17:29:40 +01:00
c3189b9efe
The flagship features are migration from bdb to sqlite and zstd support, both are enabled and taken into use. The relationship and upstream preference between sqlite and ndb formats isn't quite clear. Lua is now a hard dependency. Added packageconfig option for r/o support for bdb (that doesn't need bdb itself), but not enabled it as upstream marks it EXPERIMENTAL in capital letters. Drop sed adjustment for a file that is not anymore installed. Adjust oeqa test to check for sqlite database instead of bdb. Drop 0001-Fix-build-with-musl-C-library.patch (nss support removed upstream) 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch (difficult to undersand and rebase; obsolete with the move to zstd) 0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch (upstream made the same change) Portions of 0001-tools-Add-error.h-for-non-glibc-case.patch dropped (upstream moved the files to a separate component). Added 0001-docs-do-not-build-manpages-requires-pandoc.patch to avoid pandoc dependency. Added 0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch to restore reproducibility when compression thread amount varies between hosts. (From OE-Core rev: 6080fcf7e4f64faedd98ed26b65a3bc29ef08238) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
72 lines
1.7 KiB
Diff
72 lines
1.7 KiB
Diff
From 9b9d717f484ec913cdd3804e43489b3dc18bd77c Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sat, 31 Oct 2020 22:14:05 -0700
|
|
Subject: [PATCH] tools: Add error.h for non-glibc case
|
|
|
|
error is glibc specific API, so this patch will mostly not accepted
|
|
upstream given that elfutils has been closely tied to glibc
|
|
|
|
Upstream-Status: Inappropriate [workaround for musl]
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
---
|
|
tools/elfdeps.c | 6 +++++-
|
|
tools/error.h | 27 +++++++++++++++++++++++++++
|
|
2 files changed, 32 insertions(+), 1 deletion(-)
|
|
create mode 100644 tools/error.h
|
|
|
|
diff --git a/tools/elfdeps.c b/tools/elfdeps.c
|
|
index d205935bb..3a8945b33 100644
|
|
--- a/tools/elfdeps.c
|
|
+++ b/tools/elfdeps.c
|
|
@@ -5,10 +5,14 @@
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <fcntl.h>
|
|
-#include <error.h>
|
|
#include <errno.h>
|
|
#include <popt.h>
|
|
#include <gelf.h>
|
|
+#ifdef __GLIBC__
|
|
+#include <error.h>
|
|
+#else
|
|
+#include "error.h"
|
|
+#endif
|
|
|
|
#include <rpm/rpmstring.h>
|
|
#include <rpm/argv.h>
|
|
diff --git a/tools/error.h b/tools/error.h
|
|
new file mode 100644
|
|
index 000000000..ef06827a0
|
|
--- /dev/null
|
|
+++ b/tools/error.h
|
|
@@ -0,0 +1,27 @@
|
|
+#ifndef _ERROR_H_
|
|
+#define _ERROR_H_
|
|
+
|
|
+#include <stdarg.h>
|
|
+#include <stdio.h>
|
|
+#include <stdlib.h>
|
|
+#include <string.h>
|
|
+#include <errno.h>
|
|
+
|
|
+static unsigned int error_message_count = 0;
|
|
+
|
|
+static inline void error(int status, int errnum, const char* format, ...)
|
|
+{
|
|
+ va_list ap;
|
|
+ fprintf(stderr, "%s: ", program_invocation_name);
|
|
+ va_start(ap, format);
|
|
+ vfprintf(stderr, format, ap);
|
|
+ va_end(ap);
|
|
+ if (errnum)
|
|
+ fprintf(stderr, ": %s", strerror(errnum));
|
|
+ fprintf(stderr, "\n");
|
|
+ error_message_count++;
|
|
+ if (status)
|
|
+ exit(status);
|
|
+}
|
|
+
|
|
+#endif /* _ERROR_H_ */
|