diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-23 19:47:55 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-23 20:02:55 +0100 |
| commit | 34d96479d23d20298cb9dc8cb6c22a44cdeb01e7 (patch) | |
| tree | 76e9d7c90c8c98f1977de4141689b41cdf1ca9e2 /scripts | |
| parent | 9435521885b8cacfc43e6d402fd11860ac6cd524 (diff) | |
| download | ptxdist-34d96479d23d20298cb9dc8cb6c22a44cdeb01e7.tar.gz ptxdist-34d96479d23d20298cb9dc8cb6c22a44cdeb01e7.tar.xz | |
ptxd_make_kconfig: improve oldconfig handling with -q
Not all packages support 'silentoldconfig' and at least the kernel no
longer fails when user input is needed.
So always run oldconfig and verify that the config is unchanged instead.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_world_kconfig.sh | 10 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_prepare.sh | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/scripts/lib/ptxd_make_world_kconfig.sh b/scripts/lib/ptxd_make_world_kconfig.sh index 8522abfe2..42eca81c1 100644 --- a/scripts/lib/ptxd_make_world_kconfig.sh +++ b/scripts/lib/ptxd_make_world_kconfig.sh @@ -36,12 +36,18 @@ ptxd_make_world_kconfig_setup() { export -f ptxd_make_world_kconfig_setup ptxd_make_kconfig_sync() { + local mode + if [ -n "${PTXDIST_QUIET}" -a "${1}" = oldconfig ]; then + mode=check + else + mode=update + fi if [ -n "${ref_file_dotconfig}" ]; then file_dotconfig="${ref_file_dotconfig}" ptxd_normalize_config && relative_ref_file_dotconfig="${relative_file_dotconfig}" fi && ptxd_normalize_config && - ptxd_kconfig_sync_config update "${pkg_build_dir}/.config" \ + ptxd_kconfig_sync_config "${mode}" "${pkg_build_dir}/.config" \ "${relative_file_dotconfig}" "${file_dotconfig}" "${relative_ref_file_dotconfig}" } export -f ptxd_make_kconfig_sync @@ -79,7 +85,7 @@ ptxd_make_kconfig() { "${pkg_conf_env}" \ make "${1}" \ "${pkg_conf_opt}" && - ptxd_make_kconfig_sync + ptxd_make_kconfig_sync "${1}" } export -f ptxd_make_kconfig diff --git a/scripts/lib/ptxd_make_world_prepare.sh b/scripts/lib/ptxd_make_world_prepare.sh index c8c160d0c..3d1b1c5b5 100644 --- a/scripts/lib/ptxd_make_world_prepare.sh +++ b/scripts/lib/ptxd_make_world_prepare.sh @@ -122,11 +122,7 @@ export -f ptxd_make_world_prepare_autoconf # prepare for kconfig based pkgs # ptxd_make_world_prepare_kconfig() { - if [ -n "${PTXDIST_QUIET}" ]; then - ptxd_make_kconfig silentoldconfig - else - ptxd_make_kconfig oldconfig - fi + ptxd_make_kconfig oldconfig } export -f ptxd_make_world_prepare_kconfig |