package/network-manager: add patch to set mobile-broadband-provider-info-database location
PATCH 1/2 package/network-manager: add patch to set mobile-broadband-provider-info-database location
When building network-manager in cross-compile environment pkg-config returns the wrong path to the mobile-broadband-provider-info database.
By adding the option 'mobile_broadband_provider_info_database' to set the correct path to the datafile this can be solved.
--- ...option-to-set-the-mobile-broadband-p.patch | 60 +++++++++++++++++++ package/network-manager/network-manager.mk | 1 + 2 files changed, 61 insertions(+) create mode 100644 package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch
package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch new file +60 -0
@@ -0,0 +1,60 @@ +From 03ba04d4784fa4fc7ec31455070fb5ecf25ade23 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery <[email protected]> +Date: Fri, 27 Jan 2023 22:38:42 +0100 +Subject: [PATCH] build: meson: add option to set the + mobile-broadband-provider-info database + +When building network-manager in cross-compile environment meson is not able +to detect the right location of the mobile-broadband-provider-info +database by using the pkg-config module. + +By adding the option 'mobile_broadband_provider_info_database' to set the +correct path to the datafile this can be solved. + +Signed-off-by: Heiko Thiery <[email protected]> + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1519 +--- + meson.build | 6 +++++- + meson_options.txt | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0adc42f738..84ce52c736 100644 +--- a/meson.build ++++ b/meson.build +@@ -584,7 +584,10 @@ enable_modem_manager = get_option('modem_manager') + if enable_modem_manager + mm_glib_dep = dependency('mm-glib', version: '>= 0.7.991') + +- mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ mobile_broadband_provider_info_database = get_option('mobile_broadband_provider_info_database') ++ if mobile_broadband_provider_info_database == '' ++ mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ endif + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_database) + endif + +@@ -1054,6 +1057,7 @@ 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' + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 8b1d32e645..4e359f9e92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -32,6 +32,7 @@ option('ppp', type: 'boolean', value: true, description: 'enable PPP/PPPoE suppo + option('pppd', type: 'string', value: '', description: 'path to pppd binary') + option('pppd_plugin_dir', type: 'string', value: '', description: 'path to the pppd plugins directory') + option('modem_manager', type: 'boolean', value: true, description: 'Enable new ModemManager1 interface support') ++option('mobile_broadband_provider_info_database', type: 'string', value: '', description: 'path to the mobile-broadband-provider-info database') + option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)') + option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') + option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') +-- +2.20.1 +
package/network-manager/network-manager.mk +1 -0
@@ -96,6 +96,7 @@ endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true +NETWORK_MANAGER_CONF_OPTS += -Dmobile_broadband_provider_info_database=/usr/share/mobile-broadband-provider-info/serviceproviders.xml else NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif
Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/2 package/network-manager: bump version to 1.42.0
--- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
package/network-manager/network-manager.hash +2 -2
@@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum -sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.42/NetworkManager-1.42.0.sha256sum +sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 NetworkManager-1.42.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
package/network-manager/network-manager.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.42 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES
Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedRe: [Buildroot] [PATCH 2/2] package/network-manager: bump version to 1.42.0
Quoted 5 lines · On Mon, 13 Feb 2023 13:40:23 +0100 Heiko Thiery <[email protected]> wrote:
Signed-off-by Heiko Thiery <[email protected]>--- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Applied to next, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedQuoted 6 lines · On Mon, 13 Feb 2023 13:40:21 +0100 Heiko Thiery <[email protected]> wrote:
When building network-manager in cross-compile environment pkg-config returns the wrong path to the mobile-broadband-provider-info database.
By adding the option '
mobile_broadband_provider_info_database' to set the correct path to the datafile this can be solved.
Quoted 6 lines
Signed-off-by Heiko Thiery <[email protected]>--- ...option-to-set-the-mobile-broadband-p.patch | 60 +++++++++++++++++++ package/network-manager/network-manager.mk | 1 + 2 files changed, 61 insertions(+) create mode 100644 package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch
Applied to master, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot