linux.inc: support building with B != S which is default now (resolves #79)

Based on fc7132ede2

Fixes following do_configure error
  | NOTE: make oldconfig
  | make: *** No rule to make target `oldconfig'.  Stop.
  | ERROR: oe_runmake failed

Signed-off-by: Kristof Robot <krirobo@gmail.com>
This commit is contained in:
Kristof Robot 2015-02-01 10:38:09 +01:00
parent 5b875e911c
commit 0181e67c41

View File

@ -25,15 +25,15 @@ kernel_configure_variable() {
CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
if test "$2" = "n" if test "$2" = "n"
then then
echo "# CONFIG_$1 is not set" >> ${S}/.config echo "# CONFIG_$1 is not set" >> ${B}/.config
else else
echo "CONFIG_$1=$2" >> ${S}/.config echo "CONFIG_$1=$2" >> ${B}/.config
fi fi
} }
do_configure_prepend() { do_configure_prepend() {
# Clean .config # Clean .config
echo "" > ${S}/.config echo "" > ${B}/.config
CONF_SED_SCRIPT="" CONF_SED_SCRIPT=""
# oabi / eabi support # oabi / eabi support
@ -108,9 +108,9 @@ do_configure_prepend() {
# Keep this the last line # Keep this the last line
# Remove all modified configs and add the rest to .config # Remove all modified configs and add the rest to .config
sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config' sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
yes '' | oe_runmake oldconfig yes '' | oe_runmake -C ${S} O=${B} oldconfig
} }
# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled # Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled