diff --git a/backport-depmod-do-not-output-.bin-to-stdout.patch b/backport-depmod-do-not-output-.bin-to-stdout.patch
new file mode 100644
index 0000000000000000000000000000000000000000..be01ce811ab12ac3616f6b21bdc97f5540de02c9
--- /dev/null
+++ b/backport-depmod-do-not-output-.bin-to-stdout.patch
@@ -0,0 +1,57 @@
+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: [PATCH] depmod: do not output .bin to stdout
+
+reason:do not output .bin to stdout
+Conflict:NA
+Reference:https://lore.kernel.org/linux-modules/20200306075934.3104-1-lucas.demarchi@intel.com/T/#t
+
+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);
+-- 
+2.23.0
+
diff --git a/backport-depmod-output_builtin_alias_bin-free-idx-on-error-pa.patch b/backport-depmod-output_builtin_alias_bin-free-idx-on-error-pa.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a8fe60eccca5f181c958e0f72190fcfff46d0cdd
--- /dev/null
+++ b/backport-depmod-output_builtin_alias_bin-free-idx-on-error-pa.patch
@@ -0,0 +1,56 @@
+From bd96d05256db2ff9a89dbe2e8bb6e26fcb800052 Mon Sep 17 00:00:00 2001
+From: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
+Date: Sun, 29 Nov 2020 18:47:36 +0200
+Subject: [PATCH] depmod: output_builtin_alias_bin: free idx on error path
+
+reason:depmod: output_builtin_alias_bin free idx on error path
+Conflict:NA
+Reference:https://lore.kernel.org/linux-modules/20201129164737.135866-2-yauheni.kaliuta@redhat.com/T/#u
+
+idx is allocated in the beginning but it's not freed if there is
+a failure after the allocation.
+
+Change the error path: return immediately if idx allocation fails
+and then free it in both success and error path at the end.
+
+Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
+---
+ tools/depmod.c | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/tools/depmod.c b/tools/depmod.c
+index 875e314..2c03dfe 100644
+--- a/tools/depmod.c
++++ b/tools/depmod.c
+@@ -2412,10 +2412,8 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
+ 		return 0;
+ 
+ 	idx = index_create();
+-	if (idx == NULL) {
+-		ret = -ENOMEM;
+-		goto fail;
+-	}
++	if (idx == NULL)
++		return -ENOMEM;
+ 
+ 	ret = kmod_module_get_builtin(depmod->ctx, &builtin);
+ 	if (ret < 0) {
+@@ -2458,13 +2456,12 @@ 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);
+ 
++	index_destroy(idx);
++
+ 	return ret;
+ }
+ 
+-- 
+2.23.0
+
diff --git a/backport-libkmod-allow-modules.alias.builtin-to-be-optional.patch b/backport-libkmod-allow-modules.alias.builtin-to-be-optional.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6a3a310847e089f6c13588c5f5ce66a00a4b5c0e
--- /dev/null
+++ b/backport-libkmod-allow-modules.alias.builtin-to-be-optional.patch
@@ -0,0 +1,46 @@
+From d8d1d54051053d770643b59c3f5cf5608a17a0ce Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Mon, 9 Mar 2020 22:00:28 -0700
+Subject: [PATCH] libkmod: allow modules.alias.builtin to be optional
+
+---
+ libkmod/libkmod.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index ab5c1e8..43423d6 100644
+--- a/libkmod/libkmod.c
++++ b/libkmod/libkmod.c
+@@ -855,8 +855,8 @@ KMOD_EXPORT int kmod_validate_resources(struct kmod_ctx *ctx)
+  */
+ KMOD_EXPORT int kmod_load_resources(struct kmod_ctx *ctx)
+ {
++	int ret = 0;
+ 	size_t i;
+-	int ret;
+ 
+ 	if (ctx == NULL)
+ 		return -ENOENT;
+@@ -874,8 +874,17 @@ KMOD_EXPORT int kmod_load_resources(struct kmod_ctx *ctx)
+ 							index_files[i].fn);
+ 		ret = index_mm_open(ctx, path, &ctx->indexes_stamp[i],
+ 				    &ctx->indexes[i]);
+-		if (ret)
+-			break;
++
++		/*
++		 * modules.builtin.alias are considered optional since it's
++		 * recently added and older installations may not have it;
++		 * we allow failing for any reason
++		 */
++		if (ret) {
++			if (i != KMOD_INDEX_MODULES_BUILTIN_ALIAS)
++				break;
++			ret = 0;
++		}
+ 	}
+ 
+ 	if (ret)
+-- 
+2.19.1
+
diff --git a/backport-libkmod-do-not-crash-on-unknown-signature-algorithm.patch b/backport-libkmod-do-not-crash-on-unknown-signature-algorithm.patch
new file mode 100644
index 0000000000000000000000000000000000000000..78cc8a90394999570181acec131f7dffe495768d
--- /dev/null
+++ b/backport-libkmod-do-not-crash-on-unknown-signature-algorithm.patch
@@ -0,0 +1,40 @@
+From d5950b0b5e66a5ec1c21b638dec3974056aaabeb Mon Sep 17 00:00:00 2001
+From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
+Date: Sun, 25 Sep 2022 17:46:08 +0300
+Subject: libkmod: do not crash on unknown signature algorithm
+
+Conflict:NA
+Reference:https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit?id=d5950b0b5e66a5ec1c21b638dec3974056aaabeb
+
+Example kernel module:
+https://file-store.rosalinux.ru/download/7281f97e0c04c0f818ad3f936706f4a407e8dc7e
+(/lib/modules/5.15.67-generic-1rosa2021.1-x86_64/kernel/drivers/usb/host/xhci-pci.ko.zst)
+It is signed with Streebog 512.
+
+libkmod v30 crashed in libkmod-module.c:2413 in this code:
+
+n = kmod_module_info_append(list,
+	"sig_hashalgo", strlen("sig_hashalgo"),
+	sig_info.hash_algo, strlen(sig_info.hash_algo));
+
+because strlen() got null.
+---
+ libkmod/libkmod-signature.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
+index 4ae5af6..092f396 100644
+--- a/libkmod/libkmod-signature.c
++++ b/libkmod/libkmod-signature.c
+@@ -278,6 +278,9 @@ static bool fill_pkcs7(const char *mem, off_t size,
+ 	X509_ALGOR_get0(&o, NULL, NULL, dig_alg);
+ 
+ 	sig_info->hash_algo = pkey_hash_algo[obj_to_hash_algo(o)];
++	// hash algo has not been recognized
++	if (sig_info->hash_algo == NULL)
++		goto err3;
+ 	sig_info->id_type = pkey_id_type[modsig->id_type];
+ 
+ 	pvt = malloc(sizeof(*pvt));
+-- 
+cgit 
diff --git a/backport-libkmod-error-out-on-unknown-hash-algorithm.patch b/backport-libkmod-error-out-on-unknown-hash-algorithm.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a9903b2e978cdf809684963c732409511eb5be4c
--- /dev/null
+++ b/backport-libkmod-error-out-on-unknown-hash-algorithm.patch
@@ -0,0 +1,45 @@
+From b9605c63b859adfffc0b4b9420d720aa323b90e9 Mon Sep 17 00:00:00 2001
+From: Emil Velikov <emil.velikov@collabora.com>
+Date: Mon, 6 Feb 2023 14:32:59 +0000
+Subject: [PATCH 2/9] libkmod: error out on unknown hash algorithm
+
+Currently if we see unknown algorithm, we'll do an OOB read in
+pkey_hash_algo. This can happen for example if OPENSSL_NO_SM3 is set and
+the kernel module uses a SM3 hash.
+
+Cc: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
+Cc: Lucas De Marchi <lucas.demarchi@intel.com>
+Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
+Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
+Signed-off-by: Hangliang Lai <laihangliang1@huawei.com>
+---
+ libkmod/libkmod-signature.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
+index 092f396..b749a81 100644
+--- a/libkmod/libkmod-signature.c
++++ b/libkmod/libkmod-signature.c
+@@ -219,6 +219,7 @@ static bool fill_pkcs7(const char *mem, off_t size,
+ 	unsigned char *key_id_str;
+ 	struct pkcs7_private *pvt;
+ 	const char *issuer_str;
++	int hash_algo;
+ 
+ 	size -= sig_len;
+ 	pkcs7_raw = mem + size;
+@@ -277,7 +278,10 @@ static bool fill_pkcs7(const char *mem, off_t size,
+ 
+ 	X509_ALGOR_get0(&o, NULL, NULL, dig_alg);
+ 
+-	sig_info->hash_algo = pkey_hash_algo[obj_to_hash_algo(o)];
++	hash_algo = obj_to_hash_algo(o);
++	if (hash_algo < 0)
++		goto err3;
++	sig_info->hash_algo = pkey_hash_algo[hash_algo];
+ 	// hash algo has not been recognized
+ 	if (sig_info->hash_algo == NULL)
+ 		goto err3;
+-- 
+2.30.0
+
diff --git a/backport-libkmod-fix-return-error-when-opening-index.patch b/backport-libkmod-fix-return-error-when-opening-index.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c380f74a437816d67698458d09772c170c4b30f5
--- /dev/null
+++ b/backport-libkmod-fix-return-error-when-opening-index.patch
@@ -0,0 +1,171 @@
+From 3bd7187ff549a2ef2441dcddabf382cc53cf6f22 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Mon, 9 Mar 2020 22:00:27 -0700
+Subject: [PATCH] libkmod: fix return error when opening index
+
+When calling kmod_load_resources() we could end up getting a bogus
+return value -ENOMEM due to several other reasons, like the index not
+existing. Change index_mm_open() to propagate the failure reason so we
+can take actions on it or return to the caller.
+---
+ libkmod/libkmod-index.c | 31 +++++++++++++++++++------------
+ libkmod/libkmod-index.h |  4 ++--
+ libkmod/libkmod.c       | 16 ++++++++--------
+ 3 files changed, 29 insertions(+), 22 deletions(-)
+
+diff --git a/libkmod/libkmod-index.c b/libkmod/libkmod-index.c
+index 1f3351a..6a34c8d 100644
+--- a/libkmod/libkmod-index.c
++++ b/libkmod/libkmod-index.c
+@@ -611,7 +611,7 @@ struct index_value *index_searchwild(struct index_file *in, const char *key)
+ static const char _idx_empty_str[] = "";
+ 
+ struct index_mm {
+-	struct kmod_ctx *ctx;
++	const struct kmod_ctx *ctx;
+ 	void *mm;
+ 	uint32_t root_offset;
+ 	size_t size;
+@@ -739,10 +739,10 @@ static void index_mm_free_node(struct index_mm_node *node)
+ 	free(node);
+ }
+ 
+-struct index_mm *index_mm_open(struct kmod_ctx *ctx, const char *filename,
+-						unsigned long long *stamp)
++int index_mm_open(const struct kmod_ctx *ctx, const char *filename,
++		  unsigned long long *stamp, struct index_mm **pidx)
+ {
+-	int fd;
++	int fd, err;
+ 	struct stat st;
+ 	struct index_mm *idx;
+ 	struct {
+@@ -752,28 +752,32 @@ struct index_mm *index_mm_open(struct kmod_ctx *ctx, const char *filename,
+ 	} hdr;
+ 	void *p;
+ 
++	assert(pidx != NULL);
++
+ 	DBG(ctx, "file=%s\n", filename);
+ 
+ 	idx = malloc(sizeof(*idx));
+ 	if (idx == NULL) {
+ 		ERR(ctx, "malloc: %m\n");
+-		return NULL;
++		return -ENOMEM;
+ 	}
+ 
+ 	if ((fd = open(filename, O_RDONLY|O_CLOEXEC)) < 0) {
+ 		DBG(ctx, "open(%s, O_RDONLY|O_CLOEXEC): %m\n", filename);
++		err = -errno;
+ 		goto fail_open;
+ 	}
+ 
+-	if (fstat(fd, &st) < 0)
+-		goto fail_nommap;
+-	if ((size_t) st.st_size < sizeof(hdr))
++	if (fstat(fd, &st) < 0 || (size_t) st.st_size < sizeof(hdr)) {
++		err = -EINVAL;
+ 		goto fail_nommap;
++	}
+ 
+-	if ((idx->mm = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0))
+-							== MAP_FAILED) {
++	idx->mm = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
++	if (idx->mm == MAP_FAILED) {
+ 		ERR(ctx, "mmap(NULL, %"PRIu64", PROT_READ, %d, MAP_PRIVATE, 0): %m\n",
+ 							st.st_size, fd);
++		err = -errno;
+ 		goto fail_nommap;
+ 	}
+ 
+@@ -785,12 +789,14 @@ struct index_mm *index_mm_open(struct kmod_ctx *ctx, const char *filename,
+ 	if (hdr.magic != INDEX_MAGIC) {
+ 		ERR(ctx, "magic check fail: %x instead of %x\n", hdr.magic,
+ 								INDEX_MAGIC);
++		err = -EINVAL;
+ 		goto fail;
+ 	}
+ 
+ 	if (hdr.version >> 16 != INDEX_VERSION_MAJOR) {
+ 		ERR(ctx, "major version check fail: %u instead of %u\n",
+ 					hdr.version >> 16, INDEX_VERSION_MAJOR);
++		err = -EINVAL;
+ 		goto fail;
+ 	}
+ 
+@@ -800,8 +806,9 @@ struct index_mm *index_mm_open(struct kmod_ctx *ctx, const char *filename,
+ 	close(fd);
+ 
+ 	*stamp = stat_mstamp(&st);
++	*pidx = idx;
+ 
+-	return idx;
++	return 0;
+ 
+ fail:
+ 	munmap(idx->mm, st.st_size);
+@@ -809,7 +816,7 @@ fail_nommap:
+ 	close(fd);
+ fail_open:
+ 	free(idx);
+-	return NULL;
++	return err;
+ }
+ 
+ void index_mm_close(struct index_mm *idx)
+diff --git a/libkmod/libkmod-index.h b/libkmod/libkmod-index.h
+index 52aebac..db671b0 100644
+--- a/libkmod/libkmod-index.h
++++ b/libkmod/libkmod-index.h
+@@ -40,8 +40,8 @@ void index_values_free(struct index_value *values);
+ 
+ /* Implementation using mmap */
+ struct index_mm;
+-struct index_mm *index_mm_open(struct kmod_ctx *ctx, const char *filename,
+-						unsigned long long *stamp);
++int index_mm_open(const struct kmod_ctx *ctx, const char *filename,
++		  unsigned long long *stamp, struct index_mm **pidx);
+ void index_mm_close(struct index_mm *index);
+ char *index_mm_search(struct index_mm *idx, const char *key);
+ struct index_value *index_mm_searchwild(struct index_mm *idx, const char *key);
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index 39f58d9..ab5c1e8 100644
+--- a/libkmod/libkmod.c
++++ b/libkmod/libkmod.c
+@@ -856,6 +856,7 @@ KMOD_EXPORT int kmod_validate_resources(struct kmod_ctx *ctx)
+ KMOD_EXPORT int kmod_load_resources(struct kmod_ctx *ctx)
+ {
+ 	size_t i;
++	int ret;
+ 
+ 	if (ctx == NULL)
+ 		return -ENOENT;
+@@ -871,17 +872,16 @@ KMOD_EXPORT int kmod_load_resources(struct kmod_ctx *ctx)
+ 
+ 		snprintf(path, sizeof(path), "%s/%s.bin", ctx->dirname,
+ 							index_files[i].fn);
+-		ctx->indexes[i] = index_mm_open(ctx, path,
+-						&ctx->indexes_stamp[i]);
+-		if (ctx->indexes[i] == NULL)
+-			goto fail;
++		ret = index_mm_open(ctx, path, &ctx->indexes_stamp[i],
++				    &ctx->indexes[i]);
++		if (ret)
++			break;
+ 	}
+ 
+-	return 0;
++	if (ret)
++		kmod_unload_resources(ctx);
+ 
+-fail:
+-	kmod_unload_resources(ctx);
+-	return -ENOMEM;
++	return ret;
+ }
+ 
+ /**
+-- 
+2.19.1
+
diff --git a/backport-libkmod-kmod_builtin_get_modinfo-free-modinfo-on-err.patch b/backport-libkmod-kmod_builtin_get_modinfo-free-modinfo-on-err.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3f234c71e2d3d0934de64601ddcad0dbe327582a
--- /dev/null
+++ b/backport-libkmod-kmod_builtin_get_modinfo-free-modinfo-on-err.patch
@@ -0,0 +1,35 @@
+From 47807c4cfa5ffe1e5da27e3d3056d9b47ba998c5 Mon Sep 17 00:00:00 2001
+From: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
+Date: Sun, 29 Nov 2020 18:47:35 +0200
+Subject: [PATCH] libkmod: kmod_builtin_get_modinfo: free modinfo on error
+
+reason:kmod_builtin_get_modinfo: free modinfo on error
+Conflict:NA
+Reference:https://lore.kernel.org/linux-modules/CAKi4VA+kaWfLZ_Ue-teaJAvDQjfM6G-WK3KmMWVinR-Zg6T64A@mail.gmail.com/T/#t
+
+The function allocates array but on building it if get_string()
+fails it returns the error leaving the array allocated. The caller
+does not care about it in error case either.
+
+Free it to fix memory leak.
+
+Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
+---
+ libkmod/libkmod-builtin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libkmod/libkmod-builtin.c b/libkmod/libkmod-builtin.c
+index aaec5dd..fc9a376 100644
+--- a/libkmod/libkmod-builtin.c
++++ b/libkmod/libkmod-builtin.c
+@@ -314,6 +314,7 @@ ssize_t kmod_builtin_get_modinfo(struct kmod_ctx *ctx, const char *modname,
+ 		offset = get_string(iter, pos, &line, &linesz);
+ 		if (offset <= 0) {
+ 			count = (offset) ? -errno : -EOF;
++			free(*modinfo);
+ 			goto fail;
+ 		}
+ 
+-- 
+2.23.0
+
diff --git a/backport-libkmod-kmod_log_null-qualify-ctx-argument-as-const.patch b/backport-libkmod-kmod_log_null-qualify-ctx-argument-as-const.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4ac11d08c474ffaf3726b574126762cd362d122e
--- /dev/null
+++ b/backport-libkmod-kmod_log_null-qualify-ctx-argument-as-const.patch
@@ -0,0 +1,38 @@
+From 95ed3e75365b4922f4d5f3e024a26fe230f3a315 Mon Sep 17 00:00:00 2001
+From: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
+Date: Sun, 29 Nov 2020 18:47:37 +0200
+Subject: [PATCH] libkmod: kmod_log_null: qualify ctx argument as const
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+kmod_log_null() does not change ctx (does nothing).
+
+Fix warnings
+
+In file included from libkmod/libkmod-index.c:33:
+libkmod/libkmod-index.c: In function ‘index_mm_open’:
+libkmod/libkmod-index.c:757:6: warning: passing argument 1 of ‘kmod_log_null’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
+  757 |  DBG(ctx, "file=%s\n", filename);
+
+Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
+---
+ libkmod/libkmod-internal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
+index b22ac2a..398af9c 100644
+--- a/libkmod/libkmod-internal.h
++++ b/libkmod/libkmod-internal.h
+@@ -11,7 +11,7 @@
+ #include "libkmod.h"
+ 
+ static _always_inline_ _printf_format_(2, 3) void
+-	kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {}
++	kmod_log_null(const struct kmod_ctx *ctx, const char *format, ...) {}
+ 
+ #define kmod_log_cond(ctx, prio, arg...) \
+ 	do { \
+-- 
+2.23.0
+
diff --git a/backprot-libkmod-config-fix-a-memory-leak-when-kmod_list_appe.patch b/backprot-libkmod-config-fix-a-memory-leak-when-kmod_list_appe.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8c942f7c2d969c2d7042eea5f0307cb204d05431
--- /dev/null
+++ b/backprot-libkmod-config-fix-a-memory-leak-when-kmod_list_appe.patch
@@ -0,0 +1,33 @@
+From 39dd171623744ac390dadf487c5a3ebf0b69f2ca Mon Sep 17 00:00:00 2001
+From: Seung-Woo Kim <sw0312.kim@samsung.com>
+Date: Fri, 9 Apr 2021 18:44:23 +0900
+Subject: [PATCH] libkmod-config: fix a memory leak when kmod_list_append()
+ fails
+
+From kmod_config_new(), when kmod_list_append() fails,
+fix not list-appended kmod_config_path leak.
+
+Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
+---
+ libkmod/libkmod-config.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
+index 7b62367..78957db 100644
+--- a/libkmod/libkmod-config.c
++++ b/libkmod/libkmod-config.c
+@@ -853,8 +853,10 @@ int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **p_config,
+ 		memcpy(cf->path, path, pathlen);
+ 
+ 		tmp = kmod_list_append(path_list, cf);
+-		if (tmp == NULL)
++		if (tmp == NULL) {
++			free(cf);
+ 			goto oom;
++		}
+ 		path_list = tmp;
+ 	}
+ 
+-- 
+2.23.0
+
diff --git a/depmod.conf.dist b/depmod.conf.dist
index 7bf69c59653c59f2822ec98ea9c6b0580a7d8ff9..b9cb5e939e19159a79c9c7ad88e3034301102459 100644
--- a/depmod.conf.dist
+++ b/depmod.conf.dist
@@ -3,4 +3,4 @@
 #
 
 # override default search ordering for kmod packaging
-search EulerOS updates extra external built-in weak-updates
+search updates extra external built-in weak-updates
diff --git a/kmod.spec b/kmod.spec
index 5706ab2ee701f1819795c3e9845991102ac99f28..d12dc4f4c3131b2d96391be766ef0ca55b0b8736 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -1,6 +1,6 @@
 Name:           kmod
 Version:        27
-Release:        1
+Release:        12
 Summary:        Kernel module management
 # GPLv2+ is used by programs, LGPLv2+ is used for libraries.
 License:        GPLv2+ and LGPLv2+
@@ -9,8 +9,16 @@ Source0:        https://www.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{ver
 Source1:        weak-modules
 Source2:        depmod.conf.dist
 
+Patch6000:      backport-libkmod-fix-return-error-when-opening-index.patch
+Patch6001:      backport-libkmod-allow-modules.alias.builtin-to-be-optional.patch
+Patch6002:      backport-libkmod-kmod_log_null-qualify-ctx-argument-as-const.patch
+Patch6003:      backport-depmod-do-not-output-.bin-to-stdout.patch
+Patch6004:      backport-libkmod-kmod_builtin_get_modinfo-free-modinfo-on-err.patch
+Patch6005:      backport-depmod-output_builtin_alias_bin-free-idx-on-error-pa.patch
+Patch6006:	backprot-libkmod-config-fix-a-memory-leak-when-kmod_list_appe.patch
 Patch9000:      bugfix-kmod-20-8-depmod-Don-t-unlinkat-orig-depfile-and-add-fsync.patch
 
+Recommends:	%{name}-help = %{version}-%{release}
 BuildRequires:  gcc chrpath zlib-devel xz-devel libxslt openssl-devel
 
 Provides:       module-init-tools = 4.0-1
@@ -104,6 +112,42 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf
 %doc TODO NEWS README
 
 %changelog
+* Sun Mar 26 2023 Laihangliang <laihangliang1@huawei.com> - 27-12
+- fix crash on unknown hash siginiture algorithm 
+
+* Fri Jul 22 2022 liwenchong <liwenchong@kylinos.cn> - 27-11
+- fix memeory leak
+
+* Fri Aug 13 2021 YangYanchao <yangyanchao6@huawei.com> - 27-10
+- weak-modules: fix a bug when using weak_modules without '$'
+
+* Fri Aug 13 2021 YangYanchao <yangyanchao6@huawei.com> - 27-9
+- weak-modules: fix a bug when /lib/modules/`uname -r`/weak-update does not exist
+
+* Wed Apr 7 2021 YangYanchao <yangyanchao6@huawei.com> - 27-8
+- backport weak-modules script from fedora
+
+* Thu Jan 14 2021 xinghe <xinghe1@huawei.com> - 27-7
+- fix memory leak in kmodinfo
+
+* Fri Jan 8 2020 xinghe <xinghe1@huawei.com> - 27-6
+- fix compilation warning
+
+* Wed Nov 11 2020 xinghe <xinghe1@huawei.com> - 27-5
+- add help for Recommends
+
+* Fri Aug 21 2020 WangShuo <wangshuo_1994@foxmail.com> - 27-4
+- unnecessary message
+ 
+* Tue Aug 18 2020 chenyaqiang <chenyaqiang@huawei.com> - 27-3
+- rebuild for package build
+
+* Tue May 5 2020 Wang Shuo<wangshuo47@huawei.com> - 27-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: backport patch to deal with lspci -v error report
+
 * Fri Apr 17 2020 Wang Shuo<wangshuo47@huawei.com> - 27-1
 - Type:enhancement
 - ID:NA
diff --git a/weak-modules b/weak-modules
index 4b621e96fe43f3d4fb6f03ae511f1fc3d5d30c8b..e67e7bbb46d942e4046bb22639dea1c8de314be8 100644
--- a/weak-modules
+++ b/weak-modules
@@ -3,25 +3,33 @@
 # weak-modules - determine which modules are kABI compatible with installed
 #                kernels and set up the symlinks in /lib/*/weak-updates.
 #
-# Changelog:
-#
-# 2010/01/10 - Further updates for dracut use on Fedora/RHEL (jcm).
-# 2009/09/16 - Rebase and add a bunch of updates for dracut (jcm).
-
 unset LANG LC_ALL LC_COLLATE
 
 tmpdir=$(mktemp -td ${0##*/}.XXXXXX)
 trap "rm -rf $tmpdir" EXIT
 unset ${!changed_modules_*} ${!changed_initramfs_*}
 
-initramfs_prefix="/boot" # can customize here
+unset BASEDIR
+unset CHECK_INITRAMFS
+weak_updates_dir_override=""
+default_initramfs_prefix="/boot" # will be combined with BASEDIR
 dracut="/usr/bin/dracut"
+depmod="/sbin/depmod"
+depmod_orig="$depmod"
+declare -a modules
+declare -A module_krels
+declare -A weak_modules_before
 
-if [ ! -x "$dracut" ]
-then
-        echo "weak-modules: this tool requires a dracut-enabled kernel"
-	exit 1
-fi
+declare -A groups
+declare -A grouped_modules
+
+# output of validate_weak_links, one iteration
+# short_name -> path
+declare -A compatible_modules
+
+# state for update_modules_for_krel (needed for add_kernel case)
+# short_name -> path
+declare -A installed_modules
 
 # doit:
 # A wrapper used whenever we're going to perform a real operation.
@@ -30,29 +38,82 @@ doit() {
     [ -n "$dry_run" ] || "$@"
 }
 
+# pr_verbose:
+# print verbose -- wrapper used to print extra messages if required
+pr_verbose() {
+    [ -n "$verbose" ] && echo "$@"
+}
+
+# pr_warning:
+# print warning
+pr_warning() {
+    echo "WARNING: $*"
+}
+
 # rpmsort: The sort in coreutils can't sort the RPM list how we want it so we
 # instead transform the list into a form it will sort correctly, then sort.
 rpmsort() {
-	local IFS=$' '
-	REVERSE=""
-	rpmlist=($(cat))
+    local IFS=$' '
+    REVERSE=""
+    rpmlist=($(cat))
 
-	if [ "-r" == "$1" ];
-	then
-		REVERSE="-r"
-	fi
+    if [ "-r" == "$1" ];
+    then
+        REVERSE="-r"
+    fi
 
-	echo ${rpmlist[@]} | \
-	sed -e 's/-/../g' | \
-	sort ${REVERSE} -n -t"." -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 -k6,6 -k7,7 \
-				 -k8,8 -k9,9 -k10,10 | \
-	sed -e 's/\.\./-/g'
+    echo ${rpmlist[@]} | \
+        sed -e 's/-/../g' | \
+        sort ${REVERSE} -n -t"." -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 -k6,6 -k7,7 \
+             -k8,8 -k9,9 -k10,10 | \
+        sed -e 's/\.\./-/g'
+}
+
+# krel_of_module:
+# Compute the kernel release of a module.
+krel_of_module() {
+    local module="$1"
+
+    if [ x"${module_krels[$module]+set}" = x"set" ]; then
+        # version cached in the array already
+        echo "${module_krels[$module]}"
+    elif [ -f "$module" ]; then
+        krel_of_module_modinfo "$module"
+    else
+        # Try to extract the kernel release from the path
+        # delete case, the .ko already deleted
+        set -- "${module#*/lib/modules/}"
+        echo "${1%%/*}"
+    fi
+}
+
+# krel_of_module_modinfo:
+# Fetches module version from internal module info
+krel_of_module_modinfo() {
+    local module="$1"
+    /sbin/modinfo -F vermagic "$module" | awk '{print $1}'
+}
+
+# weak_updates_dir:
+# gives the root directory for the weak-updates
+# We need some flexibility here because of dry-run.
+weak_updates_dir() {
+    local krel="$1"
+
+    if [[ -z "$weak_updates_dir_override" ]]; then
+        echo "$BASEDIR/lib/modules/$krel/weak-updates"
+    else
+        echo "$weak_updates_dir_override"
+    fi
 }
 
 # read_modules_list:
 # Read in a list of modules from standard input. Convert the filenames into
 # absolute paths and compute the kernel release for each module (either using
 # the modinfo section or through the absolute path.
+# If used with input redirect, should be used as read_module_list < input,
+# not input | read_modules_list, the latter spawns a subshell
+# and the arrays are not seen in the caller
 read_modules_list() {
     local IFS=$'\n'
     modules=($(cat))
@@ -61,16 +122,52 @@ read_modules_list() {
         if [ ${modules[n]:0:1} != '/' ]; then
             modules[n]="$PWD/${modules[n]}"
         fi
-        if [ -f "${modules[n]}" ]; then
-            module_krels[n]=$(krel_of_module ${modules[n]})
-        else
-            # Try to extract the kernel release from the path
-            set -- "${modules[n]#/lib/modules/}"
-            module_krels[n]=${1%%/*}
-        fi
+        module_krels["${modules[n]}"]=$(krel_of_module ${modules[n]})
     done
 }
 
+decompress_initramfs() {
+    local input=$1
+    local output=$2
+
+    # First, check if this is compressed at all
+    if cpio -i -t < "$input" > /dev/null 2>/dev/null; then
+        # If this archive contains a file early_cpio, it's a trick. Strip off
+        # the early cpio archive and try again.
+        if cpio -i -t < "$input" 2>/dev/null | grep -q '^early_cpio$' ; then
+            /usr/lib/dracut/skipcpio "$input" > "${tmpdir}/post_early_cpio.img"
+            decompress_initramfs "${tmpdir}/post_early_cpio.img" "$output"
+            retval="$?"
+            rm -f "${tmpdir}/post_early_cpio.img"
+            return $retval
+        fi
+
+        cp "$input" "$output"
+        return 0
+    fi
+
+    # Try gzip
+    if gzip -cd < "$input" > "$output" 2>/dev/null ; then
+        return 0
+    fi
+
+    # Next try xz
+    if xz -cd < "$input" > "$output" 2>/dev/null ; then
+        return 0
+    fi
+
+    echo "Unable to decompress $input: Unknown format" >&2
+    return 1
+}
+
+# List all module files and modprobe configuration that could require a new
+# initramfs. The current directory must be the root of the uncompressed
+# initramfs. The unsorted list of files is output to stdout.
+list_module_files() {
+    find . -iname \*.ko -o -iname '*.ko.xz' -o -iname '*.ko.gz' 2>/dev/null
+    find etc/modprobe.d usr/lib/modprobe.d -name \*.conf 2>/dev/null
+}
+
 # read_old_initramfs:
 compare_initramfs_modules() {
     local old_initramfs=$1
@@ -81,28 +178,35 @@ compare_initramfs_modules() {
     mkdir "$tmpdir/old_initramfs"
     mkdir "$tmpdir/new_initramfs"
 
+    decompress_initramfs "$old_initramfs" "$tmpdir/old_initramfs.img"
     pushd "$tmpdir/old_initramfs" >/dev/null
-    zcat "$old_initramfs" | cpio -i 2>/dev/null
-    n=0; for i in `find . -iname \*.ko|sort`; do
+    cpio -i < "$tmpdir/old_initramfs.img" 2>/dev/null
+    rm "$tmpdir/old_initramfs.img"
+    n=0; for i in `list_module_files|sort`; do
         old_initramfs_modules[n]="$i"
         n=$((n+1))
     done
     popd >/dev/null
 
+    decompress_initramfs "$new_initramfs" "$tmpdir/new_initramfs.img"
     pushd "$tmpdir/new_initramfs" >/dev/null
-    zcat "$new_initramfs" | cpio -i 2>/dev/null
-    n=0; for i in `find . -iname \*.ko|sort`; do
+    cpio -i < "$tmpdir/new_initramfs.img" 2>/dev/null
+    rm "$tmpdir/new_initramfs.img"
+    n=0; for i in `list_module_files|sort`; do
         new_initramfs_modules[n]="$i"
         n=$((n+1))
     done
     popd >/dev/null
 
-    if [ "${#old_initramfs_modules[@]}" == "${#new_initramfs_modules[@]}" ];
+    # Compare the length and contents of the arrays
+    if [ "${#old_initramfs_modules[@]}" == "${#new_initramfs_modules[@]}" -a \
+         "${old_initramfs_modules[*]}" == "${new_initramfs_modules[*]}" ];
     then
+        # If the file lists are the same, compare each file to find any that changed
         for ((n = 0; n < ${#old_initramfs_modules[@]}; n++)); do
-            old_md5=`md5sum $tmpdir/old_initramfs/${old_initramfs_modules[n]}|sed -nre 's:(^\ )* .*:\1:p'`
-            new_md5=`md5sum $tmpdir/new_initramfs/${new_initramfs_modules[n]}|sed -nre 's:(^\ )* .*:\1:p'`
-            if [ ! "$old_md5" == "$new_md5" ];
+            if ! cmp "$tmpdir/old_initramfs/${old_initramfs_modules[n]}" \
+                     "$tmpdir/new_initramfs/${new_initramfs_modules[n]}" \
+                     >/dev/null 2>&1
             then
                 return 1
             fi
@@ -128,7 +232,7 @@ check_initramfs() {
 
         $dracut -f "$tmp_initramfs" "$kernel"
 
-        if ! $(compare_initramfs_modules "$old_initramfs" "$tmp_initramfs");
+        if ! compare_initramfs_modules "$old_initramfs" "$tmp_initramfs";
         then
             doit mv "$tmp_initramfs" "$new_initramfs"
         else
@@ -137,71 +241,6 @@ check_initramfs() {
     fi
 }
 
-# krel_of_module:
-# Compute the kernel release of a module.
-krel_of_module() {
-    declare module=$1
-    /sbin/modinfo -F vermagic "$module" | awk '{print $1}'
-}
-
-# module_is_compatible:
-# Determine if a module is compatible with a particular kernel release. Also
-# include any symbol deps that might be introduced by other external kmods.
-module_is_compatible() {
-    declare module=$1 krel=$2 module_krel=$(krel_of_module "$module")
-
-    if [ ! -e "$tmpdir/all-symvers-$krel-$module_krel" ]; then
-        # Symbols exported by the "new" kernel
-        if [ ! -e $tmpdir/symvers-$krel ]; then
-            if [ -e /boot/symvers-$krel.gz ]; then
-                zcat /boot/symvers-$krel.gz \
-                | sed -r -ne 's:^(0x[0]*[0-9a-f]{8}\t[0-9a-zA-Z_]+)\t.*:\1:p'
-            fi > $tmpdir/symvers-$krel
-        fi
-
-        # Symbols that other add-on modules of the "old" kernel export
-        # (and that this module may require)
-        if [ ! -e "$tmpdir/extra-symvers-$module_krel" ]; then
-            if [ -e /lib/modules/$module_krel/extra ] && \
-	       [ -n "`find /lib/modules/$module_krel/extra -type f`" ]; then
-                find /lib/modules/$module_krel/extra -name '*.ko' \
-                | xargs nm \
-                | sed -nre 's:^[0]*([0-9a-f]{8}) A __crc_(.*):0x\1 \2:p'
-            fi > $tmpdir/extra-symvers-$module_krel
-        fi
-
-        sort -u $tmpdir/symvers-$krel $tmpdir/extra-symvers-$module_krel \
-        > "$tmpdir/all-symvers-$krel-$module_krel"
-    fi
-
-    # If the module does not have modversions enabled, $tmpdir/modvers
-    # will be empty.
-    /sbin/modprobe --dump-modversions "$module" \
-    | sed -r -e 's:^(0x[0]*[0-9a-f]{8}\t.*):\1:' \
-    | sort -u \
-    > $tmpdir/modvers
-
-    # Only include lines of the second file in the output that don't
-    # match lines in the first file. (The default separator is
-    # <space>, so we are matching the whole line.)
-    join -j 1 -v 2 $tmpdir/all-symvers-$krel-$module_krel \
-                   $tmpdir/modvers > $tmpdir/join
-
-    if [ ! -s $tmpdir/modvers ]; then
-        echo "Warning: Module ${module##*/} from kernel $module_krel has no" \
-             "modversions, so it cannot be reused for kernel $krel" >&2
-    elif [ -s $tmpdir/join ]; then
-        [ -n "$verbose" ] &&
-        echo "Module ${module##*/} from kernel $module_krel is not compatible" \             "with kernel $krel in symbols:" $(sed -e 's:.* ::' $tmpdir/join)
-    else
-        [ -n "$verbose" ] &&
-        echo "Module ${module##*/} from kernel $module_krel is compatible" \
-             "with kernel $krel"
-        return 0
-    fi
-    return 1
-}
-
 usage() {
     echo "Usage: ${0##*/} [options] {--add-modules|--remove-modules}"
     echo "${0##*/} [options] {--add-kernel|--remove-kernel} {kernel-release}"
@@ -214,8 +253,7 @@ usage() {
 --remove-modules
         Remove compatibility symlinks from weak-updates/ directories
         for a list of modules.  The list of modules is read from
-        standard input. Optionally specify --delete-modules to
-        prevent weak-modules from attempting to locate any
+        standard input. Note: it doesn't attempt to locate any
         compatible modules to replace those being removed.
 
 --add-kernel
@@ -227,7 +265,7 @@ usage() {
         kernel.
 
 --no-initramfs
-	Do not generate an initramfs.
+        Do not generate an initramfs.
 
 --verbose
         Print the commands executed.
@@ -244,8 +282,11 @@ EOF
 module_has_changed() {
 
     declare module=$1 krel=$2
+    declare orig_module=$module
 
     module=${module%.ko}
+    [[ $module == $orig_module ]] && module=${module%.ko.xz}
+    [[ $module == $orig_module ]] && module=${module%.ko.gz}
     module=${module##*/}
 
     eval "changed_modules_${krel//[^a-zA-Z0-9]/_}=$krel"
@@ -253,134 +294,793 @@ module_has_changed() {
 
 }
 
-# add_modules:
-# Read in a list of modules from stdinput and process them for compatibility
-# with installed kernels under /lib/modules.
-add_modules() {
+# module_weak_link:
+# Generate a weak link path for the module.
+# Takes module file name and the target kernel release as arguments
+# The way of generation intentionally left from the initial version
+module_weak_link() {
+    local module="$1"
+    local krel="$2"
+    local module_krel
+    local subpath
+    local module_krel_escaped
+
+    module_krel="$(krel_of_module "$module")"
+    module_krel_escaped=$(echo "$module_krel" | \
+                              sed 's/\([.+?^$\/\\|()\[]\|\]\)/\\\0/g')
+    subpath=$(echo $module | sed -nre "s:$BASEDIR(/usr)?/lib/modules/$module_krel_escaped/([^/]*)/(.*):\3:p")
+
+    if [[ -z $subpath ]]; then
+        # module is not in /lib/modules/$krel?
+        # It's possible for example for Oracle ACFS compatibility check
+        # Install it with its full path as a /lib/modules subpath
+        subpath="$module"
+    fi
+
+    echo "$(weak_updates_dir $krel)/${subpath#/}"
+}
+
+# module_short_name:
+# 'basename' version purely in bash, cuts off path from the filename
+module_short_name() {
+    echo "${1##*/}"
+}
+
+#### Helper predicates
+
+# is_weak_for_module_valid:
+# Takes real module filename and target kernel as arguments.
+# Calculates weak symlink filename for the corresponding module
+# for the target kernel,
+# returns 'true' if the symlink filename is a symlink
+# and the symlink points to a readable file
+# EVEN if it points to a different filename
+is_weak_for_module_valid() {
+    local module="$1"
+    local krel="$2"
+    local weak_link
+
+    weak_link="$(module_weak_link $module $krel)"
+    [[ -L "$weak_link" ]] && [[ -r "$weak_link" ]]
+}
+
+# is_weak_link:
+# Takes a filename and a kernel release.
+# 'true' if the filename is symlink under weak-updates/ for the kernel.
+# It doesn't matter, if it's a valid symlink (points to a real file) or not.
+is_weak_link() {
+    local link="$1"
+    local krel="$2"
+
+    echo $link | grep -q "$(weak_updates_dir $krel)" || return 1
+    [[ -L $link ]]
+}
+
+# is_extra_exists:
+# Takes a module filename, the module's kernel release and target kernel release.
+# The module filename should be a real, not a symlink, filename (i.e. in extra/).
+# Returns 'true' if the same module exists for the target kernel.
+is_extra_exists() {
+    local module="$1"
+    local module_krel="$2"
+    local krel="$3"
+    local subpath="${module#*/lib/modules/$module_krel/extra/}"
+
+    [[ -f $BASEDIR/lib/modules/$krel/extra/$subpath ]]
+}
+
+is_kernel_installed() {
+    local krel="$1"
+
+    find_symvers_file "$krel" > /dev/null &&
+        find_systemmap_file "$krel" > /dev/null
+}
+
+is_empty_file() {
+    local file="$1"
+
+    [[ "$(wc -l "$file" | cut -f 1 -d ' ')" == 0 ]]
+}
+
+#### Helpers
+
+# find_modules:
+# Takes kernel release and a list of subdirectories.
+# Produces list of module files in the subdirectories for the kernel
+find_modules() {
+    local krel="$1"
+    shift
+    local dirs="$*"
+
+    for dir in $dirs; do
+        find $BASEDIR/lib/modules/$krel/$dir \
+             -name '*.ko' -o -name '*.ko.xz' -o -name '*.ko.gz' \
+             2>/dev/null
+    done
+}
+
+# find_modules_dirs:
+# Takes a list of directories.
+# Produces list of module files in the subdirectories
+find_modules_dirs() {
+    local dirs="$*"
+
+    for dir in $dirs; do
+        find $dir -name '*.ko' -o -name '*.ko.xz' -o -name '*.ko.gz' \
+             2>/dev/null
+    done
+}
+
+# find_installed_kernels:
+# Produces list of kernels, which modules are still installed
+find_installed_kernels() {
+    ls $BASEDIR/lib/modules/
+}
+
+# find_kernels_with_extra:
+# Produces list of kernels, where exists extra/ directory
+find_kernels_with_extra() {
+    local krel
+    local extra_dir
+
+    for krel in $(find_installed_kernels); do
+        extra_dir="$BASEDIR/lib/modules/$krel/extra"
+        [[ -d "$extra_dir" ]] || continue
+        echo "$krel"
+    done
+}
+
+# remove_weak_link_quiet:
+# Takes symlink filename and target kernel release.
+# Removes the symlink and the directory tree
+# if it was the last file in the tree
+remove_weak_link_quiet() {
+    local link="$1"
+    local krel="$2"
+    local subpath="${link#*$(weak_updates_dir $krel)}"
+
+    rm -f $link
+    ( cd "$(weak_updates_dir $krel)" && \
+          rmdir --parents --ignore-fail-on-non-empty "$(dirname "${subpath#/}")" 2>/dev/null )
+}
+
+# prepare_sandbox:
+# Takes kernel release, creates temporary weak-modules directory for it
+# and depmod config to operate on it.
+# Sets the global state accordingly
+
+prepare_sandbox() {
+    local krel="$1"
+    local orig_dir
+    local dir
+    local conf="$tmpdir/depmod.conf"
+
+    #directory
+    orig_dir=$(weak_updates_dir $krel)
+    dir="$tmpdir/$krel/weak-updates"
+
+    mkdir -p "$dir"
+    # the orig_dir can be empty
+    cp -R "$orig_dir"/* "$dir" 2>/dev/null
+
+    weak_updates_dir_override="$dir"
+
+    #config
+    echo "search external extra built-in weak-updates" >"$conf"
+    echo "external * $dir" >>"$conf"
+
+    depmod="$depmod_orig -C $conf"
+}
+
+# discard_installed:
+# remove installed_modules[] from modules[]
+discard_installed()
+{
+    local short_name
+
+    for m in "${!modules[@]}"; do
+        short_name="$(module_short_name "${modules[$m]}")"
+
+        [[ -z "${installed_modules[$short_name]}" ]] && continue
+
+        unset "modules[$m]"
+    done
+}
+
+# update_installed:
+# add compatible_modules[] to installed_modules[]
+update_installed()
+{
+    for m in "${!compatible_modules[@]}"; do
+        installed_modules[$m]="${compatible_modules[$m]}"
+    done
+}
+
+# finish_sandbox:
+# restore global state after sandboxing
+# copy configuration to the kernel directory if not dry run
+finish_sandbox() {
+    local krel="$1"
+    local override="$weak_updates_dir_override"
+    local wa_dir
+
+    weak_updates_dir_override=""
+    depmod="$depmod_orig"
+
+    [[ -n "$dry_run" ]] && return
+
+    wa_dir="$(weak_updates_dir $krel)"
+
+    rm -rf "$wa_dir"
+    mkdir -p "$wa_dir"
+
+    cp -R "${override}"/* "$wa_dir" 2>/dev/null
+}
+
+# Auxiliary functions to find symvers file
+make_kernel_file_names() {
+    local krel="$1"
+    local file="$2"
+    local suffix="$3"
+
+    echo "${BASEDIR}/boot/${file}-${krel}${suffix}"
+    echo "${BASEDIR}/lib/modules/${krel}/${file}${suffix}"
+}
+
+find_kernel_file() {
+    local krel="$1"
+    local file="$2"
+    local suffix="$3"
+    local print="$4"
+    local i
+
+    if [[ "$print" != "" ]]; then
+        make_kernel_file_names "$krel" "$file" "$suffix"
+        return 0
+    fi
+
+    for i in  $(make_kernel_file_names "$krel" "$file" "$suffix"); do
+        if [[ -r "$i" ]]; then
+            echo "$i"
+            return 0
+        fi
+    done
+
+    return 1
+}
+
+# find_symvers_file:
+# Since /boot/ files population process is now controlled by systemd's
+# kernel-install bash script and its plug-ins, it might be the case
+# that, while present, symvers file is not populated in /boot.
+# Let's also check for /lib/modules/$kver/symvers.gz, since that's where
+# it is populated from.
+#
+# $1 - krel
+# return - 0 if symvers file is found, 1 otherwise.
+# Prints symvers path if found, empty string otherwise.
+find_symvers_file() {
+    local krel="$1"
+    local print="$2"
+
+    find_kernel_file "$krel" symvers .gz "$print"
+}
+
+# find_systemmap_file:
+# Same as above but for System.map
+find_systemmap_file() {
+    local krel="$1"
+    local print="$2"
+    local no_suffix=""
+
+    find_kernel_file "$krel" System.map "$no_suffix" "$print"
+}
+
+#### Main logic
+
+# update_modules_for_krel:
+# Takes kernel release and "action" function name.
+# Skips kernel without symvers,
+# otherwise triggers the main logic of modules installing/removing
+# for the given kernel, which is:
+# - save current state of weak modules symlinks
+# - install/remove the symlinks for the given (via stdin) list of modules
+# - validate the state and remove invalid symlinks
+#   (for the modules, which are not compatible (became incompatible) for
+#   the given kernel)
+# - check the state after validation to produce needed messages
+#   and trigger initrd regeneration if the list changed.
+#
+update_modules_for_krel() {
+    local krel="$1"
+    local func="$2"
+    local force_update="$3"
+
+    is_kernel_installed "$krel" || return
+
+    prepare_sandbox $krel
+
+    global_link_state_save $krel
+
+    # remove already installed from modules[]
+    discard_installed
+
+    # do not run heavy validation procedure if no modules to install
+    if [[ "${#modules[@]}" -eq 0 ]]; then
+        finish_sandbox $krel
+        return
+    fi
+
+    $func $krel
+
+    if ! validate_weak_links $krel && [[ -z "$force_update" ]]; then
+        global_link_state_restore $krel
+    fi
+
+    # add compatible to installed
+    update_installed
+
+    global_link_state_announce_changes $krel
+
+    finish_sandbox $krel
+}
+
+# update_modules:
+# Common entry point for add/remove modules command
+# Takes the "action" function, the module list is supplied via stdin.
+# Reads the module list and triggers modules update for all installed
+# kernels.
+# Triggers initrd rebuild for the kernels, which modules are installed.
+update_modules() {
+    local func="$1"
+    local force_update="$2"
+    local module_krel
+    declare -a saved_modules
+
     read_modules_list || exit 1
-    if [ ${#modules[@]} -gt 0 ]; then
-        for krel in $(ls /lib/modules/); do
-            [ -e "/boot/symvers-$krel.gz" ] || continue
-            for ((n = 0; n < ${#modules[@]}; n++)); do
-                module="${modules[n]}"
-                module_krel="${module_krels[n]}"
-                case "$module" in
-                /lib/modules/$krel/*)
-                    # Module was built against this kernel, update initramfs.
-                    module_has_changed $module $krel
-                    continue ;;
-                esac
-
-		# Module my also serve as a weak-update built against another
-		# kernel. We need to create symlinks for compatible kernels
-		# under /lib/modules and rerun depmod/dracut for those.
-
-		subpath=`echo $module | sed -nre "s:/lib/modules/$module_krel/([^/]*)/(.*):\2:p"`
-                weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
-                if [ -r "$weak_module" ]; then
-                    weak_krel=$(krel_of_module "$weak_module")
-                    if [ "$weak_krel" != "$module_krel" ] &&
-                       [ "$(printf "%s\n" "$weak_krel" "$module_krel" \
-                            | rpmsort | (read input; echo "$input"; \
-                                         while read input; do true; done))" = \
-                         "$module_krel" ]; then
-                        # Keep modules from more recent kernels.
-                        [ -n "$verbose" ] && echo \
-"Keeping module ${module##*/} from kernel $weak_krel for kernel $krel"
-                        continue
-                    fi
-                fi
-                if module_is_compatible $module $krel; then
-                    doit mkdir -p $(dirname $weak_module)
-                    doit ln -sf $module $weak_module
-                    # Module was built against another kernel, update initramfs.
-                    module_has_changed $module $krel
-                fi
-            done
-        done
+    [[ ${#modules[@]} -gt 0 ]] || return
+    saved_modules=("${modules[@]}")
+
+    for krel in $(find_installed_kernels); do
+        update_modules_for_krel $krel $func $force_update
+        modules=("${saved_modules[@]}")
+        installed_modules=()
+    done
+
+    for module in "${modules[@]}"; do
+        # Module was built against this kernel, update initramfs.
+        module_krel="${module_krels[$module]}"
+        module_has_changed $module $module_krel
+    done
+}
+
+# add_weak_links:
+# Action function for the "add-modules" command
+# Takes the kernel release, where the modules are added
+# and the modules[] and module_krels[] global arrays.
+# Install symlinks for the kernel with minimal checks
+# (just filename checks, no symbol checks)
+add_weak_links() {
+    local krel="$1"
+    local module_krel
+    local weak_link
+
+    for module in "${modules[@]}"; do
+        module_krel="$(krel_of_module $module)"
+
+        case "$module" in
+            $BASEDIR/lib/modules/$krel/*)
+                # Module already installed to the current kernel
+                continue ;;
+        esac
+
+        if is_extra_exists $module $module_krel $krel; then
+            pr_verbose "found $(module_short_name $module) for $krel while installing for $module_krel, update case?"
+        fi
+
+        if is_weak_for_module_valid $module $krel; then
+            pr_verbose "weak module for $(module_short_name $module) already exists for kernel $krel, update case?"
+            # we should update initrd in update case,
+            # the change is not seen by the symlink detector
+            # (global_link_state_announce_changes())
+            module_has_changed $module $krel
+        fi
+
+        weak_link="$(module_weak_link $module $krel)"
+
+        mkdir -p "$(dirname $weak_link)"
+        ln -sf $module $weak_link
+
+    done
+}
+
+# remove_weak_links:
+# Action function for the "remove-modules" command
+# Takes the kernel release, where the modules are removed
+# and the modules[] and module_krels[] global arrays.
+# Removes symlinks from the given kernel if they are installed
+# for the modules in the list.
+remove_weak_links() {
+    local krel="$1"
+    local weak_link
+    local target
+    local module_krel
+
+    for module in "${modules[@]}"; do
+        module_krel="$(krel_of_module $module)"
+
+        weak_link="$(module_weak_link $module $krel)"
+        target="$(readlink $weak_link)"
+
+        if [[ "$module" != "$target" ]]; then
+            pr_verbose "Skipping symlink $weak_link"
+            continue
+        fi
+        # In update case the --remove-modules call is performed
+        # after --add-modules (from postuninstall).
+        # So, we shouldn't really remove the symlink in this case.
+        # But in the remove case the actual target already removed.
+        if ! is_weak_for_module_valid "$module" "$krel"; then
+            remove_weak_link_quiet "$weak_link" "$krel"
+        fi
+    done
+}
+
+# validate_weak_links:
+# Takes kernel release.
+# Checks if all the weak symlinks are suitable for the given kernel.
+# Uses depmod to perform the actual symbol checks and parses the output.
+# Since depmod internally creates the module list in the beginning of its work
+# accroding to the priority list in its configuration, but without symbol
+# check and doesn't amend the list during the check, the function runs it
+# in a loop in which it removes discovered incompatible symlinks
+#
+# Returns 0 (success) if proposal is fine or
+#         1 (false) if some incompatible symlinks were removed
+# initializes global hashmap compatible_modules with all the valid ones
+validate_weak_links() {
+    local krel="$1"
+    local basedir=${BASEDIR:+-b $BASEDIR}
+    local tmp
+    declare -A symbols
+    local is_updates_changed=1
+    local module
+    local module_krel
+    local target
+    local modpath
+    local symbol
+    local weak_link
+    # to return to caller that original proposal is not valid
+    # here 0 is true, 1 is false, since it will be the return code
+    local is_configuration_valid=0
+
+    tmp=$(mktemp -p $tmpdir)
+    compatible_modules=()
+
+    if ! [[ -e $tmpdir/symvers-$krel ]]; then
+        local symvers_path=$(find_symvers_file "$krel")
+
+        [[ -n "$symvers_path" ]] || return
+        zcat "$symvers_path" > $tmpdir/symvers-$krel
     fi
+
+    while ((is_updates_changed)); do
+        is_updates_changed=0
+
+        # again $tmp because of subshell, see read_modules_list() comment
+        # create incompatibility report by depmod
+        # Shorcut if depmod finds a lot of incompatible modules elsewhere,
+        # we care only about weak-updates
+        $depmod $basedir -naeE $tmpdir/symvers-$krel $krel 2>&1 1>/dev/null | \
+            grep "$(weak_updates_dir $krel)" 2>/dev/null >$tmp
+        # parse it into symbols[] associative array in form a-la
+        #   symbols["/path/to/the/module"]="list of bad symbols"
+        while read line; do
+            set -- $(echo $line | awk '/needs unknown symbol/{print $3 " " $NF}')
+            modpath=$1
+            symbol=$2
+            if [[ -n "$modpath" ]]; then
+                symbols[$modpath]="${symbols[$modpath]} $symbol"
+                continue
+            fi
+
+            set -- $(echo $line | awk '/disagrees about version of symbol/{print $3 " " $NF}')
+            modpath=$1
+            symbol=$2
+            if [[ -n "$modpath" ]]; then
+                symbols[$modpath]="${symbols[$modpath]} $symbol"
+                continue
+            fi
+        done < $tmp
+
+        # loop through all the weak links from the list of incompatible
+        # modules and remove them. Skips non-weak incompatibilities
+        for modpath in "${!symbols[@]}"; do
+            is_weak_link $modpath $krel || continue
+
+            target=$(readlink $modpath)
+            module_krel=$(krel_of_module $target)
+
+            remove_weak_link_quiet "$modpath" "$krel"
+
+            pr_verbose "Module $(module_short_name $modpath) from kernel $module_krel is not compatible with kernel $krel in symbols: ${symbols[$modpath]}"
+            is_updates_changed=1
+            is_configuration_valid=1 # inversed value
+        done
+    done
+    rm -f $tmp
+
+    # this loop is just to produce verbose compatibility messages
+    # for the compatible modules
+    for module in "${modules[@]}"; do
+        is_weak_for_module_valid $module $krel || continue
+
+        weak_link="$(module_weak_link $module $krel)"
+        target="$(readlink $weak_link)"
+        module_krel=$(krel_of_module $target)
+
+        if [[ "$module" == "$target" ]]; then
+            short_name="$(module_short_name "$module")"
+            compatible_modules+=([$short_name]="$module")
+
+            pr_verbose "Module ${module##*/} from kernel $module_krel is compatible with kernel $krel"
+        fi
+    done
+    return $is_configuration_valid
+}
+
+# global_link_state_save:
+# Takes kernel release
+# Saves the given kernel's weak symlinks state into the global array
+# weak_modules_before[] for later processing
+global_link_state_save() {
+    local krel="$1"
+    local link
+    local target
+
+    weak_modules_before=()
+    for link in $(find_modules_dirs $(weak_updates_dir $krel) | xargs); do
+        target=$(readlink $link)
+        weak_modules_before[$link]=$target
+    done
+}
+
+# global_link_state_restore:
+# Takes kernel release
+# Restores the previous weak links state
+# (for example, if incompatible modules were installed)
+global_link_state_restore() {
+    local krel="$1"
+    local link
+    local target
+
+    pr_verbose "Falling back weak-modules state for kernel $krel"
+
+    ( cd "$(weak_updates_dir $krel)" 2>/dev/null && rm -rf * )
+
+    for link in "${!weak_modules_before[@]}"; do
+        target=${weak_modules_before[$link]}
+
+        mkdir -p "$(dirname $link)"
+        ln -sf $target $link
+    done
+}
+
+# global_link_state_announce_changes:
+# Takes kernel release
+# Reads the given kernel's weak symlinks state, compares to the saved,
+# triggers initrd rebuild if there were changes
+# and produces message on symlink removal
+global_link_state_announce_changes() {
+    local krel="$1"
+    local link
+    local target
+    local new_target
+    declare -A weak_modules_after
+
+    for link in $(find_modules_dirs $(weak_updates_dir $krel) | xargs); do
+        target=${weak_modules_before[$link]}
+        new_target=$(readlink $link)
+        weak_modules_after[$link]=$new_target
+
+        # report change of existing link and appearing of a new link
+        [[ "$target" == "$new_target" ]] || module_has_changed $new_target $krel
+    done
+
+    for link in "${!weak_modules_before[@]}"; do
+        target=${weak_modules_before[$link]}
+        new_target=${weak_modules_after[$link]}
+
+        # report change of existing link and disappearing of an old link
+        [[ "$target" == "$new_target" ]] && continue
+        module_has_changed $target $krel
+        [[ -n "$new_target" ]] ||
+            pr_verbose "Removing compatible module $(module_short_name $target) from kernel $krel"
+    done
 }
 
 # remove_modules:
 # Read in a list of modules from stdinput and process them for removal.
-# Parameter is noreplace to delete modules, otherwise link compat.
+# Parameter (noreplace) is deprecated, acts always as "noreplace".
+# There is no sense in the "replace" functionality since according
+# to the current requirements RPM will track existing of only one version
+# of extra/ module (no same extra/ modules for different kernels).
 remove_modules() {
-    delete_modules=${1:-replace}
+    update_modules remove_weak_links force_update
+}
 
-    read_modules_list || exit 1
-    if [ ${#modules[@]} -gt 0 ]; then
-
-	# Hunt for all known users of this module in /lib/modules, remove them
-	# and create symlinks to other compatible modules (downgrade) if
-	# possible, update initramfs for each modified kernel too.
-
-        krels=($(ls /lib/modules/ | rpmsort -r))
-        for krel in "${krels[@]}"; do
-            [ -e "/boot/symvers-$krel.gz" ] || continue
-            for ((n = 0; n < ${#modules[@]}; n++)); do
-                module="${modules[n]}"
-                module_krel="${module_krels[n]}"
-
-		# Module is going to be removed, update initramfs.
-		module_has_changed $module $krel
-
-                subpath="${module#/lib/modules/$module_krel/extra}"
-                weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
-                if [ "$module" == "`readlink $weak_module`" ]; then
-                    [ -n "$verbose" ] && echo \
-"Removing compatible module ${module##*/} from kernel $krel"
-                    doit rm -f "$weak_module"
-                    if [ "replace" == "$delete_modules" ]; then
-                        for krel2 in "${krels[@]}"; do
-                            if [ $krel2 != $krel ]; then
-                                module="/lib/modules/$krel2/extra/${subpath#/}"
-                                [ -e "$module" ] || continue
-                                if module_is_compatible "$module" "$krel"; then
-                                    [ -n "$verbose" ] && echo \
-"Adding compatible module ${module##*/} from kernel $krel2 instead"
-                                    doit ln -s "$module" "$weak_module"
-			            module_has_changed $module $krel
-                                    break
-                                fi
-                            fi
-                        done
-                    fi
-                    doit rmdir --parents --ignore-fail-on-non-empty \
-                               "$(dirname "$weak_module")"
-                fi
-            done
+# add_modules:
+# Read in a list of modules from stdinput and process them for compatibility
+# with installed kernels under /lib/modules.
+add_modules() {
+    no_force_update=""
+
+    update_modules add_weak_links $no_force_update
+}
+
+# do_make_groups:
+# Takes tmp file which contains preprocessed modules.dep
+# output (or modules.dep)
+#
+# reads modules.dep format information from stdin
+# produces groups associative array
+# the group is a maximum subset of modules having at least a link
+#
+# more fine tuned extra filtering.
+do_make_groups()
+{
+    local tmp="$1"
+    local group_name
+    local mod
+    declare -a mods
+
+    while read i; do
+        mods=($i)
+
+        echo "${mods[0]}" |grep -q "extra/" || continue
+
+        # if the module already met, then its dependencies already counted
+        module_group="${grouped_modules[${mods[0]}]}"
+        [[ -n $module_group ]] && continue
+
+        # new group
+        group_name="${mods[0]}"
+
+        for mod in "${mods[@]}"; do
+            echo "$mod" |grep -q "extra/" || continue
+
+            # if there is already such group,
+            # it is a subset of the one being created
+            # due to depmod output
+            unset groups[$mod]
+
+            # extra space doesn't matter, since later (in add_kernel())
+            # it is expanded without quotes
+            groups[$group_name]+=" $mod"
+            grouped_modules[$mod]=$group_name
         done
-    fi
+    done < $tmp # avoid subshell
+}
+
+# filter_depmod_deps:
+# preprocess output for make_groups
+# depmod -n produces also aliases, so it cuts them off
+# also it removes colon after the first module
+cut_depmod_deps()
+{
+    awk 'BEGIN { pr = 1 } /^#/{ pr = 0 } pr == 1 {sub(":",""); print $0}'
+}
+
+# filter_extra_absoluted:
+# Takes kernel version
+# makes full path from the relative module path
+# (produced by depmod for in-kernel-dir modules)
+# filter only extra/ modules
+filter_extra_absoluted()
+{
+    local kver="$1"
+    local mod
+    declare -a mods
+
+    while read i; do
+        # skip non-extra. The check is not perfect, but ok
+        # to speed up handling in general cases
+        echo "$i" |grep -q "extra/" || continue
+
+        mods=($i)
+        for j in "${!mods[@]}"; do
+            mod="${mods[$j]}"
+
+            [[ ${mod:0:1} == "/" ]] || mod="$BASEDIR/lib/modules/$kver/$mod"
+            mods[$j]="$mod"
+        done
+        echo "${mods[@]}"
+    done
+}
+
+# make_groups:
+# takes k -- kernel version, we are installing extras from
+# prepares and feeds to do_make_groups
+# to create the module groups (global)
+make_groups()
+{
+    local k="$1"
+    local tmp2=$(mktemp -p $tmpdir)
+    local basedir=${BASEDIR:+-b $BASEDIR}
+
+    groups=()
+    grouped_modules=()
+
+    $depmod -n $basedir $k 2>/dev/null |
+        cut_depmod_deps | filter_extra_absoluted $k > $tmp2
+
+    do_make_groups $tmp2
+
+    rm -f $tmp2
 }
 
 add_kernel() {
-    add_krel=${1:-$(uname -r)}
-    if [ ! -e "/boot/symvers-$add_krel.gz" ]; then
-        echo "Symvers dump file /boot/symvers-$add_krel.gz" \
-             "not found" >&2
+    local krel=${1:-$(uname -r)}
+    local tmp
+    local no_force_update=""
+    local num
+
+    tmp=$(mktemp -p $tmpdir)
+
+    if ! find_symvers_file "$krel" > /dev/null; then
+        echo "Symvers dump file is not found in" \
+             $(find_symvers_file "$krel" print) >&2
         exit 1
     fi
-    for krel in $(ls /lib/modules/ | rpmsort -r); do
-        [ "$add_krel" = "$krel" ] && continue
-        [ -d /lib/modules/$krel/extra ] || continue
-        for module in $(find /lib/modules/$krel/extra -name '*.ko'); do
-            subpath="${module#/lib/modules/$krel/extra}"
-            weak_module="/lib/modules/$add_krel/weak-updates/${subpath#/}"
-            [ -e "$weak_module" ] && continue
-            if module_is_compatible $module $add_krel; then
-		module_has_changed $module $add_krel
-                doit mkdir -p $(dirname $weak_module)
-                doit ln -sf $module $weak_module
-            fi
+
+    for k in $(find_kernels_with_extra | rpmsort -r); do
+        [[ "$krel" == "$k" ]] && continue
+        find_modules $k extra > $tmp
+
+        is_empty_file "$tmp" || make_groups $k
+
+        # reuse tmp
+
+	# optimization, check independent modules in one run.
+	# first try groups with one element in each.
+	# it means independent modules, so we can safely remove
+	# incompatible links
+	# some cut and paste here
+
+	echo > $tmp
+        for g in "${groups[@]}"; do
+	    num="$(echo "$g" | wc -w)"
+	    [ "$num" -gt 1 ] && continue
+
+            printf '%s\n' $g >> $tmp
+	done
+        # to avoid subshell, see the read_modules_list comment
+        read_modules_list < $tmp
+        update_modules_for_krel $krel add_weak_links force_update
+
+        for g in "${groups[@]}"; do
+	    num="$(echo "$g" | wc -w)"
+	    [ "$num" -eq 1 ] && continue
+
+            printf '%s\n' $g > $tmp
+            read_modules_list < $tmp
+            update_modules_for_krel $krel add_weak_links $no_force_update
         done
     done
+
+    rm -f $tmp
+
 }
 
 remove_kernel() {
     remove_krel=${1:-$(uname -r)}
-    weak_modules="/lib/modules/$remove_krel/weak-updates"
+    weak_modules="$(weak_updates_dir $remove_krel)"
     module_has_changed $weak_modules $remove_krel
-    doit rm -rf "$weak_modules"
+
+    # Remove everything beneath the weak-updates directory
+    if [ -d "$weak_modules" ]; then
+        ( cd "$weak_modules" && doit rm -rf * )
+    fi
 }
 
 ################################################################################
@@ -389,7 +1089,8 @@ remove_kernel() {
 
 options=`getopt -o h --long help,add-modules,remove-modules \
                      --long add-kernel,remove-kernel \
-                     --long dry-run,no-initramfs,verbose,delete-modules -- "$@"`
+                     --long dry-run,no-initramfs,verbose,delete-modules \
+                     --long basedir:,dracut:,check-initramfs-prog: -- "$@"`
 
 [ $? -eq 0 ] || usage 1
 
@@ -411,6 +1112,10 @@ while :; do
         ;;
     --dry-run)
         dry_run=1
+        # --dry-run option is not pure dry run anymore,
+        # because of depmod used internally.
+        # For add/remove modules we have to add/remove the symlinks
+        # and just restore the original configuration afterwards.
         ;;
     --no-initramfs)
         no_initramfs=1
@@ -419,7 +1124,19 @@ while :; do
         verbose=1
         ;;
     --delete-modules)
-        do_delete_modules=1
+        pr_warning "--delete-modules is deprecated, no effect"
+        ;;
+    --basedir)
+        BASEDIR="$2"
+        shift
+        ;;
+    --dracut)
+        dracut="$2"
+        shift
+        ;;
+    --check-initramfs-prog)
+        CHECK_INITRAMFS="$2"
+        shift
         ;;
     -h|--help)
         usage 0
@@ -432,27 +1149,31 @@ while :; do
     shift
 done
 
+if [ ! -x "$dracut" ]
+then
+    echo "weak-modules: could not find dracut at $dracut"
+    exit 1
+fi
+
+initramfs_prefix="$BASEDIR/${default_initramfs_prefix#/}"
+
 if [ -n "$do_add_modules" ]; then
-	add_modules
+    add_modules
 
 elif [ -n "$do_remove_modules" ]; then
-        if [ -n "$do_delete_modules" ]; then
-            remove_modules "noreplace"
-        else
-	    remove_modules
-        fi
+    remove_modules
 
 elif [ -n "$do_add_kernel" ]; then
-	kernel=${1:-$(uname -r)}
-	add_kernel $kernel
+    kernel=${1:-$(uname -r)}
+    add_kernel $kernel
 
 elif [ -n "$do_remove_kernel" ]; then
-	kernel=${1:-$(uname -r)}
-	remove_kernel $kernel
+    kernel=${1:-$(uname -r)}
+    remove_kernel $kernel
 
-	exit 0
+    exit 0
 else
-	usage 1
+    usage 1
 fi
 
 ################################################################################
@@ -462,14 +1183,19 @@ fi
 # run depmod and dracut as needed
 for krel in ${!changed_modules_*}; do
     krel=${!krel}
+    basedir=${BASEDIR:+-b $BASEDIR}
 
-    doit /sbin/depmod -ae -F /boot/System.map-$krel $krel
+    if is_kernel_installed $krel; then
+        doit $depmod $basedir -ae -F $(find_systemmap_file $krel) $krel
+    else
+        pr_verbose "Skipping depmod for non-installed kernel $krel"
+    fi
 done
 
 for krel in ${!changed_initramfs_*}; do
     krel=${!krel}
 
     if [ ! -n "$no_initramfs" ]; then
-        check_initramfs $krel
+        ${CHECK_INITRAMFS:-check_initramfs} $krel
     fi
 done