| Message ID | 20211205005412.2888068-7-james.hilliard1@gmail.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v2,1/7] package/network-manager: bump to version 1.32.12 | expand |
Hello James, On Sat, 4 Dec 2021 17:54:12 -0700 James Hilliard <james.hilliard1@gmail.com> wrote: > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > --- > package/network-manager/network-manager.mk | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > index 14bf0d4dd1..7a268d72c8 100644 > --- a/package/network-manager/network-manager.mk > +++ b/package/network-manager/network-manager.mk > @@ -112,6 +112,21 @@ else > NETWORK_MANAGER_CONF_OPTS += --enable-polkit=no > endif > > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > +NETWORK_MANAGER_DEPENDENCIES += systemd > +NETWORK_MANAGER_CONF_OPTS += \ > + --with-systemd-journal=yes \ =yes not needed > + --with-config-logging-backend-default=journal \ > + --with-session-tracking=systemd \ > + --with-suspend-resume=systemd > +else > +NETWORK_MANAGER_CONF_OPTS += \ > + --with-systemd-journal=no \ --without-systemd-journal > + --with-config-logging-backend-default=syslog \ > + --with-session-tracking=no \ --without-session-tracking > + --with-suspend-resume=upower Are you sure about this? We don't forcefully enable upower when systemd is disabled, so is this working? Thomas
On Sun, Dec 5, 2021 at 3:09 AM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > > Hello James, > > On Sat, 4 Dec 2021 17:54:12 -0700 > James Hilliard <james.hilliard1@gmail.com> wrote: > > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > > --- > > package/network-manager/network-manager.mk | 15 +++++++++++++++ > > 1 file changed, 15 insertions(+) > > > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > index 14bf0d4dd1..7a268d72c8 100644 > > --- a/package/network-manager/network-manager.mk > > +++ b/package/network-manager/network-manager.mk > > @@ -112,6 +112,21 @@ else > > NETWORK_MANAGER_CONF_OPTS += --enable-polkit=no > > endif > > > > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > > +NETWORK_MANAGER_DEPENDENCIES += systemd > > +NETWORK_MANAGER_CONF_OPTS += \ > > + --with-systemd-journal=yes \ > > =yes not needed > > > + --with-config-logging-backend-default=journal \ > > + --with-session-tracking=systemd \ > > + --with-suspend-resume=systemd > > +else > > +NETWORK_MANAGER_CONF_OPTS += \ > > + --with-systemd-journal=no \ > > --without-systemd-journal > > > + --with-config-logging-backend-default=syslog \ > > + --with-session-tracking=no \ > > --without-session-tracking > > > + --with-suspend-resume=upower > > Are you sure about this? We don't forcefully enable upower when systemd > is disabled, so is this working? Should be the default for non-systemd installs: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.32.12/configure.ac#L494-495 > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 14bf0d4dd1..7a268d72c8 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -112,6 +112,21 @@ else NETWORK_MANAGER_CONF_OPTS += --enable-polkit=no endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +NETWORK_MANAGER_DEPENDENCIES += systemd +NETWORK_MANAGER_CONF_OPTS += \ + --with-systemd-journal=yes \ + --with-config-logging-backend-default=journal \ + --with-session-tracking=systemd \ + --with-suspend-resume=systemd +else +NETWORK_MANAGER_CONF_OPTS += \ + --with-systemd-journal=no \ + --with-config-logging-backend-default=syslog \ + --with-session-tracking=no \ + --with-suspend-resume=upower +endif + ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient endif
Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- package/network-manager/network-manager.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+)