summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-08-17 10:31:18 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-08-17 10:56:21 +0200
commit039ffdcfe7154f15b58a3b1422a90a1ce2e5c9a9 (patch)
tree446b2c2708296dbe5b9e5320ca0d93be7448c7e8 /bin
parent8dc657457d1c53a4f8565fdf5cb2956c896f4670 (diff)
downloadptxdist-039ffdcfe7154f15b58a3b1422a90a1ce2e5c9a9.tar.gz
ptxdist-039ffdcfe7154f15b58a3b1422a90a1ce2e5c9a9.tar.xz
[ptxdist] allow menuconfig even if production location is unset
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ptxdist43
1 files changed, 34 insertions, 9 deletions
diff --git a/bin/ptxdist b/bin/ptxdist
index afb343d78..3657ef90b 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -2156,6 +2156,26 @@ setup_config() {
#
+# this function defines which args are allowed in case of a broken
+# config during "setup_platform"
+#
+setup_platform_continue_with_broken_config()
+{
+ set -- "${PTXDIST_ARGS_FULL[@]}"
+ while [ ${#} -ne 0 ]; do
+ local arg="${1}"
+ shift
+
+ case "${arg}" in
+ menuconfig|select) return ;;
+ *) return 1 ;;
+ esac
+ done
+}
+
+
+
+#
# setup PTXDIST_PLATFORMDIR properly
#
# out: PTXDIST_PLATFORMDIR
@@ -2175,15 +2195,20 @@ setup_platform() {
local prefix
if [ -n "${production}" ]; then
if ! prefix="$(ptxd_get_ptxconf PTXCONF_PROJECT_BUILD_PRODUCTION_PREFIX)"; then
- ptxd_dialog_msgbox \
- "error: 'production' release is activated, but the config symbol\n" \
- " PROJECT_BUILD_PRODUCTION_PREFIX is empty.\n" \
- "\n" \
- " Please do 'ptxdist menuconfig',\n" \
- " navigate into the submenu 'Project Name & Version'\n" \
- " and enter a production prefix, \n" \
- " or choose: 'Build Type (development)'."
- return 1
+ if setup_platform_continue_with_broken_config; then
+ # use default
+ prefix="${PTXDIST_WORKSPACE}"
+ else
+ ptxd_dialog_msgbox \
+ "error: 'production' release is activated, but the config symbol\n" \
+ " PROJECT_BUILD_PRODUCTION_PREFIX is empty.\n" \
+ "\n" \
+ " Please do 'ptxdist menuconfig',\n" \
+ " navigate into the submenu 'Project Name & Version'\n" \
+ " and enter a production prefix, \n" \
+ " or choose: 'Build Type (development)'."
+ return 1
+ fi
fi
platform_version="$(ptxd_get_ptxconf PTXCONF_PLATFORM_VERSION)"
else