improve PTXdist release for license reporting mechanism

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 50 insertions, 13 deletions

diff --git a/rules/post/ptxd_make_license_report.make b/rules/post/ptxd_make_license_report.make
index 8eac2ee06..9ec60f273 100644
--- a/rules/post/ptxd_make_license_report.make
+++ b/rules/post/ptxd_make_license_report.make
@@ -8,33 +8,55 @@
 # see the README file.
 #
 
+PTX_PACKAGES_TOOLS := \
+	$(CROSS_PACKAGES) \
+	$(HOST_PACKAGES) \
+	$(LAZY_PACKAGES)
+
 PHONY += license-report
 
 license-report: \
-	$(STATEDIR)/license-report.pdf \
-	$(STATEDIR)/license-report-tools.pdf
+	$(REPORTDIR)/license-report.pdf \
+	$(REPORTDIR)/license-report-tools.pdf
 
-$(STATEDIR)/license-report.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_INSTALL)))
+$(REPORTDIR)/license-report.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_INSTALL)))
 	@$(call targetinfo)
+	@mkdir -p $(REPORTDIR)
 	@$(image/env) \
-	ptx_report_dir="$(STATEDIR)/report" \
 	ptx_license_target="$@" \
-	ptx_license_package_filter="target" \
 	ptxd_make_license_report $(sort $(PTX_PACKAGES_INSTALL))
 	@$(call finish)
 
-PTX_PACKAGES_TOOLS := \
-	$(CROSS_PACKAGES) \
-	$(HOST_PACKAGES) \
-	$(LAZY_PACKAGES)
-
-$(STATEDIR)/license-report-tools.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_TOOLS)))
+$(REPORTDIR)/license-report-tools.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_TOOLS)))
 	@$(call targetinfo)
+	@mkdir -p $(REPORTDIR)
 	@$(image/env) \
-	ptx_report_dir="$(STATEDIR)/report" \
 	ptx_license_target="$@" \
-	ptx_license_package_filter="tools" \
 	ptxd_make_license_report $(sort $(PTX_PACKAGES_TOOLS))
 	@$(call finish)
 
+PTXDIST_LICENSE_COMPLIANCE_OSS_ARCHIVE := $(RELEASEDIR)/OSS-$(call remove_quotes,$(PTXCONF_PROJECT_VENDOR)-$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)).tar.gz
+
+PHONY += license-compliance-distribution
+
+license-compliance-distribution: \
+		$(RELEASEDIR)/license-compliance.pdf \
+		$(PTXDIST_LICENSE_COMPLIANCE_OSS_ARCHIVE)
+
+$(PTXDIST_LICENSE_COMPLIANCE_OSS_ARCHIVE): $(addprefix $(STATEDIR)/,$(addsuffix .release,$(PTX_PACKAGES_INSTALL) $(PTX_PACKAGES_TOOLS)))
+	@$(call targetinfo)
+	@tar -C "$(RELEASEDIR)" \
+		--exclude=license-compliance.pdf --exclude $(notdir $@) \
+		 --transform 's;^./;$(notdir $(basename $(basename $@)))/;' -cf "$@" .
+	@$(call finish)
+
+
+$(RELEASEDIR)/license-compliance.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_INSTALL)))
+	@$(call targetinfo)
+	@mkdir -p $(RELEASEDIR)
+	@$(image/env) \
+	ptx_license_target="$@" \
+	ptxd_make_license_compliance $(sort $(PTX_PACKAGES_INSTALL))
+	@$(call finish)
+
 # vim: syntax=make
diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make
index 14fce7eb6..dc882bf04 100644
--- a/rules/post/ptxd_make_world_common.make
+++ b/rules/post/ptxd_make_world_common.make
@@ -23,6 +23,8 @@ ptx/env = \
 										\
 	ptx_state_dir="$(call ptx/escape,$(STATEDIR))"				\
 	ptx_image_dir="$(call ptx/escape,$(IMAGEDIR))"				\
+	ptx_report_dir="$(call ptx/escape,$(REPORTDIR))"			\
+	ptx_release_dir="$(call ptx/escape,$(RELEASEDIR))"			\
 	ptx_lib_dir="$(call ptx/escape,$(PTXDIST_LIB_DIR))"			\
 	ptx_pkg_dir="$(call ptx/escape,$(PKGDIR))"				\
 	ptx_pkg_dev_dir="$(call ptx/escape,$(PTXDIST_DEVPKG_PLATFORMDIR))"	\
@@ -71,6 +73,7 @@ world/env/impl = \
 	pkg_config="$(call ptx/escape,$($(1)_CONFIG))"				\
 	pkg_path="$(call ptx/escape,$($(1)_PATH))"				\
 	pkg_src="$(call ptx/escape,$($(1)_SOURCE))"				\
+	pkg_srcs="$(call ptx/escape,$($(1)_SOURCES))"				\
 	pkg_md5="$(call ptx/escape,$($(1)_MD5))"				\
 	pkg_url="$(call ptx/escape,$($(1)_URL))"				\
 										\
diff --git a/rules/post/ptxd_make_world_license.make b/rules/post/ptxd_make_world_license.make
index ba811de48..11d9fcc2d 100644
--- a/rules/post/ptxd_make_world_license.make
+++ b/rules/post/ptxd_make_world_license.make
@@ -20,4 +20,16 @@ $(STATEDIR)/%.report:
 	@$(call world/license, $(PTX_MAP_TO_PACKAGE_$(*)))
 	@$(call touch)
 
+# create a "release" of all required information including licenses, sources and patches
+
+world/release = \
+	$(call world/env, $(1)) \
+	ptxd_make_world_release
+
+$(STATEDIR)/%.release:
+	@$(call targetinfo)
+	@$(call world/release, $(PTX_MAP_TO_PACKAGE_$(*)))
+	@$(call touch)
+
+
 # vim: syntax=make