From 54f3cdf0fec3640e1527d6f80914a86aa5dfcbea Mon Sep 17 00:00:00 2001
From: Zachery Wu <wuzuoyu@huawei.com>
Date: Thu, 5 Aug 2021 15:46:05 +0800
Subject: [PATCH] fix OAT problem

Signed-off-by: Zachery Wu <wuzuoyu@huawei.com>
---
 BUILD.gn                                      | 15 ++++-
 OAT.xml                                       | 66 +++++++++++++++++++
 build.sh                                      | 18 -----
 .../prebuilts/usr/include/asm-arm/asm/Kbuild  | 24 -------
 .../asm-arm/uapi/asm/.unistd-common.h.cmd     |  1 -
 .../asm-arm/uapi/asm/.unistd-eabi.h.cmd       |  1 -
 .../asm-arm/uapi/asm/.unistd-oabi.h.cmd       |  1 -
 7 files changed, 79 insertions(+), 47 deletions(-)
 create mode 100644 OAT.xml
 delete mode 100755 build.sh
 delete mode 100644 linux-4.19/prebuilts/usr/include/asm-arm/asm/Kbuild
 delete mode 100644 linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-common.h.cmd
 delete mode 100644 linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-eabi.h.cmd
 delete mode 100644 linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-oabi.h.cmd

