CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

modemmanager: Upgrade to 1.8.2

Browse Source 
Obsolete patch dropped, upstream solved this differently:
  Use realpath() instead of canonicalize_filename(),
  fixing build with musl libc.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Adrian Bunk 2018-10-21 17:34:24 +03:00 committed by Khem Raj
parent 8a824ee1f4
commit 42ab6b30ec
2 changed files with 2 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
View File

@ -1,66 +0,0 @@
From 07f1eda630517816bfa900e811963745a149e57c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 8 Jun 2018 20:38:30 -0700
Subject: [PATCH] Add configure check for canonicalize_file_name() before use
Define canonicalize_file_name API if not provided by system C library
musl e.g. does not provide this API
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
configure.ac | 2 ++
src/kerneldevice/mm-kernel-device-generic.c | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
Index: ModemManager-1.7.991/configure.ac
===================================================================
--- ModemManager-1.7.991.orig/configure.ac
+++ ModemManager-1.7.991/configure.ac
@@ -72,6 +72,8 @@ AC_SUBST(MM_GLIB_LT_CURRENT)
AC_SUBST(MM_GLIB_LT_REVISION)
AC_SUBST(MM_GLIB_LT_AGE)
+AC_CHECK_FUNCS([canonicalize_file_name])
+
dnl-----------------------------------------------------------------------------
dnl Documentation
dnl
Index: ModemManager-1.7.991/src/kerneldevice/mm-kernel-device-generic.c
===================================================================
--- ModemManager-1.7.991.orig/src/kerneldevice/mm-kernel-device-generic.c
+++ ModemManager-1.7.991/src/kerneldevice/mm-kernel-device-generic.c
@@ -21,6 +21,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
+#include "config.h"
#include "mm-kernel-device-generic.h"
#include "mm-kernel-device-generic-rules.h"
#include "mm-log.h"
@@ -100,6 +101,24 @@ read_sysfs_property_as_string (const gch
return contents;
}
+#ifndef HAVE_CANONICALIZE_FILE_NAME
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+static char * canonicalize_file_name(const char *path)
+{
+ char buf[PATH_MAX] = { };
+
+ snprintf(buf, sizeof(buf) - 1, "%s", path);
+
+ if (!realpath(path, buf))
+ return NULL;
+
+ return strdup(buf);
+}
+#endif
+
/*****************************************************************************/
/* Load contents */

5
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb → meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb
View File

@ -12,11 +12,10 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion
DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native"
SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \
file://0001-Add-configure-check-for-canonicalize_file_name-befor.patch \
"
SRC_URI[md5sum] = "4efe6a240cef212bf8855c95424e7c7f"
SRC_URI[sha256sum] = "4e366243bd4983f2e6efe35cb901cf5da51939307b5d6299fe622a9fcf411745"
SRC_URI[md5sum] = "a49c9f73e46c7b89e5efedda250d22c0"
SRC_URI[sha256sum] = "96f2a5f0ed15532b4c4c185b756fdc0326e7c2027cea26a1264f91e098260f80"
S = "${WORKDIR}/ModemManager-${PV}"