From 379a44a8914b5792ae8ef17b7a151da7602588c3 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 7 Mar 2014 15:13:18 +0100
Subject: [PATCH] meta-digi-arm: simplify linux-dey recipe

linux-dey.inc is a copy of meta-fsl-arm's linux-imx recipe file, so
instead of copying the whole recipe just use that (including the file)
and code the differences.

While on it, add RDEPENDS_kernel-base="" to remove the dependence of the
rootfs image recipes on the linux image. We don't need/use the kernel
image in the rootfs as we load it from a different partition. This makes
rootfs images a bit smaller.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../recipes-kernel/linux/linux-dey.inc        | 72 ++-----------------
 1 file changed, 6 insertions(+), 66 deletions(-)

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index 07b7eb9cb..bbd086ec2 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -1,21 +1,8 @@
 # Copyright (C) 2013 Digi International
-# Copyright (C) 2012 O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
 
-DESCRIPTION = "Linux kernel for Digi's imx based platforms"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+require recipes-kernel/linux/linux-imx.inc
 
-INC_PR = "r0"
-
-inherit kernel
-
-# Put a local version until we have a true SRCREV to point to
 LOCALVERSION ?= "+dey"
-SCMVERSION ?= "y"
-
-# Add imx-test support hacks
-IMX_TEST_SUPPORT ?= "y"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"
 SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${KBRANCH}"
@@ -25,66 +12,19 @@ SRC_URI = " \
     ${KERNEL_CFG_FRAGS} \
 "
 
-S = "${WORKDIR}/git"
-
-# We need to pass it as param since kernel might support more then one
-# machine, with different entry points
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-FILES_kernel-image += "/boot/config*"
-
-kernel_conf_variable() {
-	CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
-	if test "$2" = "n"
-	then
-		echo "# CONFIG_$1 is not set" >> ${S}/.config
-	else
-		echo "CONFIG_$1=$2" >> ${S}/.config
-	fi
-}
-
-do_configure_prepend() {
-	echo "" > ${S}/.config
-	CONF_SED_SCRIPT=""
-
-	kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\""
-	kernel_conf_variable LOCALVERSION_AUTO y
-
-	sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config'
-
+do_configure() {
 	for i in $(echo ${WORKDIR}/*.cfg); do
 		[ "${i}" = "${WORKDIR}/*.cfg" ] && continue
 		cat ${i} >> '${S}/.config'
 	done
-
-	if [ "${SCMVERSION}" = "y" ]; then
-		# Add GIT revision to the local version
-		head=`git rev-parse --verify --short HEAD 2> /dev/null`
-		printf "%s%s" +g $head > ${S}/.scmversion
-	fi
+	kernel_do_configure
 }
 
 do_deploy_append() {
 	(cd ${DEPLOYDIR} && ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME})
 }
 
-# install nedded headers for imx-test compilation
-do_install_append() {
-	if [ "${IMX_TEST_SUPPORT}" = "y" ]; then
-		# bounds.h may be used by a module and is currently missing
-		if [ -d include/generated ]; then
-			cp -r include/generated/* $kerneldir/include/generated/
-		fi
+FILES_kernel-image += "/boot/config-${KERNEL_VERSION}"
 
-		# Host architecture object file
-		rm -f $kerneldir/scripts/kconfig/kxgettext.o
-	fi
-}
-
-sysroot_stage_all_append() {
-	# Copy native binaries need for imx-test build onto sysroot
-	mkdir -p ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}/scripts/basic \
-	         ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}/scripts/mod
-	cp ${S}/scripts/basic/fixdep ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}/scripts/basic
-	cp ${S}/scripts/mod/modpost ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}/scripts/mod
-}
+# Don't include kernels in standard images
+RDEPENDS_kernel-base = ""