diff options
| author | Xiangyu Chen <xiangyu.chen@windriver.com> | 2023-11-30 13:45:24 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-12-04 21:05:40 +0000 |
| commit | 6e69a270b36aed0080ae5bac8391734b51070339 (patch) | |
| tree | 15a96d30ed0918129437f65a012bc29f72eca470 | |
| parent | edc85da6e4d22d5c71ab614658e62159b76e3c4c (diff) | |
| download | meta-virtualization-6e69a270b36aed0080ae5bac8391734b51070339.tar.gz | |
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 <xiangyu.chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
| -rw-r--r-- | recipes-containers/lxc/lxc_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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', ' | |||
| 60 | 60 | ||
| 61 | # No meson equivalent for --with-distro | 61 | # No meson equivalent for --with-distro |
| 62 | # EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" | 62 | # EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" |
| 63 | EXTRA_OEMESON += "${PTEST_CONF}" | 63 | EXTRA_OEMESON += "${PTEST_CONF} -Ddistrosysconfdir=${sysconfdir}/default" |
| 64 | # No meson equivalent for these yet | 64 | # No meson equivalent for these yet |
| 65 | # EXTRA_OECONF += "--enable-log-src-basename --disable-werror" | 65 | # EXTRA_OECONF += "--enable-log-src-basename --disable-werror" |
| 66 | 66 | ||