diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-05-19 16:14:20 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-05-19 16:16:04 +0200 |
| commit | 4afc44d8551445ee7e65c3f8add069a61f96feb4 (patch) | |
| tree | 0119b83978258b347dd99a6850fcba3516c2e123 /scripts | |
| parent | f25d209ea810ca5b5da9757c202fa4bcbfc0fd31 (diff) | |
| download | ptxdist-4afc44d8551445ee7e65c3f8add069a61f96feb4.tar.gz ptxdist-4afc44d8551445ee7e65c3f8add069a61f96feb4.tar.xz | |
ptxd_install_dir: fix /usr merge handling
Use 'dst' as variable name. This way install_setup() will do the correct
/usr merge fixup.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh index 99e7fb69c..fc6b51a77 100644 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh @@ -219,7 +219,7 @@ export -f ptxd_install_setup_src ptxd_install_dir() { local sep="$(echo -e "\x1F")" - local dir="$1" + local dst="$1" local usr="$2" local grp="$3" local mod="$4" @@ -229,16 +229,16 @@ ptxd_install_dir() { ptxd_install_setup && echo "\ install directory: - dir=${dir} + dir=${dst} owner=${usr} ${usr_name} group=${grp} ${grp_name} permissions=${mod} " && - install -m "${mod_nfs}" -d "${ndirs[@]/%/${dir}}" && - install -m "${mod}" -o "${usr}" -g "${grp}" -d "${pdirs[@]/%/${dir}}" && + install -m "${mod_nfs}" -d "${ndirs[@]/%/${dst}}" && + install -m "${mod}" -o "${usr}" -g "${grp}" -d "${pdirs[@]/%/${dst}}" && - echo "f${sep}${dir}${sep}${usr}${sep}${grp}${sep}${mod}" >> "${pkg_xpkg_perms}" || + echo "f${sep}${dst}${sep}${usr}${sep}${grp}${sep}${mod}" >> "${pkg_xpkg_perms}" || ptxd_install_error "install_dir failed!" } export -f ptxd_install_dir |