summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-01 11:56:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-04 00:07:28 +0100
commit5f9889edb3bd3948285b3ffb9880c7b38f35e65b (patch)
treec6a36b6d3f4e73fbcc413e4ca689374fd17b4a3d /meta/classes
parent9cc449273252314fdc88cd62deb18a3e03d8abd5 (diff)
downloadpoky-5f9889edb3bd3948285b3ffb9880c7b38f35e65b.tar.gz
populate_sdk_base: Deploy images to SDKDEPLOYDIR
Changed deployment directory from DEPLOY_DIR_IMAGE to SDKDEPLOYDIR to make sstate machinery to do final deployment and generate manifest. (From OE-Core rev: 1c8c8d8a0e2c73b3bb8a9a222bf5e8aa9927e526) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/populate_sdk_base.bbclass20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 0a85a98d06..5f52660553 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -60,8 +60,8 @@ SDK_RELOCATE_AFTER_INSTALL ?= "1"
60SDKEXTPATH ?= "~/${@d.getVar('DISTRO', True)}_sdk" 60SDKEXTPATH ?= "~/${@d.getVar('DISTRO', True)}_sdk"
61SDK_TITLE ?= "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} SDK" 61SDK_TITLE ?= "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} SDK"
62 62
63SDK_TARGET_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest" 63SDK_TARGET_MANIFEST = "${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"
64SDK_HOST_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.host.manifest" 64SDK_HOST_MANIFEST = "${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"
65python write_target_sdk_manifest () { 65python write_target_sdk_manifest () {
66 from oe.sdk import sdk_list_installed_packages 66 from oe.sdk import sdk_list_installed_packages
67 from oe.utils import format_pkg_list 67 from oe.utils import format_pkg_list
@@ -182,14 +182,14 @@ SDKTAROPTS = "--owner=root --group=root"
182 182
183fakeroot tar_sdk() { 183fakeroot tar_sdk() {
184 # Package it up 184 # Package it up
185 mkdir -p ${SDK_DEPLOY} 185 mkdir -p ${SDKDEPLOYDIR}
186 cd ${SDK_OUTPUT}/${SDKPATH} 186 cd ${SDK_OUTPUT}/${SDKPATH}
187 tar ${SDKTAROPTS} -cf - . | pixz > ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz 187 tar ${SDKTAROPTS} -cf - . | pixz > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.xz
188} 188}
189 189
190fakeroot create_shar() { 190fakeroot create_shar() {
191 # copy in the template shar extractor script 191 # copy in the template shar extractor script
192 cp ${COREBASE}/meta/files/toolchain-shar-extract.sh ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh 192 cp ${COREBASE}/meta/files/toolchain-shar-extract.sh ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
193 193
194 rm -f ${T}/pre_install_command ${T}/post_install_command 194 rm -f ${T}/pre_install_command ${T}/post_install_command
195 195
@@ -205,7 +205,7 @@ ${SDK_POST_INSTALL_COMMAND}
205EOF 205EOF
206 sed -i -e '/@SDK_PRE_INSTALL_COMMAND@/r ${T}/pre_install_command' \ 206 sed -i -e '/@SDK_PRE_INSTALL_COMMAND@/r ${T}/pre_install_command' \
207 -e '/@SDK_POST_INSTALL_COMMAND@/r ${T}/post_install_command' \ 207 -e '/@SDK_POST_INSTALL_COMMAND@/r ${T}/post_install_command' \
208 ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh 208 ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
209 209
210 # substitute variables 210 # substitute variables
211 sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \ 211 sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \
@@ -217,16 +217,16 @@ EOF
217 -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ 217 -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \
218 -e '/@SDK_PRE_INSTALL_COMMAND@/d' \ 218 -e '/@SDK_PRE_INSTALL_COMMAND@/d' \
219 -e '/@SDK_POST_INSTALL_COMMAND@/d' \ 219 -e '/@SDK_POST_INSTALL_COMMAND@/d' \
220 ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh 220 ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
221 221
222 # add execution permission 222 # add execution permission
223 chmod +x ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh 223 chmod +x ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
224 224
225 # append the SDK tarball 225 # append the SDK tarball
226 cat ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz >> ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh 226 cat ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.xz >> ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
227 227
228 # delete the old tarball, we don't need it anymore 228 # delete the old tarball, we don't need it anymore
229 rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz 229 rm ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.xz
230} 230}
231 231
232populate_sdk_log_check() { 232populate_sdk_log_check() {