Re: [ptxdist] [PATCH v2 3/4] networkmanager: version bump 1.26.2 -> 1.30.4

[Alexander Dahl <ada@thorsis.com>]

Hello,

Am Freitag, 18. Juni 2021, 13:21:09 CEST schrieb Alexander Dahl:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  patches/NetworkManager-1.26.2/series          |  1 -
>  ...d-generate_docs_nm_settings_nmcli-on.patch | 19 +++++++++----------
>  patches/NetworkManager-1.30.4/series          |  4 ++++
>  rules/networkmanager.make                     |  4 ++--
>  4 files changed, 15 insertions(+), 13 deletions(-)
>  delete mode 100644 patches/NetworkManager-1.26.2/series
>  rename patches/{NetworkManager-1.26.2 =>
> NetworkManager-1.30.4}/0001-clients-cli-build-generate_docs_nm_settings_nmc
> li-on.patch (67%) create mode 100644 patches/NetworkManager-1.30.4/series
> 
> diff --git a/patches/NetworkManager-1.26.2/series
> b/patches/NetworkManager-1.26.2/series deleted file mode 100644
> index b04ab9c47..000000000
> --- a/patches/NetworkManager-1.26.2/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> diff --git
> a/patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_set
> tings_nmcli-on.patch
> b/patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_set
> tings_nmcli-on.patch similarity index 67%
> rename from
> patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_setti
> ngs_nmcli-on.patch rename to
> patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_setti
> ngs_nmcli-on.patch index db3c29643..ebc2816df 100644
> ---
> a/patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_set
> tings_nmcli-on.patch +++
> b/patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_set
> tings_nmcli-on.patch @@ -1,4 +1,3 @@
> -From 5ddd262c1042ef2cd748b3b2a724d2e15f89b9fb Mon Sep 17 00:00:00 2001
>  From: Robert Schwebel <r.schwebel@pengutronix.de>
>  Date: Sat, 25 Jul 2020 18:14:35 +0200
>  Subject: [PATCH] clients/cli: build generate_docs_nm_settings_nmcli only if
> @@ -10,10 +9,10 @@ Signed-off-by: Robert Schwebel
> <r.schwebel@pengutronix.de> 1 file changed, 5 insertions(+)
> 
>  diff --git a/clients/cli/meson.build b/clients/cli/meson.build
> -index 517deffa6..2dada71f5 100644
> +index f8e6a8236d4e..af57eedabfb9 100644
>  --- a/clients/cli/meson.build
>  +++ b/clients/cli/meson.build
> -@@ -35,6 +35,9 @@ executable(
> +@@ -37,6 +37,9 @@ executable(
> 
>   endif
> 
> @@ -23,12 +22,12 @@ index 517deffa6..2dada71f5 100644
>   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,
> +@@ -54,6 +57,8 @@ generate_docs_nm_settings_nmcli = executable(
> +   link_depends: linker_script_binary,
>   )
> -+
> +
>  +endif
> ---
> -2.27.0
> -
> ++
> + if enable_docs
> +   generate_docs_nm_settings_nmcli_xml = custom_target(
> +     'generate-docs-nm-settings-nmcli.xml',
> diff --git a/patches/NetworkManager-1.30.4/series
> b/patches/NetworkManager-1.30.4/series new file mode 100644
> index 000000000..24a953ec8
> --- /dev/null
> +++ b/patches/NetworkManager-1.30.4/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> +# c940234bc49ce84559747d716a7955c5  - git-ptx-patches magic
> diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> index e2502b3f0..75c05bbc0 100644
> --- a/rules/networkmanager.make
> +++ b/rules/networkmanager.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
>  #
>  # Paths and names
>  #
> -NETWORKMANAGER_VERSION	:= 1.26.2
> -NETWORKMANAGER_MD5	:= ad5332a7fe5d00db7c75b722337be62b
> +NETWORKMANAGER_VERSION	:= 1.30.4
> +NETWORKMANAGER_MD5	:= 8ce53a38356864832f7f10ad46fcde27
>  NETWORKMANAGER		:= NetworkManager-$(NETWORKMANAGER_VERSION)
>  NETWORKMANAGER_SUFFIX	:= tar.xz
>  NETWORKMANAGER_URL	:= $(call ptx/mirror, GNOME, NetworkManager/$(basename
> $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX))

I'm no meson expert (at all), but I think the following option can be removed, 
because it was removed upstream:

  -Djson_validation=false

And that option was changed:

-       -Dpolkit_agent=false
+       -Dpolkit_agent_helper_1=

This was changed with networkmanager upstream commits 8f2ca652d91c ("build: 
make path to polkit-agent-helper-1 binary configurable") and ea198096ebe5 
("build: rename build option "--with-polkit-agent-helper-1{-path,}"") … and 
the option should be set to an absolute path, but which one? Would that be the 
path "/usr/libexec/polkit-agent-helper-1" as used in "rules/polkit.make" or 
some other path? That's only relevant if NETWORKMANAGER_POLKIT is set, right?

Greets
Alex





_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de