diff options
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/multi-kernel.inc | 7 | ||||
-rw-r--r-- | recipes-kernel/linux/setup-defconfig.inc | 20 |
2 files changed, 13 insertions, 14 deletions
diff --git a/recipes-kernel/linux/multi-kernel.inc b/recipes-kernel/linux/multi-kernel.inc index b3358f95..5d21d4ec 100644 --- a/recipes-kernel/linux/multi-kernel.inc +++ b/recipes-kernel/linux/multi-kernel.inc | |||
@@ -54,7 +54,7 @@ do_compileconfigs () { | |||
54 | 54 | ||
55 | for configname in ${WORKDIR}/configs/* ; do | 55 | for configname in ${WORKDIR}/configs/* ; do |
56 | # Copy in alternative config | 56 | # Copy in alternative config |
57 | cd ${S} | 57 | cd ${B} |
58 | cp $configname ${WORKDIR}/defconfig | 58 | cp $configname ${WORKDIR}/defconfig |
59 | 59 | ||
60 | # Build and Install this alternative kernel | 60 | # Build and Install this alternative kernel |
@@ -96,7 +96,7 @@ do_compileconfigs () { | |||
96 | 96 | ||
97 | # Restore the regular 'defconfig' | 97 | # Restore the regular 'defconfig' |
98 | cp ${WORKDIR}/defconfig.save ${WORKDIR}/defconfig | 98 | cp ${WORKDIR}/defconfig.save ${WORKDIR}/defconfig |
99 | cd ${S} | 99 | cd ${B} |
100 | do_configure | 100 | do_configure |
101 | fi | 101 | fi |
102 | } | 102 | } |
@@ -106,8 +106,7 @@ do_deploy_append () { | |||
106 | install -d ${DEPLOYDIR} | 106 | install -d ${DEPLOYDIR} |
107 | 107 | ||
108 | # Drop the regular defconfig along side the others for consistency | 108 | # Drop the regular defconfig along side the others for consistency |
109 | cd ${S} | 109 | cp ${B}/.config ${DEPLOYDIR}/config-${PV}-${PR}-${MACHINE}.config |
110 | cp .config ${DEPLOYDIR}/config-${PV}-${PR}-${MACHINE}.config | ||
111 | 110 | ||
112 | # add symlink | 111 | # add symlink |
113 | cd ${DEPLOYDIR} | 112 | cd ${DEPLOYDIR} |
diff --git a/recipes-kernel/linux/setup-defconfig.inc b/recipes-kernel/linux/setup-defconfig.inc index 2c169cd2..2b67bfc8 100644 --- a/recipes-kernel/linux/setup-defconfig.inc +++ b/recipes-kernel/linux/setup-defconfig.inc | |||
@@ -11,27 +11,27 @@ do_configure() { | |||
11 | # Always copy the defconfig file to .config to keep consistency | 11 | # Always copy the defconfig file to .config to keep consistency |
12 | # between the case where there is a real config and the in kernel | 12 | # between the case where there is a real config and the in kernel |
13 | # tree config | 13 | # tree config |
14 | cp ${WORKDIR}/defconfig ${S}/.config | 14 | cp ${WORKDIR}/defconfig ${B}/.config |
15 | 15 | ||
16 | echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion | 16 | echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion |
17 | echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion | 17 | echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion |
18 | 18 | ||
19 | # First, check if pointing to a combined config with config fragments | 19 | # First, check if pointing to a combined config with config fragments |
20 | config=`cat ${S}/.config | grep use-combined-config | cut -d= -f2` | 20 | config=`cat ${B}/.config | grep use-combined-config | cut -d= -f2` |
21 | if [ -n "$config" ] | 21 | if [ -n "$config" ] |
22 | then | 22 | then |
23 | cp $config ${S}/.config | 23 | cp ${S}/$config ${B}/.config |
24 | fi | 24 | fi |
25 | 25 | ||
26 | # Second, extract any config fragments listed in the defconfig | 26 | # Second, extract any config fragments listed in the defconfig |
27 | config=`cat ${S}/.config | grep config-fragment | cut -d= -f2` | 27 | config=`cat ${B}/.config | grep config-fragment | cut -d= -f2` |
28 | if [ -n "$config" ] | 28 | if [ -n "$config" ] |
29 | then | 29 | then |
30 | configfrags="" | 30 | configfrags="" |
31 | for f in $config | 31 | for f in $config |
32 | do | 32 | do |
33 | # Check if the config fragment is available | 33 | # Check if the config fragment is available |
34 | if [ ! -e "$f" ] | 34 | if [ ! -e "${S}/$f" ] |
35 | then | 35 | then |
36 | echo "Could not find kernel config fragment $f" | 36 | echo "Could not find kernel config fragment $f" |
37 | exit 1 | 37 | exit 1 |
@@ -43,12 +43,12 @@ do_configure() { | |||
43 | fi | 43 | fi |
44 | 44 | ||
45 | # Third, check if pointing to a known in kernel defconfig | 45 | # Third, check if pointing to a known in kernel defconfig |
46 | config=`cat ${S}/.config | grep use-kernel-config | cut -d= -f2` | 46 | config=`cat ${B}/.config | grep use-kernel-config | cut -d= -f2` |
47 | if [ -n "$config" ] | 47 | if [ -n "$config" ] |
48 | then | 48 | then |
49 | oe_runmake $config | 49 | oe_runmake -C ${S} O=${B} $config |
50 | else | 50 | else |
51 | yes '' | oe_runmake oldconfig | 51 | yes '' | oe_runmake -C ${S} O=${B} oldconfig |
52 | fi | 52 | fi |
53 | 53 | ||
54 | # Fourth, handle config fragments specified in the recipe | 54 | # Fourth, handle config fragments specified in the recipe |
@@ -70,7 +70,7 @@ do_configure() { | |||
70 | # Now that all the fragments are located merge them | 70 | # Now that all the fragments are located merge them |
71 | if [ -n "${KERNEL_CONFIG_FRAGMENTS}" -o -n "$configfrags" ] | 71 | if [ -n "${KERNEL_CONFIG_FRAGMENTS}" -o -n "$configfrags" ] |
72 | then | 72 | then |
73 | ( cd ${WORKDIR} && ${S}/scripts/kconfig/merge_config.sh -m -r -O ${S} ${S}/.config $configfrags ${KERNEL_CONFIG_FRAGMENTS} 1>&2 ) | 73 | ( cd ${WORKDIR} && ${S}/scripts/kconfig/merge_config.sh -m -r -O ${B} ${B}/.config $configfrags ${KERNEL_CONFIG_FRAGMENTS} 1>&2 ) |
74 | yes '' | oe_runmake oldconfig | 74 | yes '' | oe_runmake -C ${S} O=${B} oldconfig |
75 | fi | 75 | fi |
76 | } | 76 | } |