diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-05-13 14:16:55 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-05-23 08:44:44 -0700 |
commit | ffc64e9c6fee0af7eea3466135416d011172a5e6 (patch) | |
tree | b9effa069d9af3c63d6f3a41caff6b887450522c /meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | |
parent | a90f89dbc7eff2ae83bab6a6676f4737c0b48a8d (diff) | |
download | meta-openembedded-ffc64e9c6fee0af7eea3466135416d011172a5e6.tar.gz |
recipes: Start WORKDIR -> UNPACKDIR transition
Replace references of WORKDIR with UNPACKDIR where it makes sense to do
so in preparation for changing the default value of UNPACKDIR.
Signed-off-by: Khem Raj <raj.khem@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 | 6 |
1 files changed, 3 insertions, 3 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 1c66ea499..6343256d3 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 | |||
@@ -88,7 +88,7 @@ TOOLS:class-native = "fastboot ext4_utils mkbootimg" | |||
88 | TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" | 88 | TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" |
89 | 89 | ||
90 | do_compile() { | 90 | do_compile() { |
91 | cp ${WORKDIR}/gitignore ${S}/.gitignore | 91 | cp ${UNPACKDIR}/gitignore ${S}/.gitignore |
92 | 92 | ||
93 | # Setting both variables below causing our makefiles to not work with | 93 | # Setting both variables below causing our makefiles to not work with |
94 | # implicit make rules | 94 | # implicit make rules |
@@ -123,7 +123,7 @@ do_compile() { | |||
123 | 123 | ||
124 | for tool in ${TOOLS}; do | 124 | for tool in ${TOOLS}; do |
125 | mkdir -p ${B}/${tool} | 125 | mkdir -p ${B}/${tool} |
126 | oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool} | 126 | oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool} |
127 | done | 127 | done |
128 | } | 128 | } |
129 | 129 | ||
@@ -151,7 +151,7 @@ do_install() { | |||
151 | fi | 151 | fi |
152 | 152 | ||
153 | # Outside the if statement to avoid errors during do_package | 153 | # Outside the if statement to avoid errors during do_package |
154 | install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ | 154 | install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \ |
155 | ${D}${systemd_unitdir}/system/android-tools-adbd.service | 155 | ${D}${systemd_unitdir}/system/android-tools-adbd.service |
156 | 156 | ||
157 | if echo ${TOOLS} | grep -q "fastboot" ; then | 157 | if echo ${TOOLS} | grep -q "fastboot" ; then |