From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 17 Feb 2008 13:56:40 +0000 (+0000)
Subject: classes/kernel.bbclass: Remove usage of non-standard variables (DEPLOY_TO) and random... 
X-Git-Tag: Release-2010-05/1~7653^2~54^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=456ba7ffd159821e86ad7ad4b66ec7d5790bd054;p=openembedded.git

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

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 28e04ea204..6c12004dad 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -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`