[meta-freescale] [meta-fsl-arm][PATCH 2/5] linux-imx.inc: Use the new fsl-kernel-localversion class
Otavio Salvador
otavio at ossystems.com.br
Sun Aug 31 15:32:54 PDT 2014
Change-Id: Ib571e17c250473b923b31837954942ca5bacb61b
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
recipes-kernel/linux/linux-imx.inc | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 47566b0..dd4540e 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -4,7 +4,7 @@
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-inherit kernel
+inherit kernel fsl-kernel-localversion
# Put a local version until we have a true SRCREV to point to
LOCALVERSION ?= "+yocto"
@@ -19,29 +19,3 @@ 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}"
-
-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'
-
- 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
-}
--
1.7.10.4
More information about the meta-freescale
mailing list