|
|
@ -123,8 +123,12 @@ fi |
|
|
|
|
|
|
|
|
|
|
|
newconfig=`grep CONFIG_NUTTX_NEWCONFIG= "${configpath}/defconfig" | cut -d'=' -f2` |
|
|
|
newconfig=`grep CONFIG_NUTTX_NEWCONFIG= "${configpath}/defconfig" | cut -d'=' -f2` |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
defappdir=y |
|
|
|
if [ -z "${appdir}" ]; then |
|
|
|
if [ -z "${appdir}" ]; then |
|
|
|
appdir=`grep CONFIG_APPS_DIR= "${configpath}/defconfig" | cut -d'=' -f2` |
|
|
|
appdir=`grep CONFIG_APPS_DIR= "${configpath}/defconfig" | cut -d'=' -f2` |
|
|
|
|
|
|
|
if [ ! -z "${appdir}" ]; then |
|
|
|
|
|
|
|
defappdir=n |
|
|
|
|
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# Check for the apps/ directory in the usual place if appdir was not provided |
|
|
|
# Check for the apps/ directory in the usual place if appdir was not provided |
|
|
@ -181,12 +185,15 @@ if [ ! -z "${appdir}" -a "X${newconfig}" != "Xy" ]; then |
|
|
|
install -C "${configpath}/appconfig" "${TOPDIR}/${appdir}/.config" || \ |
|
|
|
install -C "${configpath}/appconfig" "${TOPDIR}/${appdir}/.config" || \ |
|
|
|
{ echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; } |
|
|
|
{ echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ "X${defappdir}" = "Xy" ]; then |
|
|
|
|
|
|
|
sed -i -e "/^CONFIG_APPS_DIR/d" "${TOPDIR}/.configX" |
|
|
|
echo "" >> "${TOPDIR}/.configX" |
|
|
|
echo "" >> "${TOPDIR}/.configX" |
|
|
|
echo "# Application configuration" >> "${TOPDIR}/.configX" |
|
|
|
echo "# Application configuration" >> "${TOPDIR}/.configX" |
|
|
|
echo "" >> "${TOPDIR}/.configX" |
|
|
|
echo "" >> "${TOPDIR}/.configX" |
|
|
|
echo "CONFIG_APPS_DIR=\"$appdir\"" >> "${TOPDIR}/.configX" |
|
|
|
echo "CONFIG_APPS_DIR=\"$appdir\"" >> "${TOPDIR}/.configX" |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# install the final .configX only if it differs from any existing |
|
|
|
# install the final .configX only if it differs from any existing |
|
|
|
# .config file. |
|
|
|
# .config file. |
|
|
|