Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (0cd0a29c7497fd0712cc8b6d97f3e3fffb58d8c2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (0cd0a29c7497fd0712cc8b6d97f3e3fffb58d8c2)
  • Date: Sat, 8 Jul 2023 05:51:22 +0000

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

net/network-manager/BUILD | 39 +++++-----
net/network-manager/CONFIGURE | 31 +++++++-
net/network-manager/DEPENDS | 149
++++++++++++++++++++++++++++++------------
net/network-manager/HISTORY | 4 +
4 files changed, 159 insertions(+), 64 deletions(-)

New commits:
commit 0cd0a29c7497fd0712cc8b6d97f3e3fffb58d8c2
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

net/network-manager: refactor and overhaul

Overhaul the network-manager spell to be more complete and more correct.

There are still some options that aren't properly handled yet (e.g.
Qt-related options), but this should be an improvement over the existing
option handling.

diff --git a/net/network-manager/BUILD b/net/network-manager/BUILD
index 8543bd4..d924ce1 100755
--- a/net/network-manager/BUILD
+++ b/net/network-manager/BUILD
@@ -1,26 +1,27 @@
-OPTS+=" tests=no"
-#OPTS+=" wext=false" #obsolete
-OPTS+=" qt=false"
-#OPTS+=" $NM_DOCS"
-if is_depends_enabled $SPELL systemd; then
- OPTS+=" session_tracking=systemd"
-else
- OPTS+=" session_tracking=elogind"
- OPTS+=" suspend_resume=elogind"
- OPTS+=" systemd_journal=false"
- OPTS+=" systemdsystemunitdir=no"
+OPTS="$NM_TESTS $OPTS"
+#OPTS="wext=false $OPTS" #obsolete
+OPTS="qt=false $OPTS"
+OPTS="$NM_DOCS $OPTS"
+if ! is_depends_enabled "$SPELL" systemd; then
+ OPTS="systemd_journal=false $OPTS"
+ OPTS="systemdsystemunitdir=no $OPTS"
fi &&
-if is_depends_enabled $SPELL iwd; then
- config_wifi_backend_default=iwd
-else
- config_wifi_backend_default=wpa_supplicant
+
+OPTS="config_wifi_backend_default=${DEFAULT_WIFI:-wpa_supplicant} $OPTS"
+OPTS="config_dhcp_default=${DEFAULT_DHCP:-internal} $OPTS"
+OPTS="$NM_CRYPTO $OPTS"
+OPTS="$LOGGING_BACKEND_OPT $OPTS"
+OPTS="$SUSPEND_RESUME_OPT $OPTS"
+OPTS="$SESSION_TRACKING_OPT $OPTS"
+
+if [ -n "$LINUX_FIRMWARE" ] ;then
+ OPTS="kernel_firmware_dir=${LINUX_FIRMWARE} $OPTS"
fi &&

# disable stripping
-LDFLAGS="${LDFLAGS//,-s/}" &&
-LDFLAGS="${LDFLAGS//-s,/}" &&
-LDFLAGS="${LDFLAGS// -s/}" &&
-LDFLAGS="${LDFLAGS//-s /}" &&
+# if stripping is enabled the build fails with "no symbols" errors
+LDFLAGS="${LDFLAGS//[, ]-s/}" &&
+LDFLAGS="${LDFLAGS//-s[, ]/}" &&
LDFLAGS="${LDFLAGS//^-s$/}" &&

default_build
diff --git a/net/network-manager/CONFIGURE b/net/network-manager/CONFIGURE
index e94900a..d3d6d63 100755
--- a/net/network-manager/CONFIGURE
+++ b/net/network-manager/CONFIGURE
@@ -1,9 +1,34 @@
source $GRIMOIRE/MESON_CONFIGURE &&

config_query_option NETWORK_MANAGER_RESOLV "Enable resolv.conf support?" y \
- with-resolvconf={yes,no} &&
+ with-resolvconf={yes,no} &&

config_query_list NETWORK_MANAGER_CRYPTO "Which cryptography library to
use?" \
- nss gnutls
+ none nss gnutls &&

