Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
usb_linux.c: fix minor()/major() build failure due to glibc 2.28
|
||||
|
||||
glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>,
|
||||
and therefore <sys/sysmacros.h> must be included explicitly when
|
||||
major()/minor() are used.
|
||||
|
||||
This commit adds a patch to directly include <sys/sysmacros.h> into
|
||||
all usb_linux.c files where minor() and major() macros are used.
|
||||
|
||||
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c
|
||||
--- host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c 2013-02-18 15:49:03.000000000 +0100
|
||||
+++ host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c 2018-09-09 11:47:16.476292546 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <dirent.h>
|
||||
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c
|
||||
--- host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c 2018-09-09 02:32:57.154503866 +0200
|
||||
+++ host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c 2018-09-09 11:47:28.148353880 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <dirent.h>
|
||||
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c
|
||||
--- host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c 2013-02-18 15:49:03.000000000 +0100
|
||||
+++ host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c 2018-09-09 11:46:53.028169154 +0200
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
@@ -15,6 +15,8 @@ config BR2_PACKAGE_ANDROID_TOOLS
|
||||
can be used to interact with target devices using of these
|
||||
protocols.
|
||||
|
||||
https://wiki.debian.org/AndroidTools#Original_android-tools_package
|
||||
|
||||
if BR2_PACKAGE_ANDROID_TOOLS
|
||||
|
||||
# We need kernel headers that support the __SANE_USERSPACE_TYPES__
|
||||
@@ -34,13 +36,13 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
|
||||
|
||||
config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT
|
||||
bool "fastboot"
|
||||
select BR2_PACKAGE_LIBSELINUX
|
||||
select BR2_PACKAGE_ZLIB
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux
|
||||
depends on !BR2_STATIC_LIBS # libselinux
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux
|
||||
depends on !BR2_arc # libselinux
|
||||
depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
|
||||
select BR2_PACKAGE_LIBSELINUX
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
This option will build and install the fastboot utility for
|
||||
the target, which can be used to reflash other target devices
|
||||
|
||||
@@ -73,7 +73,7 @@ endef
|
||||
|
||||
define HOST_ANDROID_TOOLS_INSTALL_CMDS
|
||||
$(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\
|
||||
$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(HOST_DIR)/usr/bin/$(t)$(sep))
|
||||
$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(HOST_DIR)/bin/$(t)$(sep))
|
||||
endef
|
||||
|
||||
define ANDROID_TOOLS_INSTALL_TARGET_CMDS
|
||||
|
||||
Reference in New Issue
Block a user