mirror of
https://github.com/PartialVolume/shredos.x86_64.git
synced 2026-02-20 09:35:26 +00:00
Upgrade buildroot to 2023.05 (from 2021.08.2), kernel is upgraded to 6.3 (from 5.13.19).
This commit is contained in:
PartialVolume
@@ -0,0 +1,60 @@
|
||||
From 03ba04d4784fa4fc7ec31455070fb5ecf25ade23 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
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 <heiko.thiery@gmail.com>
|
||||
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
config BR2_PACKAGE_NETWORK_MANAGER
|
||||
bool "network-manager"
|
||||
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
|
||||
depends on !BR2_STATIC_LIBS # gnutls
|
||||
depends on BR2_USE_MMU # dbus
|
||||
depends on BR2_PACKAGE_HAS_UDEV
|
||||
@@ -11,15 +10,11 @@ config BR2_PACKAGE_NETWORK_MANAGER
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
|
||||
depends on BR2_USE_WCHAR # libglib2
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_GNUTLS
|
||||
select BR2_PACKAGE_GNUTLS if !BR2_PACKAGE_LIBNSS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_LIBGCRYPT
|
||||
select BR2_PACKAGE_LIBNDP
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
select BR2_PACKAGE_WIRELESS_TOOLS
|
||||
select BR2_PACKAGE_WIRELESS_TOOLS_LIB
|
||||
select BR2_PACKAGE_READLINE
|
||||
select BR2_PACKAGE_LIBNDP
|
||||
help
|
||||
NetworkManager is a set of co-operative tools that make
|
||||
networking simple and straightforward. Whether WiFi, wired,
|
||||
@@ -38,28 +33,31 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI
|
||||
help
|
||||
This option enables terminal based UI
|
||||
|
||||
config BR2_PACKAGE_NETWORK_MANAGER_CLI
|
||||
bool "nmcli support"
|
||||
select BR2_PACKAGE_READLINE
|
||||
help
|
||||
This option enables support for the NetworkManager Command
|
||||
Line Interface
|
||||
|
||||
config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER
|
||||
bool "modem-manager support"
|
||||
select BR2_PACKAGE_MODEM_MANAGER
|
||||
select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
|
||||
help
|
||||
This option enables support for ModemManager
|
||||
|
||||
config BR2_PACKAGE_NETWORK_MANAGER_PPPD
|
||||
bool "pppd support"
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # pppd
|
||||
select BR2_PACKAGE_PPPD
|
||||
help
|
||||
This option enables support for PPPD daemon
|
||||
|
||||
comment "pppd support needs a glibc or uClibc toolchain"
|
||||
depends on BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_NETWORK_MANAGER_OVS
|
||||
bool "OpenVSwitch support"
|
||||
select BR2_PACKAGE_JANSSON
|
||||
help
|
||||
This option enables support for OpenVSwitch
|
||||
|
||||
endif
|
||||
|
||||
comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# From https://download.gnome.org/sources/NetworkManager/1.32/NetworkManager-1.32.2.sha256sum
|
||||
sha256 701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873 NetworkManager-1.32.2.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
|
||||
sha256 e70c2d84a038b972beff16d8662f35567709dff2d552220bd1af6014f6d2215d CONTRIBUTING.md
|
||||
sha256 cfb6c71f6df5898e1724be3debe9adac48c115b903915406c1e7dfd362b57892 CONTRIBUTING.md
|
||||
|
||||
@@ -4,85 +4,162 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NETWORK_MANAGER_VERSION_MAJOR = 1.32
|
||||
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2
|
||||
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
|
||||
NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \
|
||||
libgcrypt wireless_tools util-linux host-intltool readline libndp
|
||||
NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm)
|
||||
NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md
|
||||
NETWORK_MANAGER_CPE_ID_VENDOR = gnome
|
||||
NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager
|
||||
NETWORK_MANAGER_SELINUX_MODULES = networkmanager
|
||||
|
||||
NETWORK_MANAGER_CONF_ENV = \
|
||||
ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
|
||||
ac_cv_file__etc_fedora_release=no \
|
||||
ac_cv_file__etc_mandriva_release=no \
|
||||
ac_cv_file__etc_debian_version=no \
|
||||
ac_cv_file__etc_redhat_release=no \
|
||||
ac_cv_file__etc_SuSE_release=no
|
||||
NETWORK_MANAGER_DEPENDENCIES = \
|
||||
host-intltool \
|
||||
host-libxslt \
|
||||
host-pkgconf \
|
||||
dbus \
|
||||
libglib2 \
|
||||
libndp \
|
||||
udev \
|
||||
util-linux
|
||||
|
||||
NETWORK_MANAGER_CONF_OPTS = \
|
||||
--disable-introspection \
|
||||
--disable-tests \
|
||||
--disable-qt \
|
||||
--disable-more-warnings \
|
||||
--with-crypto=gnutls \
|
||||
--with-iptables=/usr/sbin/iptables \
|
||||
--disable-ifupdown \
|
||||
--without-nm-cloud-setup
|
||||
-Dintrospection=false \
|
||||
-Ddocs=false \
|
||||
-Dtests=no \
|
||||
-Dqt=false \
|
||||
-Diptables=/usr/sbin/iptables \
|
||||
-Difupdown=false \
|
||||
-Dnm_cloud_setup=false \
|
||||
-Dsession_tracking_consolekit=false
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OFONO),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += ofono
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-ofono
|
||||
ifeq ($(BR2_PACKAGE_AUDIT),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += audit
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --without-ofono
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DHCPCD),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_IWD),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += iwd
|
||||
NETWORK_MANAGER_CONF_OPTS += -Diwd=true
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=wpa_supplicant
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=iwd
|
||||
endif
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += \
|
||||
-Diwd=false \
|
||||
-Dconfig_wifi_backend_default=wpa_supplicant
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += libcurl
|
||||
NETWORK_MANAGER_CONF_OPTS += --enable-concheck
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --disable-concheck
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += newt
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes
|
||||
ifeq ($(BR2_PACKAGE_LIBNSS),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += libnss
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dcrypto=nss
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-nmtui=no
|
||||
NETWORK_MANAGER_DEPENDENCIES += gnutls
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dcrypto=gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPSL),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += libpsl
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += libselinux
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dselinux=true
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dselinux=false
|
||||
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
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dovs=true
|
||||
NETWORK_MANAGER_DEPENDENCIES += jansson
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dovs=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += pppd
|
||||
NETWORK_MANAGER_CONF_OPTS += --enable-ppp
|
||||
NETWORK_MANAGER_CONF_OPTS += \
|
||||
-Dppp=true \
|
||||
-Dpppd=/usr/sbin/pppd \
|
||||
-Dpppd_plugin_dir=/usr/lib/pppd/$(PPPD_VERSION)
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --disable-ppp
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dppp=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += modem-manager
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += newt
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DHCPCD),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += --enable-ovs
|
||||
NETWORK_MANAGER_DEPENDENCIES += jansson
|
||||
ifeq ($(BR2_PACKAGE_OFONO),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += ofono
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dofono=true
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --disable-ovs
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dofono=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += systemd
|
||||
NETWORK_MANAGER_CONF_OPTS += \
|
||||
-Dsystemd_journal=true \
|
||||
-Dconfig_logging_backend_default=journal \
|
||||
-Dsession_tracking=systemd \
|
||||
-Dsuspend_resume=systemd
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += \
|
||||
-Dsystemd_journal=false \
|
||||
-Dconfig_logging_backend_default=syslog \
|
||||
-Dsession_tracking=no \
|
||||
-Dsuspend_resume=upower \
|
||||
-Dsystemdsystemunitdir=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_POLKIT),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += polkit
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += readline
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false
|
||||
endif
|
||||
|
||||
define NETWORK_MANAGER_INSTALL_INIT_SYSV
|
||||
@@ -95,4 +172,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
|
||||
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(meson-package))
|
||||
|
||||
Reference in New Issue
Block a user