Merge "[Feature][task-view-998]merge P56U10 version"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/zxic-image.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/zxic-image.bb
index f15ad14..bce89e6 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/zxic-image.bb
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/zxic-image.bb
@@ -258,6 +258,8 @@
"
#xf.li@20240716 add start
do_oem_config() {
+ LYNQ_INSIDE_VERSION_UCI=" option LYNQ_SW_INSIDE_VERSION '${LYNQ_CONFIG_VERSION}'"
+ eval sed -i 's/^.*LYNQ_SW_INSIDE_VERSION.*$/"${LYNQ_INSIDE_VERSION_UCI}"/' ${IMAGE_ROOTFS}/etc/config/lynq_uci_ro
if [ "${MOBILETEK_LOG_ENCRYPT}" = "enable" ]; then
touch ${IMAGE_ROOTFS}/etc/syslog_encrypt_flag
else
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 dd579d3..37b2b5f 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/sntp/sntp.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/sntp/sntp.bb
@@ -50,7 +50,9 @@
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
install -Dm 0755 ${WORKDIR}/sntp.sysvinit ${D}${sysconfdir}/init.d/sntp
install -d ${D}${sysconfdir}/rcS.d
- ln -s ../init.d/sntp ${D}${sysconfdir}/rcS.d/S22sntp
+ #xy.he@20250211 bug-view-378 add for disable sntp autostart start
+ #ln -s ../init.d/sntp ${D}${sysconfdir}/rcS.d/S22sntp
+ #xy.he@20250211 bug-view-378 add for disable sntp autostart end
fi
#install elfs
@@ -73,4 +75,4 @@
SYSTEMD_SERVICE_${PN} = "sntp.service"
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-RDEPENDS_${PN} = " libdebug-info libnvram libsoftap libsofttimer"
\ No newline at end of file
+RDEPENDS_${PN} = " libdebug-info libnvram libsoftap libsofttimer"
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-led-sev/lynq_led_sev.c b/cap/zx297520v3/src/lynq/framework/lynq-led-sev/lynq_led_sev.c
index ca23cb2..cc105ff 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-led-sev/lynq_led_sev.c
+++ b/cap/zx297520v3/src/lynq/framework/lynq-led-sev/lynq_led_sev.c
@@ -19,7 +19,7 @@
char led_enable[BUF_LEN] = "";
char com_val[GPIO_LED] = "";
- system("/usr/bin/lynq-default");
+ //system("/usr/bin/lynq-default");
lynq_get_value(LYNQ_UCI_FILE, LYNQ_UCI_SECTION, LYNQ_UCI_STATUSLED_KEY, led_enable);
if(atoi(led_enable))
{
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-uci/lynq_uci.config b/cap/zx297520v3/src/lynq/lib/liblynq-uci/lynq_uci.config
index aef436c..755a968 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-uci/lynq_uci.config
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-uci/lynq_uci.config
@@ -9,7 +9,7 @@
option gateway '192.168.11.1'
config lynq_sync_time_rw 'lynq_sync_time'
- option lynq_modem_sync_time_enable '1'
+ option lynq_modem_sync_time_enable '0'
option lynq_gnss_sync_time_enable '0'
config lynq_autosuspend 'lynq_autosuspend'
option auto_enable '0'
diff --git a/update_version.sh b/update_version.sh
index 3baea97..72bf655 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#export LYNQ_VERSION="T106_lynq_version_ap_build_sh"
-LYNQ_AP_VERSION="T106-V2.01.01.02P56U09.AP.17.15"
+LYNQ_AP_VERSION="T106-MXX-PLXXXX-P56U09.AP.17.15"
LYNQ_CAP_INSIDE_VERSION="CAP.17.15"
LYNQ_CAP_VERSION="CAP.17.15"
COMMIT_ID="$(git rev-parse HEAD)"