diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel-artifact-names.bbclass | 22 | ||||
-rw-r--r-- | meta/classes/kernel-devicetree.bbclass | 22 | ||||
-rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 16 | ||||
-rw-r--r-- | meta/classes/kernel.bbclass | 14 |
4 files changed, 37 insertions, 37 deletions
diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass index d235bc1096..56352d73b3 100644 --- a/meta/classes/kernel-artifact-names.bbclass +++ b/meta/classes/kernel-artifact-names.bbclass | |||
@@ -1,17 +1,17 @@ | |||
1 | KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" | 1 | KERNEL_IMAGE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
2 | KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" | 2 | KERNEL_IMAGE_LINK_NAME ?= "${MACHINE}" |
3 | 3 | ||
4 | KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" | 4 | KERNEL_DTB_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
5 | KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" | 5 | KERNEL_DTB_LINK_NAME ?= "${MACHINE}" |
6 | 6 | ||
7 | KERNEL_FIT_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" | 7 | KERNEL_FIT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
8 | KERNEL_FIT_SYMLINK_NAME ?= "${MACHINE}" | 8 | KERNEL_FIT_LINK_NAME ?= "${MACHINE}" |
9 | 9 | ||
10 | MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" | 10 | MODULE_IMAGE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
11 | 11 | ||
12 | MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" | 12 | MODULE_TARBALL_NAME ?= "${MODULE_IMAGE_NAME}.tgz" |
13 | MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" | 13 | MODULE_TARBALL_LINK_NAME ?= "modules-${MACHINE}.tgz" |
14 | MODULE_TARBALL_DEPLOY ?= "1" | 14 | MODULE_TARBALL_DEPLOY ?= "1" |
15 | 15 | ||
16 | INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" | 16 | INITRAMFS_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
17 | INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" | 17 | INITRAMFS_LINK_NAME ?= "initramfs-${MACHINE}" |
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 |
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index a99c9d8054..a4d7acae40 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
@@ -489,21 +489,21 @@ kernel_do_deploy_append() { | |||
489 | # Update deploy directory | 489 | # Update deploy directory |
490 | if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then | 490 | if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then |
491 | echo "Copying fit-image.its source file..." | 491 | echo "Copying fit-image.its source file..." |
492 | install -m 0644 ${B}/fit-image.its ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_BASE_NAME}.its | 492 | install -m 0644 ${B}/fit-image.its ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_NAME}.its |
493 | ln -snf fitImage-its-${KERNEL_FIT_BASE_NAME} ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_SYMLINK_NAME} | 493 | ln -snf fitImage-its-${KERNEL_FIT_NAME} ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_LINK_NAME} |
494 | 494 | ||
495 | echo "Copying linux.bin file..." | 495 | echo "Copying linux.bin file..." |
496 | install -m 0644 ${B}/linux.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_BASE_NAME}.bin | 496 | install -m 0644 ${B}/linux.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_NAME}.bin |
497 | ln -snf fitImage-linux.bin-${KERNEL_FIT_BASE_NAME}.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_SYMLINK_NAME} | 497 | ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME} |
498 | 498 | ||
499 | if [ -n "${INITRAMFS_IMAGE}" ]; then | 499 | if [ -n "${INITRAMFS_IMAGE}" ]; then |
500 | echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." | 500 | echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." |
501 | install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.its | 501 | install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its |
502 | ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_SYMLINK_NAME} | 502 | ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME} |
503 | 503 | ||
504 | echo "Copying fitImage-${INITRAMFS_IMAGE} file..." | 504 | echo "Copying fitImage-${INITRAMFS_IMAGE} file..." |
505 | install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.bin | 505 | install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin |
506 | ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.bin ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_SYMLINK_NAME} | 506 | ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME} |
507 | fi | 507 | fi |
508 | fi | 508 | fi |
509 | } | 509 | } |
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 42efa382ad..e47c063f5a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -667,26 +667,26 @@ kernel_do_deploy() { | |||
667 | fi | 667 | fi |
668 | 668 | ||
669 | for type in ${KERNEL_IMAGETYPES} ; do | 669 | for type in ${KERNEL_IMAGETYPES} ; do |
670 | base_name=${type}-${KERNEL_IMAGE_BASE_NAME} | 670 | base_name=${type}-${KERNEL_IMAGE_NAME} |
671 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin | 671 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin |
672 | done | 672 | done |
673 | if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then | 673 | if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then |
674 | mkdir -p ${D}/lib | 674 | mkdir -p ${D}/lib |
675 | tar -cvzf $deployDir/${MODULE_TARBALL_BASE_NAME} -C ${D} lib | 675 | tar -cvzf $deployDir/${MODULE_TARBALL_NAME} -C ${D} lib |
676 | ln -sf ${MODULE_TARBALL_BASE_NAME} $deployDir/${MODULE_TARBALL_SYMLINK_NAME} | 676 | ln -sf ${MODULE_TARBALL_NAME} $deployDir/${MODULE_TARBALL_LINK_NAME} |
677 | fi | 677 | fi |
678 | 678 | ||
679 | for type in ${KERNEL_IMAGETYPES} ; do | 679 | for type in ${KERNEL_IMAGETYPES} ; do |
680 | base_name=${type}-${KERNEL_IMAGE_BASE_NAME} | 680 | base_name=${type}-${KERNEL_IMAGE_NAME} |
681 | symlink_name=${type}-${KERNEL_IMAGE_SYMLINK_NAME} | 681 | symlink_name=${type}-${KERNEL_IMAGE_LINK_NAME} |
682 | ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin | 682 | ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin |
683 | ln -sf ${base_name}.bin $deployDir/${type} | 683 | ln -sf ${base_name}.bin $deployDir/${type} |
684 | done | 684 | done |
685 | 685 | ||
686 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then | 686 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then |
687 | for type in ${KERNEL_IMAGETYPES} ; do | 687 | for type in ${KERNEL_IMAGETYPES} ; do |
688 | initramfs_base_name=${type}-${INITRAMFS_BASE_NAME} | 688 | initramfs_base_name=${type}-${INITRAMFS_NAME} |
689 | initramfs_symlink_name=${type}-${INITRAMFS_SYMLINK_NAME} | 689 | initramfs_symlink_name=${type}-${INITRAMFS_LINK_NAME} |
690 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin | 690 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin |
691 | ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin | 691 | ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin |
692 | done | 692 | done |