From 6e69a270b36aed0080ae5bac8391734b51070339 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Thu, 30 Nov 2023 13:45:24 +0800 Subject: [PATCH] lxc: add distrosysconfdir option to make sure the lxc configuration in correct folder After the commit[1] "meson.build: allow explicit distrosysconfdir", the config of lxc would install to distrosysconfdir[2], if this value not set, it might set to /etc/sysconfig, that cause lxc-net configuration cannot be found[3] due to our bb file install the lxc-net to /etc/default folder. Ref: [1] https://github.com/lxc/lxc/commit/16ebb29dccb35bf74e8a19e8c45d2513f927476f [2] https://github.com/lxc/lxc/blob/main/config/sysconfig/meson.build#L9 [3] https://github.com/lxc/lxc/blob/main/config/sysconfig/lxc.in#L28 Signed-off-by: Xiangyu Chen Signed-off-by: Bruce Ashfield --- recipes-containers/lxc/lxc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb index 94e71087..33ea4ee7 100644 --- a/recipes-containers/lxc/lxc_git.bb +++ b/recipes-containers/lxc/lxc_git.bb @@ -60,7 +60,7 @@ PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-Dtests=true', ' # No meson equivalent for --with-distro # EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" -EXTRA_OEMESON += "${PTEST_CONF}" +EXTRA_OEMESON += "${PTEST_CONF} -Ddistrosysconfdir=${sysconfdir}/default" # No meson equivalent for these yet # EXTRA_OECONF += "--enable-log-src-basename --disable-werror"