diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-15 07:36:57 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-15 07:36:59 +0100 |
| commit | 915f722c60f0804260fbd72388da17020bb17446 (patch) | |
| tree | 86cf77d322c0a06b529f9d7f5fb7b6c252137681 | |
| parent | 30f4e4fab9af9c10f47054b9e5611e50b243db8b (diff) | |
| download | ptxdist-915f722c60f0804260fbd72388da17020bb17446.tar.gz ptxdist-915f722c60f0804260fbd72388da17020bb17446.tar.xz | |
ptxd_kconfig: don't overwrite confdir
for collections, ptxd_kconfig is called for ptxconfig and platformconfig
for each layer. In this case confdir is already set and modified for the
correct layer.
Without this some files are generated for the wrong layer and the
collections effectively use the ptxconfig from the lowest layer.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_lib_kconfig.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_lib_kconfig.sh b/scripts/lib/ptxd_lib_kconfig.sh index 1013e77c7..4c7073c1a 100644 --- a/scripts/lib/ptxd_lib_kconfig.sh +++ b/scripts/lib/ptxd_lib_kconfig.sh @@ -675,7 +675,10 @@ ptxd_kconfig() { PROJECT="ptxdist" \ FULLVERSION="${PTXDIST_VERSION_FULL}" - local confdir="${PTXDIST_TEMPDIR}/kconfig" + if [ -z "${confdir}" ]; then + local confdir="${PTXDIST_TEMPDIR}/kconfig" + fi + # # In silent mode, we cannot redirect input. So use |