From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 18 Jun 2021 13:22:30 +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 1luCZy-00036s-9F for lore@lore.pengutronix.de; Fri, 18 Jun 2021 13:22:30 +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 1luCZx-0008KA-V3; Fri, 18 Jun 2021 13:22:29 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1luCZ1-00083r-WB for ptxdist@pengutronix.de; Fri, 18 Jun 2021 13:21:32 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 2FEA43245 for ; Fri, 18 Jun 2021 13:21:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bzsJVmTAumqU for ; Fri, 18 Jun 2021 13:21:31 +0200 (CEST) Received: by mail.thorsis.com (Postfix, from userid 109) id 0415A2945; Fri, 18 Jun 2021 13:21:30 +0200 (CEST) From: Alexander Dahl To: ptxdist@pengutronix.de Date: Fri, 18 Jun 2021 13:21:09 +0200 Message-Id: <20210618112110.121867-4-ada@thorsis.com> In-Reply-To: <20210618112110.121867-1-ada@thorsis.com> References: <20210618112110.121867-1-ada@thorsis.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.5 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 3/4] 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 MIME-Version: 1.0 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 Signed-off-by: Alexander Dahl --- 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_nmcli-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_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 db3c29643..ebc2816df 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 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)) -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de