All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] lxc: Add lua to PACKAGECONFIG
@ 2017-03-27  6:43 Jonatan Pålsson
  2017-03-27 15:52 ` Mark Asselstine
  2017-03-28 13:10 ` Bruce Ashfield
  0 siblings, 2 replies; 3+ messages in thread
From: Jonatan Pålsson @ 2017-03-27  6:43 UTC (permalink / raw)
  To: meta-virtualization

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



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] lxc: Add lua to PACKAGECONFIG
  2017-03-27  6:43 [PATCH] lxc: Add lua to PACKAGECONFIG Jonatan Pålsson
@ 2017-03-27 15:52 ` Mark Asselstine
  2017-03-28 13:10 ` Bruce Ashfield
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Asselstine @ 2017-03-27 15:52 UTC (permalink / raw)
  To: Jonatan Pålsson; +Cc: meta-virtualization

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>
> ---

This looks fine. I wasn't sure about the handling of the globbing in
${libdir}/lua/lxc but since -dbg comes first in the PACKAGES list it
is all good. This addresses a bug report we have in meta-overc which I
was just about to look at, thanks for getting this out first and
saving me some time.

Mark

>  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


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] lxc: Add lua to PACKAGECONFIG
  2017-03-27  6:43 [PATCH] lxc: Add lua to PACKAGECONFIG Jonatan Pålsson
  2017-03-27 15:52 ` Mark Asselstine
@ 2017-03-28 13:10 ` Bruce Ashfield
  1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2017-03-28 13:10 UTC (permalink / raw)
  To: Jonatan Pålsson; +Cc: meta-virtualization

[-- Attachment #1: Type: text/plain, Size: 2163 bytes --]

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"

[-- Attachment #2: Type: text/html, Size: 3480 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-28 13:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-27  6:43 [PATCH] lxc: Add lua to PACKAGECONFIG Jonatan Pålsson
2017-03-27 15:52 ` Mark Asselstine
2017-03-28 13:10 ` Bruce Ashfield

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.