All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Hilliard <james.hilliard1@gmail.com>
To: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>,
	buildroot <buildroot@buildroot.org>
Subject: Re: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson
Date: Thu, 27 Jan 2022 14:18:39 -0700	[thread overview]
Message-ID: <CADvTj4qiMBPcdxp_rffUwS2Rb4F9e6UnEi3q4WFK85yw2p3stQ@mail.gmail.com> (raw)
In-Reply-To: <20220127210924.GQ457876@scaer>

On Thu, Jan 27, 2022 at 2:09 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> James, All,
>
> On 2022-01-27 11:39 -0700, James Hilliard spake thusly:
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > ---
> >  package/network-manager/Config.in          |   1 +
> >  package/network-manager/network-manager.mk | 100 ++++++++++-----------
> >  2 files changed, 48 insertions(+), 53 deletions(-)
> >
> > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
> > index a48cb37b15..da1a7d79b3 100644
> > --- a/package/network-manager/Config.in
> > +++ b/package/network-manager/Config.in
> > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI
> >  config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER
> >       bool "modem-manager support"
> >       select BR2_PACKAGE_MODEM_MANAGER
> > +     select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
>
> It looks like this is totally unrelated to the switch to meson, and
> should be applied in its own right, and then backported to the
> maintenance branches, no?
>
> If it is due to the switch to meson, then it should be explained in the
> commit log.

Well meson is enforcing that dependency is present while autotools was not.

I'm not really sure if it's actually a hard requirement for the modem manager
integration to work correctly.

>
> Regards,
> Yann E. MORIN.
>
> >       help
> >         This option enables support for ModemManager
> >
> > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
> > index 974320fce0..290333e16c 100644
> > --- a/package/network-manager/network-manager.mk
> > +++ b/package/network-manager/network-manager.mk
> > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12
> >  NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
> >  NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
> >  NETWORK_MANAGER_INSTALL_STAGING = YES
> > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \
> > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \
> >       libgcrypt wireless_tools util-linux host-intltool libndp
> >  NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm)
> >  NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md
> > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome
> >  NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager
> >  NETWORK_MANAGER_SELINUX_MODULES = networkmanager
> >
> > -NETWORK_MANAGER_CONF_ENV = \
> > -     ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
> > -     ac_cv_file__etc_fedora_release=no \
> > -     ac_cv_file__etc_mandriva_release=no \
> > -     ac_cv_file__etc_debian_version=no \
> > -     ac_cv_file__etc_redhat_release=no \
> > -     ac_cv_file__etc_SuSE_release=no
> > -
> >  NETWORK_MANAGER_CONF_OPTS = \
> > -     --disable-introspection \
> > -     --disable-tests \
> > -     --disable-qt \
> > -     --disable-more-warnings \
> > -     --with-crypto=gnutls \
> > -     --with-iptables=/usr/sbin/iptables \
> > -     --disable-ifupdown \
> > -     --without-nm-cloud-setup
> > +     -Dintrospection=false \
> > +     -Ddocs=false \
> > +     -Dtests=no \
> > +     -Dqt=false \
> > +     -Dcrypto=gnutls \
> > +     -Diptables=/usr/sbin/iptables \
> > +     -Difupdown=false \
> > +     -Dnm_cloud_setup=false \
> > +     -Dsession_tracking_consolekit=false
> >
> >  ifeq ($(BR2_PACKAGE_AUDIT),y)
> >  NETWORK_MANAGER_DEPENDENCIES += audit
> > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit
> > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit
> > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
> > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient
> > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_DHCPCD),y)
> > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
> > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_IWD),y)
> >  NETWORK_MANAGER_DEPENDENCIES += iwd
> > -NETWORK_MANAGER_CONF_OPTS += --with-iwd
> > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --without-iwd
> > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_LIBCURL),y)
> >  NETWORK_MANAGER_DEPENDENCIES += libcurl
> > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck
> > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck
> > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_LIBPSL),y)
> >  NETWORK_MANAGER_DEPENDENCIES += libpsl
> > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl
> > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl
> > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
> >  NETWORK_MANAGER_DEPENDENCIES += libselinux
> > -NETWORK_MANAGER_CONF_OPTS += --with-selinux
> > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --without-selinux
> > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y)
> > -NETWORK_MANAGER_DEPENDENCIES += modem-manager
> > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1
> > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info
> > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1
> > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y)
> > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs
> > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true
> >  NETWORK_MANAGER_DEPENDENCIES += jansson
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs
> > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y)
> >  NETWORK_MANAGER_DEPENDENCIES += pppd
> > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp
> > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp
> > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
> >  NETWORK_MANAGER_DEPENDENCIES += newt
> > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui
> > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui
> > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_OFONO),y)
> >  NETWORK_MANAGER_DEPENDENCIES += ofono
> > -NETWORK_MANAGER_CONF_OPTS += --with-ofono
> > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --without-ofono
> > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> >  NETWORK_MANAGER_DEPENDENCIES += systemd
> >  NETWORK_MANAGER_CONF_OPTS += \
> > -     --with-systemd-journal \
> > -     --with-config-logging-backend-default=journal \
> > -     --with-session-tracking=systemd \
> > -     --with-suspend-resume=systemd
> > +     -Dsystemd_journal=true \
> > +     -Dconfig_logging_backend_default=journal \
> > +     -Dsession_tracking=systemd \
> > +     -Dsuspend_resume=systemd
> >  else
> >  NETWORK_MANAGER_CONF_OPTS += \
> > -     --without-systemd-journal \
> > -     --with-config-logging-backend-default=syslog \
> > -     --without-session-tracking \
> > -     --with-suspend-resume=upower
> > +     -Dsystemd_journal=false \
> > +     -Dconfig_logging_backend_default=syslog \
> > +     -Dsession_tracking=no \
> > +     -Dsuspend_resume=upower \
> > +     -Dsystemdsystemunitdir=no
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_POLKIT),y)
> >  NETWORK_MANAGER_DEPENDENCIES += polkit
> > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit
> > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit
> > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_READLINE),y)
> >  NETWORK_MANAGER_DEPENDENCIES += readline
> > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli
> > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true
> >  else
> > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli
> > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false
> >  endif
> >
> >  define NETWORK_MANAGER_INSTALL_INIT_SYSV
> > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
> >
> >  endef
> >
> > -$(eval $(autotools-package))
> > +$(eval $(meson-package))
> > --
> > 2.25.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  reply	other threads:[~2022-01-27 21:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-27 18:39 [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson James Hilliard
2022-01-27 21:09 ` Yann E. MORIN
2022-01-27 21:18   ` James Hilliard [this message]
2022-01-28  7:50   ` Peter Seiderer
2022-01-28 19:23     ` James Hilliard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CADvTj4qiMBPcdxp_rffUwS2Rb4F9e6UnEi3q4WFK85yw2p3stQ@mail.gmail.com \
    --to=james.hilliard1@gmail.com \
    --cc=buildroot@buildroot.org \
    --cc=eric.le.bihan.dev@free.fr \
    --cc=yann.morin.1998@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.