diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/android-tools')
5 files changed, 22 insertions, 22 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup index 517227d4a..f27d77df5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup @@ -6,7 +6,7 @@ cd /sys/kernel/config/usb_gadget cd adb -echo "" > UDC || true +echo -n "" > UDC || true killall adbd || true diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup index e44d1bacb..dbd711515 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup @@ -23,8 +23,8 @@ mkdir configs/c.1 mkdir functions/ffs.usb0 mkdir strings/0x409 mkdir configs/c.1/strings/0x409 -echo 0x18d1 > idVendor -echo 0xd002 > idProduct +echo -n 0x18d1 > idVendor +echo -n 0xd002 > idProduct echo "$serial" > strings/0x409/serialnumber echo "$manufacturer" > strings/0x409/manufacturer echo "$model" > strings/0x409/product diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start index ca6c3df27..d67878fef 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start @@ -4,4 +4,4 @@ set -e sleep 3 -ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC +ls /sys/class/udc/ | xargs echo -n > /sys/kernel/config/usb_gadget/adb/UDC diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb index 01dc1bea9..3f9d49a2d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb @@ -27,9 +27,9 @@ do_install() { install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d } -FILES_${PN} += " \ +FILES:${PN} += " \ ${systemd_unitdir}/system/ \ " PROVIDES += "android-tools-conf" -RPROVIDES_${PN} = "android-tools-conf" +RPROVIDES:${PN} = "android-tools-conf" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index e8992346b..7e8b03c43 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ " DEPENDS = "libbsd libpcre zlib libcap" -DEPENDS_append_class-target = " openssl" +DEPENDS:append:class-target = " openssl" ANDROID_MIRROR = "android.googlesource.com" @@ -58,27 +58,27 @@ S = "${WORKDIR}/git" B = "${WORKDIR}/${BPN}" # http://errors.yoctoproject.org/Errors/Details/133881/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" -COMPATIBLE_HOST_powerpc = "(null)" -COMPATIBLE_HOST_powerpc64 = "(null)" -COMPATIBLE_HOST_powerpc64le = "(null)" +COMPATIBLE_HOST:powerpc = "(null)" +COMPATIBLE_HOST:powerpc64 = "(null)" +COMPATIBLE_HOST:powerpc64le = "(null)" inherit systemd SYSTEMD_PACKAGES = "${PN}-adbd" -SYSTEMD_SERVICE_${PN}-adbd = "android-tools-adbd.service" +SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service" # Find libbsd headers during native builds -CC_append_class-native = " -I${STAGING_INCDIR}" -CC_append_class-nativesdk = " -I${STAGING_INCDIR}" +CC:append:class-native = " -I${STAGING_INCDIR}" +CC:append:class-nativesdk = " -I${STAGING_INCDIR}" TOOLS = "adb fastboot ext4_utils mkbootimg adbd" # Adb needs sys/capability.h, which is not available for native* -TOOLS_class-native = "fastboot ext4_utils mkbootimg" -TOOLS_class-nativesdk = "fastboot ext4_utils mkbootimg" +TOOLS:class-native = "fastboot ext4_utils mkbootimg" +TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" do_compile() { cp ${WORKDIR}/gitignore ${S}/.gitignore @@ -133,7 +133,7 @@ do_install() { install -m0755 ${B}/ext4_utils/simg2simg ${D}${bindir} fi - if echo ${TOOLS} | grep -q "adb " ; then + if echo ${TOOLS} | grep -q "adb\>" ; then install -d ${D}${bindir} install -m0755 ${B}/adb/adb ${D}${bindir} fi @@ -160,15 +160,15 @@ do_install() { PACKAGES =+ "${PN}-fstools ${PN}-adbd" -RDEPENDS_${PN}-adbd = "${PN}-conf" -RDEPENDS_${PN}-fstools = "bash" +RDEPENDS:${PN}-adbd = "${PN}-conf" +RDEPENDS:${PN}-fstools = "bash" -FILES_${PN}-adbd = "\ +FILES:${PN}-adbd = "\ ${bindir}/adbd \ ${systemd_unitdir}/system/android-tools-adbd.service \ " -FILES_${PN}-fstools = "\ +FILES:${PN}-fstools = "\ ${bindir}/ext2simg \ ${bindir}/ext4fixup \ ${bindir}/img2simg \ |