-#config_query_option NM_DOCS "build docs?" n docs={true,false}
+config_query_option NM_DOCS "Build user docs (requires gtk-doc &
gobject-introspection)?" \
+ n \
+ docs={true,false} &&
+
+config_query_option NM_TESTS "Build/run tests?" n tests={yes,no} &&
+
+config_query_list SESSION_TRACKING "Which session tracking to use?" \
+ none consolekit elogind systemd &&
+
+config_query_list SUSPEND_RESUME "Which suspend/resume system to use?" \
+ auto consolekit elogind systemd upower &&
+
+config_query_string LINUX_FIRMWARE "Firmware location (default:
/lib/firmware)" &&
+
+config_query_list DEFAULT_WIFI "Default WiFi backend to use" \
+ default iwd wpa_supplicant &&
+
+config_query_list DEFAULT_DHCP "Default DHCP client to use" \
+ dhclient dhcpcd internal &&
+
+config_query_list LOGGING_BACKEND "Loggind backend to use" \
+ default syslog journal &&
+
+config_query_option CONNECTION_CHECK \
+ "Enable connection checking (privacy warning!)?" n \
+ concheck={true,false}
diff --git a/net/network-manager/DEPENDS b/net/network-manager/DEPENDS
index 3ae735c..82c1f1e 100755
--- a/net/network-manager/DEPENDS
+++ b/net/network-manager/DEPENDS
@@ -1,68 +1,133 @@
source $GRIMOIRE/MESON_DEPENDS &&

-depends dbus &&
+depends dbus &&
depends dbus-glib &&
depends GETTEXT &&
depends glib2 &&
-depends iptables &&
-depends libnl &&
+depends libnl &&
depends libgcrypt &&
-depends libndp &&
+depends libndp &&
depends readline &&
depends util-linux &&
depends DEVICE-MANAGER &&
-if ! is_depends_enabled $SPELL systemd; then
- depends elogind
+
+optional_depends iptables '' '' "Enable iptables support" &&
+optional_depends nftables '' '' "Enable nftables support" &&
+
+optional_depends libpsl libpsl={true,false} "Link against libpsl" &&
+
+if [ -n "$LOGGING_BACKEND" ] ;then
+ case "$LOGGING_BACKEND" in
+ syslog) depends SYSTEM-LOGGER ;;
+ journal) depends systemd ;;
+ esac
+ LOGGING_BACKEND_OPT="config_logging_backend_default=$LOGGING_BACKEND"
+fi &&
+persistent_add LOGGING_BACKEND_OPT &&
+
+if [ -n "$SESSION_TRACKING" ] ;then
+ case "$SESSION_TRACKING" in
+ none) SESSION_TRACKING="no" ;;
+ consolekit)
+ depends "$SESSION_TRACKING"
"session_tracking_consolekit=true" &&
+ unset SESSION_TRACKING
+ ;;
+ *)
+ depends "$SESSION_TRACKING"
"session_tracking_consolekit=false"
+ ;;
+ esac &&
+
SESSION_TRACKING_OPT="${SESSION_TRACKING:+session_tracking=$SESSION_TRACKING}"
+fi &&
+persistent_add SESSION_TRACKING_OPT &&
+
+for s in consolekit elogind systemd ;do
+ if ! is_depends_enabled "$SPELL" "$s" ;then
+ optional_depends "$s" "Enable $s support"
+ fi
+done
+
+if [ -n "$SUSPEND_RESUME" ] ;then
+ case "$SUSPEND_RESUME" in
+ auto) ;;
+ none) unset SUSPEND_RESUME ;;
+ *) depends "$SUSPEND_RESUME" ;;
+ esac &&
+ SUSPEND_RESUME_OPT="${SUSPEND_RESUME:+suspend_resume=$SUSPEND_RESUME}" ;;
+fi &&
+persistent_add SUSPEND_RESUME_OPT &&
+
+if ! is_depends_enabled "$SPELL" upower ;then
+ optional_depends upower "Enable upower suspend/resume support"
fi &&
-depends libgudev &&

-depends $NETWORK_MANAGER_CRYPTO crypto=$NETWORK_MANAGER_CRYPTO &&
+depends libgudev &&

-optional_depends newt nmtui={true,false} 'Build nmtui' &&
+if [ -n "$NETWORK_MANAGER_CRYPTO" ] ;then
+ case "$NETWORK_MANAGER_CRYPTO" in
+ none) NETWORK_MANAGER_CRYPTO="null" ;;
+ *) depends "$NETWORK_MANAGER_CRYPTO" ;;
+ esac &&
+ NM_CRYPTO="crypto=$NETWORK_MANAGER_CRYPTO"
+fi &&
+persistent_add NM_CRYPTO &&

-optional_depends policykit polkit={true,false} "Enable PolicyKit support?"
&&
+optional_depends newt nmtui={true,false} "Build nmtui" &&

-optional_depends CONSOLE-MANAGER session_tracking_consolekit={true,false} \
- "Enable ConsoleKit session tracking support?" &&
+optional_depends policykit polkit={true,false} "Enable PolicyKit support?" &&

