diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-06 21:43:30 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-06 21:47:35 +0200 |
| commit | 9c47a751759a3d39fca01e6b97f0a47799b396e8 (patch) | |
| tree | 40302807a764b8152f87c0e05eb07d5785dd0bcc /rules/post | |
| parent | 6323439bf66f8a26e9c9ecd8cd2c12dc9f794279 (diff) | |
| download | ptxdist-9c47a751759a3d39fca01e6b97f0a47799b396e8.tar.gz ptxdist-9c47a751759a3d39fca01e6b97f0a47799b396e8.tar.xz | |
rules: introduce EXTRA_PACKAGES
Packages that are added to this list will be built normally during
'ptxdist go'. However, they are not installed into a root filesystem by
default.
This is useful for specialized packages that are only needed for specific
images.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/post')
| -rw-r--r-- | rules/post/ptxd_make_license_report.make | 16 | ||||
| -rw-r--r-- | rules/post/world.make | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/rules/post/ptxd_make_license_report.make b/rules/post/ptxd_make_license_report.make index 4ddf83fd8..71bf1373e 100644 --- a/rules/post/ptxd_make_license_report.make +++ b/rules/post/ptxd_make_license_report.make @@ -13,18 +13,22 @@ PTX_PACKAGES_TOOLS := \ $(HOST_PACKAGES) \ $(LAZY_PACKAGES) +PTX_PACKAGES_TARGET := \ + $(PTX_PACKAGES_INSTALL) \ + $(EXTRA_PACKAGES) + PHONY += license-report license-report: \ $(REPORTDIR)/license-report.pdf \ $(REPORTDIR)/license-report-tools.pdf -$(REPORTDIR)/license-report.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_INSTALL))) +$(REPORTDIR)/license-report.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_TARGET))) @$(call targetinfo) @mkdir -p $(REPORTDIR) @$(image/env) \ ptx_license_target="$@" \ - ptxd_make_license_report $(sort $(PTX_PACKAGES_INSTALL)) + ptxd_make_license_report $(sort $(PTX_PACKAGES_TARGET)) @$(call finish) $(REPORTDIR)/license-report-tools.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_TOOLS))) @@ -51,12 +55,12 @@ $(PTXDIST_LICENSE_COMPLIANCE_OSS_ARCHIVE): $(addprefix $(STATEDIR)/,$(addsuffix @$(call finish) -$(RELEASEDIR)/license-compliance.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_INSTALL))) +$(RELEASEDIR)/license-compliance.pdf: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_TARGET))) @$(call targetinfo) @mkdir -p $(RELEASEDIR) @$(image/env) \ ptx_license_target="$@" \ - ptxd_make_license_compliance_pdf $(sort $(PTX_PACKAGES_INSTALL)) + ptxd_make_license_compliance_pdf $(sort $(PTX_PACKAGES_TARGET)) @$(call finish) PHONY += license-compliance-data @@ -64,12 +68,12 @@ PHONY += license-compliance-data license-compliance-data: \ $(RELEASEDIR)/license-compliance.yaml -$(RELEASEDIR)/license-compliance.yaml: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_INSTALL))) +$(RELEASEDIR)/license-compliance.yaml: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_TARGET))) @$(call targetinfo) @mkdir -p $(RELEASEDIR) @$(image/env) \ ptx_license_target="$@" \ - ptxd_make_license_compliance_yaml $(sort $(PTX_PACKAGES_INSTALL)) + ptxd_make_license_compliance_yaml $(sort $(PTX_PACKAGES_TARGET)) @$(call finish) # vim: syntax=make diff --git a/rules/post/world.make b/rules/post/world.make index 235a5f880..e592d5bc6 100644 --- a/rules/post/world.make +++ b/rules/post/world.make @@ -16,11 +16,13 @@ DEP_OUTPUT := $(STATEDIR)/depend.out WORLD_PACKAGES_TARGET := $(addprefix $(STATEDIR)/,$(addsuffix .targetinstall.post,$(PACKAGES))) WORLD_PACKAGES_HOST := $(addprefix $(STATEDIR)/,$(addsuffix .install.post,$(HOST_PACKAGES))) WORLD_PACKAGES_CROSS := $(addprefix $(STATEDIR)/,$(addsuffix .install.post,$(CROSS_PACKAGES))) +WORLD_PACKAGES_EXTRA := $(addprefix $(STATEDIR)/,$(addsuffix .install.post,$(EXTRA_PACKAGES))) $(STATEDIR)/world.targetinstall: \ $(WORLD_PACKAGES_TARGET) \ $(WORLD_PACKAGES_HOST) \ - $(WORLD_PACKAGES_CROSS) + $(WORLD_PACKAGES_CROSS) \ + $(WORLD_PACKAGES_EXTRA) @echo $(notdir $@) : $(notdir $^) >> $(DEP_OUTPUT) @$(call touch) |