From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Qx2Ki-0006Y4-Hb for openembedded-core@lists.openembedded.org; Fri, 26 Aug 2011 21:44:52 +0200 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 26 Aug 2011 12:39:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,286,1312182000"; d="scan'208";a="45450560" Received: from unknown (HELO swold-MOBL.bigsur.com) ([10.255.13.251]) by fmsmga001.fm.intel.com with ESMTP; 26 Aug 2011 12:39:58 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Fri, 26 Aug 2011 12:39:51 -0700 Message-Id: X-Mailer: git-send-email 1.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [CONSOLIDATED PULL 21/21] kernel.bbclass: Find the kernel consistently. X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Aug 2011 19:44:53 -0000 From: Mike Crowe Use KERNEL_OUTPUT variable to find the generated kernel image rather than duplicating the existing path. This also means it can be overridden simply. Signed-off-by: Mike Crowe --- meta/classes/kernel.bbclass | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 229679c..bc1baa0 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -471,9 +471,9 @@ python populate_packages_prepend () { # with a fixed length or there is a limit in transferring the kernel to memory do_sizecheck() { if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then - size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` + size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'` if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then - rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} + rm ${KERNEL_OUTPUT} die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular." fi fi @@ -487,7 +487,7 @@ KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" kernel_do_deploy() { - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin + install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib fi -- 1.7.6