diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-10-25 11:46:22 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-10-25 11:49:30 +0200 |
| commit | fc65bc66e8330fcb041cc2f91856cd6cb3d7220c (patch) | |
| tree | dc01b2cf12535223118cb22f77dc36269250cc6c /scripts | |
| parent | 0199384f5a9bbda56717200e0443893bc0247a09 (diff) | |
| download | ptxdist-fc65bc66e8330fcb041cc2f91856cd6cb3d7220c.tar.gz ptxdist-fc65bc66e8330fcb041cc2f91856cd6cb3d7220c.tar.xz | |
ptxd_make_image_genimage: use unique directory for filtered config files
Without this, building images that use the same config files in parallel is
broken. They use the same file in PTXDIST_TEMPDIR and all may use the
substitutions from one of them.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_image_genimage.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/lib/ptxd_make_image_genimage.sh b/scripts/lib/ptxd_make_image_genimage.sh index dd1e47412..2112875e4 100644 --- a/scripts/lib/ptxd_make_image_genimage.sh +++ b/scripts/lib/ptxd_make_image_genimage.sh @@ -23,7 +23,7 @@ ptxd_make_image_genimage_config() { local -a includes ptxd_get_alternative config/images "${1}" || ptxd_bailout "could not find config file ${1}" cfg="${ptxd_reply}" - tmp="${PTXDIST_TEMPDIR}/$(basename "${1}")" + tmp="${configdir}/$(basename "${1}")" eval \ "${image_env}" \ @@ -34,7 +34,7 @@ ptxd_make_image_genimage_config() { echo "${image_image}: \$(call genimage/config, ${1})" >> "${pkg_genimage_deps}" includes=( $(sed -n "s/.*\<include(['\"]\(.*\)['\"]).*/\1/p" "${tmp}") ) && - sed -i "s:\(.*\<include(['\"]\)\(.*\)\(['\"]).*\):\1${PTXDIST_TEMPDIR}/\2\3:" "${tmp}" && + sed -i "s:\(.*\<include(['\"]\)\(.*\)\(['\"]).*\):\1${configdir}/\2\3:" "${tmp}" && for inc in "${includes[@]}"; do ptxd_make_image_genimage_config "${inc}" done @@ -45,9 +45,10 @@ export -f ptxd_make_image_genimage_config # extract ipkg an generate a tgz image # ptxd_make_image_genimage_impl() { - local tmpdir config file + local tmpdir configdir file local -a genimage_configs tmpdir="$(mktemp -d "${PTXDIST_TEMPDIR}/genimage.XXXXXX")" + configdir="$(mktemp -d "${PTXDIST_TEMPDIR}/genimage-config.XXXXXX")" ptxd_make_image_init && pkg_genimage_deps="${ptx_state_dir}/${pkg_pkg}.deps" && |