!85 内核构建增加从vendor下面copy配置文件的方式

Merge pull request !85 from zhangfanfan2/master
This commit is contained in:
openharmony_ci 2021-03-23 10:08:39 +08:00 committed by Gitee
commit 8d0e58f98c
2 changed files with 14 additions and 6 deletions

View File

@ -32,6 +32,7 @@ set -e
echo "sh param:$1,$2,$3,$4,$5,$6,$7"
destination=".config"
config_file=""
tee=""
outdir="../..$3/test_info/gen/kernel/test"
if [ "$5" = "tee" ]; then
@ -41,15 +42,19 @@ productName="$(basename $7)"
source="tools/build/config/${productName}_release.config"
if [ "$2" = "clang" ]; then
if [ "$4" = "debug" ]; then
source="tools/build/config/debug/${productName}_$2$tee.config"
config_file="${productName}_$2$tee.config"
source="tools/build/config/debug/$config_file"
else
source="tools/build/config/${productName}_$2_release$tee.config"
config_file="${productName}_$2_release$tee.config"
source="tools/build/config/$config_file"
fi
elif [ "$2" = "gcc" ]; then
if [ "$4" = "debug" ]; then
source="tools/build/config/${productName}_debug_shell$tee.config"
config_file="${productName}_debug_shell$tee.config"
source="tools/build/config/$config_file"
else
source="tools/build/config/${productName}_release$tee.config"
config_file="${productName}_release$tee.config"
source="tools/build/config/$config_file"
fi
fi
if [ -d "./out" ]; then
@ -58,6 +63,9 @@ fi
if [ -f "$destination" ]; then
rm -rf $destination
fi
if [ ! -f "$source" ]; then
source="../..$7/config/sys/$config_file"
fi
cp $source $destination
mkdir -p $outdir

View File

@ -5,7 +5,7 @@ config PLATFORM
default "virt" if PLATFORM_QEMU_ARM_VIRT_CA7
config PRODUCT_NAME
string
string "unknown"
default "ipcamera_hi3516dv300_liteos" if PRODUCT_IPCAMERA_HI3516DV300_LITEOS
default "ipcamera_hi3518ev300_liteos" if PRODUCT_IPCAMERA_HI3518EV300_LITEOS
default "hispark_taurus" if PRODUCT_HISPARK_TAURUS
@ -13,7 +13,7 @@ config PRODUCT_NAME
default "arm_virt" if PRODUCT_QEMU_ARM
config DEVICE_COMPANY
string
string "unknown"
default "hisilicon" if PLATFORM_HI3516DV300
default "hisilicon" if PLATFORM_HI3518EV300
default "qemu" if PLATFORM_QEMU_ARM_VIRT_CA7