mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -29,7 +29,7 @@ Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
static void print_backtrace(unsigned int offset)
|
||||
{
|
||||
void *frames[99];
|
||||
@@ -309,7 +310,7 @@
|
||||
@@ -312,7 +313,7 @@
|
||||
if (detach == FALSE)
|
||||
option |= LOG_PERROR;
|
||||
|
||||
@@ -38,7 +38,7 @@ Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
signal_setup(signal_handler);
|
||||
#endif
|
||||
|
||||
@@ -326,7 +327,7 @@
|
||||
@@ -329,7 +330,7 @@
|
||||
|
||||
closelog();
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From dff595671bf5a46f7c9231966a6cd7d2a0183076 Mon Sep 17 00:00:00 2001
|
||||
From: Marcel Holtmann <marcel@holtmann.org>
|
||||
Date: Wed, 15 May 2019 09:39:44 +0200
|
||||
Subject: [PATCH] build: Add check for explicit_bzero support
|
||||
|
||||
Upstream: dff595671bf5a46f7c9231966a6cd7d2a0183076
|
||||
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bacb7ac5..cad35c5d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -54,6 +54,8 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
|
||||
fi
|
||||
])
|
||||
|
||||
+AC_CHECK_FUNCS(explicit_bzero)
|
||||
+
|
||||
AC_CHECK_FUNC(signalfd, dummy=yes,
|
||||
AC_MSG_ERROR(signalfd support is required))
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
config BR2_PACKAGE_OFONO
|
||||
bool "ofono"
|
||||
depends on BR2_USE_WCHAR # gettext, libglib2
|
||||
depends on BR2_USE_WCHAR # gettext, libglib2, ell
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
|
||||
depends on BR2_USE_MMU # dbus, libglib2
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on !BR2_STATIC_LIBS # dlopen(), ell
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
select BR2_PACKAGE_LIBCAP_NG
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_ELL
|
||||
select BR2_PACKAGE_LIBCAP_NG
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
|
||||
help
|
||||
@@ -16,7 +18,9 @@ config BR2_PACKAGE_OFONO
|
||||
|
||||
http://ofono.org/
|
||||
|
||||
comment "ofono needs a toolchain w/ dynamic library, wchar, threads"
|
||||
comment "ofono needs a toolchain w/ dynamic library, wchar, threads, headers >= 4.12"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc
|
||||
sha256 67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679 ofono-1.29.tar.xz
|
||||
sha256 a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b ofono-1.31.tar.xz
|
||||
# Locally computed
|
||||
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OFONO_VERSION = 1.29
|
||||
OFONO_VERSION = 1.31
|
||||
OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz
|
||||
OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
|
||||
OFONO_LICENSE = GPL-2.0
|
||||
@@ -12,11 +12,13 @@ OFONO_LICENSE_FILES = COPYING
|
||||
OFONO_DEPENDENCIES = \
|
||||
host-pkgconf \
|
||||
dbus \
|
||||
libglib2 \
|
||||
ell \
|
||||
libcap-ng \
|
||||
libglib2 \
|
||||
mobile-broadband-provider-info
|
||||
|
||||
OFONO_CONF_OPTS = \
|
||||
--enable-external-ell \
|
||||
--disable-test \
|
||||
--with-dbusconfdir=/etc \
|
||||
$(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system)
|
||||
@@ -29,12 +31,6 @@ define OFONO_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 0755 -D package/ofono/S46ofono $(TARGET_DIR)/etc/init.d/S46ofono
|
||||
endef
|
||||
|
||||
define OFONO_INSTALL_INIT_SYSTEMD
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/systemd/multi-user.target.wants
|
||||
ln -fs ../../../../usr/lib/systemd/system/ofono.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
OFONO_CONF_OPTS += --enable-udev
|
||||
OFONO_DEPENDENCIES += udev
|
||||
@@ -42,14 +38,11 @@ else
|
||||
OFONO_CONF_OPTS += --disable-udev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
|
||||
OFONO_CONF_OPTS += --enable-bluetooth
|
||||
OFONO_DEPENDENCIES += bluez_utils
|
||||
OFONO_DEPENDENCIES += bluez5_utils
|
||||
else
|
||||
OFONO_CONF_OPTS += --disable-bluetooth
|
||||
endif
|
||||
|
||||
# required by 0003-build-Add-check-for-explicit_bzero-support.patch
|
||||
OFONO_AUTORECONF = YES
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user