guohui лет назад: 2
Родитель
Сommit
c93584cca2
5 измененных файлов с 18 добавлено и 5 удалено
  1. BIN
      cust_data/db/ac_i1_o1_english.db
  2. 0 0
      cust_data/db/dc_i_dc_o_chinese.db
  3. 0 1
      output/t113i/etc/init.d/rcS
  4. 5 3
      pro/CMakeLists.txt
  5. 13 1
      pub

BIN
cust_data/db/ac_i1_o1_english.db


cust_data/db/dc_i_dc_o.db → cust_data/db/dc_i_dc_o_chinese.db


+ 0 - 1
output/t113i/etc/init.d/rcS

@@ -30,7 +30,6 @@ mdev -s
 
 
 /etc/adb_conf.sh start &
 /etc/adb_conf.sh start &
 #/usr/sbin/dnsmasq
 #/usr/sbin/dnsmasq
-/sbin/udhcpc -i eth0 -s /usr/share/udhcpc/default.script &
 /usr/sbin/smartMonitor.sh &
 /usr/sbin/smartMonitor.sh &
 /usr/sbin/smartUPG &
 /usr/sbin/smartUPG &
 
 

+ 5 - 3
pro/CMakeLists.txt

@@ -98,7 +98,7 @@ add_executable(smartPDU ${PDU_SRC_LIST})
 target_link_libraries(smartPDU -lpcre -lsqlite3 -lmodbus -lc -ldl -lpthread -lnetsnmp -lnetsnmpagent -lrt)
 target_link_libraries(smartPDU -lpcre -lsqlite3 -lmodbus -lc -ldl -lpthread -lnetsnmp -lnetsnmpagent -lrt)
 
 
 
 
-set(SRC_DIR  ${PROJECT_BINARY_DIR})
+set(SRC_DIR ${PROJECT_BINARY_DIR})
 set(DST_DIR ${PROJECT_SOURCE_DIR}/../output)
 set(DST_DIR ${PROJECT_SOURCE_DIR}/../output)
 set(CHIP t113i)
 set(CHIP t113i)
 
 
@@ -108,14 +108,16 @@ set(UPG_SRC_LIST ${PROJECT_SOURCE_DIR}/upgrade/md5.c
 add_executable(smartUPG ${UPG_SRC_LIST})
 add_executable(smartUPG ${UPG_SRC_LIST})
 target_link_libraries(smartUPG -lc -lpthread)
 target_link_libraries(smartUPG -lc -lpthread)
 
 
-add_custom_command(TARGET  smartUPG  POST_BUILD
+add_custom_command(TARGET smartUPG  POST_BUILD
                    COMMAND mkdir -p ${DST_DIR}/${CHIP}/usr/sbin
                    COMMAND mkdir -p ${DST_DIR}/${CHIP}/usr/sbin
                    COMMAND cp -upf  ${SRC_DIR}/smartUPG ${DST_DIR}/${CHIP}/usr/sbin)
                    COMMAND cp -upf  ${SRC_DIR}/smartUPG ${DST_DIR}/${CHIP}/usr/sbin)
 
 
 add_custom_command(TARGET  smartPDU  POST_BUILD
 add_custom_command(TARGET  smartPDU  POST_BUILD
                    COMMAND mkdir -p ${DST_DIR}/${CHIP}/root/run/app
                    COMMAND mkdir -p ${DST_DIR}/${CHIP}/root/run/app
                    COMMAND cp -upf  ${SRC_DIR}/smartPDU ${DST_DIR}/${CHIP}/root/run/app
                    COMMAND cp -upf  ${SRC_DIR}/smartPDU ${DST_DIR}/${CHIP}/root/run/app
-                   COMMAND ${DST_DIR}/pack.sh)
+				   COMMAND ${DST_DIR}/pack.sh)
 
 
 
 
 
 
+#execute_process(COMMAND ${DST_DIR}/pack.sh)
+#add_custom_target(PACK COMMAND ${DST_DIR}/pack.sh ALWAYS)

+ 13 - 1
pub

@@ -2,6 +2,8 @@
 #  2:  RUSSIA_ITK
 #  2:  RUSSIA_ITK
 #  3:  RUSSIA_ITK_DC
 #  3:  RUSSIA_ITK_DC
 #  4:  GOWONE_CHN
 #  4:  GOWONE_CHN
+#  5:  LITECH_ENGLISH
+#  6:  NEUTER_CHN
 #
 #
 cust=4
 cust=4
 
 
@@ -20,8 +22,18 @@ elif [ $cust -eq 3 ]; then
     cp -f $custdir/db/ac_i1_o1_russian.db $curdir/output/t113i/root/run/app/pdu_dat.db
     cp -f $custdir/db/ac_i1_o1_russian.db $curdir/output/t113i/root/run/app/pdu_dat.db
     cp -f $custdir/logo/logo_itk.png $curdir/output/t113i/root/run/app/image/logo.png
     cp -f $custdir/logo/logo_itk.png $curdir/output/t113i/root/run/app/image/logo.png
 elif [ $cust -eq 4 ]; then
 elif [ $cust -eq 4 ]; then
-    cp -f $custdir/db/ac_1_o1.db $curdir/output/t113i/root/run/app/pdu_dat.db
+    cp -f $custdir/db/ac_i1_o1_chinese.db $curdir/output/t113i/root/run/app/pdu_dat.db
     cp -f $custdir/logo/logo_gowone.png $curdir/output/t113i/root/run/app/image/logo.png
     cp -f $custdir/logo/logo_gowone.png $curdir/output/t113i/root/run/app/image/logo.png
+elif [ $cust -eq 5 ]; then
+    cp -f $custdir/db/ac_i1_o1_english.db $curdir/output/t113i/root/run/app/pdu_dat.db
+    #cp -f $custdir/db/ac_i3_o1_english.db $curdir/output/t113i/root/run/app/pdu_dat.db
+    cp -f $custdir/logo/logo_litech.png $curdir/output/t113i/root/run/app/image/logo.png
+elif [ $cust -eq 6 ]; then
+    cp -f $custdir/db/dc_i_dc_o_chinese.db $curdir/output/t113i/root/run/app/pdu_dat.db
+    #cp -f $custdir/db/ac_i1_o1_chinese.db $curdir/output/t113i/root/run/app/pdu_dat.db
+    #cp -f $custdir/db/ac_i3_o1_chinese.db $curdir/output/t113i/root/run/app/pdu_dat.db
+    #cp -f $custdir/db/ac_i3_o3_chinese.db $curdir/output/t113i/root/run/app/pdu_dat.db
+    cp -f $custdir/logo/logo_neuter.png $curdir/output/t113i/root/run/app/image/logo.png
 else
 else
     echo error!  customer value is wrong!!!
     echo error!  customer value is wrong!!!
     exit 1
     exit 1