diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2023-11-17 14:13:12 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2023-11-17 14:48:54 +0300 |
| commit | 270bd6c368617e0679142b425d1def3bcef3bb26 (patch) | |
| tree | b14370644bbc2645fd65e8ea5f349bac889f59ce | |
| parent | 630bbbdf9bd411b26898417221ad81109bb1f1fc (diff) | |
| download | ydb-270bd6c368617e0679142b425d1def3bcef3bb26.tar.gz | |
Get rid of an artificial Linux-syscall-note-in-syscall-glue license
Better solution will be presented in.
| -rw-r--r-- | build/conf/license.conf | 6 | ||||
| -rw-r--r-- | contrib/libs/libaio/dynamic/ya.make | 5 | ||||
| -rw-r--r-- | contrib/libs/libaio/static/ya.make | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/build/conf/license.conf b/build/conf/license.conf index 97d8ce36f1..86caaf2012 100644 --- a/build/conf/license.conf +++ b/build/conf/license.conf @@ -208,7 +208,6 @@ LICENSES_REQUIRE_DISCLOSURE= \ GPL-2.0 \ GPL-2.0-only \ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 \ - GPL-2.0-only WITH Linux-syscall-note \ GPL-2.0-or-later \ GPL-2.0-or-later WITH GCC-exception-2.0 \ GPL-2.0-or-later WITH Linux-syscall-note \ @@ -291,6 +290,7 @@ LICENSES_REQUIRE_CITATION= \ FTL \ GPL-2.0-only WITH Classpath-exception-2.0 \ GPL-2.0-only WITH GCC-exception-2.0 \ + GPL-2.0-only WITH Linux-syscall-note \ GPL-3.0-only WITH Bison-exception-2.2 \ GPL-3.0-or-later WITH Bison-exception-2.2 \ H2 \ @@ -389,7 +389,6 @@ LICENSES_REQUIRE_CITATION= \ Zlib \ zlib-acknowledgement \ ZPL-2.1 \ - ${CUSTOM_LICENSE_LINUX_SYSCALL_NOTE} \ LICENSES_REQUIRE_CITATION_DYNAMIC= \ LGPL \ @@ -400,9 +399,6 @@ LICENSES_REQUIRE_CITATION_DYNAMIC= \ LGPL-3.0-only \ LGPL-3.0-or-later -# Permissive if the code is used to declare and invoke syscalls -CUSTOM_LICENSE_LINUX_SYSCALL_NOTE=Linux-syscall-note-in-syscall-glue - LICENSES_SERVICE= \ Service-Default-License \ Service-Dll-Harness \ diff --git a/contrib/libs/libaio/dynamic/ya.make b/contrib/libs/libaio/dynamic/ya.make index 7b5bb0427f..8873b474e9 100644 --- a/contrib/libs/libaio/dynamic/ya.make +++ b/contrib/libs/libaio/dynamic/ya.make @@ -3,14 +3,15 @@ DYNAMIC_LIBRARY() LICENSE( + GPL-2.0-only WITH Linux-syscall-note AND LGPL-2.0-or-later AND - LGPL-2.1-only AND - Linux-syscall-note-in-syscall-glue + LGPL-2.1-only ) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) DYNAMIC_LIBRARY_FROM(contrib/libs/libaio/static) + LICENSE_RESTRICTION_EXCEPTIONS(contrib/libs/libaio/static) NO_RUNTIME() diff --git a/contrib/libs/libaio/static/ya.make b/contrib/libs/libaio/static/ya.make index b540cd41b1..03607e8c35 100644 --- a/contrib/libs/libaio/static/ya.make +++ b/contrib/libs/libaio/static/ya.make @@ -3,9 +3,9 @@ LIBRARY() LICENSE( + GPL-2.0-only WITH Linux-syscall-note AND LGPL-2.0-or-later AND - LGPL-2.1-only AND - Linux-syscall-note-in-syscall-glue + LGPL-2.1-only ) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) |