mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-29 23:12:45 +00:00
Code Issues Projects Releases Wiki Activity

kernel .inc: fix the breakage due to S!=B separation in master

Browse Source 
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
This commit is contained in:
Denys Dmytriyenko
2015-02-28 01:49:37 +00:00
parent 4ce69eff28
commit 23d3e10a0f
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-kernel/linux/multi-kernel.inc
+3 -4
View File
@@ -54,7 +54,7 @@ do_compileconfigs () {
for configname in ${WORKDIR}/configs/* ; do for configname in ${WORKDIR}/configs/* ; do
# Copy in alternative config # Copy in alternative config
cd ${S} cd ${B}
cp $configname ${WORKDIR}/defconfig cp $configname ${WORKDIR}/defconfig
# Build and Install this alternative kernel # Build and Install this alternative kernel
@@ -96,7 +96,7 @@ do_compileconfigs () {
# Restore the regular 'defconfig' # Restore the regular 'defconfig'
cp ${WORKDIR}/defconfig.save ${WORKDIR}/defconfig cp ${WORKDIR}/defconfig.save ${WORKDIR}/defconfig
cd ${S} cd ${B}
do_configure do_configure
fi fi
} }
@@ -106,8 +106,7 @@ do_deploy_append () {
install -d ${DEPLOYDIR} install -d ${DEPLOYDIR}
# Drop the regular defconfig along side the others for consistency # Drop the regular defconfig along side the others for consistency
cd ${S} cp ${B}/.config ${DEPLOYDIR}/config-${PV}-${PR}-${MACHINE}.config
cp .config ${DEPLOYDIR}/config-${PV}-${PR}-${MACHINE}.config
# add symlink # add symlink
cd ${DEPLOYDIR} cd ${DEPLOYDIR}
recipes-kernel/linux/setup-defconfig.inc
+10 -10
View File
@@ -11,27 +11,27 @@ do_configure() {
# Always copy the defconfig file to .config to keep consistency # Always copy the defconfig file to .config to keep consistency
# between the case where there is a real config and the in kernel # between the case where there is a real config and the in kernel
# tree config # tree config
cp ${WORKDIR}/defconfig ${S}/.config cp ${WORKDIR}/defconfig ${B}/.config
echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
# First, check if pointing to a combined config with config fragments # First, check if pointing to a combined config with config fragments
config=`cat ${S}/.config | grep use-combined-config | cut -d= -f2` config=`cat ${B}/.config | grep use-combined-config | cut -d= -f2`
if [ -n "$config" ] if [ -n "$config" ]
then then
cp $config ${S}/.config cp ${S}/$config ${B}/.config
fi fi
# Second, extract any config fragments listed in the defconfig # Second, extract any config fragments listed in the defconfig
config=`cat ${S}/.config | grep config-fragment | cut -d= -f2` config=`cat ${B}/.config | grep config-fragment | cut -d= -f2`
if [ -n "$config" ] if [ -n "$config" ]
then then
configfrags="" configfrags=""
for f in $config for f in $config
do do
# Check if the config fragment is available # Check if the config fragment is available
if [ ! -e "$f" ] if [ ! -e "${S}/$f" ]
then then
echo "Could not find kernel config fragment $f" echo "Could not find kernel config fragment $f"
exit 1 exit 1
@@ -43,12 +43,12 @@ do_configure() {
fi fi
# Third, check if pointing to a known in kernel defconfig # Third, check if pointing to a known in kernel defconfig
config=`cat ${S}/.config | grep use-kernel-config | cut -d= -f2` config=`cat ${B}/.config | grep use-kernel-config | cut -d= -f2`
if [ -n "$config" ] if [ -n "$config" ]
then then
oe_runmake $config oe_runmake -C ${S} O=${B} $config
else else
yes '' | oe_runmake oldconfig yes '' | oe_runmake -C ${S} O=${B} oldconfig
fi fi
# Fourth, handle config fragments specified in the recipe # Fourth, handle config fragments specified in the recipe
@@ -70,7 +70,7 @@ do_configure() {
# Now that all the fragments are located merge them # Now that all the fragments are located merge them
if [ -n "${KERNEL_CONFIG_FRAGMENTS}" -o -n "$configfrags" ] if [ -n "${KERNEL_CONFIG_FRAGMENTS}" -o -n "$configfrags" ]
then then
( cd ${WORKDIR} && ${S}/scripts/kconfig/merge_config.sh -m -r -O ${S} ${S}/.config $configfrags ${KERNEL_CONFIG_FRAGMENTS} 1>&2 ) ( cd ${WORKDIR} && ${S}/scripts/kconfig/merge_config.sh -m -r -O ${B} ${B}/.config $configfrags ${KERNEL_CONFIG_FRAGMENTS} 1>&2 )
yes '' | oe_runmake oldconfig yes '' | oe_runmake -C ${S} O=${B} oldconfig
fi fi
} }