From: John Keeping <john@metanate.com>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/network-manager: fix build with -Dmodem_manager=false
Date: Mon, 6 Mar 2023 14:07:11 +0000 [thread overview]
Message-ID: <ZAXzj+otrp04YukT@donbot> (raw)
In-Reply-To: <20230221130040.868693-1-fontaine.fabrice@gmail.com>
On Tue, Feb 21, 2023 at 02:00:40PM +0100, Fabrice Fontaine wrote:
> Fix the following build failure with -Dmodem_manager=false raised since
> commit c36f6938858d3246ca493dacc925717586e2ea0f:
>
> ../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database".
>
> Fixes:
> - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: John Keeping <john@metanate.com>
I hit the network-manager failure in 2023.02-rc2, this patch fixes it.
> ---
> ...build-failure-with-Dmodem_manager-fa.patch | 38 +++++++++++++++++++
> 1 file changed, 38 insertions(+)
> create mode 100644 package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch
>
> diff --git a/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch
> new file mode 100644
> index 0000000000..648be027e0
> --- /dev/null
> +++ b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch
> @@ -0,0 +1,38 @@
> +From 736a2c356c1c4871e8c4e70be622c65c87d3bca8 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Tue, 21 Feb 2023 13:03:00 +0100
> +Subject: [PATCH] meson.build: fix build failure with -Dmodem_manager=false
> +
> +Fix the following build failure with -Dmodem_manager=false raised since
> +https://gitlab.freedesktop.org/ffontaine/NetworkManager/-/commit/03ba04d4784fa4fc7ec31455070fb5ecf25ade23:
> +
> +../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database".
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status:
> +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1544]
> +---
> + meson.build | 4 +++-
> + 1 file changed, 3 insertions(+), 1 deletion(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 84ce52c736..b79240efc0 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -1057,7 +1057,9 @@ output += ' jansson: ' + jansson_msg + '\n'
> + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n'
> + output += ' nft: ' + config_h.get('NFT_PATH') + '\n'
> + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n'
> +-output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n'
> ++if enable_modem_manager
> ++ output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n'
> ++endif
> + output += ' ofono: ' + enable_ofono.to_string() + '\n'
> + output += ' concheck: ' + enable_concheck.to_string() + '\n'
> + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n'
> +--
> +2.39.0
> +
> --
> 2.39.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2023-03-06 14:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 13:00 [Buildroot] [PATCH 1/1] package/network-manager: fix build with -Dmodem_manager=false Fabrice Fontaine
2023-03-06 14:07 ` John Keeping [this message]
2023-03-10 21:00 ` Arnout Vandecappelle
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=ZAXzj+otrp04YukT@donbot \
--to=john@metanate.com \
--cc=buildroot@buildroot.org \
--cc=fontaine.fabrice@gmail.com \
/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