diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-25 11:39:29 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-26 19:07:37 +0200 |
| commit | 388520bc1380738dfa953627e6cd165bfb67540e (patch) | |
| tree | 418bc5003932bb7febb019fd1b62a2dc2d26a7a3 | |
| parent | 4387ed63e885768a21f51f65fb5ce0a1e79806a2 (diff) | |
| download | ptxdist-388520bc1380738dfa953627e6cd165bfb67540e.tar.gz ptxdist-388520bc1380738dfa953627e6cd165bfb67540e.tar.xz | |
ptxd_make_xpkg_pkg: make it possible to use "-" as source for install_tree
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/post/install.make | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/rules/post/install.make b/rules/post/install.make index 817c3ed97..93f37ee57 100644 --- a/rules/post/install.make +++ b/rules/post/install.make @@ -124,7 +124,7 @@ install_config = \ # $1: xpkg label # $2: OWN, use '-' to use the real UID of each file/directory # $3: GID, use '-' to use the real GID of each file/directory -# $4: the toplevel directory. +# $4: the toplevel directory, or "-": to use $(PKG_PKGDIR)/$destination # $5: the target directory. # $6: strip # diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh index 38c0a40fe..bd45b7db9 100644 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh @@ -425,7 +425,13 @@ ptxd_install_find() { export -f ptxd_install_find ptxd_install_tree() { - ptxd_install_find "$@" || + local src="${1}" + local dst="${2}" + shift 2 + if [ "${src}" = "-" ]; then + src="${pkg_pkg_dir}${dst}" + fi + ptxd_install_find "${src}" "${dst}" "$@" || ptxd_install_error "install_tree failed!" } export -f ptxd_install_tree |