Patchwork [meta-graphics,v3] recipes-graphics/lxdm: autotools and config updates

login
register
mail settings
Submitter stephen.arnold42
Date March 18, 2014, 9:09 a.m.
Message ID <1395133748-1211-1-git-send-email-stephen.arnold42@gmail.com>
Download mbox | patch
Permalink /patch/68801/
State Accepted, archived
Headers show

Comments

stephen.arnold42 - March 18, 2014, 9:09 a.m.
lxdm_git.bb: Upstream changes required autotools and gettext (intl) updates; 
the package autogen script doesn't create the makefile in po, but autotools 
by itself is missing the input file (thus, the configure_prepend). There 
were also missing depends (from upstream docs and configure checks) and 
some configure options were added to ensure the desired X/gtk2 config and 
enable (optional) auto-login.

Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>

---
 meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
Andreas Müller - March 18, 2014, 9:32 a.m.
On Tue, Mar 18, 2014 at 10:09 AM, Stephen Arnold
<stephen.arnold42@gmail.com> wrote:
> lxdm_git.bb: Upstream changes required autotools and gettext (intl) updates;
> the package autogen script doesn't create the makefile in po, but autotools
> by itself is missing the input file (thus, the configure_prepend). There
> were also missing depends (from upstream docs and configure checks) and
> some configure options were added to ensure the desired X/gtk2 config and
> enable (optional) auto-login.
For my interest since I have autologin working as expected (with
oe-core updated last in january -> autotools not updated). What is
this --enable-password for?
>
> Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>
>
> ---
>  meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
> index c12eddf..c602ad3 100644
> --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
> +++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
> @@ -16,17 +16,24 @@ SRCREV = "07fb151a99ef99318b71f3de0afbba977b1e6267"
>  PV = "0.5.0+git${SRCPV}"
>  PE = "1"
>
> -DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
> +DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes"
>  DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"
>
>  # combine oe-core way with angstrom DISTRO_TYPE
>  DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
>
> -inherit autotools gettext systemd
> +inherit autotools pkgconfig gettext systemd
>
>  S = "${WORKDIR}/git"
>
> -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}"
> +CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr "
Why these extra flags - I found no hint in commit message.
> +
> +EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \
> +    ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}"
> +
> +do_configure_prepend() {
> +    cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
> +}
>
>  do_compile_append() {
>      # default background configured not available / no password field available / no default screensaver
> --
regards

Andreas
stephen.arnold42 - March 19, 2014, 2:57 a.m.
On --enable-password=yes:

The upstream docs say "enable to load autologin password store at config
file" and it's part of the default config on my gentoo arm builds.  I
haven't actually tried it in oe yet, since I wanted a default user with a
password in my rpi build.  It sounds like the oe method doesn't need that
option, so I can remove it if that's what you want.

On the extra CFLAGS:

I suppose they're not strictly necessary either, but they do help reduce
configure warnings.  Some of the build failures didn't really have any
obvious errors (just a boat-load of warnings) so it helps in getting to the
true error.  But as I said, it should be okay to remove them now.

Do you want a new version of the patch minus the above?

Steve


On Tue, Mar 18, 2014 at 2:32 AM, Andreas Müller <
schnitzeltony@googlemail.com> wrote:

> On Tue, Mar 18, 2014 at 10:09 AM, Stephen Arnold
> <stephen.arnold42@gmail.com> wrote:
> > lxdm_git.bb: Upstream changes required autotools and gettext (intl)
> updates;
> > the package autogen script doesn't create the makefile in po, but
> autotools
> > by itself is missing the input file (thus, the configure_prepend). There
> > were also missing depends (from upstream docs and configure checks) and
> > some configure options were added to ensure the desired X/gtk2 config and
> > enable (optional) auto-login.
> For my interest since I have autologin working as expected (with
> oe-core updated last in january -> autotools not updated). What is
> this --enable-password for?
> >
> > Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>
> >
> > ---
> >  meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 13 ++++++++++---
> >  1 file changed, 10 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bbb/meta-oe/recipes-graphics/lxdm/
> lxdm_git.bb
> > index c12eddf..c602ad3 100644
> > --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
> > +++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
> > @@ -16,17 +16,24 @@ SRCREV = "07fb151a99ef99318b71f3de0afbba977b1e6267"
> >  PV = "0.5.0+git${SRCPV}"
> >  PE = "1"
> >
> > -DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb
> pango"
> > +DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf
> glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes"
> >  DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "",
> "consolekit", d)}"
> >
> >  # combine oe-core way with angstrom DISTRO_TYPE
> >  DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks",
> "debug", "",d)}"
> >
> > -inherit autotools gettext systemd
> > +inherit autotools pkgconfig gettext systemd
> >
> >  S = "${WORKDIR}/git"
> >
> > -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd',
> '--with-systemdsystemunitdir=${systemd_unitdir}/system/
> --disable-consolekit', '--without-systemdsystemunitdir', d)}"
> > +CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset
> -fno-builtin-strstr "
> Why these extra flags - I found no hint in commit message.
> > +
> > +EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x
> -with-xconn=xcb \
> > +    ${@base_contains('DISTRO_FEATURES', 'systemd',
> '--with-systemdsystemunitdir=${systemd_unitdir}/system/
> --disable-consolekit', '--without-systemdsystemunitdir', d)}"
> > +
> > +do_configure_prepend() {
> > +    cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
> > +}
> >
> >  do_compile_append() {
> >      # default background configured not available / no password field
> available / no default screensaver
> > --
> regards
>
> Andreas
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Andreas Müller - March 20, 2014, 12:35 p.m.
On Wed, Mar 19, 2014 at 3:57 AM, Stephen Arnold
<stephen.arnold42@gmail.com> wrote:
> On --enable-password=yes:
>
> The upstream docs say "enable to load autologin password store at config
> file" and it's part of the default config on my gentoo arm builds.  I
> haven't actually tried it in oe yet, since I wanted a default user with a
> password in my rpi build.  It sounds like the oe method doesn't need that
> option, so I can remove it if that's what you want.
>
> On the extra CFLAGS:
>
> I suppose they're not strictly necessary either, but they do help reduce
> configure warnings.  Some of the build failures didn't really have any
> obvious errors (just a boat-load of warnings) so it helps in getting to the
> true error.  But as I said, it should be okay to remove them now.
>
> Do you want a new version of the patch minus the above?
Thanks for explanation & taking care. I have not time for testing but
I think patches are OK as they are.

Andreas

Patch

diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index c12eddf..c602ad3 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -16,17 +16,24 @@  SRCREV = "07fb151a99ef99318b71f3de0afbba977b1e6267"
 PV = "0.5.0+git${SRCPV}"
 PE = "1"
 
-DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
+DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes"
 DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"
 
 # combine oe-core way with angstrom DISTRO_TYPE
 DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
 
-inherit autotools gettext systemd
+inherit autotools pkgconfig gettext systemd
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}"
+CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr "
+
+EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \
+    ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}"
+
+do_configure_prepend() {
+    cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
+}
 
 do_compile_append() {
     # default background configured not available / no password field available / no default screensaver