gentoo resync : 22.05.2021

1 files changed, 0 insertions, 53 deletions

diff --git a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch
deleted file mode 100644
index dc776b515bc0..000000000000
--- a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 53b30aeba2dedae9f5558f560231d9462e063dfc Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@intel.com>
-Date: Thu, 5 Mar 2020 13:33:10 -0800
-Subject: depmod: do not output .bin to stdout
-
-index_write() relies on fseek/ftell to manage the position to which we
-are write and thus needs the file stream to support it.
-
-Right now when trying to write the index to stdout we fail with:
-
-	depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed.
-	Aborted (core dumped)
-
-We have no interest in outputting our index to stdout, so just skip it
-like is done with other indexes.
-
-While at it, add/remove some newlines to improve readability.
-
-Reported-by: Yanko Kaneti <yaneti@declera.com>
-Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo")
----
- tools/depmod.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tools/depmod.c b/tools/depmod.c
-index fbbce10..875e314 100644
---- a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -2408,8 +2408,10 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
- 	struct index_node *idx;
- 	struct kmod_list *l, *builtin = NULL;
- 
--	idx = index_create();
-+	if (out == stdout)
-+		return 0;
- 
-+	idx = index_create();
- 	if (idx == NULL) {
- 		ret = -ENOMEM;
- 		goto fail;
-@@ -2456,7 +2458,9 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
- 
- 	if (count)
- 		index_write(idx, out);
-+
- 	index_destroy(idx);
-+
- fail:
- 	if (builtin)
- 		kmod_module_unref_list(builtin);
--- 
-cgit 1.2.3-1.el7
-