aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2017-05-17 10:45:08 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2017-05-17 10:45:08 +0200
commitda63ca630845558e3e350bbf9ffb3de3091a4972 (patch)
treeb61ab62cb4ecdf7ca5bec0d6fcc922fac74238e2
parentcae7067fdaf1e18bf6cba7e914d6a9553d2f172b (diff)
downloadmeta-qcom-da63ca630845558e3e350bbf9ffb3de3091a4972.tar.gz
meta-qcom-da63ca630845558e3e350bbf9ffb3de3091a4972.tar.bz2
meta-qcom-da63ca630845558e3e350bbf9ffb3de3091a4972.zip
skales: install binary files in app specific folder
Avoid installing skales tools in $bindir, mostly because mkbootimg conflicts with mkbootimg from android-tools package. Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-rw-r--r--recipes-devtools/skales/skales_git.bb6
-rw-r--r--recipes-kernel/linux/linux-qcom-bootimg.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes-devtools/skales/skales_git.bb b/recipes-devtools/skales/skales_git.bb
index dfbefb3..71928e8 100644
--- a/recipes-devtools/skales/skales_git.bb
+++ b/recipes-devtools/skales/skales_git.bb
@@ -16,9 +16,9 @@ SRC_URI = "git://codeaurora.org/quic/kernel/skales"
S = "${WORKDIR}/git"
do_install () {
- install -d ${D}${bindir}
- install -m 0755 ${S}/mkbootimg ${D}${bindir}
- install -m 0755 ${S}/dtbTool ${D}${bindir}
+ install -d ${D}${bindir}/skales
+ install -m 0755 ${S}/mkbootimg ${D}${bindir}/skales
+ install -m 0755 ${S}/dtbTool ${D}${bindir}/skales
}
BBCLASSEXTEND = "native"
diff --git a/recipes-kernel/linux/linux-qcom-bootimg.inc b/recipes-kernel/linux/linux-qcom-bootimg.inc
index 6c9b41f..ab1065b 100644
--- a/recipes-kernel/linux/linux-qcom-bootimg.inc
+++ b/recipes-kernel/linux/linux-qcom-bootimg.inc
@@ -13,7 +13,7 @@ do_deploy_append() {
mkbootimg_dtarg=""
if [ "${QCOM_BOOTIMG_BUNDLE_DT}" = "1" ]; then
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${STAGING_LIBDIR_NATIVE}"
- dtbTool -o ${DEPLOYDIR}/${DT_IMAGE_BASE_NAME}.img -s ${QCOM_BOOTIMG_PAGE_SIZE} ${B}/arch/${ARCH}/boot/dts/qcom/
+ ${STAGING_BINDIR_NATIVE}/skales/dtbTool -o ${DEPLOYDIR}/${DT_IMAGE_BASE_NAME}.img -s ${QCOM_BOOTIMG_PAGE_SIZE} ${B}/arch/${ARCH}/boot/dts/qcom/
mkbootimg_dtarg="--dt ${DEPLOYDIR}/${DT_IMAGE_BASE_NAME}.img"
ln -sf ${DT_IMAGE_BASE_NAME}.img ${DEPLOYDIR}/${DT_IMAGE_SYMLINK_NAME}.img
fi
@@ -26,7 +26,7 @@ do_deploy_append() {
# during boot
echo "This is not an initrd" > ${B}/initrd.img
- mkbootimg --kernel ${B}/arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
+ ${STAGING_BINDIR_NATIVE}/skales/mkbootimg --kernel ${B}/arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
--ramdisk ${B}/initrd.img \
--output ${DEPLOYDIR}/${BOOT_IMAGE_BASE_NAME}.img \
$mkbootimg_dtarg \