merged.

Bruce

On Mon, Mar 27, 2017 at 2:43 AM, Jonatan Pålsson <
jonatan.palsson@pelagicore.com> wrote:

> Lua support is automatically enabled when configuring LXC if lua is
> available in the sysroot. The packaging step will fail since the lua
> related files are not in FILES.
>
> This patch explicitly enables/disables lua support using PACKAGECONFIG,
> and also adds lua-related files to FILES.
>
> Signed-off-by: Jonatan Pålsson <jonatan.palsson@pelagicore.com>
> ---
>  recipes-containers/lxc/lxc_2.0.0.bb | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/recipes-containers/lxc/lxc_2.0.0.bb b/recipes-containers/lxc/
> lxc_2.0.0.bb
> index 250ac4d..c98d1a7 100644
> --- a/recipes-containers/lxc/lxc_2.0.0.bb
> +++ b/recipes-containers/lxc/lxc_2.0.0.bb
> @@ -65,6 +65,7 @@ PACKAGECONFIG[templates] = ",,, ${PN}-templates"
>  PACKAGECONFIG[selinux] = "--enable-selinux,--disable-
> selinux,libselinux,libselinux"
>  PACKAGECONFIG[seccomp] ="--enable-seccomp,--disable-
> seccomp,libseccomp,libseccomp"
>  PACKAGECONFIG[python] = "--enable-python,--disable-
> python,python3,python3-core"
> +PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua,lua"
>
>  # required by python3 to run setup.py
>  export BUILD_SYS
> @@ -86,6 +87,9 @@ FILES_${PN}-doc = "${mandir} ${infodir}"
>  # For LXC the docdir only contains example configuration files and should
> be included in the lxc package
>  FILES_${PN} += "${docdir}"
>  FILES_${PN} += "${libdir}/python3*"
> +FILES_${PN} += "${datadir}/lua/*"
> +FILES_${PN} += "${libdir}/lua/lxc/*"
> +FILES_${PN}-dbg += "${libdir}/lua/lxc/.debug"
>  FILES_${PN}-dbg += "${libexecdir}/lxc/.debug ${libexecdir}/lxc/hooks/.
> debug"
>  PACKAGES =+ "${PN}-templates ${PN}-setup ${PN}-networking"
>  FILES_${PN}-templates += "${datadir}/lxc/templates"
> --
> 2.10.2
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"