diff options
-rw-r--r-- | meta/classes/kernel.bbclass | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 7ce64fd19f..0045cec819 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -229,8 +229,6 @@ copy_initramfs() { | |||
229 | echo "Finished copy of initramfs into ./usr" | 229 | echo "Finished copy of initramfs into ./usr" |
230 | } | 230 | } |
231 | 231 | ||
232 | INITRAMFS_BASE_NAME ?= "initramfs-${PV}-${PR}-${MACHINE}-${DATETIME}" | ||
233 | INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME" | ||
234 | do_bundle_initramfs () { | 232 | do_bundle_initramfs () { |
235 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then | 233 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then |
236 | echo "Creating a kernel image with a bundled initramfs..." | 234 | echo "Creating a kernel image with a bundled initramfs..." |
@@ -673,6 +671,10 @@ MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" | |||
673 | MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" | 671 | MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" |
674 | MODULE_TARBALL_DEPLOY ?= "1" | 672 | MODULE_TARBALL_DEPLOY ?= "1" |
675 | 673 | ||
674 | INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" | ||
675 | INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME" | ||
676 | INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" | ||
677 | |||
676 | kernel_do_deploy() { | 678 | kernel_do_deploy() { |
677 | deployDir="${DEPLOYDIR}" | 679 | deployDir="${DEPLOYDIR}" |
678 | if [ -n "${KERNEL_DEPLOYSUBDIR}" ]; then | 680 | if [ -n "${KERNEL_DEPLOYSUBDIR}" ]; then |
@@ -697,17 +699,14 @@ kernel_do_deploy() { | |||
697 | ln -sf ${base_name}.bin $deployDir/${type} | 699 | ln -sf ${base_name}.bin $deployDir/${type} |
698 | done | 700 | done |
699 | 701 | ||
700 | cd ${B} | 702 | if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then |
701 | # Update deploy directory | 703 | for type in ${KERNEL_IMAGETYPES} ; do |
702 | for type in ${KERNEL_IMAGETYPES} ; do | ||
703 | if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then | ||
704 | echo "Copying deploy ${type} kernel-initramfs image and setting up links..." | ||
705 | initramfs_base_name=${type}-${INITRAMFS_BASE_NAME} | 704 | initramfs_base_name=${type}-${INITRAMFS_BASE_NAME} |
706 | initramfs_symlink_name=${type}-initramfs-${MACHINE} | 705 | initramfs_symlink_name=${type}-${INITRAMFS_SYMLINK_NAME} |
707 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin | 706 | install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin |
708 | ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin | 707 | ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin |
709 | fi | 708 | done |
710 | done | 709 | fi |
711 | } | 710 | } |
712 | do_deploy[cleandirs] = "${DEPLOYDIR}" | 711 | do_deploy[cleandirs] = "${DEPLOYDIR}" |
713 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" | 712 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" |