On Fri, 2012-01-06 at 15:51 +0800, [email protected] wrote:
> From: Zhenhua Luo <[email protected]>
>
> DEPLOY_DIR_IMAGE is the images deploy folder - tmp/deploy/images
> DEPLOYDIR is the deploy folder of linux - deploy-linux-qoriq-sdk
>
> Signed-off-by: Zhenhua Luo <[email protected]>
> ---
> meta/recipes-kernel/linux/linux-dtb.inc | 30 +++++++++++++++++++++---------
> 1 files changed, 21 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-dtb.inc
> b/meta/recipes-kernel/linux/linux-dtb.inc
> index 7ec7584..f1bd2bf 100644
> --- a/meta/recipes-kernel/linux/linux-dtb.inc
> +++ b/meta/recipes-kernel/linux/linux-dtb.inc
> @@ -13,15 +13,27 @@ python __anonymous () {
> d.setVar("PACKAGES", "%s kernel-devicetree" % packages)
> }
>
> -do_install_append() {
> +kernel_do_deploy_append() {
> if test -n "${KERNEL_DEVICETREE}"; then
> - dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree
> ${KERNEL_DEVICETREE}
> - install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION}
> - install -d ${DEPLOY_DIR_IMAGE}
> - install -m 0644 devicetree
> ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb
> - cd ${DEPLOY_DIR_IMAGE}
> - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
> - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
> + for DTS_FILE in ${KERNEL_DEVICETREE}; do
> + DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
> + DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed
> "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed
> "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> + dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree
> ${DTS_FILE}
> + install -m 0644 devicetree
> ${D}/boot/devicetree-${DTS_BASE_NAME}-${KERNEL_VERSION}
> + install -d ${DEPLOY_DIR_IMAGE}
> + install -m 0644 devicetree ${DEPLOY_DIR_IMAGE}/${DTB_NAME}.dtb
> + rm -f devicetree
> + cd ${DEPLOY_DIR_IMAGE}
> + rm -f ${DTB_SYMLINK_NAME}.dtb
> + ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb
> + cd -
> +
> + install -d ${DEPLOYDIR}
> + install -m 0644 ${DEPLOY_DIR_IMAGE}/${DTB_NAME}.dtb
> ${DEPLOYDIR}/${DTB_NAME}.dtb
> + cd ${DEPLOYDIR}
> + ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb
> + cd -
> + done
>
This is close but its still not 100% right. If you put the files into
${DEPLOYDIR} (such as ${DEPLOYDIR}/${DTB_NAME}.dtb), the sstate code
itself will ensure it makes it to ${DEPLOY_DIR_IMAGE}/${DTB_NAME}.dtb.
You can therefore remove the last bit of duplication in this function,
don't touch ${DEPLOY_DIR_IMAGE} at all and the files will still appear
there, just like kernel_do_deploy() itself does.
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
