From 0adcb7cb56cb32fe7172cf2b9c4a35e5fd01bfe7 Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Fri, 13 Sep 2024 03:35:42 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B8=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=A3=B0=E6=98=8E5.0release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao --- LICENSE | 10 ++++++++++ OAT.xml | 5 +++++ hiebpf/include/bpf_log_writer.h | 18 +++++------------- hiebpf/include/fstrace_progs.h | 19 ++++++------------- hiebpf/include/hiebpf_types.h | 19 ++++++------------- hiebpf/src/hiebpf.bpf.c | 19 ++++++------------- 6 files changed, 38 insertions(+), 52 deletions(-) diff --git a/LICENSE b/LICENSE index e454a5258..95456ee3e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,13 @@ +Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. + +Because of hiebpf.bpf.c,bpf_log_write.h,fstrace_progs.h,hiebpf_types.h is run at kernel mode, other files +under hiebpf subdirectories is run at user mode, so other files under hiebpf subdirectories use Apache License. +The hiebpf.bpf.c,bpf_log_write.h,fstrace_progs.h,hiebpf_types.h is dual licensed: you can use it +either under the terms of the GPL V2, or the 3-Clause BSD license, at your option. + +hiebpf is dual licensed: you can use it either under the terms of +the GPL V2, or the BSD3 license, at your option. + Apache License Version 2.0, January 2004 diff --git a/OAT.xml b/OAT.xml index d8faae580..7617b6167 100644 --- a/OAT.xml +++ b/OAT.xml @@ -96,6 +96,11 @@ Note:If the text contains special characters, please escape them according to th + + + + + diff --git a/hiebpf/include/bpf_log_writer.h b/hiebpf/include/bpf_log_writer.h index a2c7398ab..194432112 100644 --- a/hiebpf/include/bpf_log_writer.h +++ b/hiebpf/include/bpf_log_writer.h @@ -1,18 +1,10 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. +* The bpf_log_writer.h is dual licensed: you can use it either under the terms of +* the GPL V2, or the 3-Clause BSD license, at your option. +* See the LICENSE file in the root of this repository for complete details. +*/ #ifndef BPF_LOG_WRITER_H #define BPF_LOG_WRITER_H diff --git a/hiebpf/include/fstrace_progs.h b/hiebpf/include/fstrace_progs.h index 33f039f6b..0329a2672 100644 --- a/hiebpf/include/fstrace_progs.h +++ b/hiebpf/include/fstrace_progs.h @@ -1,17 +1,10 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. + +* The fstrace_progs.h is dual licensed: you can use it either under the terms of +* the GPL V2, or the 3-Clause BSD license, at your option. +* See the LICENSE file in the root of this repository for complete details. +*/ /* This line is generated to truncate the original file */ /************************** fstrace BPF progs BEGIN *****************************/ diff --git a/hiebpf/include/hiebpf_types.h b/hiebpf/include/hiebpf_types.h index bb1a5a024..f994ddf42 100644 --- a/hiebpf/include/hiebpf_types.h +++ b/hiebpf/include/hiebpf_types.h @@ -1,17 +1,10 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. + +* The hiebpf_types.h is dual licensed: you can use it either under the terms of +* the GPL V2, or the 3-Clause BSD license, at your option. +* See the LICENSE file in the root of this repository for complete details. +*/ #ifndef HIEBPF_EVENT_STRUCTS_H #define HIEBPF_EVENT_STRUCTS_H diff --git a/hiebpf/src/hiebpf.bpf.c b/hiebpf/src/hiebpf.bpf.c index 087b7ae77..8858077a8 100644 --- a/hiebpf/src/hiebpf.bpf.c +++ b/hiebpf/src/hiebpf.bpf.c @@ -1,17 +1,10 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2022. All rights reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved. + +* The hiebpf.bpf.c is dual licensed: you can use it either under the terms of +* the GPL V2, or the 3-Clause BSD license, at your option. +* See the LICENSE file in the root of this repository for complete details. +*/ #include #include "vmlinux.h"