[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/cap/zx297520v3/sources/meta-zxic/conf/app_com.inc b/cap/zx297520v3/sources/meta-zxic/conf/app_com.inc
index 5c05d34..a811432 100755
--- a/cap/zx297520v3/sources/meta-zxic/conf/app_com.inc
+++ b/cap/zx297520v3/sources/meta-zxic/conf/app_com.inc
@@ -1,4 +1,4 @@
-CFLAGS_prepend = " -I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/include -Wall -ffunction-sections -fomit-frame-pointer -fno-short-enums "
+CFLAGS_prepend = " -I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/include -I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/include/sctel -Wall -ffunction-sections -fomit-frame-pointer -fno-short-enums "
CFLAGS_append_arm = " -msoft-float -fno-common "
LDFLAGS_append = " -g -fno-common -fno-builtin -Wl,--gc-sections "
CFLAGS_append = " ${CUSTOM_MACRO} "
diff --git a/cap/zx297520v3/sources/meta-zxic/conf/machine/zx279132.conf b/cap/zx297520v3/sources/meta-zxic/conf/machine/zx279132.conf
deleted file mode 100755
index 55245a3..0000000
--- a/cap/zx297520v3/sources/meta-zxic/conf/machine/zx279132.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#@TYPE: Machine
-#@NAME: zxic 5G Development Board
-#@DESCRIPTION: Machine configuration for the zxic 5G
-
-#MACHINEOVERRIDES = "zxic:${MACHINE}"
-MACHINE_FEATURES += ""
-MACHINE_EXTRA_RRECOMMENDS += "\
-"
-
-include conf/machine/include/zxic-64.inc
-
-TUNE_FEATURES_tune-armv7a_remove = "vfp"
-SERIAL_CONSOLES ?= "115200;ttyS0"
-
-#UBOOT_MACHINE = ""
-
-# kernel and uboot default:
-#
-KERNEL_BOOTCMD ??= "bootm"
-KERNEL_IMAGETYPE_UBOOT ??= "uImage"
-KERNEL_IMAGETYPE_DIRECT ??= "zImage"
-KERNEL_IMAGETYPE ?= "${@bb.utils.contains('zxic_USE_U_BOOT', '1', \
- '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}"
-
-#IMAGE_FSTYPES config : tar.bz2 jffs2 ubifs cpio.gz
-IMAGE_FSTYPES ?= "tar.bz2"
-
-MACHINE_FEATURES += ""
-
-KERNEL_DEVICETREE ?= " \
- zte/zx279132s/zx279132s-evb.dtb \
- zte/zx279132s/zx279132s-cpe.dtb \
- "
-
-#EXTRA_IMAGEDEPENDS += "u-boot-zxic"
-UBOOT_MACHINE ?= "zxic_defconfig"
-
-MKUBIFS_ARGS ?= "-m 2048 -e 126976 "
-UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 2048"
-
-USERDATA_MKUBIFS_ARGS ?= "-m 2048 -e 126976 "
-USERDATA_UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 2048"
-
diff --git a/cap/zx297520v3/sources/meta-zxic/conf/machine/zx297520v3.conf b/cap/zx297520v3/sources/meta-zxic/conf/machine/zx297520v3.conf
index 5b9c41b..a8c52af 100644
--- a/cap/zx297520v3/sources/meta-zxic/conf/machine/zx297520v3.conf
+++ b/cap/zx297520v3/sources/meta-zxic/conf/machine/zx297520v3.conf
@@ -31,7 +31,7 @@
KERNEL_IMAGETYPE_UBOOT ??= "uImage"
KERNEL_IMAGETYPE_DIRECT ??= "zImage"
KERNEL_IMAGETYPE ?= "uImage"
-KERNEL_LOADADDR ?= "0x22208000"
+KERNEL_LOADADDR ?= "0x22808000"
#IMAGE_FSTYPES config : tar.bz2 jffs2 ubifs cpio.gz
IMAGE_FSTYPES ?= "tar.bz2 cpio.gz"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/adb/adb.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/adb/adb.bb
index b4230a3..9ffd4b9 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/adb/adb.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/adb/adb.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://adb \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://adb.init","", d)} \
@@ -43,7 +43,7 @@
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/adb.service ${D}${systemd_unitdir}/adbd
+ install -m 0644 ${WORKDIR}/adb.service ${D}${systemd_unitdir}/system
fi
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-ctl/at-ctl.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/at-ctl/at-ctl.bb
index 30d6a74..3eb28ce 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-ctl/at-ctl.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/at-ctl/at-ctl.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "at_ctl"
-DEPENDS = "libnvram libsoftap libsofttimer libatutils sqlcipher libatext libmxml"
+DEPENDS = "libnvram libsoftap libsofttimer libatutils sqlcipher libatext libmxml libtelsvr "
SECTION = "app"
LICENSE = "zte"
PV = "1.0.0"
@@ -17,7 +17,7 @@
"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://at_ctl \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://at_ctl.init","", d)} \
@@ -32,7 +32,7 @@
#引用公用头文件和编译选项。
include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
-CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/at_ctl/src/phone/inc"
+CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/phone/inc"
CFLAGS_append += "${ZXIC_EXTRA_CFLAGS}"
LDLIBS_EXT = "${@bb.utils.contains('DISTRO_FEATURES', 'volte', '-lvoice', '', d)}"
#include at-ctl.inc
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr.bb
deleted file mode 100755
index 98b1544..0000000
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr.bb
+++ /dev/null
@@ -1,80 +0,0 @@
-DESCRIPTION = "at_svr"
-DEPENDS = "libzxiceap"
-SECTION = "app"
-LICENSE = "zte"
-PV = "1.0.0"
-PR = "r0"
-
-CLASS_COM = " \
- ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
-"
-inherit ${CLASS_COM}
-
-#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
-SRC_URI = " \
- file://at_svr \
- ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://at_svr.init","", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://at_svr.service","", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "file://at_svr.sysvinit","", d)} \
- file://preconfigured_urs_policy.xml \
- "
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
-S = "${WORKDIR}"
-S_SRC_PATH = "${S}/at_svr"
-
-#引用公用头文件和编译选项。
-# include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
-CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/at_svr/inc"
-
-#inherit autotools pkgconfig systemd
-
-do_compile() {
- make -C ${S_SRC_PATH}
-}
-
-do_install () {
- install -d ${D}${bindir}/
- install -m 0755 ${S_SRC_PATH}/at_svr ${D}${bindir}/
-
- if ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
- install -Dm 0755 ${WORKDIR}/at_svr.init ${D}${sysconfdir}/init.d/at_svr
- fi
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/at_svr.service ${D}${systemd_unitdir}/system
- fi
-
- if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
- install -Dm 0755 ${WORKDIR}/at_svr.sysvinit ${D}${sysconfdir}/init.d/at_svr
- install -d ${D}${sysconfdir}/rcS.d
- ln -s ../init.d/at_svr ${D}${sysconfdir}/rcS.d/S20at_svr
- fi
-
- install -d ${D}/etc_ro/config/
- install -m 0644 ${WORKDIR}/preconfigured_urs_policy.xml ${D}/etc_ro/config/
-
- #install elfs
- install -d ${ELFS-PATH}/
- #install -m 0755 ${S_SRC_PATH}/at_svr ${ELFS-PATH}/${PN}/
- install -m 0755 ${S_SRC_PATH}/at_svr ${ELFS-PATH}/
-}
-
-do_cleanlibs () {
- rm -fr ${ELFS-PATH}/at_svr
-}
-
-addtask cleanlibs after do_clean before do_cleansstate
-
-FILES_${PN} = "\
- ${bindir}/ \
- ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/at_svr","", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${sysconfdir}/","", d)} \
- etc_ro/ \
- "
-SYSTEMD_SERVICE_${PN} = "at_svr.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-
-RDEPENDS_${PN} = " libzxiceap"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr.inc b/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr.inc
deleted file mode 100755
index b72de47..0000000
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/at_svr/inc "
-
-
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.service b/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.service
deleted file mode 100755
index 6d8710e..0000000
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=The at_svr service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/at_svr
-Restart=always
-
-[Install]
-WantedBy=basic.target
-
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/preconfigured_urs_policy.xml b/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/preconfigured_urs_policy.xml
deleted file mode 100755
index db24b34..0000000
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/preconfigured_urs_policy.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<URSP>
- <Rule1>
- <Traffic_Descriptor>
- <DNN_Info>
- <Node>
- <DNN>internet</DNN>
- </Node>
- <Node>
- <DNN>internet1</DNN>
- </Node>
- </DNN_Info>
- </Traffic_Descriptor>
- <Router_Selection_Descriptor>
- <RSD1>
- <Network_Slice>
- <Node>
- <S-NSSAI>01</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>1</Access_Type>
- <PDU_Session_Type>1</PDU_Session_Type>
- <RSD_Priority>1</RSD_Priority>
- </RSD1>
- <RSD2>
- <Network_Slice>
- <Node>
- <S-NSSAI>01</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>2</Access_Type>
- <PDU_Session_Type>2</PDU_Session_Type>
- <RSD_Priority>2</RSD_Priority>
- </RSD2>
- <RSD3>
- <Network_Slice>
- <Node>
- <S-NSSAI>02</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>1</Access_Type>
- <PDU_Session_Type>3</PDU_Session_Type>
- <RSD_Priority>3</RSD_Priority>
- </RSD3>
- <RSD4>
- <Network_Slice>
- <Node>
- <S-NSSAI>02</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>2</Access_Type>
- <PDU_Session_Type>4</PDU_Session_Type>
- <RSD_Priority>4</RSD_Priority>
- </RSD4>
- </Router_Selection_Descriptor>
- <Rule_Priority>1</Rule_Priority>
- </Rule1>
- <Rule2>
- <Traffic_Descriptor>
- <DNN_Info>
- <Node>
- <DNN>ims</DNN>
- </Node>
- </DNN_Info>
- </Traffic_Descriptor>
- <Router_Selection_Descriptor>
- <RSD1>
- <Network_Slice>
- <Node>
- <S-NSSAI>02</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>1</Access_Type>
- <PDU_Session_Type>5</PDU_Session_Type>
- <RSD_Priority>1</RSD_Priority>
- </RSD1>
- <RSD2>
- <Network_Slice>
- <Node>
- <S-NSSAI>02</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>2</Access_Type>
- <PDU_Session_Type>6</PDU_Session_Type>
- <RSD_Priority>4</RSD_Priority>
- </RSD2>
- </Router_Selection_Descriptor>
- <Rule_Priority>2</Rule_Priority>
- </Rule2>
- <Rule3>
- <Traffic_Descriptor>
- <OS_APP_ID_Info>
- <Node>
- <OS_ID>97a498e3fc925c9489860333d06e4e47</OS_ID>
- <OS_APP_ID>SUPL</OS_APP_ID>
- </Node>
- </OS_APP_ID_Info>
- </Traffic_Descriptor>
- <Router_Selection_Descriptor>
- <RSD1>
- <Network_Slice>
- <Node>
- <S-NSSAI>01</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>1</Access_Type>
- <PDU_Session_Type>7</PDU_Session_Type>
- <RSD_Priority>1</RSD_Priority>
- </RSD1>
- </Router_Selection_Descriptor>
- <Rule_Priority>3</Rule_Priority>
- </Rule3>
- <Rule4>
- <Traffic_Descriptor>
- <APP_ID_Info>
- <Node>
- <OS_APP_ID>SUPL</OS_APP_ID>
- </Node>
- </APP_ID_Info>
- <FQDN_Info>
- <Node>
- <FQDN>https://abc.com.cn/ref</FQDN>
- </Node>
- </FQDN_Info>
- <IP_3_Tuple_Info>
- <Node>
- <V4_ADDR>10.9.8.7,255.255.0.0</V4_ADDR>
- <PROTOCOL_OR_NEXT>17</PROTOCOL_OR_NEXT>
- <SINGLE_PORT>8080</SINGLE_PORT>
- </Node>
- <Node>
- <V6_ADDR>fe80::329c:23ff:fe4c:9e33/64</V6_ADDR>
- <PROTOCOL_OR_NEXT>6</PROTOCOL_OR_NEXT>
- <PORT_RANGE>500:1024</PORT_RANGE>
- </Node>
- </IP_3_Tuple_Info>
- </Traffic_Descriptor>
- <Router_Selection_Descriptor>
- <RSD1>
- <DNN_Info>
- <Node>
- <DNN>ims4-1</DNN>
- </Node>
- </DNN_Info>
- <Network_Slice>
- <Node>
- <S-NSSAI>01</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>1</Access_Type>
- <PDU_Session_Type>8</PDU_Session_Type>
- <RSD_Priority>1</RSD_Priority>
- </RSD1>
- </Router_Selection_Descriptor>
- <Rule_Priority>4</Rule_Priority>
- </Rule4>
- <Rule5>
- <Traffic_Descriptor>
- <DNN_Info>
- <Node>
- <DNN>CCcCC</DNN>
- </Node>
- </DNN_Info>
- <APP_ID_Info>
- <Node>
- <OS_APP_ID>AaAaAaAa</OS_APP_ID>
- </Node>
- </APP_ID_Info>
- <FQDN_Info>
- <Node>
- <FQDN>BaiDu.com</FQDN>
- </Node>
- </FQDN_Info>
- <IP_3_Tuple_Info>
- <Node>
- <V4_ADDR>10.10.10.21,255.255.0.0</V4_ADDR>
- <PORT_RANGE>79:81</PORT_RANGE>
- </Node>
- <Node>
- <V6_ADDR>fe80::329c:23ff:fe4c:9e33/64</V6_ADDR>
- <PROTOCOL_OR_NEXT>6</PROTOCOL_OR_NEXT>
- <PORT_RANGE>500:1024</PORT_RANGE>
- </Node>
- </IP_3_Tuple_Info>
- </Traffic_Descriptor>
- <Router_Selection_Descriptor>
- <RSD1>
- <Network_Slice>
- <Node>
- <S-NSSAI>01</S-NSSAI>
- </Node>
- </Network_Slice>
- <SSC_Mode>1</SSC_Mode>
- <Access_Type>1</Access_Type>
- <PDU_Session_Type>9</PDU_Session_Type>
- <RSD_Priority>1</RSD_Priority>
- </RSD1>
- </Router_Selection_Descriptor>
- <Rule_Priority>5</Rule_Priority>
- </Rule5>
-</URSP>
\ No newline at end of file
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxiceap-demo/zxiceap-demo.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/atchn-test/atchn-test.bb
similarity index 63%
rename from cap/zx297520v3/sources/meta-zxic/recipes-app/zxiceap-demo/zxiceap-demo.bb
rename to cap/zx297520v3/sources/meta-zxic/recipes-app/atchn-test/atchn-test.bb
index e7a0525..8fd4529 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxiceap-demo/zxiceap-demo.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/atchn-test/atchn-test.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "zxiceap_demo"
+DESCRIPTION = "atchn_test"
DEPENDS = "libatchn libsoftap libnvram libsofttimer"
SECTION = "app"
LICENSE = "zte"
@@ -14,14 +14,14 @@
#配置code路径信息。
FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
SRC_URI = " \
- file://libatchn/zxiceap_demo \
- file://libatchn/inc \
- ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://zxiceap_demo.init","", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://zxiceap_demo.service","", d)} \
+ file://test/atchn_test \
+ file://platform/libatchn/inc \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://atchn_test.init","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://atchn_test.service","", d)} \
"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
S = "${WORKDIR}"
-S_SRC_PATH = "${S}/libatchn/zxiceap_demo"
+S_SRC_PATH = "${S}/test/atchn_test"
#引用公用头文件和编译选项。
include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
@@ -33,33 +33,33 @@
do_install () {
install -d ${D}${bindir}/
- install -m 0755 ${S_SRC_PATH}/zxiceap_demo ${D}${bindir}/
+ install -m 0755 ${S_SRC_PATH}/atchn_test ${D}${bindir}/
if ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
- install -Dm 0755 ${WORKDIR}/zxiceap_demo.init ${D}${sysconfdir}/init.d/zxiceap_demo
+ install -Dm 0755 ${WORKDIR}/atchn_test.init ${D}${sysconfdir}/init.d/atchn_test
fi
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/zxiceap_demo.service ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/atchn_test.service ${D}${systemd_unitdir}/system
fi
#install elfs
install -d ${ELFS-PATH}/
- install -m 0755 ${S_SRC_PATH}/zxiceap_demo ${ELFS-PATH}/
+ install -m 0755 ${S_SRC_PATH}/atchn_test ${ELFS-PATH}/
}
do_cleanlibs () {
- rm -fr ${ELFS-PATH}/zxiceap_demo
+ rm -fr ${ELFS-PATH}/atchn_test
}
addtask cleanlibs after do_clean before do_cleansstate
FILES_${PN} = "\
${bindir}/ \
- ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/zxiceap_demo","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/atchn_test","", d)} \
"
-SYSTEMD_SERVICE_${PN} = "zxiceap_demo.service"
+SYSTEMD_SERVICE_${PN} = "atchn_test.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
RDEPENDS_${PN} = " libatchn libsoftap libnvram libsofttimer"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxiceap-demo/zxiceap-demo/zxiceap_demo.init b/cap/zx297520v3/sources/meta-zxic/recipes-app/atchn-test/atchn-test/atchn_test.init
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic/recipes-app/zxiceap-demo/zxiceap-demo/zxiceap_demo.init
rename to cap/zx297520v3/sources/meta-zxic/recipes-app/atchn-test/atchn-test/atchn_test.init
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxiceap-demo/zxiceap-demo/zxiceap_demo.service b/cap/zx297520v3/sources/meta-zxic/recipes-app/atchn-test/atchn-test/atchn_test.service
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic/recipes-app/zxiceap-demo/zxiceap-demo/zxiceap_demo.service
rename to cap/zx297520v3/sources/meta-zxic/recipes-app/atchn-test/atchn-test/atchn_test.service
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/bsp-test/bsp-test.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/bsp-test/bsp-test.bb
new file mode 100644
index 0000000..e11b648
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/bsp-test/bsp-test.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = "bsp_test"
+DEPENDS = "libbsp"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+SRC_URI = " \
+ file://test/bsp_test \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+S_SRC_PATH = "${S}/test/bsp_test"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "${ZXIC_EXTRA_CFLAGS}"
+
+#inherit autotools pkgconfig systemd
+
+do_compile() {
+ make -C ${S_SRC_PATH}
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S_SRC_PATH}/bsp_test ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S_SRC_PATH}/bsp_test ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/bsp_test
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+#rootfs包含的文件
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo.bb
new file mode 100755
index 0000000..a1bad59
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo.bb
@@ -0,0 +1,64 @@
+DESCRIPTION = "cc_demo"
+DEPENDS = "libsctel"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+SRC_URI = " \
+ file://test/cc_demo \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://cc_demo.init","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://cc_demo.service","", d)} \
+ "
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+S_SRC_PATH = "${S}/test/cc_demo"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+
+#inherit autotools pkgconfig systemd
+
+do_compile() {
+ make -C ${S_SRC_PATH}
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S_SRC_PATH}/cc_demo ${D}${bindir}/
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/cc_demo.init ${D}${sysconfdir}/init.d/cc_demo
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/cc_demo.service ${D}${systemd_unitdir}/system
+ fi
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S_SRC_PATH}/cc_demo ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/cc_demo
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+FILES_${PN} = "\
+ ${bindir}/ \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/cc_demo","", d)} \
+ "
+SYSTEMD_SERVICE_${PN} = "cc_demo.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+
+RDEPENDS_${PN} = " libsctel"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo/cc_demo.init b/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo/cc_demo.init
new file mode 100755
index 0000000..46b19e0
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo/cc_demo.init
@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+START=18
+STOP=85
+USE_PROCD=1
+
+logger -t cc_demo
+
+start_service() {
+ procd_open_instance
+ procd_set_param command /usr/bin/cc_demo
+ procd_set_param stdout 1 # forward stdout of the command to logd
+ procd_set_param stderr 1 # same for stderr
+ procd_set_param respawn
+ procd_close_instance
+}
+
+stop_service()
+{
+ echo "add clean code"
+}
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo/cc_demo.service b/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo/cc_demo.service
new file mode 100755
index 0000000..6765ff2
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/cc-demo/cc-demo/cc_demo.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=The cc_demo service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/cc_demo
+Restart=always
+
+[Install]
+WantedBy=basic.target
+
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/cfg-tool/cfg-tool.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/cfg-tool/cfg-tool.bb
index 481dd53..a911ea8 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/cfg-tool/cfg-tool.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/cfg-tool/cfg-tool.bb
@@ -7,7 +7,7 @@
PR = "r0"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://cfg_tool \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/crc-mcu/crc-mcu.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/crc-mcu/crc-mcu.bb
new file mode 100755
index 0000000..39a08d7
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/crc-mcu/crc-mcu.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "crc-mcu"
+
+DEPENDS = ""
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://crc_mcu \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "${ZXIC_EXTRA_CFLAGS}"
+
+#编译
+do_compile() {
+ make -C crc_mcu
+}
+
+#库文件的安装
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/crc_mcu/uartcrc_mcu ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/crc_mcu/uartcrc_mcu ${ELFS-PATH}/
+}
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/crc_mcu
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+#rootfs包含的文件
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/crc-modem/crc-modem.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/crc-modem/crc-modem.bb
new file mode 100755
index 0000000..eb7f9ed
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/crc-modem/crc-modem.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "crc-modem"
+
+DEPENDS = ""
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://crc_modem \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "${ZXIC_EXTRA_CFLAGS}"
+
+#编译
+do_compile() {
+ make -C crc_modem
+}
+
+#库文件的安装
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/crc_modem/uartcrc_modem ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/crc_modem/uartcrc_modem ${ELFS-PATH}/
+}
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/uartcrc_modem
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+#rootfs包含的文件
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/crc/crc.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/crc/crc.bb
new file mode 100755
index 0000000..71ba344
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/crc/crc.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "crc"
+
+DEPENDS = ""
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://crc \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "${ZXIC_EXTRA_CFLAGS}"
+
+#编译
+do_compile() {
+ make -C crc
+}
+
+#库文件的安装
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/crc/crc ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/crc/crc ${ELFS-PATH}/
+}
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/crc
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+#rootfs包含的文件
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/dhcp6/dhcp6.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/dhcp6/dhcp6.bb
index cc2b085..036f45b 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/dhcp6/dhcp6.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/dhcp6/dhcp6.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://dhcp6 \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://dhcp6s.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/dialtest/dialtest.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/dialtest/dialtest.bb
new file mode 100755
index 0000000..85ee97c
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/dialtest/dialtest.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "dialtest"
+DEPENDS = "libsctel"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://dialtest \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+
+
+do_compile() {
+ make -C dialtest
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/dialtest/dialtest ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/dialtest/dialtest ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/dialtest
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
+
+RDEPENDS_${PN} = " libsctel"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/ethtest/ethtest.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/ethtest/ethtest.bb
new file mode 100644
index 0000000..64930c6
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/ethtest/ethtest.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "ethtest"
+
+DEPENDS = "libbsp"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://ethtest \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "${ZXIC_EXTRA_CFLAGS}"
+
+#编译
+do_compile() {
+ make -C ethtest
+}
+
+#库文件的安装
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/ethtest/ethtest ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/ethtest/ethtest ${ELFS-PATH}/
+}
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/ethtest
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+#rootfs包含的文件
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/fluxstat/fluxstat.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/fluxstat/fluxstat.bb
index 46ee966..631585e 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/fluxstat/fluxstat.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/fluxstat/fluxstat.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://fluxstat \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://fluxstat.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/fscheck/fscheck.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/fscheck/fscheck.bb
index 5d19220..e50580f 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/fscheck/fscheck.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/fscheck/fscheck.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://fscheck \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor.bb
new file mode 100755
index 0000000..8f23fcd
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor.bb
@@ -0,0 +1,75 @@
+DESCRIPTION = "fsmonitor"
+DEPENDS = ""
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
+SRC_URI = " \
+ file://fsmonitor \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://fsmonitor.init","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://fsmonitor.service","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "file://fsmonitor.sysvinit","", d)} \
+ "
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+S_SRC_PATH = "${S}/fsmonitor"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "${ZXIC_EXTRA_CFLAGS}"
+
+
+do_compile() {
+ make -C ${S_SRC_PATH}
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S_SRC_PATH}/fsmonitor ${D}${bindir}/
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/fsmonitor.init ${D}${sysconfdir}/init.d/fsmonitor
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/fsmonitor.service ${D}${systemd_unitdir}/system
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/fsmonitor.sysvinit ${D}${sysconfdir}/init.d/fsmonitor
+ install -d ${D}${sysconfdir}/rcS.d
+ ln -s ../init.d/fsmonitor ${D}${sysconfdir}/rcS.d/S75ubi_nl
+ fi
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S_SRC_PATH}/fsmonitor ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/fsmonitor
+ rm -fr ${D}${bindir}/fsmonitor
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+FILES_${PN} = "\
+ ${bindir}/ \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/fsmonitor","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${sysconfdir}/","", d)} \
+ "
+SYSTEMD_SERVICE_${PN} = "fsmonitor.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+
+#RDEPENDS_${PN} = ""
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.init b/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.init
similarity index 79%
rename from cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.init
rename to cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.init
index e1ee5d9..1008064 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.init
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.init
@@ -1,14 +1,14 @@
#!/bin/sh /etc/rc.common
START=17
-STOP=85
+STOP=75
USE_PROCD=1
-logger -t at_svr
+logger -t fsmonitor
start_service() {
procd_open_instance
- procd_set_param command /usr/bin/at_svr
+ procd_set_param command /usr/bin/fsmonitor
procd_set_param stdout 0 # forward stdout of the command to logd
procd_set_param stderr 0 # same for stderr
procd_set_param respawn
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.service b/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.service
new file mode 100755
index 0000000..ae2a950
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=The fsmonitor service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/fsmonitor
+Restart=always
+
+[Install]
+WantedBy=basic.target
+
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit b/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.sysvinit
similarity index 80%
copy from cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit
copy to cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.sysvinit
index 29ccdb1..952c6b6 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/fsmonitor/fsmonitor/fsmonitor.sysvinit
@@ -3,20 +3,20 @@
# Run the daemon
#
-DAEMON="at_svr"
+DAEMON="fsmonitor"
PIDFILE="/var/run/$DAEMON.pid"
-EXEC="/usr/bin/at_svr"
+EXEC="/usr/bin/fsmonitor"
EXEC_ARGS=""
start() {
- echo -n "Starting $DAEMON... "
+ echo "Starting $DAEMON... "
start-stop-daemon --no-close -S -b -m -p $PIDFILE -x $EXEC -- $EXEC_ARGS
[ $? -eq 0 ] && echo "OK" || echo "ERROR"
}
stop() {
- echo -n "Stopping $DAEMON... "
+ echo "Stopping $DAEMON... "
start-stop-daemon -K -p $PIDFILE
[ $? -eq 0 ] && echo "OK" || echo "ERROR"
}
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/i2ctest/i2ctest.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/i2ctest/i2ctest.bb
new file mode 100644
index 0000000..3a2c18b
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/i2ctest/i2ctest.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "i2ctest"
+
+DEPENDS = "libbsp"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://i2ctest \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "${ZXIC_EXTRA_CFLAGS}"
+
+#编译
+do_compile() {
+ make -C i2ctest
+}
+
+#库文件的安装
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/i2ctest/i2ctest ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/i2ctest/i2ctest ${ELFS-PATH}/
+}
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/i2ctest
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+#rootfs包含的文件
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libatchn/libatchn.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libatchn/libatchn.bb
index 5482abb..1a27edd 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libatchn/libatchn.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libatchn/libatchn.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libatchn \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libatext/libatext.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libatext/libatext.bb
index 8dd16e4..0f5dcee 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libatext/libatext.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libatext/libatext.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libatext \
"
@@ -20,7 +20,7 @@
#引用公用头文件和编译选项。
include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
-CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/at_ctl/inc"
+CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/inc"
CFLAGS_append += "${ZXIC_EXTRA_CFLAGS}"
LIBS_append += "${@bb.utils.contains('DISTRO_FEATURES', 'volte', '-lvoice', '', d)}"
#include atext.inc
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libatreg/libatreg.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libatreg/libatreg.bb
new file mode 100755
index 0000000..1dc923b
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libatreg/libatreg.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "libatreg"
+SECTION = "lib"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
+SRC_URI = " \
+ file://libatreg \
+ "
+
+DEPENDS = "libsoftap libatutils libnvram"
+
+S = "${WORKDIR}"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/inc"
+CFLAGS_append += "${ZXIC_EXTRA_CFLAGS}"
+LIBS_append += "${@bb.utils.contains('DISTRO_FEATURES', 'volte', '-lvoice', '', d)}"
+
+do_compile () {
+ make -C libatreg
+}
+
+do_install () {
+ install -d ${D}${libdir}/
+ install -d ${D}/usr/include
+ install -m 0755 ${S}/libatreg/libatreg.so ${D}${libdir}/
+ install -m 0755 ${S}/libatreg/libatreg.a ${D}${libdir}/
+
+ install -m 0644 ${S}/libatreg/*.h ${D}/usr/include
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/libatreg/libatreg.so ${ELFS-PATH}/
+}
+
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/libatreg.so
+}
+
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP_${PN} = "dev-so"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libatutils/libatutils.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libatutils/libatutils.bb
index de63817..bd76d42 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libatutils/libatutils.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libatutils/libatutils.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libatutils \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libbinder/libbinder.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libbinder/libbinder.bb
index dfbccea..7f384a9 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libbinder/libbinder.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libbinder/libbinder.bb
@@ -7,7 +7,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
SRC_URI = " \
file://binder \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libbsp/libbsp.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libbsp/libbsp.bb
new file mode 100644
index 0000000..b8df422
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libbsp/libbsp.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "libbsp"
+SECTION = "lib"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
+SRC_URI = " \
+ file://libbsp \
+ "
+
+S = "${WORKDIR}"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+
+do_compile () {
+ make -C libbsp
+}
+
+#库和头文件的安装
+do_install () {
+ install -d ${D}${libdir}/
+ install -d ${D}/usr/include
+ install -m 0755 ${S}/libbsp/libbsp.so ${D}${libdir}/
+ install -m 0755 ${S}/libbsp/libbsp.a ${D}${libdir}/
+ install -m 0644 ${S}/libbsp/sc_uart.h ${D}/usr/include/
+ install -m 0644 ${S}/libbsp/sc_i2c.h ${D}/usr/include/
+ install -m 0644 ${S}/libbsp/sc_spi.h ${D}/usr/include/
+ install -m 0644 ${S}/libbsp/sc_gpio.h ${D}/usr/include/
+ install -m 0644 ${S}/libbsp/sc_irq.h ${D}/usr/include/
+ install -m 0644 ${S}/libbsp/sc_pm.h ${D}/usr/include/
+ install -m 0644 ${S}/libbsp/sc_bsp.h ${D}/usr/include/
+ install -m 0644 ${S}/libbsp/sc_eth.h ${D}/usr/include/
+
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/libbsp/libbsp.so ${ELFS-PATH}/
+
+}
+
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/libbsp.so
+}
+
+
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP_${PN} = "dev-so"
+
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libdebug-info/libdebug-info.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libdebug-info/libdebug-info.bb
index 17d1719..6d62270 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libdebug-info/libdebug-info.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libdebug-info/libdebug-info.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
SRC_URI = " \
file://libdebug_info \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libmedia/libmedia.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libmedia/libmedia.bb
new file mode 100755
index 0000000..3fed4cd
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libmedia/libmedia.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "libmedia"
+DEPENDS = "libvoice"
+SECTION = "lib"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
+SRC_URI = " \
+ file://libmedia \
+ "
+
+S = "${WORKDIR}"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/libvoice/include"
+
+#编译
+do_compile () {
+ make -C libmedia
+}
+
+#库和头文件的安装
+do_install () {
+ install -d ${D}${libdir}/
+ install -d ${D}/usr/include
+ install -m 0755 ${S}/libmedia/libmedia.so ${D}${libdir}/
+ install -m 0755 ${S}/libmedia/libmedia.a ${D}${libdir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/libmedia/libmedia.so ${ELFS-PATH}/
+}
+
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/libmedia.so
+}
+
+#rootfs包含的文件
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP_${PN} = "dev-so"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libnvram/libnvram.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libnvram/libnvram.bb
index 5cae728..2633a87 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libnvram/libnvram.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libnvram/libnvram.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
SRC_URI = " \
file://libnvram \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libreference-ril/libreference-ril.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libreference-ril/libreference-ril.bb
index 892ded5..c354826 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libreference-ril/libreference-ril.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libreference-ril/libreference-ril.bb
@@ -7,7 +7,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
SRC_URI = " \
file://ril/ \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libril/libril.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libril/libril.bb
index 4e5603d..3f0fbb7 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libril/libril.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libril/libril.bb
@@ -7,7 +7,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
SRC_URI = " \
file://ril \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libscipc/libscipc.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libscipc/libscipc.bb
new file mode 100755
index 0000000..7650e8c
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libscipc/libscipc.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "libscipc"
+DEPENDS = ""
+SECTION = "lib"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
+SRC_URI = " \
+ file://libscipc \
+ "
+
+S = "${WORKDIR}"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+
+#编译
+do_compile () {
+ make -C libscipc
+}
+
+#库和头文件的安装
+do_install () {
+ install -d ${D}${libdir}/
+ install -d ${D}/usr/include
+ install -m 0755 ${S}/libscipc/libscipc.so ${D}${libdir}/
+ install -m 0755 ${S}/libscipc/libscipc.a ${D}${libdir}/
+
+ install -m 0644 ${S}/libscipc/sc_ipc.h ${D}/usr/include/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/libscipc/libscipc.so ${ELFS-PATH}/
+}
+
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/libscipc.so
+}
+
+#rootfs包含的文件
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP_${PN} = "dev-so"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libsctel/libsctel.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libsctel/libsctel.bb
new file mode 100755
index 0000000..ec3beff
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libsctel/libsctel.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "libsctel"
+DEPENDS = "libscipc libsofttimer libsoftap libatutils libnvram libatreg libgcc"
+SECTION = "lib"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
+SRC_URI = " \
+ file://libsctel \
+ "
+
+S = "${WORKDIR}"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/inc"
+
+do_compile () {
+ make -C libsctel
+}
+
+do_install () {
+ install -d ${D}${libdir}/
+ install -d ${D}/usr/include
+
+ install -m 0755 ${S}/libsctel/libsctel.so ${D}${libdir}/
+ install -m 0755 ${S}/libsctel/libsctel.a ${D}${libdir}/
+
+ install -m 0644 ${S}/libsctel/include/*.h ${D}/usr/include/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/libsctel/libsctel.so ${ELFS-PATH}/
+}
+
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/libsctel.so
+}
+
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP_${PN} = "dev-so"
+RDEPENDS_${PN} = " libscipc libsofttimer libsoftap libatutils libnvram libatreg libgcc"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libsoftap/libsoftap.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libsoftap/libsoftap.bb
index b5e268d..4e102f9 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libsoftap/libsoftap.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libsoftap/libsoftap.bb
@@ -7,7 +7,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libsoftap \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libsofttimer/libsofttimer.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libsofttimer/libsofttimer.bb
index e159251..c50c362 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libsofttimer/libsofttimer.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libsofttimer/libsofttimer.bb
@@ -5,7 +5,7 @@
PR = "r0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
SRC_URI = " \
file://libsofttimer \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libsqlite/libsqlite.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libsqlite/libsqlite.bb
index 3d7240f..529d0e1 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libsqlite/libsqlite.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libsqlite/libsqlite.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libsqlite \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libtelsvr/libtelsvr.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libtelsvr/libtelsvr.bb
new file mode 100755
index 0000000..94ecc60
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libtelsvr/libtelsvr.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "libtelsvr"
+SECTION = "lib"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
+SRC_URI = " \
+ file://libtelsvr \
+ "
+
+S = "${WORKDIR}"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+
+#编译
+do_compile () {
+ make -C libtelsvr
+}
+
+#库和头文件的安装
+do_install () {
+ install -d ${D}${libdir}/
+ install -d ${D}/usr/include
+ #install -m 0755 ${S}/libtelsvr/libtelsvr.so ${D}${libdir}/
+ install -m 0755 ${S}/libtelsvr/lib/libtelsvr.a ${D}${libdir}/
+
+ install -m 0644 ${S}/libtelsvr/include/*.h ${D}/usr/include/
+ install -m 0644 ${S}/libtelsvr/include/pal/os/*.h ${D}/usr/include/
+ install -m 0644 ${S}/libtelsvr/include/pal/dm/*.h ${D}/usr/include/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+
+ install -m 0755 ${S}/libtelsvr/lib/libtelsvr.a ${ELFS-PATH}/
+}
+
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/libtelsvr.a
+}
+
+#rootfs包含的文件
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP_${PN} = "dev-so"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libtinyalsa/libtinyalsa.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libtinyalsa/libtinyalsa.bb
index e33f9ea..22ad792 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libtinyalsa/libtinyalsa.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libtinyalsa/libtinyalsa.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libtinyalsa \
"
@@ -24,10 +24,12 @@
#库和头文件的安装
do_install () {
install -d ${D}${libdir}/
- install -d ${D}/usr/include
+ install -d ${D}/usr/include/tinyalsa
install -m 0755 ${S}/libtinyalsa/libtinyalsa.so ${D}${libdir}/
install -m 0755 ${S}/libtinyalsa/libtinyalsa.a ${D}${libdir}/
+ install -m 0644 ${S}/libtinyalsa/include/tinyalsa/*.h ${D}/usr/include/tinyalsa
+
#install elfs
install -d ${ELFS-PATH}/
install -m 0755 ${S}/libtinyalsa/libtinyalsa.so ${ELFS-PATH}/
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libvoice/libvoice.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libvoice/libvoice.bb
index 11dbd16..8618a97 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libvoice/libvoice.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libvoice/libvoice.bb
@@ -7,7 +7,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libvoice \
"
@@ -15,7 +15,7 @@
S = "${WORKDIR}"
#引用公用头文件和编译选项。
include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
-CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/libtinyalsa/include"
+CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/libtinyalsa/include"
#编译
do_compile () {
@@ -28,7 +28,7 @@
install -d ${D}/usr/include
install -m 0755 ${S}/libvoice/libvoice.so ${D}${libdir}/
install -m 0755 ${S}/libvoice/libvoice.a ${D}${libdir}/
- install -m 0644 ${S}/libvoice/include/voice_lib.h ${D}/usr/include/
+ install -m 0644 ${S}/libvoice/include/*.h ${D}/usr/include/
#install elfs
install -d ${ELFS-PATH}/
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libzxic-pbm/libzxic-pbm.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libzxic-pbm/libzxic-pbm.bb
index 2cce5b3..97acd80 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libzxic-pbm/libzxic-pbm.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libzxic-pbm/libzxic-pbm.bb
@@ -7,7 +7,7 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libzxic-pbm \
"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libzxiceap/libzxiceap.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libzxiceap/libzxiceap.bb
index ec1dd09..2448fcb 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libzxiceap/libzxiceap.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libzxiceap/libzxiceap.bb
@@ -6,14 +6,14 @@
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://libzxiceap \
"
S = "${WORKDIR}"
#引用公用头文件和编译选项。
-include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+#include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
#编译
do_compile () {
@@ -28,11 +28,11 @@
install -m 0755 ${S}/libzxiceap/libzxiceap.a ${D}${libdir}/
install -m 0644 ${S}/libzxiceap/inc/eap_api.h ${D}/usr/include/
install -m 0644 ${S}/libzxiceap/inc/os_type_def.h ${D}/usr/include/
- #install -m 0644 ${S}/libzxiceap/inc/message.h ${D}/usr/include/
+ install -m 0644 ${S}/libzxiceap/inc/message.h ${D}/usr/include/
install -m 0644 ${S}/libzxiceap/inc/max_macro.h ${D}/usr/include/
install -m 0644 ${S}/libzxiceap/inc/eap_log.h ${D}/usr/include/
install -m 0644 ${S}/libzxiceap/inc/zxic_list.h ${D}/usr/include/
- #install -m 0644 ${S}/libzxiceap/inc/soft_timer.h ${D}/usr/include/
+ install -m 0644 ${S}/libzxiceap/inc/soft_timer.h ${D}/usr/include/
install -m 0644 ${S}/libzxiceap/inc/at_reg.h ${D}/usr/include/
install -m 0644 ${S}/libzxiceap/inc/at_utils.h ${D}/usr/include/
#install elfs
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/nv-rpc-daemon/nv-rpc-daemon.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/nv-rpc-daemon/nv-rpc-daemon.bb
index e7e51e8..4e58955 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/nv-rpc-daemon/nv-rpc-daemon.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/nv-rpc-daemon/nv-rpc-daemon.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://nv-rpc-daemon \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://nv-rpc-daemon.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/nvserver/nvserver.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/nvserver/nvserver.bb
index 216c716..817fab5 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/nvserver/nvserver.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/nvserver/nvserver.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://nvserver \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://nvserver.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/phonebook/phonebook.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/phonebook/phonebook.bb
index d276a41..1c53be6 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/phonebook/phonebook.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/phonebook/phonebook.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://phonebook \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://phonebook.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/rild/rild.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/rild/rild.bb
index e4c5c76..1474e86 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/rild/rild.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/rild/rild.bb
@@ -12,7 +12,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
SRC_URI = " \
file://rild \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://rild.init","", d)} \
@@ -28,7 +28,7 @@
#编译
do_compile() {
- make -C rild CONFIG_RIL_CAP_SUPPORT=${CONFIG_RIL_CAP_SUPPORT}
+ make -C rild
}
#库文件的安装
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/rtc-service/rtc-service.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/rtc-service/rtc-service.bb
index a49c4f4..7f21bb1 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/rtc-service/rtc-service.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/rtc-service/rtc-service.bb
@@ -12,7 +12,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://rtc-service \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://rtc-service.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc-at-test.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc-at-test.bb
new file mode 100755
index 0000000..caa002d
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc-at-test.bb
@@ -0,0 +1,65 @@
+DESCRIPTION = "sc_at_test"
+DEPENDS = "libsctel libsoftap libatutils libsofttimer libnvram"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+SRC_URI = " \
+ file://test/sc_at_test \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://sc_at_test.init","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://sc_at_test.service","", d)} \
+ "
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+S_SRC_PATH = "${S}/test/sc_at_test"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+#include +=
+#inherit autotools pkgconfig systemd
+
+do_compile() {
+ make -C ${S_SRC_PATH}
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S_SRC_PATH}/sc_at_test ${D}${bindir}/
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/sc_at_test.init ${D}${sysconfdir}/init.d/sc_at_test
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/sc_at_test.service ${D}${systemd_unitdir}/system
+ fi
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S_SRC_PATH}/sc_at_test ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/sc_at_test
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+FILES_${PN} = "\
+ ${bindir}/ \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/sc_at_test","", d)} \
+ "
+SYSTEMD_SERVICE_${PN} = "sc_at_test.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+
+
+RDEPENDS_${PN} = "libsctel libsoftap libatutils libsofttimer libnvram"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc_at_test/sc_at_test.init b/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc_at_test/sc_at_test.init
new file mode 100755
index 0000000..5d02fdf
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc_at_test/sc_at_test.init
@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+START=18
+STOP=85
+USE_PROCD=1
+
+logger -t sc_at_send
+
+start_service() {
+ procd_open_instance
+ procd_set_param command /usr/bin/sc_at_send
+ procd_set_param stdout 1 # forward stdout of the command to logd
+ procd_set_param stderr 1 # same for stderr
+ procd_set_param respawn
+ procd_close_instance
+}
+
+stop_service()
+{
+ echo "add clean code"
+}
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc_at_test/sc_at_test.service b/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc_at_test/sc_at_test.service
new file mode 100755
index 0000000..0e0dc1b
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-at-test/sc_at_test/sc_at_test.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=The sc_at_send service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/sc_at_send
+Restart=always
+
+[Install]
+WantedBy=basic.target
+
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-nw-mgr-test/sc-nw-mgr-test.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-nw-mgr-test/sc-nw-mgr-test.bb
new file mode 100755
index 0000000..52898fd
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sc-nw-mgr-test/sc-nw-mgr-test.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "sc_nw_mgr_test"
+DEPENDS = "libsctel"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://sc_nw_mgr_test \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+
+
+do_compile() {
+ make -C sc_nw_mgr_test
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/sc_nw_mgr_test/sc_nw_mgr_test ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/sc_nw_mgr_test/sc_nw_mgr_test ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/sc_nw_mgr_test
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
+
+RDEPENDS_${PN} = " libsctel"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo.bb
new file mode 100755
index 0000000..3db9c17
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo.bb
@@ -0,0 +1,64 @@
+DESCRIPTION = "sim_demo"
+DEPENDS = "libsctel libscipc"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+SRC_URI = " \
+ file://test/sim_demo \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://sim_demo.init","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://sim_demo.service","", d)} \
+ "
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+S_SRC_PATH = "${S}/test/sim_demo"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+
+#inherit autotools pkgconfig systemd
+
+do_compile() {
+ make -C ${S_SRC_PATH}
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S_SRC_PATH}/sim_demo ${D}${bindir}/
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/sim_demo.init ${D}${sysconfdir}/init.d/sim_demo
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/sim_demo.service ${D}${systemd_unitdir}/system
+ fi
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S_SRC_PATH}/sim_demo ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/sim_demo
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+FILES_${PN} = "\
+ ${bindir}/ \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/sim_demo","", d)} \
+ "
+SYSTEMD_SERVICE_${PN} = "sim_demo.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+
+RDEPENDS_${PN} = " libsctel libscipc"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo/sim_demo.init b/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo/sim_demo.init
new file mode 100755
index 0000000..b7e4fa7
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo/sim_demo.init
@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+START=18
+STOP=85
+USE_PROCD=1
+
+logger -t sim_demo
+
+start_service() {
+ procd_open_instance
+ procd_set_param command /usr/bin/sim_demo
+ procd_set_param stdout 1 # forward stdout of the command to logd
+ procd_set_param stderr 1 # same for stderr
+ procd_set_param respawn
+ procd_close_instance
+}
+
+stop_service()
+{
+ echo "add clean code"
+}
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo/sim_demo.service b/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo/sim_demo.service
new file mode 100755
index 0000000..6765ff2
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sim-demo/sim-demo/sim_demo.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=The cc_demo service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/cc_demo
+Restart=always
+
+[Install]
+WantedBy=basic.target
+
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sms/sms.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/sms/sms.bb
index e3184ac..e279a92 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/sms/sms.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sms/sms.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://sms \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://sms.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/sntp/sntp.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/sntp/sntp.bb
index 709b45d..4976f93 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/sntp/sntp.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sntp/sntp.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://sntp \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://sntp.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/spitest/spitest.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/spitest/spitest.bb
new file mode 100755
index 0000000..8e0fd39
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/spitest/spitest.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "spitest"
+#nv依赖libnvram库
+DEPENDS += "libbsp"
+SECTION = "spitest"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://spitest \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+
+#编译
+do_compile() {
+ make -C spitest
+}
+
+#库文件的安装，封库的宏MK_SDK_VERSION
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/spitest/test_spidev ${D}${bindir}/
+ install -m 0755 ${S}/spitest/test_spidev_used_gpio_ctrl ${D}${bindir}/
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/spitest/test_spidev ${ELFS-PATH}/
+ install -m 0755 ${S}/spitest/test_spidev_used_gpio_ctrl ${ELFS-PATH}/
+}
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/test_spidev
+ rm -fr ${ELFS-PATH}/test_spidev_used_gpio_ctrl
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+#rootfs包含的文件
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr.bb
new file mode 100755
index 0000000..5bc435a
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr.bb
@@ -0,0 +1,74 @@
+DESCRIPTION = "tel_svr"
+DEPENDS = "libsoftap libsofttimer libnvram libatutils libscipc libtelsvr libtinyalsa libvoice"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
+SRC_URI = " \
+ file://telecom_svr \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://tel_svr.init","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://tel_svr.service","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "file://tel_svr.sysvinit","", d)} \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+
+#编译
+do_compile() {
+ make -C telecom_svr
+}
+
+#库文件的安装
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S}/telecom_svr/tel_svr ${D}${bindir}/
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/tel_svr.init ${D}${sysconfdir}/init.d/tel_svr
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/tel_svr.service ${D}${systemd_unitdir}/system
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/tel_svr.sysvinit ${D}${sysconfdir}/init.d/tel_svr
+ install -d ${D}${sysconfdir}/rcS.d
+ ln -s ../init.d/tel_svr ${D}${sysconfdir}/rcS.d/S16tel_svr
+ fi
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/telecom_svr/tel_svr ${ELFS-PATH}/
+}
+#清库
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/tel_svr
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+#rootfs包含的文件
+FILES_${PN} = "\
+ ${bindir}/ \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${sysconfdir}/","", d)} \
+ "
+SYSTEMD_SERVICE_${PN} = "tel_svr.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+
+RDEPENDS_${PN} = " libsoftap libsofttimer libnvram libatutils libscipc libtinyalsa libvoice"
\ No newline at end of file
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.init b/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.init
new file mode 100755
index 0000000..c62d39a
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.init
@@ -0,0 +1,17 @@
+#!/bin/sh /etc/rc.common
+
+START=16
+STOP=85
+USE_PROCD=1
+
+start_service() {
+ procd_open_instance
+ procd_set_param command /usr/bin/tel_svr
+ procd_set_param respawn
+ procd_close_instance
+}
+
+stop_service()
+{
+ echo "add clean code"
+}
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.service b/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.service
new file mode 100755
index 0000000..82efb2b
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=The tel_svr service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/tel_svr
+Restart=always
+
+[Install]
+WantedBy=basic.target
+
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit b/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.sysvinit
similarity index 80%
copy from cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit
copy to cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.sysvinit
index 29ccdb1..ed3ec0f 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/tel-svr/tel-svr/tel_svr.sysvinit
@@ -3,11 +3,10 @@
# Run the daemon
#
-DAEMON="at_svr"
+DAEMON="tel_svr"
PIDFILE="/var/run/$DAEMON.pid"
-EXEC="/usr/bin/at_svr"
-EXEC_ARGS=""
-
+EXEC="/usr/bin/tel_svr"
+EXEC_ARGS="-d /mnt/userdata -r /mnt/userdata/log.rule -t 1024 -n 10"
start() {
echo -n "Starting $DAEMON... "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/uarttest/uarttest.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/uarttest/uarttest.bb
new file mode 100755
index 0000000..3153ce4
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/uarttest/uarttest.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "uarttest"
+
+DEPENDS = "libbsp"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/test:"
+SRC_URI = " \
+ file://uarttest \
+ "
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+CFLAGS_append = "${ZXIC_EXTRA_CFLAGS}"
+
+do_compile() {
+ make -C uarttest
+}
+
+
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0777 ${S}/uarttest/uarttest ${D}${bindir}/
+
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S}/uarttest/uarttest ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/uarttest
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+FILES_${PN} = "\
+ ${bindir}/ \
+ "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl.bb
new file mode 100755
index 0000000..f3be15f
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl.bb
@@ -0,0 +1,71 @@
+DESCRIPTION = "voiceipc_mainctrl"
+DEPENDS = "libvoice"
+SECTION = "app"
+LICENSE = "zte"
+PV = "1.0.0"
+PR = "r0"
+
+CLASS_COM = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'procd', 'openwrt openwrt-services', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+inherit ${CLASS_COM}
+
+#配置code路径信息。
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
+SRC_URI = " \
+ file://voiceipc_mainctrl \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://voiceipc_mainctrl.init","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "file://voiceipc_mainctrl.service","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "file://voiceipc_mainctrl.sysvinit","", d)} \
+ "
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
+S = "${WORKDIR}"
+S_SRC_PATH = "${S}/voiceipc_mainctrl"
+#引用公用头文件和编译选项。
+include ${BSPDIR}/sources/meta-zxic/conf/app_com.inc
+CFLAGS_append = "-I ${BSPDIR}/zxic_code/zxic_source/zxic_app_open/platform/libtinyalsa/include"
+#inherit autotools pkgconfig systemd
+
+do_compile() {
+ make -C ${S_SRC_PATH}
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${S_SRC_PATH}/voiceipc_mainctrl ${D}${bindir}/
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','procd','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/voiceipc_mainctrl.init ${D}${sysconfdir}/init.d/voiceipc_mainctrl
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/voiceipc_mainctrl.service ${D}${systemd_unitdir}/system
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+ install -Dm 0755 ${WORKDIR}/voiceipc_mainctrl.sysvinit ${D}${sysconfdir}/init.d/voiceipc_mainctrl
+ install -d ${D}${sysconfdir}/rcS.d
+ ln -s ../init.d/voiceipc_mainctrl ${D}${sysconfdir}/rcS.d/S50voiceipc_mainctrl
+ fi
+ #install elfs
+ install -d ${ELFS-PATH}/
+ install -m 0755 ${S_SRC_PATH}/voiceipc_mainctrl ${ELFS-PATH}/
+}
+
+do_cleanlibs () {
+ rm -fr ${ELFS-PATH}/voiceipc_mainctrl
+}
+
+addtask cleanlibs after do_clean before do_cleansstate
+
+FILES_${PN} = "\
+ ${bindir}/ \
+ ${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/voiceipc_mainctrl","", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${sysconfdir}/","", d)} \
+ "
+SYSTEMD_SERVICE_${PN} = "voiceipc_mainctrl.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+
+RDEPENDS_${PN} = " libvoice"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.init b/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.init
new file mode 100755
index 0000000..1794f4c
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.init
@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+START=50
+STOP=85
+USE_PROCD=1
+
+logger -t voiceipc_mainctrl
+
+start_service() {
+ procd_open_instance
+ procd_set_param command /usr/bin/voiceipc_mainctrl
+ procd_set_param stdout 1 # forward stdout of the command to logd
+ procd_set_param stderr 1 # same for stderr
+ procd_set_param respawn
+ procd_close_instance
+}
+
+stop_service()
+{
+ echo "add clean code"
+}
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.service b/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.service
new file mode 100755
index 0000000..c0291e9
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=The voiceipc_mainctrl service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/voiceipc_mainctrl
+Restart=always
+
+[Install]
+WantedBy=basic.target
+
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit b/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.sysvinit
similarity index 88%
rename from cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit
rename to cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.sysvinit
index 29ccdb1..4466cd4 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/at-svr/at-svr/at_svr.sysvinit
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/voiceipc-mainctrl/voiceipc-mainctrl/voiceipc_mainctrl.sysvinit
@@ -3,9 +3,9 @@
# Run the daemon
#
-DAEMON="at_svr"
+DAEMON="voiceipc_mainctrl"
PIDFILE="/var/run/$DAEMON.pid"
-EXEC="/usr/bin/at_svr"
+EXEC="/usr/bin/voiceipc_mainctrl"
EXEC_ARGS=""
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zlog-agent/zlog-agent.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zlog-agent/zlog-agent.bb
index 89738da..fcfff41 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zlog-agent/zlog-agent.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zlog-agent/zlog-agent.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://zlog_agent \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://zlog_agent.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zlog-agent/zlog-agent/zlog_agent.sysvinit b/cap/zx297520v3/sources/meta-zxic/recipes-app/zlog-agent/zlog-agent/zlog_agent.sysvinit
index 015caf4..d13ef55 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zlog-agent/zlog-agent/zlog_agent.sysvinit
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zlog-agent/zlog-agent/zlog_agent.sysvinit
@@ -6,8 +6,8 @@
DAEMON="zlog_agent"
PIDFILE="/var/run/$DAEMON.pid"
EXEC="/usr/bin/zlog_agent"
-EXEC_ARGS="-d /tmp -r /etc/log.rule -t 1024 -n 10"
-
+EXEC_ARGS=" "
+#EXEC_ARGS="-d /mnt/userdata -r /mnt/userdata/log.rule -t 1024 -n 10"
start() {
echo -n "Starting $DAEMON... "
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-audio-ctrl/zxic-audio-ctrl.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-audio-ctrl/zxic-audio-ctrl.bb
index 8c85bed..2583260 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-audio-ctrl/zxic-audio-ctrl.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-audio-ctrl/zxic-audio-ctrl.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://zxic_audio_ctrl \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://zxic_audio_ctrl.init","", d)} \
@@ -50,7 +50,8 @@
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
install -Dm 0755 ${WORKDIR}/zxic_audio_ctrl.sysvinit ${D}${sysconfdir}/init.d/zxic_audio_ctrl
install -d ${D}${sysconfdir}/rcS.d
- ln -s ../init.d/zxic_audio_ctrl ${D}${sysconfdir}/rcS.d/S24zxic_audio_ctrl
+ ln -s ../init.d/zxic_audio_ctrl ${D}${sysconfdir}/rcS.d/
+ #S24zxic_audio_ctrl
fi
#install elfs
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-debug/zxic-debug.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-debug/zxic-debug.bb
index d1c51f8..c7f87d1 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-debug/zxic-debug.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-debug/zxic-debug.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "zxic-debug"
-
-DEPENDS = ""
+#zxic-debug依赖libnvram库
+DEPENDS = "libnvram"
SECTION = "app"
LICENSE = "zte"
PV = "1.0.0"
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://zxic_debug \
${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "file://zxic_debug.sysvinit","", d)} \
@@ -40,7 +40,7 @@
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
install -Dm 0755 ${WORKDIR}/zxic_debug.sysvinit ${D}${sysconfdir}/init.d/zxic_debug
install -d ${D}${sysconfdir}/rcS.d
- #ln -s ../init.d/zxic_debug ${D}${sysconfdir}/rcS.d/S90zxic_debug
+ ln -s ../init.d/zxic_debug ${D}${sysconfdir}/rcS.d/S90zxic_debug
fi
#install elfs
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-debug/zxic-debug/zxic_debug.sysvinit b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-debug/zxic-debug/zxic_debug.sysvinit
index 323c3b4..bbcbea4 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-debug/zxic-debug/zxic_debug.sysvinit
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-debug/zxic-debug/zxic_debug.sysvinit
@@ -6,7 +6,7 @@
DAEMON="zxic_debug"
PIDFILE="/var/run/$DAEMON.pid"
EXEC="/usr/bin/zxic_debug"
-EXEC_ARGS="-p /var"
+EXEC_ARGS=""
start() {
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-hotplug/zxic-hotplug.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-hotplug/zxic-hotplug.bb
index 26d330e..520c23e 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-hotplug/zxic-hotplug.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-hotplug/zxic-hotplug.bb
@@ -12,7 +12,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://zxic_hotplug \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://zxic_hotplug.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ipv6-addr-conver/zxic-ipv6-addr-conver.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ipv6-addr-conver/zxic-ipv6-addr-conver.bb
index 0e1bb6a..d5f4758 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ipv6-addr-conver/zxic-ipv6-addr-conver.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ipv6-addr-conver/zxic-ipv6-addr-conver.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://zxic_ipv6_addr_conver \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://zxic_ipv6_addr_conver.init","", d)} \
@@ -68,7 +68,7 @@
${@bb.utils.contains("DISTRO_FEATURES", "procd", "${sysconfdir}/init.d/ipv6_addr_conver","", d)} \
${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${sysconfdir}/","", d)} \
"
-SYSTEMD_SERVICE_${PN} = "zxic_ipv6_addr_collect.service"
+SYSTEMD_SERVICE_${PN} = "zxic_ipv6_addr_conver.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
RDEPENDS_${PN} = " libnvram"
\ No newline at end of file
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ipv6-slaac/zxic-ipv6-slaac.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ipv6-slaac/zxic-ipv6-slaac.bb
index 559fd23..92cae5f 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ipv6-slaac/zxic-ipv6-slaac.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ipv6-slaac/zxic-ipv6-slaac.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://zxic_ipv6_slaac \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://zxic_ipv6_slaac.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-mainctrl/zxic-mainctrl.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-mainctrl/zxic-mainctrl.bb
index 26709b6..fe909dc 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-mainctrl/zxic-mainctrl.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-mainctrl/zxic-mainctrl.bb
@@ -12,7 +12,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://zxic_mainctrl \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://zxic_mainctrl.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ndp/zxic-ndp.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ndp/zxic-ndp.bb
index 7d7c82d..2f4e632 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ndp/zxic-ndp.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-ndp/zxic-ndp.bb
@@ -13,7 +13,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://zxic_ndp \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://zxic_ndp.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-script/zxic-script.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-script/zxic-script.bb
index 0a1ca47..45fd680 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-script/zxic-script.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/zxic-script/zxic-script.bb
@@ -12,7 +12,7 @@
inherit ${CLASS_COM}
#配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}:"
+FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/platform:"
SRC_URI = " \
file://Script \
${@bb.utils.contains("DISTRO_FEATURES", "procd", "file://udhcpd.init","", d)} \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox/busybox-1.33.1/010-syslogd-recive-remote-log.patch b/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox/busybox-1.33.1/010-syslogd-recive-remote-log.patch
new file mode 100755
index 0000000..9f8f709
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox/busybox-1.33.1/010-syslogd-recive-remote-log.patch
@@ -0,0 +1,283 @@
+--- /sysklogd/syslogd.c 2021-01-01 21:37:14.000000000 +0800
++++ /sysklogd/syslogd.c 2023-04-25 17:49:26.575996968 +0800
+@@ -984,6 +984,50 @@ static NOINLINE int create_socket(void)
+ return sock_fd;
+ }
+
++static NOINLINE int create_inet_socket(void)
++{
++ int err, fd = -1;
++ struct addrinfo hints, *rp, *ai;
++ int fd4 = -1;
++
++ memset(&hints, 0, sizeof(hints));
++ hints.ai_family = AF_INET;
++ hints.ai_socktype = SOCK_DGRAM;
++ hints.ai_flags = AI_PASSIVE;
++
++ err = getaddrinfo(NULL, "514", &hints, &rp);
++ if (err)
++ {
++ bb_perror_msg("lookup error, suspending inet service");
++ return;
++ }
++
++ for (ai = rp; ai; ai = ai->ai_next)
++ {
++ int yes = 1;
++
++ fd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
++ if (fd < 0)
++ continue;
++
++ err = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
++ if (err < 0)
++ bb_perror_msg("failed to set SO_REUSEADDR");
++
++ if (bind(fd, ai->ai_addr, ai->ai_addrlen) < 0)
++ {
++ close(fd);
++ fd = -1;
++ continue;
++ }
++ /* Register any success. */
++ if (ai->ai_family == AF_INET && fd4 < 0)
++ fd4 = fd;
++ }
++ freeaddrinfo(rp);
++ return fd4;
++}
++
+ #if ENABLE_FEATURE_REMOTE_LOG
+ static int try_to_resolve_remote(remoteHost_t *rh)
+ {
+@@ -1002,9 +1046,17 @@ static int try_to_resolve_remote(remoteH
+ }
+ #endif
+
++#define SOCKET_FILENO 4
+ static void do_syslogd(void) NORETURN;
+ static void do_syslogd(void)
+ {
++ struct pollfd *fdarray;
++ unsigned int nfds = 0;
++ int nready = 0;
++ unsigned int i = 0;
++ int sock_read = 0;
++ struct sockaddr_storage frominet;
++ socklen_t len = sizeof(frominet);
+ #if ENABLE_FEATURE_REMOTE_LOG
+ llist_t *item;
+ #endif
+@@ -1025,7 +1077,24 @@ static void do_syslogd(void)
+ signal(SIGALRM, do_mark);
+ alarm(G.markInterval);
+ #endif
++
++ /* We add 3 = 1(klog) + 2(inet,inet6), even if they may stay unused. */
++ fdarray = (struct pollfd *)malloc(3 * sizeof (*fdarray));
++ if (fdarray == NULL)
++ bb_perror_msg_and_die("can't allocate fd table");
++
+ xmove_fd(create_socket(), STDIN_FILENO);
++ xmove_fd(create_inet_socket(), SOCKET_FILENO);
++
++ // log
++ fdarray[nfds].fd = STDIN_FILENO;
++ fdarray[nfds].events = POLLIN | POLLPRI;
++ nfds++;
++
++ // socket
++ fdarray[nfds].fd = SOCKET_FILENO;
++ fdarray[nfds].events = POLLIN | POLLPRI;
++ nfds++;
+
+ if (option_mask32 & OPT_circularlog)
+ ipcsyslog_init();
+@@ -1038,6 +1107,7 @@ static void do_syslogd(void)
+
+ while (!bb_got_signal) {
+ ssize_t sz;
++loop_again:
+
+ #if ENABLE_FEATURE_SYSLOGD_DUP
+ last_buf = recvbuf;
+@@ -1047,76 +1117,113 @@ static void do_syslogd(void)
+ recvbuf = G.recvbuf;
+ #endif
+ read_again:
+- sz = read(STDIN_FILENO, recvbuf, MAX_READ - 1);
+- if (sz < 0) {
+- if (!bb_got_signal)
+- bb_perror_msg("read from %s", _PATH_LOG);
+- break;
+- }
+-
+- /* Drop trailing '\n' and NULs (typically there is one NUL) */
+- while (1) {
+- if (sz == 0)
+- goto read_again;
+- /* man 3 syslog says: "A trailing newline is added when needed".
+- * However, neither glibc nor uclibc do this:
+- * syslog(prio, "test") sends "test\0" to /dev/log,
+- * syslog(prio, "test\n") sends "test\n\0".
+- * IOW: newline is passed verbatim!
+- * I take it to mean that it's syslogd's job
+- * to make those look identical in the log files. */
+- if (recvbuf[sz-1] != '\0' && recvbuf[sz-1] != '\n')
+- break;
+- sz--;
++ nready = poll(fdarray, nfds, -1);
++ if (nready == 0) /* ?? noop */
++ goto read_again;
++
++ if (nready < 0)
++ {
++ if (errno != EINTR)
++ timestamp_and_log_internal("syslogd poll");
++ goto read_again;
+ }
++ for (i = 0; i < nfds; i++)
++ {
++ if (fdarray[i].revents & (POLLIN | POLLPRI))
++ {
++ if (fdarray[i].fd == -1)
++ continue;
++ else if (fdarray[i].fd == STDIN_FILENO)
++ sz = read(fdarray[i].fd, recvbuf, MAX_READ - 1);
++ else if (fdarray[i].fd == SOCKET_FILENO)
++ sz = recvfrom(fdarray[i].fd, recvbuf, MAX_READ - 1, 0,
++ (struct sockaddr *)&frominet, &len);
++ if (sz < 0) {
++ if (!bb_got_signal)
++ bb_perror_msg("read from %s", _PATH_LOG);
++ goto read_exit;
++ }
++
++ /* Drop trailing '\n' and NULs (typically there is one NUL) */
++ while (1) {
++ if (sz == 0)
++ goto read_again;
++ /* man 3 syslog says: "A trailing newline is added when needed".
++ * However, neither glibc nor uclibc do this:
++ * syslog(prio, "test") sends "test\0" to /dev/log,
++ * syslog(prio, "test\n") sends "test\n\0".
++ * IOW: newline is passed verbatim!
++ * I take it to mean that it's syslogd's job
++ * to make those look identical in the log files. */
++ if (recvbuf[sz-1] != '\0' && recvbuf[sz-1] != '\n')
++ break;
++ sz--;
++ }
+ #if ENABLE_FEATURE_SYSLOGD_DUP
+- if ((option_mask32 & OPT_dup) && (sz == last_sz))
+- if (memcmp(last_buf, recvbuf, sz) == 0)
+- continue;
+- last_sz = sz;
++ if (fdarray[i].fd == STDIN_FILENO)
++ {
++ if ((option_mask32 & OPT_dup) && (sz == last_sz))
++ if (memcmp(last_buf, recvbuf, sz) == 0)
++ goto loop_again;
++ last_sz = sz;
++ }
+ #endif
+ #if ENABLE_FEATURE_REMOTE_LOG
+- /* Stock syslogd sends it '\n'-terminated
+- * over network, mimic that */
+- recvbuf[sz] = '\n';
+-
+- /* We are not modifying log messages in any way before send */
+- /* Remote site cannot trust _us_ anyway and need to do validation again */
+- for (item = G.remoteHosts; item != NULL; item = item->link) {
+- remoteHost_t *rh = (remoteHost_t *)item->data;
+-
+- if (rh->remoteFD == -1) {
+- rh->remoteFD = try_to_resolve_remote(rh);
+- if (rh->remoteFD == -1)
+- continue;
+- }
+-
+- /* Send message to remote logger.
+- * On some errors, close and set remoteFD to -1
+- * so that DNS resolution is retried.
+- */
+- if (sendto(rh->remoteFD, recvbuf, sz+1,
+- MSG_DONTWAIT | MSG_NOSIGNAL,
+- &(rh->remoteAddr->u.sa), rh->remoteAddr->len) == -1
+- ) {
+- switch (errno) {
+- case ECONNRESET:
+- case ENOTCONN: /* paranoia */
+- case EPIPE:
+- close(rh->remoteFD);
+- rh->remoteFD = -1;
+- free(rh->remoteAddr);
+- rh->remoteAddr = NULL;
+- }
+- }
+- }
+-#endif
+- if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
+- recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */
+- split_escape_and_log(recvbuf, sz);
+- }
++ if (fdarray[i].fd == STDIN_FILENO)
++ {
++ /* Stock syslogd sends it '\n'-terminated
++ * over network, mimic that */
++ recvbuf[sz] = '\n';
++
++ /* We are not modifying log messages in any way before send */
++ /* Remote site cannot trust _us_ anyway and need to do validation again */
++ for (item = G.remoteHosts; item != NULL; item = item->link) {
++ remoteHost_t *rh = (remoteHost_t *)item->data;
++
++ if (rh->remoteFD == -1) {
++ rh->remoteFD = try_to_resolve_remote(rh);
++ if (rh->remoteFD == -1)
++ continue;
++ }
++
++ /* Send message to remote logger.
++ * On some errors, close and set remoteFD to -1
++ * so that DNS resolution is retried.
++ */
++ if (sendto(rh->remoteFD, recvbuf, sz+1,
++ MSG_DONTWAIT | MSG_NOSIGNAL,
++ &(rh->remoteAddr->u.sa), rh->remoteAddr->len) == -1
++ ) {
++ switch (errno) {
++ case ECONNRESET:
++ case ENOTCONN: /* paranoia */
++ case EPIPE:
++ close(rh->remoteFD);
++ rh->remoteFD = -1;
++ free(rh->remoteAddr);
++ rh->remoteAddr = NULL;
++ }
++ }
++ }
++ }
++#endif
++ if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
++ recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */
++ split_escape_and_log(recvbuf, sz);
++ }
++ }
++ else if (fdarray[i].revents & POLLNVAL)
++ {
++ timestamp_and_log_internal("syslogd poll nval");
++ fdarray[i].fd = -1;
++ }
++ else if (fdarray[i].revents & POLLERR)
++ timestamp_and_log_internal("syslogd poll err");
++ else if (fdarray[i].revents & POLLHUP)
++ timestamp_and_log_internal("syslogd poll hup");
++ }
+ } /* while (!bb_got_signal) */
+-
++read_exit:
+ timestamp_and_log_internal("syslogd exiting");
+ remove_pidfile_std_path_and_ext("syslogd");
+ ipcsyslog_cleanup();
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox_1.33.1.bb b/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox_1.33.1.bb
index 5593768..1949669 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox_1.33.1.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox_1.33.1.bb
@@ -2,6 +2,7 @@
SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://busybox-1.33.1/busybox-udhcpc-no_deconfig.patch \
+ file://busybox-1.33.1/010-syslogd-recive-remote-log.patch \
file://find-touchscreen.sh \
file://busybox-cron \
file://busybox-httpd \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox_1.33.1.inc b/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox_1.33.1.inc
index dfc38a6..3791da8 100644
--- a/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox_1.33.1.inc
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/busybox_1.33.1.inc
@@ -274,6 +274,8 @@
install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog
install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf
install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf
+ #install -d ${D}${sysconfdir}/rcS.d
+ #ln -s ../init.d/syslog ${D}${sysconfdir}/rcS.d/S18syslog
fi
if grep -q "CONFIG_CROND=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/files/syslog.conf b/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/files/syslog.conf
index 75bb630..0ca1743 100644
--- a/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/files/syslog.conf
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-core/busybox/files/syslog.conf
@@ -1 +1,2 @@
# /etc/syslog.conf Configuration file for busybox's syslogd utility
+user.* /var/log/syslogd.log
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-add-zxic-bsp_api_h.patch b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-add-zxic-bsp_api_h.patch
new file mode 100644
index 0000000..e6d4b88
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-add-zxic-bsp_api_h.patch
@@ -0,0 +1,73 @@
+From ead7cfc7b2f9cee1a0cfe292ad98cba5493e0548 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?=E5=91=A8=E5=9B=BD=E5=9D=A1=2010053386?=
+ <zhou.guopo@zte.com.cn>
+Date: Fri, 21 Apr 2023 08:39:33 +0800
+Subject: [PATCH] add bsp_api_h
+
+---
+ include/uapi/linux/sc_bsp/bsp_api.h | 53 +++++++++++++++++++++++++++++
+ 1 file changed, 53 insertions(+)
+ create mode 100644 include/uapi/linux/sc_bsp/bsp_api.h
+
+diff --git a/include/uapi/linux/sc_bsp/bsp_api.h b/include/uapi/linux/sc_bsp/bsp_api.h
+new file mode 100644
+index 0000000..f3ab959
+--- /dev/null
++++ b/include/uapi/linux/sc_bsp/bsp_api.h
+@@ -0,0 +1,53 @@
++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
++#ifndef _UAPI_LINUX_BSPAPI_H
++#define _UAPI_LINUX_BSPAPI_H
++
++#include <linux/ioctl.h>
++#include <linux/types.h>
++
++struct sc_irq_info {
++ unsigned int line;
++ unsigned int type;
++};
++
++#define SC_IRQ_IOC_MAGIC 'I'
++
++/*ioctl cmd usd by device*/
++#define SC_IRQ_INSTALL _IOW(SC_IRQ_IOC_MAGIC, 1, char *)
++#define SC_IRQ_SET_TYPE _IOW(SC_IRQ_IOC_MAGIC, 2, char *)
++#define SC_IRQ_SET_WAKE _IOW(SC_IRQ_IOC_MAGIC, 3, char *)
++#define SC_IRQ_GET_WAKE _IOW(SC_IRQ_IOC_MAGIC, 4, char *)
++#define SC_IRQ_UNINSTALL _IOW(SC_IRQ_IOC_MAGIC, 5, char *)
++
++#define SC_IRQ_GET_STATUS _IOW(SC_IRQ_IOC_MAGIC, 6, char *)
++#define SC_IRQ_CLEAR_STATUS _IOW(SC_IRQ_IOC_MAGIC, 7, char *)
++
++#define SC_IRQ_DEV "/dev/sc_irq"
++
++
++
++/*----------------------------------------------------------*/
++struct sc_pm_info {
++ unsigned int sleep_time; /* ms */
++ unsigned int wake_event;
++};
++
++#define SC_PM_WL_EVENT_EXT0 ((unsigned int)1 << 0)
++#define SC_PM_WL_EVENT_EXT1 ((unsigned int)1 << 1)
++#define SC_PM_WL_EVENT_EXT2 ((unsigned int)1 << 2)
++#define SC_PM_WL_EVENT_EXT3 ((unsigned int)1 << 3)
++#define SC_PM_WL_EVENT_EXT4 ((unsigned int)1 << 4)
++#define SC_PM_WL_EVENT_EXT5 ((unsigned int)1 << 5)
++#define SC_PM_WL_EVENT_EXT6 ((unsigned int)1 << 6)
++#define SC_PM_WL_EVENT_EXT7 ((unsigned int)1 << 7)
++
++#define SC_PM_IOC_MAGIC 'P'
++
++/*ioctl cmd usd by device*/
++#define SC_PM_WL_SET _IOW(SC_PM_IOC_MAGIC, 1, char *)
++#define SC_PM_WL_CLEAR _IOW(SC_PM_IOC_MAGIC, 2, char *)
++#define SC_PM_WL_GET _IOW(SC_PM_IOC_MAGIC, 3, char *)
++
++#define SC_PM_DEV "/dev/sc_pm"
++
++#endif /* _UAPI_LINUX_BSPAPI_H */
+--
+2.17.1
+
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
index db0f115..cdcfff7 100644
--- a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
@@ -12,6 +12,7 @@
file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
file://0001-add-zxic-volte_drv.h.patch \
file://0002-add-zxic-rpmsg_zx29.h.patch \
+ file://0003-add-zxic-bsp_api_h.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc-normal-defconfig b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc-normal-defconfig
index 105ef68..14b0f1a 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc-normal-defconfig
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc-normal-defconfig
@@ -76,9 +76,11 @@
CONFIG_HIGH_RES_TIMERS=y
# end of Timers subsystem
-CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
#
# CPU/Task time and stats accounting
@@ -93,10 +95,15 @@
#
# RCU Subsystem
#
-CONFIG_TINY_RCU=y
+CONFIG_TREE_RCU=y
+CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_EXPERT is not set
CONFIG_SRCU=y
-CONFIG_TINY_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
# end of RCU Subsystem
# CONFIG_IKCONFIG is not set
@@ -184,8 +191,7 @@
# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
# CONFIG_PROFILING is not set
# end of General setup
-CONFIG_RAMDUMP=y
-#CONFIG_RAMDUMP_USER=y
+
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -198,7 +204,7 @@
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
-CONFIG_PHYS_OFFSET=0x22200000
+CONFIG_PHYS_OFFSET=0x22800000
CONFIG_GENERIC_BUG=y
CONFIG_PGTABLE_LEVELS=2
@@ -640,11 +646,7 @@
# CONFIG_IOSCHED_BFQ is not set
# end of IO Schedulers
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
CONFIG_FREEZER=y
@@ -699,7 +701,8 @@
#
# Networking options
#
-# CONFIG_PACKET is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
CONFIG_UNIX=y
CONFIG_UNIX_SCM=y
CONFIG_UNIX_DIAG=y
@@ -1210,6 +1213,7 @@
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_UBI_EXCEPTION=y
# CONFIG_MTD_HYPERBUS is not set
CONFIG_DTC=y
CONFIG_OF=y
@@ -1734,8 +1738,12 @@
# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
+
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_ZX29_WATCHDOG=y
+
# CONFIG_SSB is not set
CONFIG_BCMA_POSSIBLE=y
# CONFIG_BCMA is not set
@@ -1938,10 +1946,10 @@
# CONFIG_SND_SOC_XTFPGA_I2S is not set
# CONFIG_ZX_TDM is not set
CONFIG_SND_SOC_SANECHIPS=y
-# CONFIG_SND_SOC_ZX297520V3_TI3100 is not set
-# CONFIG_SND_SOC_ZX297520V3_NAU8810 is not set
-# CONFIG_SND_SOC_ZX297520V3_ES8374 is not set
-# CONFIG_SND_SOC_ZX297520V3_ES8312 is not set
+CONFIG_SND_SOC_ZX29_TI3100=y
+# CONFIG_SND_SOC_ZX29_NAU8810 is not set
+# CONFIG_SND_SOC_ZX29_ES8374 is not set
+# CONFIG_SND_SOC_ZX29_ES8312 is not set
# CONFIG_SND_SOC_ZX29_AK4940 is not set
CONFIG_SND_SOC_ZX_VOICE=y
CONFIG_SND_SOC_ZX297520V3=y
@@ -2095,8 +2103,6 @@
# CONFIG_SND_SIMPLE_CARD is not set
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_SUPPORT is not set
CONFIG_MMC=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_ZX29=y
@@ -2115,6 +2121,75 @@
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_CONN_GPIO is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB is not set
+# CONFIG_USB_CDNS3 is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_ISP1760 is not set
+
+#
+# USB port drivers
+#
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ULPI is not set
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_MAX3420_UDC is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_F_ADB_CLIENT=y
+# CONFIG_USB_CONFIGFS is not set
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_RAW_GADGET is not set
+# end of USB Gadget precomposed configurations
+
#
# DMA Devices
#
@@ -2344,7 +2419,14 @@
# CONFIG_VALIDATE_FS_PARSER is not set
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_FS is not set
+CONFIG_EXT4_FS=y
+# CONFIG_EXT4_USE_FOR_EXT2 is not set
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_DEBUG=y
+CONFIG_JBD2=y
+CONFIG_JBD2_DEBUG=y
+CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_XFS_FS is not set
@@ -2885,7 +2967,11 @@
# end of Scheduler Debugging
# CONFIG_DEBUG_TIMEKEEPING is not set
-
+CONFIG_DEBUG_PREEMPT=y
+CONFIG_RAMDUMP=y
+#hong.liu modify for close ramdump
+#CONFIG_RAMDUMP_USER=y
+#hong.liu modify for close ramdump
#
# Lock Debugging (spinlocks, mutexes, etc...)
#
@@ -2927,6 +3013,7 @@
# CONFIG_RCU_SCALE_TEST is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
# CONFIG_RCU_TRACE is not set
# CONFIG_RCU_EQS_DEBUG is not set
# end of RCU Debugging
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_4Gb-normal-defconfig b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_4Gb-normal-defconfig
new file mode 120000
index 0000000..4ac009b
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_4Gb-normal-defconfig
@@ -0,0 +1 @@
+linux-5_10-vehicle_dc-normal-defconfig
\ No newline at end of file
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/linux-zxic_5.10.bb b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/linux-zxic_5.10.bb
index ae96bf5..29942f4 100644
--- a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/linux-zxic_5.10.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/linux-zxic_5.10.bb
@@ -16,8 +16,10 @@
# PR_CONFIG_cpe = "linux-5_10-cpe-${BOOT_CTL}-defconfig"
# PR_CONFIG_v2x = "linux-5_10-v2x-${BOOT_CTL}-defconfig"
PR_CONFIG_vehicle_dc = "linux-5_10-vehicle_dc-${BOOT_CTL}-defconfig"
+PR_CONFIG_vehicle_dc_4Gb = "linux-5_10-vehicle_dc_4Gb-${BOOT_CTL}-defconfig"
S = "${WORKDIR}/linux-5.10"
+do_install[nostamp] = "1"
SRC_URI = "\
file://linux-5.10 \
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-tools/mkimgsig/mkimgsig.bb b/cap/zx297520v3/sources/meta-zxic/recipes-tools/mkimgsig/mkimgsig.bb
index ef6aff0..a41018e 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-tools/mkimgsig/mkimgsig.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-tools/mkimgsig/mkimgsig.bb
@@ -14,11 +14,13 @@
DEPENDS += "\
u-boot-tools-native dtc-native \
- "
+ "
#pub include
include ${BSPDIR}/sources/meta-zxic/conf/pub.inc
+do_configure[nostamp] = "1"
+
KERNEL_BIN_NAME = "${@bb.utils.contains("BOOT_CTL", "recovery", "ap_recovery.bin", "ap_cpucap.bin", d)}"
#编译