diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-21 19:46:24 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-22 13:17:07 +0100 |
| commit | f7326128b848e798922ccba07eeb4c5f51ca8ce0 (patch) | |
| tree | 4441a9123b60000c000e5212e3778bfecb1f5c9c /meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | |
| parent | 4816cb8bc5f73f412fd516c71531b8a6c2ca318c (diff) | |
| download | meta-openembedded-f7326128b848e798922ccba07eeb4c5f51ca8ce0.tar.gz | |
android-tools: add libcap dependency and fix build on big endian systems
* add dependency on libcap to fix:
android-tools/5.1.1.r37-r0/git/system/core/adb/adb.c:39:28: fatal error: sys/capability.h: No such file or directory
#include <sys/capability.h>
^
* add patch from buildroot to fix build with newer glibc and on
bit-endian systems
android-tools/5.1.1.r37-r0/git/system/core/adb/usb_linux_client.c:38:25: error: initializer element is not constant
#define cpu_to_le32(x) htole32(x)
^
* and also disable thumb to fix:
http://errors.yoctoproject.org/Errors/Details/133881/
* drop default apply=yes for the .patch files
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb')
| -rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index a9e7d5d828..f39a82ccc6 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378 \ file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ " -DEPENDS = "libbsd libpcre openssl zlib" +DEPENDS = "libbsd libpcre openssl zlib libcap" ANDROID_TAG = "android-5.1.1_r37" ANDROID_MIRROR = "android.googlesource.com" @@ -23,14 +23,15 @@ SRC_URI = " \ git://${LIBHARDWARE_REPO};name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware;tag=${ANDROID_TAG} \ git://${LIBSELINUX_REPO};name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux;tag=${ANDROID_TAG} \ git://${BUILD_REPO};name=build;protocol=https;nobranch=1;destsuffix=git/build;tag=${ANDROID_TAG} \ - file://remove-selinux-android.patch;apply=yes \ - file://use-capability.patch;apply=yes \ - file://use-local-socket.patch;apply=yes \ - file://preserve-ownership.patch;apply=yes \ - file://mkbootimg-Add-dt-parameter-to-specify-DT-image.patch;apply=yes \ - file://remove-bionic-android.patch;apply=yes \ - file://define-shell-command.patch;apply=yes \ - file://implicit-declaration-function-strlcat-strlcopy.patch;apply=yes \ + file://remove-selinux-android.patch \ + file://use-capability.patch \ + file://use-local-socket.patch \ + file://preserve-ownership.patch \ + file://mkbootimg-Add-dt-parameter-to-specify-DT-image.patch \ + file://remove-bionic-android.patch \ + file://define-shell-command.patch \ + file://implicit-declaration-function-strlcat-strlcopy.patch \ + file://fix-big-endian-build.patch \ file://android-tools-adbd.service \ file://.gitignore;subdir=git \ file://adb.mk;subdir=${BPN} \ @@ -43,6 +44,10 @@ SRC_URI = " \ S = "${WORKDIR}/git" B = "${WORKDIR}/${BPN}" +# http://errors.yoctoproject.org/Errors/Details/133881/ +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + inherit systemd SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" |