diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-27 21:14:57 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-28 18:39:54 +0200 |
| commit | 726f53a5e490e6ffebbc38bf4e1333413aa3baa0 (patch) | |
| tree | a01619022cc00b87d303d75ea58aed0597e8c254 | |
| parent | 556122f73bd47c79475edd56067f857c5a0da0d2 (diff) | |
| download | ptxdist-726f53a5e490e6ffebbc38bf4e1333413aa3baa0.tar.gz ptxdist-726f53a5e490e6ffebbc38bf4e1333413aa3baa0.tar.xz | |
ptxd_lib_kconfig: fix 'ptxdist setup'
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_lib_kconfig.sh | 11 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_kconfig.sh | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/scripts/lib/ptxd_lib_kconfig.sh b/scripts/lib/ptxd_lib_kconfig.sh index d4e8d6020..901208a61 100644 --- a/scripts/lib/ptxd_lib_kconfig.sh +++ b/scripts/lib/ptxd_lib_kconfig.sh @@ -414,7 +414,8 @@ ptxd_kconfig_sync_config() { local mode="${1}" local target_config="${2}" local relative_config="${3}" - local relative_ref_config="${4}" + local absolute_config="${4}" + local relative_ref_config="${5}" local last_config base_config ptxd_kconfig_find_config "${mode}" "${relative_config}" "${relative_ref_config}" && @@ -433,6 +434,10 @@ ptxd_kconfig_sync_config() { ptxd_kconfig_update_config "${target_config}" \ "${last_config}" "${base_config}" ;; + single) + ptxd_kconfig_update_config "${target_config}" \ + "${absolute_config}" + ;; esac } export -f ptxd_kconfig_sync_config @@ -444,7 +449,7 @@ ptxd_kconfig_update() { # nothing to do for PTXdist itself return fi - if [ "${config}" != dep ]; then + if [ "${config}" != dep -a "${part}" != user ]; then ( # call ptxd_kconfig_update() recursively after removing the last layer PTXDIST_LAYERS=( "${PTXDIST_LAYERS[@]:1}" ) @@ -541,7 +546,7 @@ ptxd_kconfig_update() { fi && ptxd_kconfig_sync_config "${mode}" .config \ - "${relative_file_dotconfig}" + "${relative_file_dotconfig}" "${file_dotconfig}" } export -f ptxd_kconfig_update diff --git a/scripts/lib/ptxd_make_world_kconfig.sh b/scripts/lib/ptxd_make_world_kconfig.sh index bb3cdc853..faeb22a4c 100644 --- a/scripts/lib/ptxd_make_world_kconfig.sh +++ b/scripts/lib/ptxd_make_world_kconfig.sh @@ -42,7 +42,7 @@ ptxd_make_kconfig_sync() { fi && ptxd_normalize_config && ptxd_kconfig_sync_config update "${pkg_build_dir}/.config" \ - "${relative_file_dotconfig}" "${relative_ref_file_dotconfig}" + "${relative_file_dotconfig}" "${file_dotconfig}" "${relative_ref_file_dotconfig}" } export -f ptxd_make_kconfig_sync |