[oe] [meta-oe][PATCH 2/3] iwd: Add PACKAGECONFIG options

[Robert Joslyn]

On Sat, 2020-02-01 at 15:25 +0000, Alex Kiernan wrote:
> On Fri, Jan 31, 2020 at 9:45 PM Robert Joslyn
> <robert.joslyn at redrectangle.org> wrote:
> > Make it easier to disable optional client, monitor, and man page
> > components and their dependencies. A user may want to disable the
> > client
> > to avoid the use of GPLv3 readline.
> > 
> > Signed-off-by: Robert Joslyn <robert.joslyn at redrectangle.org>
> > ---
> >  meta-oe/recipes-connectivity/iwd/iwd_1.4.bb | 14 ++++++++++++--
> >  1 file changed, 12 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb b/meta-
> > oe/recipes-connectivity/iwd/iwd_1.4.bb
> > index 49fc45a74..a023c0d28 100644
> > --- a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb
> > +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb
> > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "
> > file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
> > 
> >  inherit autotools pkgconfig systemd python3native
> > 
> > -DEPENDS = "ell readline python3-docutils-native"
> > +DEPENDS = "ell"
> > 
> >  SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
> >             file://0001-Makefile.am-Avoid-redirection-of-input-and-
> > output-fi.patch \
> > @@ -12,7 +12,15 @@ SRC_URI =
> > "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
> >  SRCREV = "860fa4697f349da7791ecf22ca76f9ac0e5de261"
> >  S = "${WORKDIR}/git"
> > 
> > -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd',
> > d)}"
> > +PACKAGECONFIG ??= " \
> > +    client \
> > +    monitor \
> > +    manual-pages \
> > +    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> > +"
> > +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
> > +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor"
> > +PACKAGECONFIG[manual-pages] = "--enable-manual-pages,--disable-
> > manual-pages,python3-docutils-native"
> 
> If you make this PACKAGECONFIG[manpages], inherit manpages and drop it
> from the default PACKAGECONFIG you'll automatically get documentation
> driven by the api-documentation distro feature. Though at that
> possibly it should be a separate commit.
> 
> Maybe just /manual-pages/manpages/ as that's a common name?

That's a good idea. I wasn't familiar with that class, but I'll add that
in the v2.

Thanks,
Robert

> >  PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
> >  PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
> >  PACKAGECONFIG[systemd] = "--with-systemd-
> > unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd"
> > @@ -26,6 +34,8 @@ do_configure_prepend () {
> >  do_install_append() {
> >      mkdir --parents ${D}${docdir}/${BPN}
> >      install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN}
> > +    # If client and monitor are disabled, bindir is empty, causing a
> > QA error
> > +    rmdir --ignore-fail-on-non-empty ${D}/${bindir}
> >  }
> > 
> >  FILES_${PN} += "${datadir}/dbus-1 ${nonarch_libdir}/modules-load.d
> > ${systemd_unitdir}/network/"
> > --
> > 2.24.1
> > 
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
>