StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle MODULE_LICENSE_MPL the same as MODULE_LICENSE_GPL.

Browse Source 
Change-Id: Iefc6df3f3401a591f53ec3f22202044c60acf460
This commit is contained in:
Ying Wang
2011-03-03 13:29:38 -08:00
parent 1bc81fc523
commit a67ce69e9a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/base_rules.mk
View File

@@ -106,11 +106,11 @@ endif
# Add implicit tags.
#
# If the local directory or one of its parents contains a MODULE_LICENSE_GPL
# file, tag the module as "gnu". Search for "*_GNU*" so that we can also
# file, tag the module as "gnu". Search for "*_GPL*" and "*_MPL*" so that we can also
# find files like MODULE_LICENSE_GPL_AND_AFL but exclude files like
# MODULE_LICENSE_LGPL.
#
ifneq ($(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*_GPL*),)
ifneq ($(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*_GPL* MODULE_LICENSE*_MPL*),)
LOCAL_MODULE_TAGS += gnu
endif

2
core/definitions.mk
View File

@@ -339,7 +339,7 @@ endef
define find-parent-file
$(strip \
$(eval _fpf := $(wildcard $(strip $(1))/$(strip $(2)))) \
$(eval _fpf := $(wildcard $(foreach f, $(2), $(strip $(1))/$(f)))) \
$(if $(_fpf),$(_fpf), \
$(if $(filter-out ./ .,$(1)), \
$(call find-parent-file,$(patsubst %/,%,$(dir $(1))),$(2)) \