From 0d5eb3bf46ef6c1197fe69b1194af547aef85e99 Mon Sep 17 00:00:00 2001 From: Andrei Varvara Date: Wed, 25 Nov 2015 17:00:23 +0100 Subject: Moved config fragment path fix for linux-qoriq kernel relocated config fragment path fix for linux-qoriq kernel from meta-fsl-ppc to meta-enea-bsp-ppc Signed-off-by: Andrei Varvara Signed-off-by: George Nita --- recipes-kernel/linux/linux-qoriq_3.12.bbappend | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/recipes-kernel/linux/linux-qoriq_3.12.bbappend b/recipes-kernel/linux/linux-qoriq_3.12.bbappend index f9311e9..67afd97 100644 --- a/recipes-kernel/linux/linux-qoriq_3.12.bbappend +++ b/recipes-kernel/linux/linux-qoriq_3.12.bbappend @@ -1 +1,27 @@ require recipes-kernel/linux/linux-qoriq-common.inc + +do_configure_prepend() { + # copy desired defconfig so we pick it up for the real kernel_do_configure + cp ${KERNEL_DEFCONFIG} ${B}/.config + + # add config fragments + for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do + if [ -f "${WORKDIR}/${deltacfg}" ]; then + ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} + elif [ -f "${S}/arch/powerpc/configs/${deltacfg}" ]; then + ${S}/scripts/kconfig/merge_config.sh -m .config \ + ${S}/arch/powerpc/configs/${deltacfg} + fi + done + + #add git revision to the local version + if [ "${SCMVERSION}" = "y" ]; then + # append sdk version if SDK_VERSION is defined + sdkversion='' + if [ -n "${SDK_VERSION}" ]; then + sdkversion="-${SDK_VERSION}" + fi + head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` + printf "%s%s%s" $sdkversion +g $head > ${B}/.scmversion + fi +} -- cgit v1.2.3-54-g00ecf