KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: allow defining license information per binary package

Browse source 
At the moment, license information can only be specified on a
"per source package" level while other metadata fields (e.g. maintainer)
can be given for each binary package. Apply the same logic for license
fields as well. This can be used e.g. in cases where a library is
distributed under some license while related tools are distributed
under a different one.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
This commit is contained in:
Michael Heimpold 2017-10-31 21:29:50 +01:00 committed by Hauke Mehrtens
parent 40868e3bb6
commit 2cb75cd8b9
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/package-defaults.mk
View file

@ -57,6 +57,8 @@ define Package/Default
DEFAULT_VARIANT:= DEFAULT_VARIANT:=
USERID:= USERID:=
ALTERNATIVES:= ALTERNATIVES:=
LICENSE:=$(PKG_LICENSE)
LICENSE_FILES:=$(PKG_LICENSE_FILES)
endef endef
Build/Patch:=$(Build/Patch/Default) Build/Patch:=$(Build/Patch/Default)

4
include/package-dumpinfo.mk
View file

@ -46,8 +46,8 @@ $(if $(filter nonshared,$(PKGFLAGS)),,Repository: $(if $(FEED),$(FEED),base)
Maintainer: $(MAINTAINER) Maintainer: $(MAINTAINER)
$(if $(USERID),Require-User: $(USERID) $(if $(USERID),Require-User: $(USERID)
)Source: $(PKG_SOURCE) )Source: $(PKG_SOURCE)
$(if $(PKG_LICENSE),License: $(PKG_LICENSE) $(if $(LICENSE),License: $(LICENSE)
)$(if $(PKG_LICENSE_FILES),LicenseFiles: $(PKG_LICENSE_FILES) )$(if $(LICENSE_FILES),LicenseFiles: $(LICENSE_FILES)
)Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg)) )Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))
$(if $(KCONFIG),Kernel-Config: $(KCONFIG) $(if $(KCONFIG),Kernel-Config: $(KCONFIG)
)$(if $(BUILDONLY),Build-Only: $(BUILDONLY) )$(if $(BUILDONLY),Build-Only: $(BUILDONLY)

4
include/package-ipkg.mk
View file

@ -161,8 +161,8 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES)) )$$(call addfield,Provides,$$(call mergelist,$(PROVIDES))
)$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES)) )$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES))
)$$(call addfield,Source,$(SOURCE) )$$(call addfield,Source,$(SOURCE)
)$$(call addfield,License,$$(PKG_LICENSE) )$$(call addfield,License,$(LICENSE)
)$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES) )$$(call addfield,LicenseFiles,$(LICENSE_FILES)
)$$(call addfield,Section,$(SECTION) )$$(call addfield,Section,$(SECTION)
)$$(call addfield,Require-User,$(USERID) )$$(call addfield,Require-User,$(USERID)
)$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed )$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed