diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-03-08 12:51:58 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-03-08 12:51:58 +0100 |
| commit | a7cf6d42e7ec991a29683e338dfad9e864828176 (patch) | |
| tree | 090a84fec96257f9648b097d796b369d1aa09dc1 | |
| parent | 13cecf6e96e854d4b5a2b14fc1a0d7ac81912d66 (diff) | |
| download | ptxdist-a7cf6d42e7ec991a29683e338dfad9e864828176.tar.gz ptxdist-a7cf6d42e7ec991a29683e338dfad9e864828176.tar.xz | |
[ptxd_make_xpkg_pkg] fix 'ptxd_install_file' if src is a link
With activated "--pedantic" ptxdist will refuse to "install_copy" a
link. Without this option the link will be dereferenced and the link
target is installed.
This restores the original behaviour of ptxdist, which has been
unintentionally broken in commit
a43bbd0ea45a25d4d87e790bb08df18c9934eeda.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh index 385419b74..875cf76e5 100644 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh @@ -127,6 +127,12 @@ EOF install -m "${mod_rw}" -o "${usr}" -g "${grp}" -D "${src}" "${d}" || return done && + if [ -L "${src}" ]; then + ptxd_pedantic "file '${src}' is a link" + src="$(readlink -f "${src}")" + echo "using '${src}' instead" + fi && + if ! file "${src}" | egrep -q ":.*(executable|shared object).*stripped"; then strip="n" fi && |