Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,18 +0,0 @@
|
||||
Fix libusb check when cross-compiling.
|
||||
|
||||
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
|
||||
Index: openobex-1.5/acinclude.m4
|
||||
===================================================================
|
||||
--- openobex-1.5.orig/acinclude.m4 2010-06-16 10:32:47.000000000 +0200
|
||||
+++ openobex-1.5/acinclude.m4 2010-06-16 10:35:33.000000000 +0200
|
||||
@@ -158,7 +158,7 @@
|
||||
;;
|
||||
*)
|
||||
PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
|
||||
- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
|
||||
+ REQUIRES="libusb"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(USB_CFLAGS)
|
||||
@@ -1,30 +0,0 @@
|
||||
obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
|
||||
|
||||
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
|
||||
Index: openobex-1.5/apps/obex_test_cable.c
|
||||
===================================================================
|
||||
--- openobex-1.5.orig/apps/obex_test_cable.c 2009-02-08 19:30:22.000000000 +0100
|
||||
+++ openobex-1.5/apps/obex_test_cable.c 2010-06-16 11:11:05.000000000 +0200
|
||||
@@ -113,9 +113,9 @@
|
||||
if(total == sizeof(tmpbuf))
|
||||
return -1;
|
||||
|
||||
- if( (answer = index(tmpbuf, '\n')) ) {
|
||||
+ if( (answer = strchr(tmpbuf, '\n')) ) {
|
||||
// Remove first line (echo)
|
||||
- if( (answer_end = index(answer+1, '\n')) ) {
|
||||
+ if( (answer_end = strchr(answer+1, '\n')) ) {
|
||||
// Found end of answer
|
||||
done = 1;
|
||||
}
|
||||
@@ -178,7 +178,7 @@
|
||||
}
|
||||
|
||||
tcgetattr(gt->ttyfd, >->oldtio);
|
||||
- bzero(>->newtio, sizeof(struct termios));
|
||||
+ memset(>->newtio, 0, sizeof(struct termios));
|
||||
gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
|
||||
gt->newtio.c_iflag = IGNPAR;
|
||||
gt->newtio.c_oflag = 0;
|
||||
@@ -5,39 +5,3 @@ config BR2_PACKAGE_OPENOBEX
|
||||
protocol.
|
||||
|
||||
http://sourceforge.net/projects/openobex
|
||||
|
||||
if BR2_PACKAGE_OPENOBEX
|
||||
|
||||
config BR2_PACKAGE_OPENOBEX_BLUEZ
|
||||
bool "enable bluez support"
|
||||
depends on !BR2_STATIC_LIBS # bluez_utils
|
||||
depends on BR2_USE_WCHAR # libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
|
||||
depends on BR2_USE_MMU # dbus
|
||||
select BR2_PACKAGE_BLUEZ_UTILS
|
||||
|
||||
comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_OPENOBEX_LIBUSB
|
||||
bool "enable libusb support"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
|
||||
select BR2_PACKAGE_LIBUSB
|
||||
select BR2_PACKAGE_LIBUSB_COMPAT
|
||||
|
||||
comment "libusb support needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_OPENOBEX_APPS
|
||||
bool "install test applications"
|
||||
help
|
||||
Also install the openobex test applications on target.
|
||||
|
||||
config BR2_PACKAGE_OPENOBEX_SYSLOG
|
||||
bool "enable debugging to the system logger"
|
||||
|
||||
config BR2_PACKAGE_OPENOBEX_DUMP
|
||||
bool "enable protocol dumping for debugging"
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
# From http://sourceforge.net/projects/openobex/files/openobex/1.5/
|
||||
sha1 5332ef95bc8b321bda675cdb74379804c6c1a83f openobex-1.5.0-Source.zip
|
||||
md5 f6d87af55a1d702d582173c81619176e openobex-1.5.0-Source.zip
|
||||
# From http://sourceforge.net/projects/openobex/files/openobex/1.7.2/
|
||||
sha1 4a5098a62889134cbd2b54997e7ff3e959e601e6 openobex-1.7.2-Source.tar.gz
|
||||
md5 f6e0b6cb7dcfd731460a7e9a91429a3a openobex-1.7.2-Source.tar.gz
|
||||
# License files, locally calculated
|
||||
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB
|
||||
|
||||
@@ -4,42 +4,31 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENOBEX_VERSION_MAJOR = 1.5
|
||||
OPENOBEX_VERSION = $(OPENOBEX_VERSION_MAJOR).0
|
||||
OPENOBEX_SITE = http://downloads.sourceforge.net/project/openobex/openobex/$(OPENOBEX_VERSION_MAJOR)
|
||||
OPENOBEX_SOURCE = openobex-$(OPENOBEX_VERSION)-Source.zip
|
||||
# Libraries seems to be released under LGPLv2.1+,
|
||||
# while other material is under GPLv2+.
|
||||
OPENOBEX_LICENSE = GPLv2+/LGPLv2.1+
|
||||
OPENOBEX_VERSION = 1.7.2
|
||||
OPENOBEX_SITE = http://downloads.sourceforge.net/project/openobex/openobex/$(OPENOBEX_VERSION)
|
||||
OPENOBEX_SOURCE = openobex-$(OPENOBEX_VERSION)-Source.tar.gz
|
||||
# Libraries seems to be released under LGPL-2.1+,
|
||||
# while other material is under GPL-2.0+.
|
||||
OPENOBEX_LICENSE = GPL-2.0+/LGPL-2.1+
|
||||
OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
|
||||
|
||||
OPENOBEX_DEPENDENCIES = host-pkgconf
|
||||
OPENOBEX_AUTORECONF = YES
|
||||
OPENOBEX_INSTALL_STAGING = YES
|
||||
OPENOBEX_CONF_OPTS = -DBUILD_DOCUMENTATION=OFF
|
||||
|
||||
define OPENOBEX_EXTRACT_CMDS
|
||||
$(UNZIP) -d $(@D) $(DL_DIR)/$(OPENOBEX_SOURCE)
|
||||
mv $(@D)/openobex-$(OPENOBEX_VERSION)-Source/* $(@D)
|
||||
$(RM) -r $(@D)/openobex-$(OPENOBEX_VERSION)-Source
|
||||
endef
|
||||
|
||||
OPENOBEX_CONF_OPTS += \
|
||||
$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
|
||||
$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
|
||||
$(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
|
||||
OPENOBEX_DEPENDENCIES += bluez_utils
|
||||
OPENOBEX_CONF_OPTS += --with-bluez=$(STAGING_DIR)
|
||||
else
|
||||
OPENOBEX_CONF_OPTS += --disable-bluetooth
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
|
||||
OPENOBEX_DEPENDENCIES += libusb-compat
|
||||
OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR)
|
||||
else
|
||||
OPENOBEX_CONF_OPTS += --disable-usb
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
|
||||
OPENOBEX_DEPENDENCIES += bluez5_utils
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB),y)
|
||||
OPENOBEX_DEPENDENCIES += libusb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
OPENOBEX_DEPENDENCIES += udev
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user