package/multipath-tools: drop patch
PATCH 1/1 package/multipath-tools: drop patch
Drop path and set SYSTEMD="" if needed following upstream feedback:
https://github.com/opensvc/multipath-tools/pull/34
Signed-off-by Fabrice Fontaine <[email protected]>
--- ...ble-systemd-if-ENABLE_SYSTEMD-is-def.patch | 35 ------------------- package/multipath-tools/multipath-tools.mk | 3 +- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch
package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 8370da992c752e4238de7a8b02ce0e179353c959 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov <[email protected]> -Date: Sun, 6 Sep 2020 10:37:41 +0200 -Subject: [PATCH] Makefile.inc: Enable systemd if ENABLE_SYSTEMD is defined - -systemd is disabled by default, to activate it set ENABLE_SYSTEMD. - -Signed-off-by: Alexander Egorenkov <[email protected]> ---- - Makefile.inc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.inc b/Makefile.inc -index d4d1e0dd..32bc1846 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,6 +35,7 @@ ifndef RUN - endif - endif - -+ifdef ENABLE_SYSTEMD - ifndef SYSTEMD - ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) - SYSTEMD = $(shell pkg-config --modversion libsystemd) -@@ -45,6 +46,7 @@ ifndef SYSTEMD - endif - endif - endif -+endif - - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib --- -2.28.0 -
package/multipath-tools/multipath-tools.mk +2 -1
@@ -31,7 +31,8 @@ MULTIPATH_TOOLS_MAKE_OPTS = \ ifeq ($(BR2_PACKAGE_SYSTEMD),y) MULTIPATH_TOOLS_DEPENDENCIES += systemd -MULTIPATH_TOOLS_MAKE_OPTS += ENABLE_SYSTEMD=1 +else +MULTIPATH_TOOLS_MAKE_OPTS += SYSTEMD="" endif define MULTIPATH_TOOLS_BUILD_CMDS
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedFabrice, All,
On 2022-12-26 14:02 +0100, Fabrice Fontaine spake thusly:
Quoted 4 lines
Drop path and set SYSTEMD="" if needed following upstream feedback:
https://github.com/opensvc/multipath-tools/pull/34Signed-off-by Fabrice Fontaine <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 68 lines
--- ...ble-systemd-if-ENABLE_SYSTEMD-is-def.patch | 35 ------------------- package/multipath-tools/multipath-tools.mk | 3 +- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patchpackage/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch deleted +0
-35@@ -1,35 +0,0 @@ -From 8370da992c752e4238de7a8b02ce0e179353c959 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov <[email protected]> -Date: Sun, 6 Sep 2020 10:37:41 +0200 -Subject: [PATCH] Makefile.inc: Enable systemd if ENABLE_SYSTEMD is defined - -systemd is disabled by default, to activate it set ENABLE_SYSTEMD. - -Signed-off-by: Alexander Egorenkov <[email protected]> ---- - Makefile.inc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.inc b/Makefile.inc -index d4d1e0dd..32bc1846 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,6 +35,7 @@ ifndef RUN - endif - endif - -+ifdef ENABLE_SYSTEMD - ifndef SYSTEMD - ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) - SYSTEMD = $(shell pkg-config --modversion libsystemd) -@@ -45,6 +46,7 @@ ifndef SYSTEMD - endif - endif - endif -+endif - - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib --- -2.28.0 -package/multipath-tools/multipath-tools.mk +2
-1@@ -31,7 +31,8 @@ MULTIPATH_TOOLS_MAKE_OPTS = \ ifeq ($(BR2_PACKAGE_SYSTEMD),y) MULTIPATH_TOOLS_DEPENDENCIES += systemd -MULTIPATH_TOOLS_MAKE_OPTS += ENABLE_SYSTEMD=1 +else +MULTIPATH_TOOLS_MAKE_OPTS += SYSTEMD="" endif define MULTIPATH_TOOLS_BUILD_CMDSSignature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot