diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2018-08-19 22:16:00 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-21 14:49:42 +0100 |
| commit | f09947586c5c2c05368651838fea970808ab161d (patch) | |
| tree | 30ba4b362c6ff6abeccb2527dcc494540b8c87d1 /meta/classes/kernel-devicetree.bbclass | |
| parent | d0a8532abbd86841f50d36407b5f4f8a84285bcd (diff) | |
| download | poky-f09947586c5c2c05368651838fea970808ab161d.tar.gz | |
kernel*.bbclass: rename *_SYMLINK_NAME variables to *_LINK_NAME and *_BASE_NAME to *_NAME
* for consistency with IMAGE_NAME and IMAGE_LINK_NAME
and to avoid confusion with IMAGE_BASENAME (which is the
actual name of the artifact, e.g. PN while KERNEL_IMAGE_BASE_NAME
was only the version suffix)
(From OE-Core rev: f952c8e08b4798aa0f8bf764cfd70bda0eae9b8b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-devicetree.bbclass')
| -rw-r--r-- | meta/classes/kernel-devicetree.bbclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index 9c5e125981..867b776aa7 100644 --- a/meta/classes/kernel-devicetree.bbclass +++ b/meta/classes/kernel-devicetree.bbclass | |||
| @@ -72,22 +72,22 @@ do_deploy_append() { | |||
| 72 | dtb_ext=${dtb##*.} | 72 | dtb_ext=${dtb##*.} |
| 73 | dtb_base_name=`basename $dtb .$dtb_ext` | 73 | dtb_base_name=`basename $dtb .$dtb_ext` |
| 74 | install -d ${DEPLOYDIR} | 74 | install -d ${DEPLOYDIR} |
| 75 | install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext | 75 | install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext |
| 76 | ln -sf $dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name.$dtb_ext | 76 | ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name.$dtb_ext |
| 77 | ln -sf $dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_SYMLINK_NAME}.$dtb_ext | 77 | ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext |
| 78 | for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do | 78 | for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do |
| 79 | if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then | 79 | if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then |
| 80 | cat ${D}/${KERNEL_IMAGEDEST}/$type \ | 80 | cat ${D}/${KERNEL_IMAGEDEST}/$type \ |
| 81 | ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext \ | 81 | ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ |
| 82 | > ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext.bin | 82 | > ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin |
| 83 | ln -sf $type-$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext.bin \ | 83 | ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \ |
| 84 | ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_SYMLINK_NAME}.$dtb_ext.bin | 84 | ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin |
| 85 | if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then | 85 | if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then |
| 86 | cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \ | 86 | cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \ |
| 87 | ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext | 87 | ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext |
| 88 | > ${DEPLOYDIR}/${type}-${INITRAMFS_BASE_NAME}-$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext.bin | 88 | > ${DEPLOYDIR}/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin |
| 89 | ln -sf ${type}-${INITRAMFS_BASE_NAME}-$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext.bin \ | 89 | ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \ |
| 90 | ${DEPLOYDIR}/${type}-${INITRAMFS_BASE_NAME}-$dtb_base_name-${KERNEL_DTB_SYMLINK_NAME}.$dtb_ext.bin | 90 | ${DEPLOYDIR}/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin |
| 91 | fi | 91 | fi |
| 92 | fi | 92 | fi |
| 93 | done | 93 | done |