mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-08-25 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

networkmanager: Fix configure without systemd in DISTRO_FEATURES

Browse Source 
meson.build handles the systemd unit dir and the systemd generator dir
with the same pattern: both options default to an empty string, and an
empty string means "resolve this from systemd.pc", which is asserted:

  systemd_systemdsystemgeneratordir = get_option('systemdsystemgeneratordir')
  install_systemdgeneratordir = (systemd_systemdsystemgeneratordir != 'no')

  if install_systemdgeneratordir and systemd_systemdsystemgeneratordir == ''
    assert(systemd_dep.found(), 'systemd required but not found, ...')

The systemd PACKAGECONFIG only turned off the unit dir, so the generator
dir kept its empty default and configure failed for sysvinit builds:

| ../sources/networkmanager-1.58.0/meson.build:420:2: ERROR: Assert failed:
| systemd required but not found, please provide a valid systemd user
| generator dir or disable it

Pass -Dsystemdsystemgeneratordir=no alongside the existing
-Dsystemdsystemunitdir=no.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Khem Raj
2026-08-08 22:30:56 -07:00
parent bb2a34aa3c
commit 1bfc80fbd4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.58.0.bb
+5 -1
View File
@@ -80,9 +80,13 @@ PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \
inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)}
# systemdsystemunitdir and systemdsystemgeneratordir both default to an empty
# string, which makes meson.build assert that systemd was found so it can
# resolve them from systemd.pc. Both have to be turned off explicitly, not just
# the unit dir, otherwise configure fails when systemd is not available.
PACKAGECONFIG[systemd] = "\
-Dsystemdsystemunitdir=${systemd_unitdir}/system -Dsession_tracking=systemd,\
-Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsession_tracking=no\
-Dsystemdsystemunitdir=no -Dsystemdsystemgeneratordir=no -Dsystemd_journal=false -Dsession_tracking=no\
"
PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit"
PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5"