diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-04 15:11:39 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-04 15:11:39 +0000 |
| commit | 934abd045057cfde4da1ab9d84d280feddd36f1a (patch) | |
| tree | 2bd2f9abe83dc13b682dd1830fa8bbcd0cfee2ab /scripts/libptxdist.sh | |
| parent | ec07a5b4294f510b5a757c97ec88bbdde2873f13 (diff) | |
| download | ptxdist-934abd045057cfde4da1ab9d84d280feddd36f1a.tar.gz ptxdist-934abd045057cfde4da1ab9d84d280feddd36f1a.tar.xz | |
* scripts/libptxdist.sh, bin/ptxdist:
call migration assistent during oldconfig
changed "migrate" semantics: iterates with --force oldconfig over
platform and ptxconfig
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9374 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'scripts/libptxdist.sh')
| -rw-r--r-- | scripts/libptxdist.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index e72392793..aa63df5b9 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -135,14 +135,16 @@ export -f ptxd_get_ptxconf # +# migrate a config file +# look in PTX_MIGRATEDIR for a migration handler and call it # +# $1 part identifier ("ptx", "platform", "collection", "board", "user") # ptxd_kconfig_migrate() { local part="${1}" local assistent="${PTX_MIGRATEDIR}/migrate_${part}" if [ \! -x "${assistent}" ]; then - echo "sorry: no support to migrate '${part}'" return 0 fi @@ -155,9 +157,7 @@ ptxd_kconfig_migrate() { return ${retval} fi - if diff -u ".config.old" ".config" >/dev/null; then - ptxd_dialog_msgbox "info: migration not necessary" - else + if ! diff -u ".config.old" ".config" >/dev/null; then ptxd_dialog_msgbox "info: successfully migrated '${file_dotconfig}'" fi @@ -167,7 +167,7 @@ ptxd_kconfig_migrate() { # -# $1 what kind of config ("oldconfig", "menuconfig", "dep", "migrate") +# $1 what kind of config ("oldconfig", "menuconfig", "dep") # $2 part identifier ("ptx", "platform", "collection", "board", "user") # $... optional parameters # @@ -256,6 +256,7 @@ ptxd_kconfig() { # oldconfig instead of silentoldconfig if somebody # tries to automate us. # + ptxd_kconfig_migrate "${part}" || return if tty -s; then "${conf}" -s "${file_kconfig}" else @@ -266,9 +267,6 @@ ptxd_kconfig() { copy_back="false" yes "" | "${conf}" -O "${file_kconfig}" ;; - migrate) - ptxd_kconfig_migrate "${part}" - ;; esac local retval=${?} |