On Thu, Sep 13, 2018 at 08:05:54PM +0200, Florian Bäuerle wrote:
> ptxt_install_find strips the last slash from a destination path. The
> result is an empty path if installing to the root directory.
> ---
> scripts/lib/ptxd_make_xpkg_pkg.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh
> b/scripts/lib/ptxd_make_xpkg_pkg.sh
> index 5e69cefdc..51c24ce5e 100644
> --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
> +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
> @@ -648,7 +648,8 @@ export -f ptxd_install_generic
>
> ptxd_install_find() {
> local src="${1%/}"
> - local dst="${2%/}"
> + local dst=${2:1}
> + dst=${2:0:1}${dst%/}
local dst="${2%/}"
dst=${dst:-/}
I think, this is more obvious.
I'd also prefer a more limited path for install_tree. '/usr' I think, and
the existing stuff for /etc for those packages that have it. But only do
this if it doesn't take too long, or if you need to change all the patches
anyways (I've not looked at those yet, so I don't know if they are ok now).
Michael
> local usr="${3#-}"
> local grp="${4#-}"
> local strip="${5}"
> --
> 2.19.0
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
--
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
[email protected]
