From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jun 2021 07:13:29 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly63t-0007I4-LN for lore@lore.pengutronix.de; Tue, 29 Jun 2021 07:13:29 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly63t-0001r1-9t; Tue, 29 Jun 2021 07:13:29 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ly606-0005lB-AQ; Tue, 29 Jun 2021 07:09:34 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly605-0005dX-Qx; Tue, 29 Jun 2021 07:09:33 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ly605-00AaqY-O5; Tue, 29 Jun 2021 07:09:33 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 29 Jun 2021 07:09:33 +0200 Message-Id: <20210629050933.2524875-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210623073309.23058-4-ada@thorsis.com> References: <20210623073309.23058-4-ada@thorsis.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] networkmanager: version bump 1.26.2 -> 1.30.4 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 7baf74944ca16173de216387df591cbecc794e22. Michael [sent from post-receive hook] On Tue, 29 Jun 2021 07:09:33 +0200, Alexander Dahl wrote: > Signed-off-by: Alexander Dahl > Message-Id: <20210623073309.23058-4-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > 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 > 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 > 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