diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-08 11:19:42 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-08 16:56:29 +0200 |
| commit | 3221343d2e791d0c3d708b059854d54a5018ddb6 (patch) | |
| tree | e30704fde9d7b31226d5194684621a987e9eb372 /scripts | |
| parent | 9b0d74381ff1ab1ce957b50fcc6c877caf98c29a (diff) | |
| download | ptxdist-3221343d2e791d0c3d708b059854d54a5018ddb6.tar.gz ptxdist-3221343d2e791d0c3d708b059854d54a5018ddb6.tar.xz | |
ptxd_kconfig_create_config_merge: fix merging options that start with the symbol prefix
The 'config' script removes the CONFIG_ or PTXCONF_ prefix automatically if
an argument starts with it. Currently ptxd_kconfig_create_config_merge()
also removed the prefix when collecting the 'config' arguments.
This breaks if the actual symbol starts with the prefix. In this case, the
prefix is removed twice.
To fix this, pass the unmodified string and let 'config' remove the prefix
for all of them.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_lib_kconfig.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_lib_kconfig.sh b/scripts/lib/ptxd_lib_kconfig.sh index 8644dc7f1..126ec766f 100644 --- a/scripts/lib/ptxd_lib_kconfig.sh +++ b/scripts/lib/ptxd_lib_kconfig.sh @@ -172,7 +172,7 @@ ptxd_kconfig_create_config_merge() { prefix="${a%%_*}_" fi args[${#args[@]}]="${option}" - args[${#args[@]}]="${a#${prefix}}" + args[${#args[@]}]="${a}" if [ -n "${arg}" ]; then args[${#args[@]}]="${arg}" fi |