From 486c7c091635b8bd7134fb796694bf472c3feed0 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Wed, 23 Dec 2015 21:01:22 +0800 Subject: linux-qoriq: replace tab with spaces Signed-off-by: Ting Liu Signed-off-by: Zhenhua Luo --- recipes-kernel/linux/linux-qoriq.inc | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index 30ab775..a4c28c7 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -19,28 +19,28 @@ KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" SCMVERSION ?= "y" DELTA_KERNEL_DEFCONFIG ?= "" 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 "${deltacfg}" ]; then - ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} - elif [ -f "${S}/arch/powerpc/configs/${deltacfg}" ]; then - ${S}/scripts/kconfig/merge_config.sh -m .config \ - ${S}/arch/powerpc/configs/${deltacfg} - fi - done - + # 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 "${deltacfg}" ]; then + ${S}/scripts/kconfig/merge_config.sh -m .config ${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 + # 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