From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] networkmanager: version bump 1.26.2 -> 1.30.4
Date: Tue, 29 Jun 2021 07:09:33 +0200 [thread overview]
Message-ID: <20210629050933.2524875-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210623073309.23058-4-ada@thorsis.com>
Thanks, applied as 7baf74944ca16173de216387df591cbecc794e22.
Michael
[sent from post-receive hook]
On Tue, 29 Jun 2021 07:09:33 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210623073309.23058-4-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/NetworkManager-1.26.2/series b/patches/NetworkManager-1.26.2/series
> deleted file mode 100644
> index b04ab9c47a95..000000000000
> --- 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_settings_nmcli-on.patch b/patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> similarity index 67%
> rename from patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> rename to patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> index db3c2964380d..ebc2816dff0b 100644
> --- a/patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> +++ b/patches/NetworkManager-1.30.4/0001-clients-cli-build-generate_docs_nm_settings_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 000000000000..24a953ec874d
> --- /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 e2502b3f0c2d..c39179f5b5d3 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))
> @@ -57,7 +57,6 @@ NETWORKMANAGER_CONF_OPT = \
> -Dintrospection=false \
> -Diptables=/usr/sbin/iptables \
> -Diwd=false \
> - -Djson_validation=false \
> -Dkernel_firmware_dir=/lib/firmware \
> -Dld_gc=true \
> -Dlibaudit=no \
> @@ -73,7 +72,7 @@ NETWORKMANAGER_CONF_OPT = \
> -Dofono=false \
> -Dovs=false \
> -Dpolkit=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_POLKIT) \
> - -Dpolkit_agent=false \
> + -Dpolkit_agent_helper_1=/usr/libexec/polkit-agent-helper-1 \
> -Dppp=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_PPP) \
> -Dpppd=/usr/sbin/pppd \
> -Dpppd_plugin_dir=$(PPP_SHARED_INST_PATH) \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-06-29 5:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 7:33 [ptxdist] [PATCH v3 0/5] mobile broadband software version bump Alexander Dahl
2021-06-23 7:33 ` [ptxdist] [PATCH v3 1/5] libqmi: version bump 1.28.2 -> 1.28.6 Alexander Dahl
2021-06-29 5:09 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-23 7:33 ` [ptxdist] [PATCH v3 2/5] modemmanager: version bump 1.16.2 -> 1.16.6 Alexander Dahl
2021-06-29 5:09 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-23 7:33 ` [ptxdist] [PATCH v3 3/5] networkmanager: version bump 1.26.2 -> 1.30.4 Alexander Dahl
2021-06-29 5:09 ` Michael Olbrich [this message]
2021-06-23 7:33 ` [ptxdist] [PATCH v3 4/5] networkmanager: Make "more logging" optional Alexander Dahl
2021-06-29 5:09 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-23 7:33 ` [ptxdist] [PATCH v3 5/5] ppp: version bump 2.4.7 -> 2.4.9 Alexander Dahl
2021-06-29 5:09 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210629050933.2524875-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox