diff options
author | Andrei Varvara <andrei.varvara@enea.com> | 2015-11-25 17:00:23 +0100 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2015-11-25 17:18:19 +0100 |
commit | 0d5eb3bf46ef6c1197fe69b1194af547aef85e99 (patch) | |
tree | b555d7e16daf430e92b9cc7233bca4fb9c60154d | |
parent | dc78ea51a05eec3a9b54e6d398c65133ce4f8fa3 (diff) | |
download | meta-enea-bsp-ppc-0d5eb3bf46ef6c1197fe69b1194af547aef85e99.tar.gz |
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 <andrei.varvara@enea.com>
Signed-off-by: George Nita <george.nita@enea.com>
-rw-r--r-- | recipes-kernel/linux/linux-qoriq_3.12.bbappend | 26 |
1 files changed, 26 insertions, 0 deletions
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 @@ | |||
1 | require recipes-kernel/linux/linux-qoriq-common.inc | 1 | require recipes-kernel/linux/linux-qoriq-common.inc |
2 | |||
3 | do_configure_prepend() { | ||
4 | # copy desired defconfig so we pick it up for the real kernel_do_configure | ||
5 | cp ${KERNEL_DEFCONFIG} ${B}/.config | ||
6 | |||
7 | # add config fragments | ||
8 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do | ||
9 | if [ -f "${WORKDIR}/${deltacfg}" ]; then | ||
10 | ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} | ||
11 | elif [ -f "${S}/arch/powerpc/configs/${deltacfg}" ]; then | ||
12 | ${S}/scripts/kconfig/merge_config.sh -m .config \ | ||
13 | ${S}/arch/powerpc/configs/${deltacfg} | ||
14 | fi | ||
15 | done | ||
16 | |||
17 | #add git revision to the local version | ||
18 | if [ "${SCMVERSION}" = "y" ]; then | ||
19 | # append sdk version if SDK_VERSION is defined | ||
20 | sdkversion='' | ||
21 | if [ -n "${SDK_VERSION}" ]; then | ||
22 | sdkversion="-${SDK_VERSION}" | ||
23 | fi | ||
24 | head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` | ||
25 | printf "%s%s%s" $sdkversion +g $head > ${B}/.scmversion | ||
26 | fi | ||
27 | } | ||