20200122_jeffrey - silenceuncrio/diary GitHub Wiki
review
m330[release/v0.08] - turn off PROSRC_CUSTOMIZE on all profile
commit 7df4f8492d6ae9791e8de58b6faefc3d21491dd9
Refs: [release/v0.08], {origin/release/v0.08}
Author: jeffrey <[email protected]>
Date: Wed Jan 22 11:01:03 2020 +0800
turn off PROSRC_CUSTOMIZE on all profile
- or the top.png will be overwrite by /overlay
proscend/mconfig/configs/ALLNET/0_WIFI/defconfig | 2 +-
proscend/mconfig/configs/GENERIC/0_GENERIC/defconfig | 2 +-
proscend/mconfig/configs/GENERIC/1_GENERIC_WIFI/defconfig | 2 +-
proscend/mconfig/configs/PI/0_PI_WIFI/defconfig | 2 +-
proscend/mconfig/configs/PI/1_PI_GENERIC/defconfig | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
PROSRC_CUSTOMIZE 會把 top.png 在一開機的時候存到 /overlay 去
造成從 generic upgrade 到 allnet 時
allnet 的 image 一開機也會有 PROSRC_CUSTOMIZE 相關 module 又把之前的 top.png 回存回來
造成的後果就是 allnet 一開機還是 generic 的 logo
一點點的誤會差點造成內部成員間的誤解
還好我的態度很正面
事出必有因 - 總算把問題解決了
m330[release/v0.08] - give a hyperlink to the allnet website on the logo at the top banner
commit ccb4712b2f0fec70a684cfbdd2fde0c41c0bf011
Refs: [release/v0.08], {origin/release/v0.08}
Author: jeffrey <[email protected]>
Date: Wed Jan 22 11:24:53 2020 +0800
give a hyperlink to the allnet website on the logo at the top banner
proscend/prosrc/www/brand_allnet/src/brand/top.html.src | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
舉手之勞幫個忙 在 allnet logo 加個超連結連到他們家網頁去
build 最新的 M300[release/v2.02]
- Products/Vendor = M300/2_PLANET
planet 希望他們的 image with cid 0002 能夠 upgrade 成 image with cid 0080
修改如下
diff --git a/proscend/prosrc/icos/script/FirmwareUpgradeAPI.sh b/proscend/prosrc/icos/script/FirmwareUpgradeAPI.sh
index 85efb0e..7d2cd39 100755
--- a/proscend/prosrc/icos/script/FirmwareUpgradeAPI.sh
+++ b/proscend/prosrc/icos/script/FirmwareUpgradeAPI.sh
@@ -349,6 +349,22 @@ function mcsv_check {
progress_status "MCSV check succeeded"
fw_setenv hw_mcsv ${sw_mcsv}
fi
+ else if [ "${hw_mcsv_cccc}" == "0002" ]
+ then
+ log "Hardware customer ID is '0002' - PLANET
+ if [ "${sw_mcsv_cccc}" == "0002" ] || [ "${sw_mcsv_cccc}" == "0080" ]
+ then
+ log "Software Customer ID is '0002' or '0008'"
+ log "Allow to upgrade"
+ log "MCSV check succeeded"
+ progress_status "MCSV check succeeded"
+ fw_setenv hw_mcsv ${sw_mcsv}
+ else
+ log "Error: Customer ID not match, MCSV check failed"
+ progress_fail "Error: Customer ID not match, MCSV check failed"
+ echo "Error: Customer ID not match, MCSV check failed"
+ return
+ fi
else
log "Hardware customer ID is not '0000' or '0001'"
if [ "${sw_mcsv_cccc}" != "${hw_mcsv_cccc}" ]; then
(END)build 個 planet 的 image 實際做一下測試
被我改壞了
再次修正
測試玩上 code
M300[release/v2.02] - CID 0002 can upgrade to CID 0080
commit bef321116bcc75230bf0f66c34d1252dbafc14ac
Refs: [release/v2.02], {origin/release/v2.02}
Author: jeffrey <[email protected]>
Date: Wed Jan 22 14:03:33 2020 +0800
CID 0002 can upgrade to CID 0080
- but CID 0080 can not upgrade to CID 0002
proscend/prosrc/icos/script/FirmwareUpgradeAPI.sh | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
review task
M300[release/v2.02]
- apply the same web ui to CID 80(PLANET2) with CID 2(PLANET)
- CID 0002 can upgrade to CID 0080
m330[release/v0.08]
- apply the 'Easy Web UI' for profile HYTEC/2_HYTEC_KOREA
- add 'Diagnosis > TTY2TCP' web page
- correct the icon at the title of 'Diagnosis > TTY2TCP' web page
- turn off PROSRC_CUSTOMIZE on all profile
- give a hyperlink to the allnet website on the logo at the top banner
M350 web server
M300
- 無工作項目
M330
- P1 - GRE Keepalive
- P1 - Simple Web UI/CLI version
- P1 - Add tty2tcp in Web UI
- P3 - Web UI; GPS Track drawing(Server)
M350
- GRE
- Web UI
- Firmware Upgrade
- GRE keepalive
M360
- P3 - BGP with MD5
回到 m350
禮拜一得到結論 - 發現 m350 根本沒有 lighttpd
直接改 M330_defconfig
diff --git a/M350_defconfig b/M350_defconfig
index 28de7d8..882cea6 100644
--- a/M350_defconfig
+++ b/M350_defconfig
@@ -4645,7 +4645,10 @@ CONFIG_PACKAGE_xl2tpd=y
# CONFIG_PACKAGE_emailrelay-nossl is not set
# CONFIG_PACKAGE_haproxy is not set
# CONFIG_PACKAGE_haproxy-nossl is not set
-# CONFIG_PACKAGE_lighttpd is not set
+CONFIG_PACKAGE_lighttpd=y
+CONFIG_LIGHTTPD_SSL=y
+CONFIG_PACKAGE_lighttpd-mod-cgi=y
+CONFIG_PACKAGE_lighttpd-mod-rewrite=y
# CONFIG_PACKAGE_nginx is not set
# CONFIG_PACKAGE_polipo is not set
# CONFIG_PACKAGE_privoxy is not set
(END)退出 m350 的 docker container 後再進入
cd /home/user
source proenv.sh
直接在外層下 make
應該不用重 build 才對
怎麼會 build 這麼久呢
外層 build 好了
進 proscend 內層 build
follow 後續的步驟
看到 lighttpd 了...
root@ICR-W401:/home/admin# lighttpd -h
lighttpd/1.4.45 (ssl) (Jan 22 2020 07:13:39) - a light and fast webserver
usage:
-f <name> filename of the config-file
-m <name> module directory (default: /usr/lib/lighttpd)
-i <secs> graceful shutdown after <secs> of inactivity
-1 process single (one) request on stdin socket, then exit
-p print the parsed config-file in internal form, and exit
-t test config-file syntax, then exit
-tt test config-file syntax, load and init modules, then exit
-D don't go to background (default: go to background)
-v show version
-V show compile-time features
-h show this help
先上 code 吧
m350[develop] - add lighttpd package with version 1.4.45
commit 2def35c699cd08d68790fe648d620cbd6e2b4cf0
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Wed Jan 22 15:57:55 2020 +0800
add lighttpd package with version 1.4.45
M350_defconfig | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)