diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | |
parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
download | meta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz |
Convert to new override syntax
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
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 | 30 |
1 files changed, 15 insertions, 15 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 fc91e13a5..7e8b03c43 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 | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ | 8 | file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ |
9 | " | 9 | " |
10 | DEPENDS = "libbsd libpcre zlib libcap" | 10 | DEPENDS = "libbsd libpcre zlib libcap" |
11 | DEPENDS_append_class-target = " openssl" | 11 | DEPENDS:append:class-target = " openssl" |
12 | 12 | ||
13 | ANDROID_MIRROR = "android.googlesource.com" | 13 | ANDROID_MIRROR = "android.googlesource.com" |
14 | 14 | ||
@@ -58,27 +58,27 @@ S = "${WORKDIR}/git" | |||
58 | B = "${WORKDIR}/${BPN}" | 58 | B = "${WORKDIR}/${BPN}" |
59 | 59 | ||
60 | # http://errors.yoctoproject.org/Errors/Details/133881/ | 60 | # http://errors.yoctoproject.org/Errors/Details/133881/ |
61 | ARM_INSTRUCTION_SET_armv4 = "arm" | 61 | ARM_INSTRUCTION_SET:armv4 = "arm" |
62 | ARM_INSTRUCTION_SET_armv5 = "arm" | 62 | ARM_INSTRUCTION_SET:armv5 = "arm" |
63 | 63 | ||
64 | COMPATIBLE_HOST_powerpc = "(null)" | 64 | COMPATIBLE_HOST:powerpc = "(null)" |
65 | COMPATIBLE_HOST_powerpc64 = "(null)" | 65 | COMPATIBLE_HOST:powerpc64 = "(null)" |
66 | COMPATIBLE_HOST_powerpc64le = "(null)" | 66 | COMPATIBLE_HOST:powerpc64le = "(null)" |
67 | 67 | ||
68 | inherit systemd | 68 | inherit systemd |
69 | 69 | ||
70 | SYSTEMD_PACKAGES = "${PN}-adbd" | 70 | SYSTEMD_PACKAGES = "${PN}-adbd" |
71 | SYSTEMD_SERVICE_${PN}-adbd = "android-tools-adbd.service" | 71 | SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service" |
72 | 72 | ||
73 | # Find libbsd headers during native builds | 73 | # Find libbsd headers during native builds |
74 | CC_append_class-native = " -I${STAGING_INCDIR}" | 74 | CC:append:class-native = " -I${STAGING_INCDIR}" |
75 | CC_append_class-nativesdk = " -I${STAGING_INCDIR}" | 75 | CC:append:class-nativesdk = " -I${STAGING_INCDIR}" |
76 | 76 | ||
77 | TOOLS = "adb fastboot ext4_utils mkbootimg adbd" | 77 | TOOLS = "adb fastboot ext4_utils mkbootimg adbd" |
78 | 78 | ||
79 | # Adb needs sys/capability.h, which is not available for native* | 79 | # Adb needs sys/capability.h, which is not available for native* |
80 | TOOLS_class-native = "fastboot ext4_utils mkbootimg" | 80 | TOOLS:class-native = "fastboot ext4_utils mkbootimg" |
81 | TOOLS_class-nativesdk = "fastboot ext4_utils mkbootimg" | 81 | TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" |
82 | 82 | ||
83 | do_compile() { | 83 | do_compile() { |
84 | cp ${WORKDIR}/gitignore ${S}/.gitignore | 84 | cp ${WORKDIR}/gitignore ${S}/.gitignore |
@@ -160,15 +160,15 @@ do_install() { | |||
160 | 160 | ||
161 | PACKAGES =+ "${PN}-fstools ${PN}-adbd" | 161 | PACKAGES =+ "${PN}-fstools ${PN}-adbd" |
162 | 162 | ||
163 | RDEPENDS_${PN}-adbd = "${PN}-conf" | 163 | RDEPENDS:${PN}-adbd = "${PN}-conf" |
164 | RDEPENDS_${PN}-fstools = "bash" | 164 | RDEPENDS:${PN}-fstools = "bash" |
165 | 165 | ||
166 | FILES_${PN}-adbd = "\ | 166 | FILES:${PN}-adbd = "\ |
167 | ${bindir}/adbd \ | 167 | ${bindir}/adbd \ |
168 | ${systemd_unitdir}/system/android-tools-adbd.service \ | 168 | ${systemd_unitdir}/system/android-tools-adbd.service \ |
169 | " | 169 | " |
170 | 170 | ||
171 | FILES_${PN}-fstools = "\ | 171 | FILES:${PN}-fstools = "\ |
172 | ${bindir}/ext2simg \ | 172 | ${bindir}/ext2simg \ |
173 | ${bindir}/ext4fixup \ | 173 | ${bindir}/ext4fixup \ |
174 | ${bindir}/img2simg \ | 174 | ${bindir}/img2simg \ |