summaryrefslogtreecommitdiff
path: root/sys-kernel/genkernel
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-07-29 03:04:48 -0500
committerroot <root@alpha.trunkmasters.com>2026-07-29 03:04:48 -0500
commit8087a9548fbac1dade3245660600d025f43d6732 (patch)
treeeefc08102e8c2e47dfb50e2cf621eb07d283e5c8 /sys-kernel/genkernel
parenta0e0a56dbeec1a3cf0f82d55d0bd7540943daf84 (diff)
downloadbaldeagleos-repo-8087a9548fbac1dade3245660600d025f43d6732.tar.gz
baldeagleos-repo-8087a9548fbac1dade3245660600d025f43d6732.tar.xz
baldeagleos-repo-8087a9548fbac1dade3245660600d025f43d6732.zip
Adding metadata
Diffstat (limited to 'sys-kernel/genkernel')
-rw-r--r--sys-kernel/genkernel/files/genkernel-4.3.12-mdadm-musl-fix.patch14
-rw-r--r--sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch26
-rw-r--r--sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch22
-rw-r--r--sys-kernel/genkernel/files/genkernel-4.3.16-add-eudev-3.2.14-static.patch33
-rw-r--r--sys-kernel/genkernel/files/genkernel-4.3.16-musl.patch297
-rw-r--r--sys-kernel/genkernel/files/genkernel-4.3.16-posix-shell.patch38
-rw-r--r--sys-kernel/genkernel/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch11
7 files changed, 0 insertions, 441 deletions
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.12-mdadm-musl-fix.patch b/sys-kernel/genkernel/files/genkernel-4.3.12-mdadm-musl-fix.patch
deleted file mode 100644
index 7c5cb3f9ce94..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.3.12-mdadm-musl-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/gkbuilds/mdadm.gkbuild b/gkbuilds/mdadm.gkbuild
-index b43f753..e8060e5 100644
---- a/gkbuilds/mdadm.gkbuild
-+++ b/gkbuilds/mdadm.gkbuild
-@@ -16,6 +16,9 @@ src_prepare() {
- }
-
- src_compile() {
-+ # bug 907082
-+ append-cppflags -D_LARGEFILE64_SOURCE
-+
- gkmake V=1 mdadm mdmon
- }
-
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch b/sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch
deleted file mode 100644
index ba6eee2387dd..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f973903cea8d161893b29b4fb4114561a6aa5674 Mon Sep 17 00:00:00 2001
-From: Ben Kohler <bkohler@gentoo.org>
-Date: Wed, 22 May 2024 10:14:32 -0500
-Subject: [PATCH] defaults/software.sh: fix srcdir for new bcache-tools
-
-Signed-off-by: Ben Kohler <bkohler@gentoo.org>
----
- defaults/software.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/defaults/software.sh b/defaults/software.sh
-index 01c504b..42004f3 100644
---- a/defaults/software.sh
-+++ b/defaults/software.sh
-@@ -13,7 +13,7 @@ GKPKG_BCACHE_TOOLS_PN="bcache-tools"
- GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
- GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
- GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
--GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
-+GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
- GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
-
- GKPKG_BOOST_PN="boost"
---
-2.45.1
-
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch b/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch
deleted file mode 100644
index 74c1db168a5c..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit fb29d87cc5dcfd6e3222f3bee63fc9e6a764fa3c
-Author: Ben Kohler <bkohler@gentoo.org>
-Date: Wed May 22 09:47:29 2024 -0500
-
- gkbuilds/mdadm-4.2: add missing musl fix
-
- Signed-off-by: Ben Kohler <bkohler@gentoo.org>
-
-diff --git a/gkbuilds/mdadm-4.2.gkbuild b/gkbuilds/mdadm-4.2.gkbuild
-index d996346..99bfb84 100644
---- a/gkbuilds/mdadm-4.2.gkbuild
-+++ b/gkbuilds/mdadm-4.2.gkbuild
-@@ -16,6 +16,9 @@ src_prepare() {
- }
-
- src_compile() {
-+ # bug 907082
-+ append-cppflags -D_LARGEFILE64_SOURCE
-+
- CXFLAGS="-DNO_LIBUDEV" gkmake V=1 mdadm mdmon
- }
-
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.16-add-eudev-3.2.14-static.patch b/sys-kernel/genkernel/files/genkernel-4.3.16-add-eudev-3.2.14-static.patch
deleted file mode 100644
index 40fbd91652aa..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.3.16-add-eudev-3.2.14-static.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/patches/eudev/3.2.14/eudev-3.2.14-static.patch b/patches/eudev/3.2.14/eudev-3.2.14-static.patch
-index 88bc1e1..37c6890 100644
---- a/patches/eudev/3.2.14/eudev-3.2.14-static.patch
-+++ b/patches/eudev/3.2.14/eudev-3.2.14-static.patch
-@@ -42,6 +42,28 @@
- collect_LDADD = \
- $(top_builddir)/src/libudev/libudev-private.la \
- $(top_builddir)/src/udev/libudev-core.la
-+--- a/src/dmi_memory_id/Makefile.am
-++++ b/src/dmi_memory_id/Makefile.am
-+@@ -11,6 +11,8 @@ udevlibexec_PROGRAMS = \
-+ dmi_memory_id_SOURCES = \
-+ dmi_memory_id.c
-+
-++dmi_memory_id_LDFLAGS = -all-static
-++
-+ dmi_memory_id_LDADD = \
-+ $(top_builddir)/src/libudev/libudev-private.la \
-+ $(top_builddir)/src/udev/libudev-core.la
-+--- a/src/fido_id/Makefile.am
-++++ b/src/fido_id/Makefile.am
-+@@ -13,6 +13,8 @@ fido_id_SOURCES =\
-+ fido_id_desc.c \
-+ fido_id_desc.h
-+
-++fido_id_LDFLAGS = -all-static
-++
-+ fido_id_LDADD = \
-+ $(top_builddir)/src/libudev/libudev-private.la \
-+ $(top_builddir)/src/udev/libudev-core.la
- --- a/src/mtd_probe/Makefile.am
- +++ b/src/mtd_probe/Makefile.am
- @@ -6,6 +6,8 @@ AM_CPPFLAGS = \
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.16-musl.patch b/sys-kernel/genkernel/files/genkernel-4.3.16-musl.patch
deleted file mode 100644
index bdc45e941898..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.3.16-musl.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-https://bugs.gentoo.org/934773
-https://github.com/gentoo/genkernel/pull/62
-
-From 553ea48d2983f6febd142b97c5b7230d87cda661 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sun, 24 Nov 2024 07:33:09 -0800
-Subject: [PATCH 1/3] patches/lvm: add missing musl patches
-
-Gentoo-Issue: https://bugs.gentoo.org/934773
-Signed-off-by: orbea <orbea@riseup.net>
----
- .../lvm/2.03.22/lvm2-019-musl-basename.patch | 34 ++++++++++++
- .../lvm/2.03.22/lvm2-020-freopen-musl.patch | 54 +++++++++++++++++++
- 2 files changed, 88 insertions(+)
- create mode 100644 patches/lvm/2.03.22/lvm2-019-musl-basename.patch
- create mode 100644 patches/lvm/2.03.22/lvm2-020-freopen-musl.patch
-
-diff --git a/patches/lvm/2.03.22/lvm2-019-musl-basename.patch b/patches/lvm/2.03.22/lvm2-019-musl-basename.patch
-new file mode 100644
-index 00000000..2dd9f8ff
---- /dev/null
-+++ b/patches/lvm/2.03.22/lvm2-019-musl-basename.patch
-@@ -0,0 +1,34 @@
-+https://bugs.gentoo.org/937239
-+https://github.com/lvmteam/lvm2/commit/f98d2ffe8753895c84160a7abce4223bd127cd9e
-+
-+From f98d2ffe8753895c84160a7abce4223bd127cd9e Mon Sep 17 00:00:00 2001
-+From: Zdenek Kabelac <zkabelac@redhat.com>
-+Date: Wed, 27 Mar 2024 00:28:14 +0100
-+Subject: [PATCH] device_id: use dm_basename
-+
-+Avoid problems for other libc like muslc and use dm_basename.
-+
-+Prototype for basename has been removed from string.h from latest musl [1]
-+compilers e.g. clang-18 flags the absense of prototype as error. therefore
-+include libgen.h for providing it.
-+
-+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-+
-+Reported-by: Khem Raj <raj.khem@gmail.com>
-+---
-+ lib/device/device_id.c | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+diff --git a/lib/device/device_id.c b/lib/device/device_id.c
-+index 7d67a1cb7..200d39432 100644
-+--- a/lib/device/device_id.c
-++++ b/lib/device/device_id.c
-+@@ -740,7 +740,7 @@ static int _dev_read_sys_serial(struct cmd_context *cmd, struct device *dev,
-+ int ret;
-+
-+ /* /dev/vda to vda */
-+- base = basename(devname);
-++ base = dm_basename(devname);
-+
-+ /* vda1 to vda */
-+ for (i = 0; i < strlen(base); i++) {
-diff --git a/patches/lvm/2.03.22/lvm2-020-freopen-musl.patch b/patches/lvm/2.03.22/lvm2-020-freopen-musl.patch
-new file mode 100644
-index 00000000..2b3f0a91
---- /dev/null
-+++ b/patches/lvm/2.03.22/lvm2-020-freopen-musl.patch
-@@ -0,0 +1,54 @@
-+From 4cf08811e112100a2b10c60047f3c537ad21d674 Mon Sep 17 00:00:00 2001
-+From: David Seifert <soap@gentoo.org>
-+Date: Sat, 28 Jan 2023 14:22:42 +0100
-+Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr}
-+
-+* ISO C does not guarantee that the standard streams are modifiable
-+ lvalues. Glibc even calls out this behaviour as non-portable:
-+ https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html
-+--- a/lib/log/log.c
-++++ b/lib/log/log.c
-+@@ -208,7 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode)
-+
-+ _check_and_replace_standard_log_streams(old_stream, new_stream);
-+
-++#ifdef __GLIBC__
-+ *stream = new_stream;
-++#else
-++ freopen(NULL, mode, *stream);
-++#endif
-+ return 1;
-+ }
-+
-+--- a/tools/lvmcmdline.c
-++++ b/tools/lvmcmdline.c
-+@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
-+ int err = is_valid_fd(STDERR_FILENO);
-+
-+ if (!is_valid_fd(STDIN_FILENO) &&
-+- !(stdin = fopen(_PATH_DEVNULL, "r"))) {
-++ !freopen(_PATH_DEVNULL, "r", stdin)) {
-+ if (err)
-+ perror("stdin stream open");
-+ else
-+@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
-+ }
-+
-+ if (!is_valid_fd(STDOUT_FILENO) &&
-+- !(stdout = fopen(_PATH_DEVNULL, "w"))) {
-++ !freopen(_PATH_DEVNULL, "w", stdout)) {
-+ if (err)
-+ perror("stdout stream open");
-+ /* else no stdout */
-+@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
-+ }
-+
-+ if (!is_valid_fd(STDERR_FILENO) &&
-+- !(stderr = fopen(_PATH_DEVNULL, "w"))) {
-++ !freopen(_PATH_DEVNULL, "w", stderr)) {
-+ printf("stderr stream open: %s\n",
-+ strerror(errno));
-+ return 0;
-+--
-+2.39.2
-+
-
-From a9f818ab719c294a3bdd6b25730bb1b6ac6c2173 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sun, 24 Nov 2024 07:33:50 -0800
-Subject: [PATCH 2/3] patches/kmod: add missing musl patch
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- patches/kmod/31/kmod-31-musl-basename.patch | 113 ++++++++++++++++++++
- 1 file changed, 113 insertions(+)
- create mode 100644 patches/kmod/31/kmod-31-musl-basename.patch
-
-diff --git a/patches/kmod/31/kmod-31-musl-basename.patch b/patches/kmod/31/kmod-31-musl-basename.patch
-new file mode 100644
-index 00000000..f4839dad
---- /dev/null
-+++ b/patches/kmod/31/kmod-31-musl-basename.patch
-@@ -0,0 +1,113 @@
-+https://github.com/kmod-project/kmod/pull/32
-+
-+From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001
-+From: Khem Raj <raj.khem@gmail.com>
-+Date: Sat, 9 Dec 2023 17:35:59 -0800
-+Subject: [PATCH] Use portable implementation for basename API
-+
-+musl has removed the non-prototype declaration of basename from
-+string.h [1] which now results in build errors with clang-17+ compiler
-+
-+Implement GNU basename behavior using strchr which is portable across libcs
-+
-+Fixes
-+../git/tools/kmod.c:71:19: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-+71 | "Commands:\n", basename(argv[0]));
-+| ^
-+
-+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-+
-+Suggested-by: Rich Felker
-+
-+Signed-off-by: Khem Raj <raj.khem@gmail.com>
-+--- a/libkmod/libkmod-config.c
-++++ b/libkmod/libkmod-config.c
-+@@ -794,7 +794,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx,
-+ bool is_single = false;
-+
-+ if (name == NULL) {
-+- name = basename(path);
-++ name = gnu_basename(path);
-+ is_single = true;
-+ }
-+
-+--- a/shared/util.c
-++++ b/shared/util.c
-+@@ -172,9 +172,9 @@ char *modname_normalize(const char *modname, char buf[static PATH_MAX], size_t *
-+
-+ char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len)
-+ {
-+- char *modname;
-++ const char *modname;
-+
-+- modname = basename(path);
-++ modname = gnu_basename(path);
-+ if (modname == NULL || modname[0] == '\0')
-+ return NULL;
-+
-+--- a/shared/util.h
-++++ b/shared/util.h
-+@@ -5,6 +5,7 @@
-+ #include <stdbool.h>
-+ #include <stdlib.h>
-+ #include <stdio.h>
-++#include <string.h>
-+ #include <sys/types.h>
-+ #include <sys/stat.h>
-+ #include <time.h>
-+@@ -76,6 +77,12 @@ do { \
-+ __p->__v = (val); \
-+ } while(0)
-+
-++static _always_inline_ const char *gnu_basename(const char *s)
-++{
-++ const char *p = strrchr(s, '/');
-++ return p ? p+1 : s;
-++}
-++
-+ static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u)
-+ {
-+ return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1));
-+--- a/testsuite/testsuite.c
-++++ b/testsuite/testsuite.c
-+@@ -70,7 +70,7 @@ static void help(void)
-+
-+ printf("Usage:\n"
-+ "\t%s [options] <test>\n"
-+- "Options:\n", basename(progname));
-++ "Options:\n", gnu_basename(progname));
-+
-+ for (itr = options, itr_short = options_short;
-+ itr->name != NULL; itr++, itr_short++)
-+--- a/tools/depmod.c
-++++ b/tools/depmod.c
-+@@ -762,7 +762,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files
-+ if (name != NULL)
-+ namelen = strlen(name);
-+ else {
-+- name = basename(dir);
-++ name = gnu_basename(dir);
-+ namelen = strlen(name);
-+ dirlen -= namelen + 1;
-+ }
-+--- a/tools/kmod.c
-++++ b/tools/kmod.c
-+@@ -68,7 +68,7 @@ static int kmod_help(int argc, char *argv[])
-+ "Options:\n"
-+ "\t-V, --version show version\n"
-+ "\t-h, --help show this help\n\n"
-+- "Commands:\n", basename(argv[0]));
-++ "Commands:\n", gnu_basename(argv[0]));
-+
-+ for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) {
-+ if (kmod_cmds[i]->help != NULL) {
-+@@ -156,7 +156,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[])
-+ const char *cmd;
-+ size_t i;
-+
-+- cmd = basename(argv[0]);
-++ cmd = gnu_basename(argv[0]);
-+
-+ for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) {
-+ if (streq(kmod_compat_cmds[i]->name, cmd))
-+
-
-From 1c7bf8a58143807134f6427ab3d7e063df3038e6 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sun, 24 Nov 2024 07:34:47 -0800
-Subject: [PATCH 3/3] Bump eudev to v3.2.14
-
-Update to a version that builds with musl.
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- .../eudev-3.2.14-static.patch} | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
- rename patches/eudev/{3.2.10/eudev-3.2.10-static.patch => 3.2.14/eudev-3.2.14-static.patch} (81%)
-
-diff --git a/patches/eudev/3.2.10/eudev-3.2.10-static.patch b/patches/eudev/3.2.14/eudev-3.2.14-static.patch
-similarity index 81%
-rename from patches/eudev/3.2.10/eudev-3.2.10-static.patch
-rename to patches/eudev/3.2.14/eudev-3.2.14-static.patch
-index fc36b547..88bc1e15 100644
---- a/patches/eudev/3.2.10/eudev-3.2.10-static.patch
-+++ b/patches/eudev/3.2.14/eudev-3.2.14-static.patch
-@@ -1,14 +1,14 @@
- --- a/configure.ac
- +++ b/configure.ac
--@@ -261,7 +261,7 @@ AC_ARG_ENABLE(kmod, AS_HELP_STRING([--disable-kmod], [disable loadable modules s
-+@@ -252,7 +252,7 @@ AC_ARG_ENABLE(kmod, AS_HELP_STRING([--disable-kmod], [disable loadable modules s
- if test "x$enable_kmod" != "xno"; then
-- PKG_CHECK_EXISTS([ libkmod ], have_kmod=yes, have_kmod=no)
-- if test "x$have_kmod" = "xyes"; then
--- PKG_CHECK_MODULES(KMOD, [ libkmod >= 15 ],
--+ PKG_CHECK_MODULES_STATIC(KMOD, [ libkmod >= 15 ],
-- [AC_DEFINE(HAVE_KMOD, 1, [Define if kmod is available])],
-- AC_MSG_ERROR([*** kmod version >= 15 not found]))
-- fi
-+ PKG_CHECK_EXISTS([ libkmod ], have_kmod=yes, have_kmod=no)
-+ if test "x$have_kmod" = "xyes"; then
-+- PKG_CHECK_MODULES(KMOD, [ libkmod >= 15 ],
-++ PKG_CHECK_MODULES_STATIC(KMOD, [ libkmod >= 15 ],
-+ [AC_DEFINE(HAVE_KMOD, 1, [Define if kmod is available])],
-+ AC_MSG_ERROR([*** kmod version >= 15 not found]))
-+ fi
- --- a/src/ata_id/Makefile.am
- +++ b/src/ata_id/Makefile.am
- @@ -11,6 +11,8 @@ udevlibexec_PROGRAMS = \
-@@ -94,4 +94,3 @@
- v4l_id_LDADD = \
- $(top_builddir)/src/libudev/libudev-private.la \
- $(top_builddir)/src/udev/libudev-core.la
--
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.16-posix-shell.patch b/sys-kernel/genkernel/files/genkernel-4.3.16-posix-shell.patch
deleted file mode 100644
index da1341e97e4f..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.3.16-posix-shell.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/gentoo/genkernel/pull/60
-
-From c270c3667e04bc60fcdd9ffcc76d4d2c5a8b9d6d Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sun, 12 May 2024 08:05:09 -0700
-Subject: [PATCH] build: fix for POSIX shells
-
-When building genkernel where /bin/sh is a POSIX shell such as lksh
-(mksh) it will install a malformed software.sh. This is because 'echo
--e' is not portable shell. This can be fixed by using 'printf' instead.
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1e20ef5d..637ef1e3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -69,7 +69,7 @@ SOFTWARE = BCACHE_TOOLS \
- ZLIB \
- ZSTD
-
--SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}\n")
-+SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}")
-
- PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
-@@ -183,7 +183,7 @@ $(BUILD_DIR)/build-config:
-
- $(BUILD_DIR)/software.sh:
- install -d $(BUILD_DIR)/temp/
-- echo -e $(SOFTWARE_VERSION) > $(BUILD_DIR)/temp/versions
-+ printf '%s\n' $(SOFTWARE_VERSION) > $(BUILD_DIR)/temp/versions
- cat $(BUILD_DIR)/temp/versions defaults/software.sh > $(BUILD_DIR)/software.sh
-
- $(BUILD_DIR)/doc/genkernel.8.txt:
diff --git a/sys-kernel/genkernel/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch b/sys-kernel/genkernel/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch
deleted file mode 100644
index e39d7959b331..000000000000
--- a/sys-kernel/genkernel/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/udev/69-dm-lvm.rules.in
-+++ b/udev/69-dm-lvm.rules.in
-@@ -76,7 +76,7 @@
- # it's better suited to appearing in the journal.
-
- IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}"
--ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
-+ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --nohints --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
- GOTO="lvm_end"
-
- LABEL="lvm_end"