aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-11-22 12:12:45 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-11-22 14:41:08 +0300
commite5df5901db8d3ad7ab873a0f314319e4d4b24beb (patch)
tree18eb2cab0b5ecfdc0f4d7b986b79feaa5630ada9
parent79f29f21f1bc68f2f7b0e7a829447b85b5d11322 (diff)
downloadydb-e5df5901db8d3ad7ab873a0f314319e4d4b24beb.tar.gz
Rename REQUIRE_DISCLOSURE license property into REQUIRE_DERIVATIVE_DISCLOSURE
`.0` and `.1` licenses require modifications to be disclosed, but do not limit derivative license schema. Introduce `REQUIRE_MODIFICATIONS_DISCLOSURE` license property (containing the abovementioned licenses only). These licenses read as follows: ``` 1.3. "Covered Software" means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. 3.1. Availability of Source Code. Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. 3.6. Larger Works. You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-rw-r--r--build/conf/go.conf2
-rw-r--r--build/conf/license.conf9
-rw-r--r--build/ymake.core.conf2
3 files changed, 8 insertions, 5 deletions
diff --git a/build/conf/go.conf b/build/conf/go.conf
index 5fd9d57e9e..0093d469ca 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -887,7 +887,7 @@ module GO_PROGRAM: _GO_BASE_UNIT {
when ($OPENSOURCE == "yes" && $AUTOCHECK == "yes") {
# FIXME: Replace AUTOCHECK == yes with _not a host platform_ check after YMAKE-218
MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
- MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION
+ MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION REQUIRE_MODIFICATIONS_DISCLOSURE
}
when ($OS_IOS == "yes" || $OS_ANDROID == "yes" || $MAPSMOBI_BUILD_TARGET == "yes") {
MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
diff --git a/build/conf/license.conf b/build/conf/license.conf
index 0f3a669dfb..ada82d2c16 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -23,7 +23,8 @@ LICENSE_PROPERTIES= \
FORBIDDEN \
NDA \
REQUIRE_CITATION \
- REQUIRE_DISCLOSURE \
+ REQUIRE_DERIVATIVE_DISCLOSURE \
+ REQUIRE_MODIFICATIONS_DISCLOSURE \
SERVICE \
UNATTRIBUTED \
@@ -193,9 +194,11 @@ LICENSES_NDA= \
OracleOebs
# These licenses allow use with opensource code only
-LICENSES_REQUIRE_DISCLOSURE= \
+LICENSES_REQUIRE_MODIFICATIONS_DISCLOSURE= \
CDDL-1.0 \
CDDL-1.1 \
+
+LICENSES_REQUIRE_DERIVATIVE_DISCLOSURE= \
CECILL-2.0 \
CPL-1.0 \
EPL-1.0 \
@@ -216,7 +219,7 @@ LICENSES_REQUIRE_DISCLOSURE= \
GPLv2+ \
TMate \
-LICENSES_REQUIRE_DISCLOSURE_STATIC= \
+LICENSES_REQUIRE_DERIVATIVE_DISCLOSURE_STATIC= \
LGPL \
LGPL-1.0-or-later \
LGPL-2.0-only \
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 151b31ce24..d700f76b85 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -999,7 +999,7 @@ module _LINK_UNIT: _BASE_UNIT {
when ($OPENSOURCE == "yes" && $AUTOCHECK == "yes") {
# FIXME: Replace AUTOCHECK == yes with _not a host platform_ check after YMAKE-218
MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
- MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION
+ MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION REQUIRE_MODIFICATIONS_DISCLOSURE
}
when ($OS_IOS == "yes" || $OS_ANDROID == "yes" || $MAPSMOBI_BUILD_TARGET == "yes") {
MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY