There is a new option to install and use firewalld zone for shared mode; we set it to false by default, until someone uses firewalld with networkmanager.
Since 1.25.2-dev-90-g10020a946 in NetworkManager, there is a new tool clients/cli/generate-docs-nm-settings-nmcli that generates the nm-settings-docs-nmcli.xml based on nmcli meta data. Unfortunately, this isn't built in meson's 'native' mode; as this needs a longer dependency chain, disable generate-docs-nm-settings-nmcli when docs are disabled. Signed-off-by: Robert Schwebel <[email protected]> --- ...d-generate_docs_nm_settings_nmcli-on.patch | 34 +++++++++++++++++++ patches/NetworkManager-1.26.0/series | 1 + rules/networkmanager.make | 5 +-- 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 patches/NetworkManager-1.26.0/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch create mode 100644 patches/NetworkManager-1.26.0/series diff --git a/patches/NetworkManager-1.26.0/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch b/patches/NetworkManager-1.26.0/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch new file mode 100644 index 000000000..db3c29643 --- /dev/null +++ b/patches/NetworkManager-1.26.0/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch @@ -0,0 +1,34 @@ +From 5ddd262c1042ef2cd748b3b2a724d2e15f89b9fb Mon Sep 17 00:00:00 2001 +From: Robert Schwebel <[email protected]> +Date: Sat, 25 Jul 2020 18:14:35 +0200 +Subject: [PATCH] clients/cli: build generate_docs_nm_settings_nmcli only if + docs are enabled + +Signed-off-by: Robert Schwebel <[email protected]> +--- + clients/cli/meson.build | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/clients/cli/meson.build b/clients/cli/meson.build +index 517deffa6..2dada71f5 100644 +--- a/clients/cli/meson.build ++++ b/clients/cli/meson.build +@@ -35,6 +35,9 @@ executable( + + endif + ++enable_docs = get_option('docs') ++if enable_docs ++ + generate_docs_nm_settings_nmcli = executable( + 'generate-docs-nm-settings-nmcli', + files( +@@ -56,3 +59,5 @@ generate_docs_nm_settings_nmcli_xml = custom_target( + command: [ generate_docs_nm_settings_nmcli ], + capture: true, + ) ++ ++endif +-- +2.27.0 + diff --git a/patches/NetworkManager-1.26.0/series b/patches/NetworkManager-1.26.0/series new file mode 100644 index 000000000..b04ab9c47 --- /dev/null +++ b/patches/NetworkManager-1.26.0/series @@ -0,0 +1 @@ +0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch diff --git a/rules/networkmanager.make b/rules/networkmanager.make index db924254f..c9f4b4f9f 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.22.10 -NETWORKMANAGER_MD5 := b7b8875c3ef1db0989f78351ba3e8ad8 +NETWORKMANAGER_VERSION := 1.26.0 +NETWORKMANAGER_MD5 := c0edbbf98a1ec81eed5a03539610d324 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) @@ -50,6 +50,7 @@ NETWORKMANAGER_CONF_OPT = \ -Ddnssec_trigger=/bin/true \ -Ddocs=false \ -Debpf=false \ + -Dfirewalld_zone=false \ -Dhostname_persist=default \ -Difcfg_rh=false \ -Difupdown=true \ -- 2.27.0 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
