Bump buildroot to 2019.02

This commit is contained in:
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions

View File

@@ -0,0 +1,67 @@
From ed40ac76b125b1c3b2e2f8522d283b073c23bd3b Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Fri, 15 Jun 2018 06:25:46 +0300
Subject: [PATCH] kerneldevice: fix build with musl libc
musl libc does not implement the canonicalize_file_name() GNU extension.
Use the POSIX standard realpath() instead.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: sent to modemmanager-devel@lists.freedesktop.org
src/kerneldevice/mm-kernel-device-generic.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/kerneldevice/mm-kernel-device-generic.c b/src/kerneldevice/mm-kernel-device-generic.c
index 6b0f072402ff..885bef171f5d 100644
--- a/src/kerneldevice/mm-kernel-device-generic.c
+++ b/src/kerneldevice/mm-kernel-device-generic.c
@@ -120,7 +120,7 @@ preload_sysfs_path (MMKernelDeviceGeneric *self)
mm_kernel_event_properties_get_subsystem (self->priv->properties),
mm_kernel_event_properties_get_name (self->priv->properties));
- self->priv->sysfs_path = canonicalize_file_name (tmp);
+ self->priv->sysfs_path = realpath (tmp, NULL);
if (!self->priv->sysfs_path || !g_file_test (self->priv->sysfs_path, G_FILE_TEST_EXISTS)) {
mm_warn ("Invalid sysfs path read for %s/%s",
mm_kernel_event_properties_get_subsystem (self->priv->properties),
@@ -163,7 +163,7 @@ preload_interface_sysfs_path (MMKernelDeviceGeneric *self)
* The correct parent dir we want to have is the first one with "usb" subsystem.
*/
aux = g_strdup_printf ("%s/device", self->priv->sysfs_path);
- dirpath = canonicalize_file_name (aux);
+ dirpath = realpath (aux, NULL);
g_free (aux);
while (dirpath) {
@@ -179,7 +179,7 @@ preload_interface_sysfs_path (MMKernelDeviceGeneric *self)
gchar *canonicalized_subsystem;
gchar *subsystem_name;
- canonicalized_subsystem = canonicalize_file_name (subsystem_filepath);
+ canonicalized_subsystem = realpath (subsystem_filepath, NULL);
g_free (subsystem_filepath);
subsystem_name = g_path_get_basename (canonicalized_subsystem);
@@ -239,7 +239,7 @@ preload_driver (MMKernelDeviceGeneric *self)
gchar *tmp2;
tmp = g_strdup_printf ("%s/driver", self->priv->interface_sysfs_path);
- tmp2 = canonicalize_file_name (tmp);
+ tmp2 = realpath (tmp, NULL);
if (tmp2 && g_file_test (tmp2, G_FILE_TEST_EXISTS))
self->priv->driver = g_path_get_basename (tmp2);
g_free (tmp2);
@@ -308,7 +308,7 @@ preload_physdev_subsystem (MMKernelDeviceGeneric *self)
gchar *subsyspath;
aux = g_strdup_printf ("%s/subsystem", self->priv->physdev_sysfs_path);
- subsyspath = canonicalize_file_name (aux);
+ subsyspath = realpath (aux, NULL);
self->priv->physdev_subsystem = g_path_get_dirname (subsyspath);
g_free (subsyspath);
g_free (aux);
--
2.17.1

View File

@@ -1,12 +1,11 @@
config BR2_PACKAGE_MODEM_MANAGER
bool "modemmanager"
depends on BR2_PACKAGE_HAS_UDEV
bool "modem-manager"
depends on BR2_USE_WCHAR # libglib2 and gnutls
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_DBUS # runtime dependency
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBGUDEV
select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV
help
ModemManager is a DBus-activated daemon which controls mobile
broadband (2G/3G/4G) devices and connections.
@@ -28,7 +27,6 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
This option enables support for QMI protocol
endif
comment "modemmanager needs udev /dev management and a toolchain w/ wchar, threads"
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_PACKAGE_HAS_UDEV
comment "modemmanager needs a toolchain w/ wchar, threads"
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU

7
bsp/buildroot/package/modem-manager/S44modem-manager Executable file → Normal file
View File

@@ -3,15 +3,16 @@
# Starts ModemManager
#
PIDFILE=/var/run/ModemManager.pid
# Allow a few customizations from a config file
test -r /etc/default/ModemManager && . /etc/default/ModemManager
[ -x $MODEMMANAGER_BIN ] || exit 0
PIDFILE=/var/run/ModemManager.pid
start() {
printf "Starting ModemManager: "
umask 077
start-stop-daemon -S -q -b -m -p $PIDFILE \
--exec /usr/sbin/ModemManager
--exec /usr/sbin/ModemManager -- $MODEMMANAGER_ARGS
[ $? = 0 ] && echo "OK" || echo "FAIL"
}
stop() {

View File

@@ -1,4 +1,4 @@
# Locally computed
sha256 bc74326fa69ae8012f806e235f3d296144922669b952d4d4987dd0af645d5f68 ModemManager-1.6.10.tar.xz
sha256 18abe34421aa3b52ff47d4ba93aa282f8f8944717dd644a5c0c81eeeac9c7eb1 ModemManager-1.8.0.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB

View File

@@ -4,13 +4,14 @@
#
################################################################################
MODEM_MANAGER_VERSION = 1.6.10
MODEM_MANAGER_VERSION = 1.8.0
MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib)
MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB
MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2 libgudev
MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2
MODEM_MANAGER_INSTALL_STAGING = YES
MODEM_MANAGER_CONF_OPTS = --disable-more-warnings
ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
MODEM_MANAGER_DEPENDENCIES += libqmi
@@ -19,6 +20,13 @@ else
MODEM_MANAGER_CONF_OPTS += --without-qmi
endif
ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
MODEM_MANAGER_DEPENDENCIES += libgudev
MODEM_MANAGER_CONF_OPTS += --with-udev
else
MODEM_MANAGER_CONF_OPTS += --without-udev
endif
ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y)
MODEM_MANAGER_DEPENDENCIES += libmbim
MODEM_MANAGER_CONF_OPTS += --with-mbim