8000 platform--->device · home-coder/yun-update-source@1f5bf38 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1f5bf38

Browse files
home-coderhome-coder
committed
platform--->device
1 parent 702de50 commit 1f5bf38

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

‎include.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export SCRIPT_PWD=`pwd`
77
declare -A manifestmap=()
88
export manifestmap
99

10-
export CURENT_BRANCH CURENT_DEVICE REGISTER_PATH
10+
export CURENT_BRANCH CURENT_DEVICE DEVICE_REGISTER_PATH
1111

1212
CBP_PATH="$SCRIPT_PWD/r-config/custom_branch_device"
1313

@@ -112,12 +112,12 @@ function git_checkout_branch()
112112
function config_register_path()
113113
{
114114
debug_func "config_register_path"
115-
REGISTER_PATH="$SCRIPT_PWD/r-config/${CURENT_DEVICE}_register"
116-
if [ ! -f "$REGISTER_PATH" ]; then
117-
debug_error "$REGISTER_PATH may be not exsit, exit(-1)"
115+
DEVICE_REGISTER_PATH="$SCRIPT_PWD/r-config/${CURENT_DEVICE}_register"
116+
if [ ! -f "$DEVICE_REGISTER_PATH" ]; then
117+
debug_error "$DEVICE_REGISTER_PATH may be not exsit, exit(-1)"
118118
exit -1
119119
fi
120-
debug_info "current registed_path-->$REGISTER_PATH"
120+
debug_info "current registed_path-->$DEVICE_REGISTER_PATH"
121121
}
122122

123123
#测试用例

‎process_server.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ function process_external_product()
1818

1919
#根据内部机型属性从manifest获取对应的键值
2020
local key_index="inside_model"
21-
local key_tmp=$(awk -v var="$key_index" '($2==var){print $1}' $REGISTER_PATH)
21+
local key_tmp=$(awk -v var="$key_index" '($2==var){print $1}' $DEVICE_REGISTER_PATH)
2222
local inside_model_value=${manifestmap["$key_tmp"]}
2323
if [ -z "$inside_model_value" ]; then
2424
debug_error "not exsit 'inside_model'...please ask manifest"
2525
exit -1
2626
fi
2727

28-
local external_product_file=$(awk -v mindex="$key_index" '($2==mindex){print $3}' $REGISTER_PATH)
28+
local external_product_file=$(awk -v mindex="$key_index" '($2==mindex){print $3}' $DEVICE_REGISTER_PATH)
2929

3030
#取第一个字段在manifest查询到的value做为key, 其余字段在manifest中的查询结果拼接后作为为value
3131
#两个for，一个是先找到manifest定义的字段，er个然后通过该字段找到对应的value，并使用 = 拼接成一个value
@@ -35,7 +35,7 @@ function process_external_product()
3535
local var
3636
declare -a external_product_tmp
3737
for var in "${external_product[@]}"; do
38-
external_product_tmp[$i]=$(awk -v var_tmp="$var" '($2==var_tmp){print $1}' $REGISTER_PATH)
38+
external_product_tmp[$i]=$(awk -v var_tmp="$var" '($2==var_tmp){print $1}' $DEVICE_REGISTER_PATH)
3939
let i=i+1
4040
done
4141
local len=${#external_product_tmp}
@@ -78,7 +78,7 @@ function process_keyboard_layout()
7878

7979
#不同平台对kl文件名字不同处理; 比如全志: custom_code+business_model唯一指定一个kl配置文件
8080
#TODO 其它平台还需要可扩展
81-
local path_tmp=$(awk '($2=="customer_code"){print $3}' $REGISTER_PATH)
81+
local path_tmp=$(awk '($2=="customer_code"){print $3}' $DEVICE_REGISTER_PATH)
8282
#TODO 如果path_tmp后面有/就去掉这个/
8383
case $CURENT_DEVICE in
8484
"dolphin-cantv-h2")
@@ -104,8 +104,8 @@ function call_process_server()
104104
{
105105
debug_func "call_process_server >>>>>"
106106

107-
if [[ ! -f "$REGISTER_PATH" ]]; then
108-
debug_error "$REGISTER_PATH is not exsit, please run 'config_register_path' first, exit (-1)"
107+
if [[ ! -f "$DEVICE_REGISTER_PATH" ]]; then
108+
debug_error "$DEVICE_REGISTER_PATH is not exsit, please run 'config_register_path' first, exit (-1)"
109109
exit -1
110110
fi
111111

@@ -132,10 +132,10 @@ function call_process_server()
132132
#for将跳过特殊处理过的key, 然后统一处理普通的属性
133133
local key
134134
for key in ${!manifestmap[@]}; do
135-
#awk -v tmp="$key" '{print $0}' $REGISTER_PATH
135+
#awk -v tmp="$key" '{print $0}' $DEVICE_REGISTER_PATH
136136
#prop 和 path是本地注册表中的属性和修改路径; prop以后将作为key，而value需要从manifest中获取
137137

138-
local pp=$(awk -v tmp="$key" '($1==tmp){print $2,$3}' $REGISTER_PATH)
138+
local pp=$(awk -v tmp="$key" '($1==tmp){print $2,$3}' $DEVICE_REGISTER_PATH)
139139
if [[ -n "$pp" ]]; then
140140
local prop=$(echo $pp |awk '{print $1}')
141141
elif [[ "${key:0:2}" == "0x" ]]; then
@@ -150,7 +150,7 @@ function call_process_server()
150150
if [[ "$prop" == "customer_code" ]]; then
151151
continue
152152
elif [[ "${key:0:2}" == "0x" ]]; then
153-
local irlabel_tmp=$(awk '($2=="customer_code"){print $1}' $REGISTER_PATH)
153+
local irlabel_tmp=$(awk '($2=="customer_code"){print $1}' $DEVICE_REGISTER_PATH)
154154
local irlabel=${manifestmap["$irlabel_tmp"]}
155155
process_keyboard_layout $irlabel $key
156156
let retflag=retflag+$?

‎r-config/custom_branch_platform renamed to ‎r-config/custom_branch_device

File renamed without changes.

0 commit comments

Comments
 (0)
0