From c817f860127b7795eb53602b6e2b85da3fa2913d Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 9 Aug 2019 15:39:33 +0200 Subject: ptxd_make_world_copy_license: handle pkgdir correctly - find the license files in pkgdir - copy files for target packages directly to sysroot-cross Signed-off-by: Michael Olbrich --- scripts/lib/ptxd_make_world_copy_license.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/lib/ptxd_make_world_copy_license.sh b/scripts/lib/ptxd_make_world_copy_license.sh index cbb3afd..a6f36bf 100644 --- a/scripts/lib/ptxd_make_world_copy_license.sh +++ b/scripts/lib/ptxd_make_world_copy_license.sh @@ -9,11 +9,17 @@ # ptxd_make_world_copy_license() { + local license_dir license_url name ptxd_make_world_license_init || return - local license_dir="$(ptxd_get_ptxconf PTXCONF_SYSROOT_CROSS)/share/compliance" - local license_url="file://\$(PTXDIST_PLATFORMDIR)/selected_toolchain/../share/compliance" - local name="${pkg_label#host-}" + local ptxconf_prefix="$(ptxd_get_ptxconf PTXCONF_PREFIX_CROSS)" + if [ "${pkg_type}" = "target" ]; then + license_dir="${PTXDIST_SYSROOT_CROSS}${ptxconf_prefix}/share/compliance" + else + license_dir="${pkg_pkg_dir}${ptxconf_prefix}/share/compliance" + fi + license_url="file://\$(PTXDIST_PLATFORMDIR)/selected_toolchain/../share/compliance" + name="${pkg_label#host-}" name="${name#cross-}" pkg_license_target="${pkg_license_target:-${pkg_label}}" pkg_license_target_license="${pkg_license_target_license:-${pkg_license}}" -- cgit v1.2.3