| Summary: | Wrong handling of license text files with same name and different directory | ||
|---|---|---|---|
| Product: | buildroot | Reporter: | Aleksandar <aleksandar.zivkovic> |
| Component: | Other | Assignee: | unassigned |
| Status: | RESOLVED FIXED | ||
| Severity: | minor | CC: | buildroot |
| Priority: | P5 | ||
| Version: | 2013.02 | ||
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| Host: | Target: | ||
| Build: | |||
|
Description
Aleksandar
2013-06-26 09:47:37 UTC
Quick/dirty solution that works for me: take all files stated in *.mk and merge them in single file called license.txt
Index: pkg-utils.mk
===================================================================
--- pkg-utils.mk (revision 12362)
+++ pkg-utils.mk (revision 12874)
@@ -95,7 +95,7 @@
define legal-warning-pkg-savednothing # pkg, {local|override}
$(call legal-warning-pkg,$(1),sources and license files not saved ($(2) packages not handled))
endef
-legal-manifest=echo '"$(1)","$(2)","$(3)","$(4)","$(5)"' >>$(LEGAL_MANIFEST_CSV)
+legal-manifest=echo '"$(1)","$(2)","$(3)","license.txt","$(5)"' >>$(LEGAL_MANIFEST_CSV)
define legal-license-header
echo -e "$(LEGAL_INFO_SEPARATOR)\n\t$(1):" \
"$(2)\n$(LEGAL_INFO_SEPARATOR)\n\n" >>$(LEGAL_LICENSES_TXT)
@@ -108,5 +108,6 @@
cat $(3) >>$(LEGAL_LICENSES_TXT) && \
echo >>$(LEGAL_LICENSES_TXT) && \
mkdir -p $(LICENSE_FILES_DIR)/$(1)/ && \
- cp $(3) $(LICENSE_FILES_DIR)/$(1)/
+ echo -e "$(LEGAL_INFO_SEPARATOR)\n$(2):" >> $(LICENSE_FILES_DIR)/$(1)/license.txt && \
+ cat $(3) >> $(LICENSE_FILES_DIR)/$(1)/license.txt
endef
This has already been fixed in Git by commit 31aa4264d8839d05684e67a238837e8633d1e1bc. See http://git.buildroot.net/buildroot/commit/?id=31aa4264d8839d05684e67a238837e8633d1e1bc. Thanks for the report! |