提交 83b0e8f8 编写于 作者: O openharmony_ci 提交者: Gitee

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

Merge pull request !89 from zhangfanfan2/OpenHarmony_1.0.1_release
...@@ -32,6 +32,7 @@ set -e ...@@ -32,6 +32,7 @@ set -e
echo "sh param:$1,$2,$3,$4,$5,$6,$7" echo "sh param:$1,$2,$3,$4,$5,$6,$7"
destination=".config" destination=".config"
config_file=""
tee="" tee=""
outdir="../..$3/test_info/gen/kernel/test" outdir="../..$3/test_info/gen/kernel/test"
if [ "$5" = "tee" ]; then if [ "$5" = "tee" ]; then
...@@ -41,15 +42,19 @@ productName="$(basename $7)" ...@@ -41,15 +42,19 @@ productName="$(basename $7)"
source="tools/build/config/${productName}_release.config" source="tools/build/config/${productName}_release.config"
if [ "$2" = "clang" ]; then if [ "$2" = "clang" ]; then
if [ "$4" = "debug" ]; 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 else
source="tools/build/config/${productName}_$2_release$tee.config" config_file="${productName}_$2_release$tee.config"
source="tools/build/config/$config_file"
fi fi
elif [ "$2" = "gcc" ]; then elif [ "$2" = "gcc" ]; then
if [ "$4" = "debug" ]; 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 else
source="tools/build/config/${productName}_release$tee.config" config_file="${productName}_release$tee.config"
source="tools/build/config/$config_file"
fi fi
fi fi
if [ -d "./out" ]; then if [ -d "./out" ]; then
...@@ -58,6 +63,9 @@ fi ...@@ -58,6 +63,9 @@ fi
if [ -f "$destination" ]; then if [ -f "$destination" ]; then
rm -rf $destination rm -rf $destination
fi fi
if [ ! -f "$source" ]; then
source="$7/config/sys/$config_file"
fi
cp $source $destination cp $source $destination
mkdir -p $outdir mkdir -p $outdir
......
...@@ -5,7 +5,7 @@ config PLATFORM ...@@ -5,7 +5,7 @@ config PLATFORM
default "virt" if PLATFORM_QEMU_ARM_VIRT_CA7 default "virt" if PLATFORM_QEMU_ARM_VIRT_CA7
config PRODUCT_NAME config PRODUCT_NAME
string string "unknown"
default "ipcamera_hi3516dv300_liteos" if PRODUCT_IPCAMERA_HI3516DV300_LITEOS default "ipcamera_hi3516dv300_liteos" if PRODUCT_IPCAMERA_HI3516DV300_LITEOS
default "ipcamera_hi3518ev300_liteos" if PRODUCT_IPCAMERA_HI3518EV300_LITEOS default "ipcamera_hi3518ev300_liteos" if PRODUCT_IPCAMERA_HI3518EV300_LITEOS
default "hispark_taurus" if PRODUCT_HISPARK_TAURUS default "hispark_taurus" if PRODUCT_HISPARK_TAURUS
...@@ -13,7 +13,7 @@ config PRODUCT_NAME ...@@ -13,7 +13,7 @@ config PRODUCT_NAME
default "arm_virt" if PRODUCT_QEMU_ARM default "arm_virt" if PRODUCT_QEMU_ARM
config DEVICE_COMPANY config DEVICE_COMPANY
string string "unknown"
default "hisilicon" if PLATFORM_HI3516DV300 default "hisilicon" if PLATFORM_HI3516DV300
default "hisilicon" if PLATFORM_HI3518EV300 default "hisilicon" if PLATFORM_HI3518EV300
default "qemu" if PLATFORM_QEMU_ARM_VIRT_CA7 default "qemu" if PLATFORM_QEMU_ARM_VIRT_CA7
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册