diff --git a/BUILD.gn b/BUILD.gn
index f5aad13..617afc7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,5 +1,16 @@
-# Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved.
-
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 import("//build/lite/config/component/lite_component.gni")
 
 build_ext_component("linux_kernel") {
diff --git a/OAT.xml b/OAT.xml
new file mode 100644
index 0000000..ccc220b
--- /dev/null
+++ b/OAT.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
+
+     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.
+	 
+	 Notes:
+	 This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun. 	 
+--> 
+<!-- OAT(OSS Audit Tool) configuration guide:
+basedir: Root dir, the basedir + project path is the real source file location.
+licensefile: 
+1.If the project don't have "LICENSE" in root dir, please define all the license files in this project in , OAT will check license files according to this rule.
+
+tasklist(only for batch mode):
+1. task: Define oat check thread, each task will start a new thread.
+2. task name: Only an name, no practical effect.
+3. task policy: Default policy for projects under this task, this field is required and the specified policy must defined in policylist.
+4. task filter: Default filefilter for projects under this task, this field is required and the specified filefilter must defined in filefilterlist.
+5. task project: Projects to be checked, the path field define the source root dir of the project.
+
+
+policyList:
+1. policy: All policyitems will be merged to default OAT.xml rules, the name of policy doesn't affect OAT check process.
+2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is:
+<policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter"/>
+3. policyitem type:	
+    "compatibility" is used to check license compatibility in the specified path; 
+    "license" is used to check source license header in the specified path;
+    "copyright" is used to check source copyright header in the specified path;
+    "import" is used to check source dependency in the specified path, such as import ... ,include ...
+    "filetype" is used to check file type in the specified path, supported file types: archive, binary
+    "filename" is used to check whether the specified file exists in the specified path(support projectroot in default OAT.xml), supported file names: LICENSE, README, README.OpenSource
+
+4. policyitem name: This field is used for define the license, copyright, "*" means match all, the "!" prefix means could not match this value. For example, "!GPL" means can not use GPL license. 
+5. policyitem path: This field is used for define the source file scope to apply this policyitem, the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be exclude while process this policyitem.
+6. policyitem rule and group: These two fields are used together to merge policy results. "may" policyitems in the same group means any one in this group passed, the result will be passed.
+7. policyitem filefilter: Used to bind filefilter which define filter rules.
+8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is used to filter file path.
+
+Note:If the text contains special characters, please escape them according to the following rules:
+" == &gt;
+& == &gt;
+' == &gt;
+< == &gt;
+> == &gt;
+-->
+<configuration>
+    <oatconfig>
+	<licensefile></licensefile>
+	<policylist>
+            <policy name="projectPolicy" desc="">
+                <policyitem type="license" name="GPL" path=".*" desc="linux kernel adapter codes"/>
+            </policy>
+        </policylist>	
+    </oatconfig>
+</configuration>
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 0cf4579..0000000
--- a/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export TARGET_PRODUCT=hi3516dv300
-export OHOS_ROOT_PATH=$(pwd)/../../..
-export OUTDIR=$1
-
-LINUX_KERNEL_OUT=${OHOS_ROOT_PATH}/out/kernel/src_tmp/linux-4.19
-LINUX_KERNEL_OUT_DIR=${OHOS_ROOT_PATH}/out/kernel
-HISPARK_TAS_SDK_LINUX_PATH=${OHOS_ROOT_PATH}/device/hisilicon/hispark_taurus/sdk_linux
-HISPARK_TAS_SDK_LINUX_MPP_PATH=${HISPARK_TAS_SDK_LINUX_PATH}/soc/src/mpp
-
-make -f kernel.mk
-cp -rf $LINUX_KERNEL_OUT/arch/arm/boot/uImage $OUTDIR/uImage_hi3516dv300_smp
-
-pushd ${HISPARK_TAS_SDK_LINUX_MPP_PATH}; make -f sdk.mk; popd
-rm -rf $LINUX_KERNEL_OUT_DIR
diff --git a/linux-4.19/prebuilts/usr/include/asm-arm/asm/Kbuild b/linux-4.19/prebuilts/usr/include/asm-arm/asm/Kbuild
deleted file mode 100644
index 4d1cc18..0000000
--- a/linux-4.19/prebuilts/usr/include/asm-arm/asm/Kbuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# UAPI Header export list
-include include/uapi/asm-generic/Kbuild.asm
-
-generated-y += unistd-common.h
-generated-y += unistd-oabi.h
-generated-y += unistd-eabi.h
-
-generic-y += bitsperlong.h
-generic-y += bpf_perf_event.h
-generic-y += errno.h
-generic-y += ioctl.h
-generic-y += ipcbuf.h
-generic-y += msgbuf.h
-generic-y += param.h
-generic-y += poll.h
-generic-y += resource.h
-generic-y += sembuf.h
-generic-y += shmbuf.h
-generic-y += siginfo.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += termbits.h
-generic-y += termios.h
diff --git a/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-common.h.cmd b/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-common.h.cmd
deleted file mode 100644
index 9c56be7..0000000
--- a/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-common.h.cmd
+++ /dev/null
@@ -1 +0,0 @@
-cmd_arch/arm/include/generated/uapi/asm/unistd-common.h := /bin/sh './arch/arm/tools/syscallhdr.sh' 'arch/arm/tools/syscall.tbl' 'arch/arm/include/generated/uapi/asm/unistd-common.h' 'common' '' '__NR_SYSCALL_BASE'
diff --git a/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-eabi.h.cmd b/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-eabi.h.cmd
deleted file mode 100644
index ee977dc..0000000
--- a/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-eabi.h.cmd
+++ /dev/null
@@ -1 +0,0 @@
-cmd_arch/arm/include/generated/uapi/asm/unistd-eabi.h := /bin/sh './arch/arm/tools/syscallhdr.sh' 'arch/arm/tools/syscall.tbl' 'arch/arm/include/generated/uapi/asm/unistd-eabi.h' 'eabi' '' '__NR_SYSCALL_BASE'
diff --git a/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-oabi.h.cmd b/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-oabi.h.cmd
deleted file mode 100644
index e523de5..0000000
--- a/linux-4.19/prebuilts/usr/include/asm-arm/uapi/asm/.unistd-oabi.h.cmd
+++ /dev/null
@@ -1 +0,0 @@
-cmd_arch/arm/include/generated/uapi/asm/unistd-oabi.h := /bin/sh './arch/arm/tools/syscallhdr.sh' 'arch/arm/tools/syscall.tbl' 'arch/arm/include/generated/uapi/asm/unistd-oabi.h' 'oabi' '' '__NR_SYSCALL_BASE'
-- 
Gitee