diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2017-06-26 00:03:39 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-07-03 18:03:20 +0200 |
| commit | ea5695b5dff7a64187b86e8b52a3e6d18f50affd (patch) | |
| tree | ffae45953329e5b0bf64ddef4bc15aac7fef216d | |
| parent | f49392349f7cf202d13941f7f3b56622a34453a5 (diff) | |
| download | buildroot-ea5695b5dff7a64187b86e8b52a3e6d18f50affd.tar.gz buildroot-ea5695b5dff7a64187b86e8b52a3e6d18f50affd.zip | |
core/pkg-util: pass package directory and name when saving license files
This will be useful when checking the hashes of the license files.
[Peter: use '.' as buildroot directory so /buildroot.hash isn't checked]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 2 | ||||
| -rw-r--r-- | package/pkg-utils.mk | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -740,7 +740,7 @@ legal-info-clean: .PHONY: legal-info-prepare legal-info-prepare: $(LEGAL_INFO_DIR) @$(call MESSAGE,"Collecting legal info") - @$(call legal-license-file,buildroot,COPYING,COPYING,HOST) + @$(call legal-license-file,buildroot,buildroot,.,COPYING,COPYING,HOST) @$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,TARGET) @$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,HOST) @$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved,HOST) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 22330edc5b..2916a7bbad 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -851,7 +851,7 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),) ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) @$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined)) else - @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAW_BASE_NAME),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) + @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_NAME),$$($(2)_RAW_BASE_NAME),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files ifeq ($$($(2)_SITE_METHOD),local) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index c95e77953b..e9ac56276f 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -83,7 +83,7 @@ define legal-manifest # pkg, version, license, license-files, source, url, {HOST echo '"$(1)","$(2)","$(3)","$(4)","$(5)","$(6)"' >>$(LEGAL_MANIFEST_CSV_$(7)) endef -define legal-license-file # pkg, filename, file-fullpath, {HOST|TARGET} - mkdir -p $(LICENSE_FILES_DIR_$(4))/$(1)/$(dir $(2)) && \ - cp $(3) $(LICENSE_FILES_DIR_$(4))/$(1)/$(2) +define legal-license-file # pkgname, pkgname-pkgver, pkgdir, filename, file-fullpath, {HOST|TARGET} + mkdir -p $(LICENSE_FILES_DIR_$(6))/$(2)/$(dir $(4)) && \ + cp $(5) $(LICENSE_FILES_DIR_$(6))/$(2)/$(4) endef |
