diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-08-09 15:39:33 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-02 16:06:19 +0200 |
| commit | c817f860127b7795eb53602b6e2b85da3fa2913d (patch) | |
| tree | 09ad31d4c37749b00c660e9dd8088a6603f97eda | |
| parent | e3ff697371d51a90c8de6c31d60adfac913efb17 (diff) | |
| download | OSELAS.Toolchain-c817f860127b7795eb53602b6e2b85da3fa2913d.tar.gz OSELAS.Toolchain-c817f860127b7795eb53602b6e2b85da3fa2913d.tar.xz | |
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 <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_world_copy_license.sh | 12 |
1 files 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}}" |