From 753e28c1a8098b18db2ceca87cd0bd54e4e7df2d Mon Sep 17 00:00:00 2001 From: Sergei Zhmylev Date: Tue, 22 Oct 2024 18:54:35 +0300 Subject: [PATCH] multipath-tools: set etc_prefix to sysconfdir Makefile of multipath-tools uses $prefix as a destination prefix. As soon as we added usrmerge feature, multipath default configuration placed under /usr/etc/ resulting into problems locating them via a hard-coded path inside the tools. This change explicitly sets etc_prefix to ${sysconfdir} in order to recover default behaviour. Signed-off-by: Sergei Zhmylev Signed-off-by: Khem Raj --- .../recipes-support/multipath-tools/multipath-tools_0.10.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.10.0.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.10.0.bb index a09fbb2216..18874e909e 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.10.0.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.10.0.bb @@ -72,6 +72,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm" EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ OPTFLAGS="${CFLAGS}" \ prefix=${prefix} \ + etc_prefix=${sysconfdir} \ bindir=${base_sbindir} \ LIB=${base_libdir} libdir=${base_libdir}/multipath \ usrlibdir=${libdir} \