slightly better license info

There's an ISO9660 COPY tag for license info file; make use of it, factoring use/docs/license out while at that. One of the goals was to make it hold the reference to reference to GPL in regular builds and starterkits ;-)

slightly better license info
611ec48e · Michael Shigorin · a257c2ae · 611ec48e · 611ec48e · 611ec48e
Commit 611ec48e authored Jul 25, 2018 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

config.mk features.in/branding/config.mk +7 -2

90-build-distro.mk features.in/build-distro/lib/90-build-distro.mk +2 -0

config.mk features.in/docs/config.mk +2 -2

No files found.
--- a/features.in/branding/config.mk
+++ b/features.in/branding/config.mk
@@ -2,10 +2,15 @@
 use/branding:
 	@$(call add_feature)

+# license notes, if any
+use/branding/notes: use/branding
+	@$(call add,THE_BRANDING,notes)
+
 # NB: not every distro might have all the branding of its own
-use/branding/full: use/branding use/syslinux/ui/gfxboot
+# FIXME: syslinux is x86-specific
+use/branding/full: use/branding/notes use/syslinux/ui/gfxboot
 	@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
-	@$(call add,THE_BRANDING,indexhtml notes slideshow)
+	@$(call add,THE_BRANDING,indexhtml slideshow)

 use/branding/complete: use/branding/full use/plymouth/full
 	@$(call add,INSTALL2_BRANDING,notes slideshow)

--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
@@ -9,6 +9,7 @@ BOOT_VOLI := $(shell echo $(META_VOL_ID) | cut -c1-32)
 BOOT_VOLS := $(META_VOL_SET)
 BOOT_BIBL := $(META_BIBLIO)
 BOOT_ABST := $(META_ABSTRACT)
+BOOT_COPY := $(META_LICENSE_FILE)

 ISODATA_SYSI = $(BOOT_SYSI)
 ISODATA_PUBL = $(BOOT_PUBL)
@@ -18,6 +19,7 @@ ISODATA_VOLI = $(BOOT_VOLI)
 ISODATA_VOLS = $(BOOT_VOLS)
 ISODATA_BIBL = $(BOOT_BIBL)
 ISODATA_ABST = $(BOOT_ABST)
+ISODATA_COPY = $(BOOT_COPY)

 DATE_F    := $(shell date +%F)


--- a/features.in/docs/config.mk
+++ b/features.in/docs/config.mk
@@ -15,7 +15,7 @@ use/docs/manual: use/docs
 	@$(call xport,DOCS)
 	@$(call add,THE_PACKAGES,docs-$$(DOCS))

-use/docs/license: use/docs use/branding
-	@$(call add,THE_BRANDING,notes)
+use/docs/license: use/docs use/branding/notes
+	@$(call set,META_LICENSE_FILE,license.all.html)

 use/docs/full: use/docs/indexhtml use/docs/manual use/docs/license; @: