diff mbox

[Bug,6344] Wrong handling of license text files with same name and different directory

Message ID 20130626095411.DE06D9B1B9@busybox.osuosl.org
State Not Applicable
Headers show

Commit Message

bugzilla@busybox.net June 26, 2013, 9:54 a.m. UTC
https://bugs.busybox.net/show_bug.cgi?id=6344

--- Comment #1 from Aleksandar <aleksandar.zivkovic@gmail.com> 2013-06-26 09:52:21 UTC ---
Quick/dirty solution that works for me: take all files stated in *.mk and merge
them in single file called license.txt

 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
diff mbox

Patch

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)