diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-11-23 13:12:16 +0100 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-11-23 13:12:54 +0100 |
commit | 23c36f676db9979f8deb42626219a4c0f1690dfa (patch) | |
tree | bc0313f9db17c6918af78b2f15a75efc5099967e | |
parent | 3f3ba5de381611a9bee0d80a940380ab6c3fdcc9 (diff) | |
download | ptxdist-23c36f676db9979f8deb42626219a4c0f1690dfa.tar.gz ptxdist-23c36f676db9979f8deb42626219a4c0f1690dfa.tar.xz |
install_tree: add "not stripping" option
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | rules/post/install.make | 4 | ||||
-rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rules/post/install.make b/rules/post/install.make index 7b7109873..4a18ba39f 100644 --- a/rules/post/install.make +++ b/rules/post/install.make @@ -98,6 +98,7 @@ install_alternative = \ # $3: GID, use '-' to use the real GID of each file/directory # $4: the toplevel directory. # $5: the target directory. +# $6: strip # install_tree = \ XPKG=$(subst _,-,$(strip $(1))); \ @@ -105,8 +106,9 @@ install_tree = \ GRP=$(strip $(3)); \ DIR=$(strip $(4)); \ DST=$(strip $(5)); \ + STRIP=$(strip $(6)); \ $(call install_check, install_tree); \ - echo "ptxd_install_tree '$$DIR' '$$DST' '$$OWN' '$$GRP'" >> "$(STATEDIR)/$$XPKG.cmds" + echo "ptxd_install_tree '$$DIR' '$$DST' '$$OWN' '$$GRP' '$$STRIP'" >> "$(STATEDIR)/$$XPKG.cmds" # # install_archive diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh index 11f48a409..25c4f88ab 100644 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh @@ -346,6 +346,7 @@ ptxd_install_generic() { local dst="$2" local usr="$3" local grp="$4" + local strip="$5" local -a stat stat=( $(stat -c "%u %g %a %t %T" "${file}") ) && @@ -371,7 +372,7 @@ ptxd_install_generic() { ptxd_install_ln "${src}" "${dst}" "${usr}" "${grp}" ;; "regular file"|"regular empty file") - ptxd_install_file "${file}" "${dst}" "${usr}" "${grp}" "${mod}" + ptxd_install_file "${file}" "${dst}" "${usr}" "${grp}" "${mod}" "${strip}" ;; *) echo "Error: File type '${type}' unkown!" @@ -386,6 +387,7 @@ ptxd_install_find() { local dstdir="${2%/}" local usr="${3#-}" local grp="${4#-}" + local strip="${5}" test -d "${dir}" && @@ -393,7 +395,7 @@ ptxd_install_find() { -path "*/.pc" -prune -o -path "*/CVS" -prune -o \ ! -path "${dir}" -print | while read file; do local dst="${dstdir}${file#${dir}}" - ptxd_install_generic "${file}" "${dst}" "${usr}" "${grp}" || return + ptxd_install_generic "${file}" "${dst}" "${usr}" "${grp}" "${strip}" || return done } export -f ptxd_install_find |