On Tue, Jul 21, 2015 at 12:09:38PM +0200, Albert Antony wrote:
> The strip y|n option should now work for install_lib
> and install_copy_toolchain_lib, just like it works
> for install_copy.
Why? What's the use-case for this? For install_copy it's still there for
kernel modules and legacy stuff, but in general the auto detection should
work.
Michael
> --
> Signed-off-by: Albert Antony <albert@newtec.dk>
> ---
> rules/post/install.make | 3 ++-
> scripts/install_copy_toolchain.sh | 2 +-
> scripts/lib/ptxd_make_xpkg_pkg.sh | 3 ++-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/rules/post/install.make b/rules/post/install.make
> index 7da3f04..9cde3d4 100644
> --- a/rules/post/install.make
> +++ b/rules/post/install.make
> @@ -240,8 +240,9 @@ install_lib = \
> PER="$(strip $(4))"; \
> LIB=$(strip $(5)); \
> DST=$(strip $(6)); \
> + STRIP=$(strip $(7)); \
> $(call install_check, install_lib); \
> - echo "ptxd_install_lib '$$LIB' '$$DST' '$$OWN' '$$GRP' '$$PER'" >> "$(STATEDIR)/$$XPKG.cmds"
> + echo "ptxd_install_lib '$$LIB' '$$DST' '$$OWN' '$$GRP' '$$PER' '$$STRIP'" >> "$(STATEDIR)/$$XPKG.cmds"
>
> #
> # install_replace
> diff --git a/scripts/install_copy_toolchain.sh b/scripts/install_copy_toolchain.sh
> index 0cf4d31..0b70c12 100755
> --- a/scripts/install_copy_toolchain.sh
> +++ b/scripts/install_copy_toolchain.sh
> @@ -170,7 +170,7 @@ ptxd_install_toolchain_lib() {
>
> perm="$(stat -c %a "${lib_path}")"
>
> - echo "ptxd_install_shared \"${lib_path}\" \"${prefix}\" 0 0 \"${perm}\"" >> "${STATEDIR}/${packet}.cmds"
> + echo "ptxd_install_shared \"${lib_path}\" \"${prefix}\" 0 0 \"${perm}\" \"${strip}\"" >> "${STATEDIR}/${packet}.cmds"
> fi
> else
> echo "error: found ${lib_path}, but neither file nor link" 2>&1
> diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
> index ae4c12f..a31e8fe 100644
> --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
> +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
> @@ -730,9 +730,10 @@ ptxd_install_shared() {
> local usr="$3"
> local grp="$4"
> local mod="$5"
> + local strip="$6"
> local filename="$(basename "${src}")"
>
> - ptxd_install_file "${src}" "${dst}/${filename}" "${usr}" "${grp}" "${mod}" &&
> + ptxd_install_file "${src}" "${dst}/${filename}" "${usr}" "${grp}" "${mod}" "${strip}" &&
>
> find -H "$(dirname "${src}")" -maxdepth 1 -type l | while read file; do
> if [ "$(basename "$(readlink -f "${file}")")" = "${filename}" ]; then
> --
> 2.0.0
>
>
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de