From 540d93fc66bced6628e31f5a96bafa1a40f82da0 Mon Sep 17 00:00:00 2001 From: Grooooot Date: Fri, 6 Mar 2020 14:35:47 +0800 Subject: [PATCH] clibcni: sync with openeuler at 3.6 Signed-off-by: Grooooot --- clibcni.spec | 2 +- src/json/schema/src/common_c.py | 10 ++++++++++ src/json/schema/src/common_h.py | 9 +++++++++ src/json/schema/src/generate.py | 10 ++++++++++ src/json/schema/src/headers.py | 10 ++++++++++ src/json/schema/src/helpers.py | 9 +++++++++ src/json/schema/src/sources.py | 9 +++++++++ 7 files changed, 58 insertions(+), 1 deletion(-) diff --git a/clibcni.spec b/clibcni.spec index ca8f5f6..dda0ad2 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -1,5 +1,5 @@ %global _version 1.0.8 -%global _release 20200120.104549.gitefa9896c +%global _release 20191225.122403.git49093ba7 Name: clibcni Version: %{_version} Release: %{_release} diff --git a/src/json/schema/src/common_c.py b/src/json/schema/src/common_c.py index 4ccf16b..239440a 100644 --- a/src/json/schema/src/common_c.py +++ b/src/json/schema/src/common_c.py @@ -22,6 +22,16 @@ History: 2019-06-17 # # You should have received a copy of the GNU General Public License # along with libocispec. If not, see . +# +# As a special exception, you may create a larger work that contains +# part or all of the libocispec parser skeleton and distribute that work +# under terms of your choice, so long as that work isn't itself a +# parser generator using the skeleton or a modified version thereof +# as a parser skeleton. Alternatively, if you modify or redistribute +# the parser skeleton itself, you may (at your option) remove this +# special exception, which will cause the skeleton and the resulting +# libocispec output files to be licensed under the GNU General Public +# License without this special exception. CODE = '''// Auto generated file. Do not edit! # define _GNU_SOURCE diff --git a/src/json/schema/src/common_h.py b/src/json/schema/src/common_h.py index c1a8a8b..8baafbe 100644 --- a/src/json/schema/src/common_h.py +++ b/src/json/schema/src/common_h.py @@ -23,6 +23,15 @@ History: 2019-06-17 # You should have received a copy of the GNU General Public License # along with libocispec. If not, see . # +# As a special exception, you may create a larger work that contains +# part or all of the libocispec parser skeleton and distribute that work +# under terms of your choice, so long as that work isn't itself a +# parser generator using the skeleton or a modified version thereof +# as a parser skeleton. Alternatively, if you modify or redistribute +# the parser skeleton itself, you may (at your option) remove this +# special exception, which will cause the skeleton and the resulting +# libocispec output files to be licensed under the GNU General Public +# License without this special exception. #!/usr/bin/python -Es """ diff --git a/src/json/schema/src/generate.py b/src/json/schema/src/generate.py index 534e07e..698262c 100644 --- a/src/json/schema/src/generate.py +++ b/src/json/schema/src/generate.py @@ -22,6 +22,16 @@ History: 2019-06-17 # # You should have received a copy of the GNU General Public License # along with libocispec. If not, see . +# +# As a special exception, you may create a larger work that contains +# part or all of the libocispec parser skeleton and distribute that work +# under terms of your choice, so long as that work isn't itself a +# parser generator using the skeleton or a modified version thereof +# as a parser skeleton. Alternatively, if you modify or redistribute +# the parser skeleton itself, you may (at your option) remove this +# special exception, which will cause the skeleton and the resulting +# libocispec output files to be licensed under the GNU General Public +# License without this special exception. import traceback import os diff --git a/src/json/schema/src/headers.py b/src/json/schema/src/headers.py index 98116a6..e35d24c 100644 --- a/src/json/schema/src/headers.py +++ b/src/json/schema/src/headers.py @@ -23,6 +23,16 @@ History: 2019-06-17 # You should have received a copy of the GNU General Public License # along with libocispec. If not, see . # +# As a special exception, you may create a larger work that contains +# part or all of the libocispec parser skeleton and distribute that work +# under terms of your choice, so long as that work isn't itself a +# parser generator using the skeleton or a modified version thereof +# as a parser skeleton. Alternatively, if you modify or redistribute +# the parser skeleton itself, you may (at your option) remove this +# special exception, which will cause the skeleton and the resulting +# libocispec output files to be licensed under the GNU General Public +# License without this special exception. +# #!/usr/bin/python -Es import helpers diff --git a/src/json/schema/src/helpers.py b/src/json/schema/src/helpers.py index 92a96c9..cb344c6 100644 --- a/src/json/schema/src/helpers.py +++ b/src/json/schema/src/helpers.py @@ -23,6 +23,15 @@ History: 2019-06-17 # You should have received a copy of the GNU General Public License # along with libocispec. If not, see . # +# As a special exception, you may create a larger work that contains +# part or all of the libocispec parser skeleton and distribute that work +# under terms of your choice, so long as that work isn't itself a +# parser generator using the skeleton or a modified version thereof +# as a parser skeleton. Alternatively, if you modify or redistribute +# the parser skeleton itself, you may (at your option) remove this +# special exception, which will cause the skeleton and the resulting +# libocispec output files to be licensed under the GNU General Public +# License without this special exception. #!/usr/bin/python -Es import os import sys diff --git a/src/json/schema/src/sources.py b/src/json/schema/src/sources.py index d4b5393..3b5d9a1 100644 --- a/src/json/schema/src/sources.py +++ b/src/json/schema/src/sources.py @@ -19,6 +19,15 @@ # You should have received a copy of the GNU General Public License # along with libocispec. If not, see . # +# As a special exception, you may create a larger work that contains +# part or all of the libocispec parser skeleton and distribute that work +# under terms of your choice, so long as that work isn't itself a +# parser generator using the skeleton or a modified version thereof +# as a parser skeleton. Alternatively, if you modify or redistribute +# the parser skeleton itself, you may (at your option) remove this +# special exception, which will cause the skeleton and the resulting +# libocispec output files to be licensed under the GNU General Public +# License without this special exception. import helpers