20171227_jeffrey - silenceuncrio/diary GitHub Wiki
0900
繼續 GRE
1010
commit b189f9bc996c865895cb254ac4dc08d9afde514c
Author: jeffrey <[email protected]>
Date: Wed Dec 27 10:10:22 2017 +0800
add GRE web page
proscend/prosrc/webcgi/Makefile | 4 +
proscend/prosrc/webcgi/gre.c | 105 +++++++++++++++++++++++
proscend/prosrc/www/app/feature/gre.html | 85 ++++++++++++++++++
proscend/prosrc/www/app/feature/gre.js | 59 +++++++++++++
proscend/prosrc/www/app/locale-en.json | 10 +++
proscend/prosrc/www/app/locale-fr.json | 10 +++
proscend/prosrc/www/app/locale-zh-tw.json | 10 +++
proscend/prosrc/www/app/services/icos.service.js | 9 ++
proscend/prosrc/www/src/index.html.src | 2 +
proscend/prosrc/www/src/menu.html.src | 3 +
10 files changed, 297 insertions(+)
剛剛和 ariel 聊過
索性就讓 GRE 在這次的 release 出去吧
1015
commit 415fe67f6e1aeff08e2f69d463968f614779b10a
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 10:17:47 2017 +0800
modify kernel configuration - "IP: GRE tunnels over IP"
- Networking support
- Networking options
- IP: GRE demultiplexer
- IP: GRE tunnels over ip
meta-proscend/recipes-kernel/linux/files/m300_defconfig | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
1020
commit aeb8c50a419b187796dbcf7cfad510d7e22f264f
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 10:22:52 2017 +0800
add 'PROSRC_GRE' compile flag for GRE function
proscend/mconfig/Config.in | 1 +
proscend/mconfig/configs/Azuretec/0_LTR-101/defconfig | 1 +
proscend/mconfig/configs/Azuretec/1_LTRG-101/defconfig | 1 +
proscend/mconfig/configs/Azuretec/3_OLTRG-103/defconfig | 1 +
proscend/mconfig/configs/LITE/1_GPS/defconfig | 1 +
proscend/mconfig/configs/LITE/2_APN2/defconfig | 1 +
proscend/mconfig/configs/M300/0_GENERIC/defconfig | 1 +
proscend/mconfig/configs/M300/1_GPS/defconfig | 1 +
proscend/mconfig/configs/M300/2_PLANET/defconfig | 1 +
proscend/mconfig/configs/M300/3_GPS_PLANET/defconfig | 1 +
proscend/mconfig/configs/M300/4_CTCU/defconfig | 1 +
proscend/mconfig/configs/M300/5_GPS_CTCU/defconfig | 1 +
proscend/mconfig/configs/M300/6_CXR/defconfig | 1 +
proscend/mconfig/configs/M300/7_GPS_CXR/defconfig | 1 +
proscend/mconfig/configs/M300E/1_GPS/defconfig | 1 +
proscend/mconfig/configs/M300E/3_GPS_CTCU/defconfig | 1 +
16 files changed, 16 insertions(+)
1040
commit 9a87638c7304e506d79c92cfcc36b9228ca3f5b4
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 10:43:29 2017 +0800
add MODULE_GRE icos module
- apply function not implement yet
.../default/rootfs/home/factory/icos/gre/gre.json | 7 +
proscend/prosrc/icos/icoslib/Makefile | 5 +
proscend/prosrc/icos/icoslib/entry.c | 7 +
proscend/prosrc/icos/icoslib/gre/Makefile | 14 +
proscend/prosrc/icos/icoslib/gre/gre.c | 321 +++++++++++++++++++++
proscend/prosrc/icos/include/icos_common.h | 1 +
proscend/prosrc/icos/include/icos_module.h | 1 +
proscend/prosrc/icos/include/module_gre.h | 24 ++
8 files changed, 380 insertions(+)
1050
commit 59c333ed1f1dbdcff8233dd02b10105d54d011b9
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 10:50:30 2017 +0800
add GRE web page
proscend/prosrc/webcgi/Makefile | 4 +
proscend/prosrc/webcgi/gre.c | 105 +++++++++++++++++++++++
proscend/prosrc/www/app/feature/gre.html | 85 ++++++++++++++++++
proscend/prosrc/www/app/feature/gre.js | 58 +++++++++++++
proscend/prosrc/www/app/locale-en.json | 12 +++
proscend/prosrc/www/app/locale-fr.json | 12 +++
proscend/prosrc/www/app/locale-zh-tw.json | 12 +++
proscend/prosrc/www/app/services/icos.service.js | 9 ++
proscend/prosrc/www/src/index.html.src | 1 +
proscend/prosrc/www/src/menu.html.src | 3 +
10 files changed, 301 insertions(+)
1130
commit ae474e65cb917296e09f11e0d83f22c8a1a85057
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 11:30:18 2017 +0800
implement the apply function of MODULE_GRE icos module
proscend/prosrc/icos/icoslib/gre/gre.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
1135
commit c71f68dee5ee5c1ab09bd07ce2db07ebb5c29735
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 11:36:41 2017 +0800
update jeffrey part to release note
M30x-ReleaseNotes.txt | 1 +
M30x-ReleaseNotes_Azuretec.txt | 1 +
M30x-ReleaseNotes_CTC.txt | 1 +
M30x-ReleaseNotes_CXR.txt | 1 +
M30x-ReleaseNotes_LITE.txt | 1 +
M30x-ReleaseNotes_Planet.txt | 1 +
M30x-ReleaseNotes_WIDE.txt | 1 +
7 files changed, 7 insertions(+)
1155
commit 69c6ce91a4438e6f1bc96924f595c4f372a7838b
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 11:54:19 2017 +0800
add a `ACCEPT` rule for GRE in chain `APP_IN`
proscend/prosrc/icos/icoslib/gre/gre.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
1345
commit 676371b1eef3c995412faa4c19e55325d497b518
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 13:42:54 2017 +0800
the 'top.html' will be made by 'top.html.src' according the following compile flag
- PROSRC_GNSS
- ifdef, display the gnss info
- PROSRC_BRCTL_LAN2
- ifndef, display the wan priority
proscend/prosrc/www/.gitignore | 1 +
proscend/prosrc/www/Makefile | 34 ++++++---------
proscend/prosrc/www/brand_ctcu/brand/top.html | 33 ---------------
proscend/prosrc/www/brand_ctcu/brand/top_gnss.html | 45 --------------------
.../prosrc/www/brand_ctcu/src/brand/top.html.src | 47 +++++++++++++++++++++
proscend/prosrc/www/brand_cxr/brand/top.html | 33 ---------------
proscend/prosrc/www/brand_cxr/brand/top_gnss.html | 47 ---------------------
.../prosrc/www/brand_cxr/src/brand/top.html.src | 47 +++++++++++++++++++++
.../www/brand_digicomm/src/brand/top.html.src | 46 +++++++++++++++++++++
proscend/prosrc/www/brand_nobrand/brand/top.html | 34 ---------------
.../prosrc/www/brand_nobrand/brand/top_gnss.html | 48 ----------------------
.../www/brand_nobrand/src/brand/top.html.src | 48 ++++++++++++++++++++++
proscend/prosrc/www/brand_planet/brand/top.html | 33 ---------------
.../prosrc/www/brand_planet/brand/top_gnss.html | 45 --------------------
.../prosrc/www/brand_planet/src/brand/top.html.src | 47 +++++++++++++++++++++
15 files changed, 248 insertions(+), 340 deletions(-)
1440
commit 7667ad35435aede415476122dcb01e1c928f0869
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date: Wed Dec 27 14:34:56 2017 +0800
change the css of customer 'ctcu' and 'scr'
- correct the color style of 'btn-primary'
proscend/prosrc/www/brand_ctcu/brand/custom.css | 20 ++++----------------
proscend/prosrc/www/brand_cxr/brand/custom.css | 20 ++++----------------
2 files changed, 8 insertions(+), 32 deletions(-)
1615
被指派了一件新工作
{Azuretec) Combine ICON tool+CFile tool into one tool for production
目前 CFile 的內容如下
{
"MODEL_NAME_XXX": "LTR-102",
"MODEL_NAME": "LTR-102",
"_MODEL_NAME": "LTR-102",
"MODEL_URL_XXX": "http://www.test.com/LTR-102",
"MODEL_URL": "http://www.test.com/LTR-102",
"PROSRC_MANUFACTURER_XXX": "test.com",
"PROSRC_MANUFACTURER": "test.com",
"PROSRC_MANUFACTURER_DESC_XXX": "test.com",
"PROSRC_MANUFACTURER_DESC": "test.com",
"PROSRC_MANUFACTURER_URL_XXX": "http://www.test.com",
"PROSRC_MANUFACTURER_URL": "http://www.test.com",
"PROSRC_SYS_CONTACT_XXX": "[email protected]",
"PROSRC_SYS_CONTACT": "[email protected]",
"PROSRC_SYS_LOCATION_XXX": "Taiwan Hsinchu",
"PROSRC_SYS_LOCATION": "Taiwan Hsinchu",
"PROSRC_SYS_OID_XXX": "1.3.6.1.4.1.7777.1.1",
"PROSRC_SYS_OID": "1.3.6.1.4.1.7777.1.1",
}
目前打算讓使用者自行編輯 CFile 再透過 customize web page 上傳
該 page 在 apply 之後要提醒使勇者待會會 reset default 並重新開機