-#optional_depends dhcpcd "config_dhcp_default=dhcpcd dhcpcd=yes" dhcpcd='' \
-# "Enable dhcpcd support?" &&
+case "$DEFAULT_DHCP" in
+ dhcpcd) depends "$DEFAULT_DHCP" "${DEFAULT_DHCP}=true" ;;
+ dhclient) depends "$DEFAULT_DHCP" "${DEFAULT_DHCP}=true" ;;
+esac &&

-optional_depends ppp ppp={true,false} "enable PPP/PPPoE support?" &&
+for s in dhclient dhcpcd ;do
+ if ! is_depends_enabled "$SPELL" "$s" ;then
+ optional_depends dhcpcd dhcpcd={true,false} "Enable $s DHCP client
support"
+ fi
+done &&

-optional_depends linux-firmware "kernel_firmware_dir=/lib/firmware" \
- "" "Use Linux Firmware?" &&
+optional_depends ppp ppp={true,false} "Enable PPP/PPPoE support?" &&

-optional_depends IFUPDOWN ifupdown={true,false} "Network activation" &&
+optional_depends IFUPDOWN ifupdown={true,false} "Network activation" &&

-optional_depends iwd iwd={true,false} 'enable iwd support' &&
-if ! is_depends_enabled $SPELL iwd;then
-# optional_depends wpa_supplicant '' '' ''
- depends wpa_supplicant
+if [ -n "$DEFAULT_WIFI" ] ;then
+ case "$DEFAULT_WIFI" in
+ iwd) depends iwd iwd=true ;;
+ wpa_supplicant) depends wpa_supplicant ;;
+ esac
fi &&

+for s in iwd wpa_supplicant ;do
+ if ! is_depends_enabled "$SPELL" "$s" ;then
+ optional_depends dhcpcd dhcpcd={true,false} "Enable $s support"
+ fi
+done &&
+
optional_depends modemmanager modem_manager={true,false} 'Modem Manager
support' &&
-optional_depends audit libaudit={yes,no} 'audit support' &&
-optional_depends jansson ovs={true,false} 'Open vSwitch integration' &&
-optional_depends libselinux selinux={true,false} 'security enhaced linux'
-
-optional_depends gtk-doc docs={true,false} 'build documentation and
manpages' &&
-optional_depends vala vapi={true,false} 'build api docs'
-if is_depends_enabled $SPELL vala ||
- is_depends_enabled $SPELL gtk-doc ;then
- depends gobject-introspection introspection=true
-else
- optional_depends gobject-introspection introspection={true,false}
"introspection support"
+optional_depends audit libaudit={yes,no} "audit support" &&
+optional_depends jansson ovs={true,false} "Open vSwitch integration" &&
+optional_depends libselinux selinux={true,false} "Security Enhaced Linux
support" &&
+optional_depends dnsmasq "Enable dnsmasq support" &&
+
+if [ -n "$NM_DOCS" ] && [ x"$NM_DOCS"x = x"y"x ] ;then
+ depends gtk-doc docs=true
fi &&

-runtime_depends curl &&
-runtime_depends libpsl
+optional_depends vala vapi={true,false} 'Build api docs'

-if(false);then
-optional_depends upower \
- "Suspend/Resume support" &&
+if is_depends_enabled $SPELL vala ||
+ is_depends_enabled $SPELL gtk-doc ||
+ "${NM_DOCS#*=}" ;then
+ depends gobject-introspection introspection=true &&
+ depends pygobject3
+fi &&
+
+if ! is_depends_enabled "$SPELL" gobject-introspection ;then
+ optional_depends gobject-introspection introspection={true,false} "Enable
introspection support"
+fi &&
+
+if "{CONNECTION_CHECK##*=}" ;then
+ runtime_depends curl
+fi &&

-optional_depends dnsmasq \
- "DNS proxy with integrated DHCP"
-fi
-#optional_depends
+suggest_depends linux-firmware
diff --git a/net/network-manager/HISTORY b/net/network-manager/HISTORY
index 9ef05bc..3ccdb71 100644
--- a/net/network-manager/HISTORY
+++ b/net/network-manager/HISTORY
@@ -1,3 +1,7 @@
+2023-07-07 Justin Boffemmyer <flux AT sourcemage.org>
+ * BUILD,CONFIGURE,DEPENDS: (partially) rework and correct spell option
+ handling, correct code flow logic
+
2023-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.42.2




  • [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (0cd0a29c7497fd0712cc8b6d97f3e3fffb58d8c2), Justin Boffemmyer, 07/08/2023

Archive powered by MHonArc 2.6.24.

Top of Page