diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-15 14:51:49 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-16 15:23:00 +0200 |
| commit | a29b308f810b30591abbc03b00dbbf0ab7c9a7a5 (patch) | |
| tree | 642f38a5b9229140ca611b15ea074ce4740ab379 | |
| parent | d344c501adfb257b45e6a437b86c79e5aeb06148 (diff) | |
| download | ptxdist-a29b308f810b30591abbc03b00dbbf0ab7c9a7a5.tar.gz ptxdist-a29b308f810b30591abbc03b00dbbf0ab7c9a7a5.tar.xz | |
[ptxd_make_image_fix_permissions] get rid of cmd line option -r
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/post/ptxd_make_image_fix_permissions.make | 3 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_image_fix_permissions.sh | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/rules/post/ptxd_make_image_fix_permissions.make b/rules/post/ptxd_make_image_fix_permissions.make index f375a27c1..f121fd917 100644 --- a/rules/post/ptxd_make_image_fix_permissions.make +++ b/rules/post/ptxd_make_image_fix_permissions.make @@ -20,6 +20,7 @@ world: $(PTX_FIXPERM_RUN) endif $(PTX_FIXPERM_RUN): $(PTX_PERMISSIONS) $(STATEDIR)/world.targetinstall - @ptxd_make_image_fix_permissions -p "$<" -r "$(ROOTDIR)" -r "$(ROOTDIR_DEBUG)" + @$(call image/env) \ + ptxd_make_image_fix_permissions -p "$<" # vim: syntax=make diff --git a/scripts/lib/ptxd_make_image_fix_permissions.sh b/scripts/lib/ptxd_make_image_fix_permissions.sh index 9a9a11309..54b2c1556 100644 --- a/scripts/lib/ptxd_make_image_fix_permissions.sh +++ b/scripts/lib/ptxd_make_image_fix_permissions.sh @@ -83,16 +83,15 @@ export -f ptxd_make_image_fix_permissions_check ptxd_make_image_fix_permissions() { - local permfile workdirs opt + ptxd_make_image_init || return + + local permfile opt while getopts "p:r:" opt; do case "$opt" in p) permfile="${OPTARG}" ;; - r) - workdirs="${workdirs}${workdirs:+:}${OPTARG}" - ;; *) ;; esac @@ -102,10 +101,7 @@ ptxd_make_image_fix_permissions() { fixscript="$(mktemp "${PTXDIST_TEMPDIR}/fixpermissions.XXXXXXXXXX")" || ptxd_bailout "failed to create tempfile" chmod +x "${fixscript}" - local ifs_orig="${IFS}" - IFS=":" - set -- ${workdirs} - IFS="${ifs_orig}" + set -- "${ptx_nfsroot}" "${ptx_nfsroot_dbg}" exec 3> "${fixscript}" while [ ${#} -ne 0 ]; do |