[oe-commits] org.oe.dev classes/kernel.bbclass: Remove usage of non-standard variables (DEPLOY_TO) and random renaming of output.

[rpurdie commit]

classes/kernel.bbclass: Remove usage of non-standard variables (DEPLOY_TO) and random renaming of output.

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d2dfc84f7aacc1b87f823bac71acd1b0feeede23
ViewMTN: http://monotone.openembedded.org/revision/info/d2dfc84f7aacc1b87f823bac71acd1b0feeede23
Files:
1
classes/kernel.bbclass
Diffs:

#
# mt diff -r1d82d7da50c81b71f828d13440271b55c50713f5 -rd2dfc84f7aacc1b87f823bac71acd1b0feeede23
#
# 
# 
# patch "classes/kernel.bbclass"
#  from [6eb314eeb40f044c37be9df698f02b9c149aa6f8]
#    to [3aa638c9a8de8e90342e08b530a40c8c2f120497]
# 
============================================================
--- classes/kernel.bbclass	6eb314eeb40f044c37be9df698f02b9c149aa6f8
+++ classes/kernel.bbclass	3aa638c9a8de8e90342e08b530a40c8c2f120497
@@ -65,21 +65,21 @@ kernel_do_compile() {
 	fi
 }
 
+INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}"
+INITRAMFS_IMAGE_TARGET ?= "initramfs-image"
+
 do_builtin_initramfs() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-	cp "${INITRAMFS_LOC}" usr/initramfs_data.cpio.gz
+	cp "${DEPLOY_DIR_IMAME}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz
 	oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 	install -d ${DEPLOY_DIR_IMAGE}
-	mv ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.no-initramfs.bin
-	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-initramfs.bin
 	# Make sure to kill injected initramfs, in case someone will do "-c compile -f"
 	rm usr/initramfs_data.cpio.gz
-
-	[ -n "${DEPLOY_TO}" ] && install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_TO}
 }
 addtask builtin_initramfs after do_compile
-# As it accepts external parameter(s), better make it unstamped
 do_builtin_initramfs[nostamp] = "1"
+do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs"
 
 kernel_do_stage() {
 	ASMDIR=`readlink include/asm`