20190711_jeffrey - silenceuncrio/diary GitHub Wiki
review
ๅ่ Preserve permissions on samba shared files when overwriting
้ ๅ 20180605_jeffrey
็ฎๅ็ Samba ่จญๅฎ - /etc/samba/smb.conf
...
[jbox]
path = /home/jeffrey
writable = yes
guest account = jeffrey
force user = jeffrey
public = yes
force group = jeffrey
browseable = yes
create mask = 0664
directory mask = 0775
map archive = no
ๅฐฑๅคไบไปฅไธ้่ก
map archive = no
็ตๆ็ผ็พๆๆนไบ proscend/prosrc/icos/script/ ไธ็ file ๅพ
file permission ๅทฒ็ถไธๆ่ขซไฟฎๆนไบ
ๅๅฐ M330
็นผ็บๅนซ VIC ็ task ่ตทๅ้ ญ
ๅ ไปฅๆๆฐ็ M330 - develop ็บไธป
- Vendor/Products = GENERIC/1_GENERIC
- Debug selection
- DEBUG - includes
- Applications
- WIFI Support(STA mode) - includes
ๆณจๆๅฐ Applications > WIFI Support(STA mode) ่ฆ้กๅคๅป้ธๅ
้ๆจฃ PROSRC_WIFI_STA ๆๆ่ขซๆ้
user@3b95631f73fe:~/proscend$ cat .config | grep PROSRC_WIFI_STA
PROSRC_WIFI_STA=y
ๅๅๅทฒ็ถๆ M330 feature/wifi_sta ้ๅ branch ๅชๆไบ
ๅ ็บ compile ไธ้็็ทฃๆ
่งฃๅฎไนๅพๅทฒ็ถ commit ๅฐ branch develop
้ฃไนๅ็ branch - feature/wifi_sta ่ฆๅชๆ
โ m330 git:(develop) โ git branch -d feature/wifi_sta
Deleted branch feature/wifi_sta (was 5f3de67).
ๅ้ๆฐๅปบไธๆฌก - git flow feature start wifi_sta
โ m330 git:(develop) โ git flow feature start wifi_sta
Switched to a new branch 'feature/wifi_sta'
Summary of actions:
- A new branch 'feature/wifi_sta' was created, based on 'develop'
- You are now on branch 'feature/wifi_sta'
Now, start committing on your feature. When done, use:
git flow feature finish wifi_sta
โ m330 git:(feature/wifi_sta) โ
compile error
...
lte_t.c:701:17: warning: implicit declaration of function 'ApplyCONNSetting' [-Wimplicit-function-declaration]
lte_t.c:716:31: error: 'USSD_CMD_LEN' undeclared (first use in this function)
lte_t.c:716:31: note: each undeclared identifier is reported only once for each function it appears in
lte_t.c:720:21: warning: 'return' with no value, in function returning non-void [enabled by default]
lte_t.c:726:21: warning: implicit declaration of function 'SendUSSD' [-Wimplicit-function-declaration]
lte_t.c:726:30: error: 'USSD_SEND_OPT' undeclared (first use in this function)
lte_t.c:716:22: warning: unused variable 'ussd_cmd' [-Wunused-variable]
lte_t.c:733:17: warning: implicit declaration of function 'GetUSSD' [-Wimplicit-function-declaration]
lte_t.c:733:25: error: 'USSD_GET_RESPONSE' undeclared (first use in this function)
lte_t.c:315:9: warning: unused variable 'switch_error' [-Wunused-variable]
...
email ๅ็ฅ ็ธ้ๅไป
็ธ้ๅไปๅทฒๆ้ค
ๅๅชๆ branch - feature/wifi_sta
โ m330 git:(develop) โ git branch -d feature/wifi_sta
Deleted branch feature/wifi_sta (was b9e2b38).
โ m330 git:(develop) โ
ๅๅปบไธๆฌก - git flow feature start wifi_sta
โ m330 git:(develop) โ git flow feature start wifi_sta
Switched to a new branch 'feature/wifi_sta'
Summary of actions:
- A new branch 'feature/wifi_sta' was created, based on 'develop'
- You are now on branch 'feature/wifi_sta'
Now, start committing on your feature. When done, use:
git flow feature finish wifi_sta
โ m330 git:(feature/wifi_sta) โ
M330 - feature/wifi_sta - add wifi_sta.cgi
commit a058be24005e6bbe8676456a993e9553ff219308
Refs: [feature/wifi_sta]
Author: jeffrey <[email protected]>
Date: Thu Jul 11 10:35:02 2019 +0800
feature/wifi_sta - add wifi_sta.cgi
- /www/cgi-bin/wifi_sta.cgi?act=config
- /www/cgi-bin/wifi_sta.cgi?act=help
proscend/prosrc/webcgi/Makefile | 6 +++
proscend/prosrc/webcgi/wifi_sta.c | 80 +++++++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
git flow feature publish - ๆนไพฟๅ
ถไปๅไปๅญๅ
โ m330 git:(feature/wifi_sta) โ git flow feature publish
Counting objects: 7, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 1.16 KiB | 0 bytes/s, done.
Total 7 (delta 5), reused 0 (delta 0)
remote:
remote: To create a merge request for feature/wifi_sta, visit:
remote: https://192.168.0.124/RD/m330/merge_requests/new?merge_request%5Bsource_branch%5D=feature%2Fwifi_sta
remote:
To [email protected]:RD/m330.git
* [new branch] feature/wifi_sta -> feature/wifi_sta
Branch feature/wifi_sta set up to track remote branch feature/wifi_sta from origin.
Already on 'feature/wifi_sta'
Your branch is up-to-date with 'origin/feature/wifi_sta'.
Summary of actions:
- The remote branch 'feature/wifi_sta' was created or updated
- The local branch 'feature/wifi_sta' was configured to track the remote branch
- You are now on branch 'feature/wifi_sta'
โ m330 git:(feature/wifi_sta) โ
ไพๆ M300 - feature/lighttpd merge ๅ develop ๅง
โ M300 git:(feature/lighttpd) โ git flow feature finish
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Auto-merging proscend/prosrc/www/app/services/icos.service.js
Auto-merging proscend/prosrc/www/app/feature/login.js
CONFLICT (content): Merge conflict in proscend/prosrc/www/app/feature/login.js
Auto-merging proscend/prosrc/webcgi/status.c
Auto-merging proscend/prosrc/webcgi/openvpn.c
Auto-merging proscend/prosrc/webcgi/lte.c
Auto-merging proscend/prosrc/webcgi/lan_control.c
Auto-merging proscend/prosrc/webcgi/firewall.c
Auto-merging proscend/prosrc/webcgi/connmgr.c
Auto-merging proscend/prosrc/webcgi/alarm.c
Auto-merging proscend/prosrc/webcgi/Makefile
Auto-merging proscend/prosrc/icos/icoslib/web/webcfg.c
CONFLICT (content): Merge conflict in proscend/prosrc/icos/icoslib/web/webcfg.c
Auto-merging proscend/prosrc/icos/icoslib/openvpn/openvpn.c
Auto-merging meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
CONFLICT (content): Merge conflict in meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
Automatic merge failed; fix conflicts and then commit the result.
There were merge conflicts. To resolve the merge conflict manually, use:
git mergetool
git commit
You can then complete the finish by running it again:
git flow feature finish lighttpd
โ M300 git:(develop) โ
ๆญคๆ M300 - develop ็ git status
โ M300 git:(develop) โ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
You have unmerged paths.
(fix conflicts and run "git commit")
Changes to be committed:
new file: meta-proscend/recipes-extended/lighttpd/lighttpd-1.4.53/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
new file: meta-proscend/recipes-extended/lighttpd/lighttpd-1.4.53/index.html.lighttpd
new file: meta-proscend/recipes-extended/lighttpd/lighttpd-1.4.53/lighttpd
new file: meta-proscend/recipes-extended/lighttpd/lighttpd-1.4.53/lighttpd.conf
new file: meta-proscend/recipes-extended/lighttpd/lighttpd_1.4.36.bbappend
new file: meta-proscend/recipes-extended/lighttpd/lighttpd_1.4.53.bb
new file: meta-proscend/recipes-extended/lighttpd/lighttpd_1.4.53.bbappend
modified: proscend/.gitignore
modified: proscend/prosrc/Makefile
new file: proscend/prosrc/fcgi/.gitignore
new file: proscend/prosrc/fcgi/Makefile
new file: proscend/prosrc/fcgi/api.c
new file: proscend/prosrc/fcgi/app.h
new file: proscend/prosrc/fcgi/app_sntp.c
new file: proscend/prosrc/fcgi/app_status.c
new file: proscend/prosrc/fcgi/cgilib-0.7/AUTHORS
new file: proscend/prosrc/fcgi/cgilib-0.7/COPYING
new file: proscend/prosrc/fcgi/cgilib-0.7/ChangeLog
new file: proscend/prosrc/fcgi/cgilib-0.7/INSTALL
new file: proscend/prosrc/fcgi/cgilib-0.7/Makefile
new file: proscend/prosrc/fcgi/cgilib-0.7/Makefile.am
new file: proscend/prosrc/fcgi/cgilib-0.7/Makefile.in
new file: proscend/prosrc/fcgi/cgilib-0.7/aux.C
new file: proscend/prosrc/fcgi/cgilib-0.7/aux.H
new file: proscend/prosrc/fcgi/cgilib-0.7/aux.O
new file: proscend/prosrc/fcgi/cgilib-0.7/aux_x.c
new file: proscend/prosrc/fcgi/cgilib-0.7/aux_x.h
new file: proscend/prosrc/fcgi/cgilib-0.7/cgi.5
new file: proscend/prosrc/fcgi/cgilib-0.7/cgi.c
new file: proscend/prosrc/fcgi/cgilib-0.7/cgi.h
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiDebug.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiEscape.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiFree.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiFreeList.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetCookie.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetCookies.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetFile.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetFiles.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetValue.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetVariables.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiHeader.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiInit.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiRedirect.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiSetHeader.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiSetType.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgitest.c
new file: proscend/prosrc/fcgi/cgilib-0.7/config.guess
new file: proscend/prosrc/fcgi/cgilib-0.7/config.sub
new file: proscend/prosrc/fcgi/cgilib-0.7/configure.ac
new file: proscend/prosrc/fcgi/cgilib-0.7/cookies.c
new file: proscend/prosrc/fcgi/cgilib-0.7/cookies.txt
new file: proscend/prosrc/fcgi/cgilib-0.7/depcomp
new file: proscend/prosrc/fcgi/cgilib-0.7/install-sh
new file: proscend/prosrc/fcgi/cgilib-0.7/jumpto.c
new file: proscend/prosrc/fcgi/cgilib-0.7/ltmain.sh
new file: proscend/prosrc/fcgi/cgilib-0.7/missing
new file: proscend/prosrc/fcgi/iweb.c
new file: proscend/prosrc/fcgi/jweb.c
new file: proscend/prosrc/fcgi/jweb.h
new file: proscend/prosrc/fcgi/tiny.c
modified: proscend/prosrc/icos/icoslib/openvpn/openvpn.c
new file: proscend/prosrc/icos/script/web_x509_lighttpd.sh
modified: proscend/prosrc/webcgi/Makefile
modified: proscend/prosrc/webcgi/alarm.c
new file: proscend/prosrc/webcgi/api.c
modified: proscend/prosrc/webcgi/bgp.c
modified: proscend/prosrc/webcgi/com.c
modified: proscend/prosrc/webcgi/configuration.c
modified: proscend/prosrc/webcgi/connmgr.c
modified: proscend/prosrc/webcgi/cwmp.c
modified: proscend/prosrc/webcgi/ddns.c
modified: proscend/prosrc/webcgi/dhcp_client_list.c
modified: proscend/prosrc/webcgi/dmz.c
modified: proscend/prosrc/webcgi/dnat.c
modified: proscend/prosrc/webcgi/dns.c
modified: proscend/prosrc/webcgi/fail2ban.c
modified: proscend/prosrc/webcgi/firewall.c
modified: proscend/prosrc/webcgi/firmware.c
modified: proscend/prosrc/webcgi/gre.c
modified: proscend/prosrc/webcgi/icos_config.c
modified: proscend/prosrc/webcgi/icos_msg.c
modified: proscend/prosrc/webcgi/ip_alias.c
modified: proscend/prosrc/webcgi/ipfilter.c
modified: proscend/prosrc/webcgi/ipsec.c
modified: proscend/prosrc/webcgi/ipv6lan.c
modified: proscend/prosrc/webcgi/jweb.c
modified: proscend/prosrc/webcgi/jweb.h
modified: proscend/prosrc/webcgi/l2tp.c
modified: proscend/prosrc/webcgi/lan_control.c
modified: proscend/prosrc/webcgi/lte.c
modified: proscend/prosrc/webcgi/macfilter.c
modified: proscend/prosrc/webcgi/modbus.c
modified: proscend/prosrc/webcgi/mqtt.c
modified: proscend/prosrc/webcgi/netmon.c
modified: proscend/prosrc/webcgi/openvpn.c
modified: proscend/prosrc/webcgi/ospf_2g.c
modified: proscend/prosrc/webcgi/pppoe.c
modified: proscend/prosrc/webcgi/pptpd.c
modified: proscend/prosrc/webcgi/qos.c
modified: proscend/prosrc/webcgi/rip_2g.c
modified: proscend/prosrc/webcgi/route.c
modified: proscend/prosrc/webcgi/schedule_reboot.c
modified: proscend/prosrc/webcgi/smtp.c
modified: proscend/prosrc/webcgi/snat.c
modified: proscend/prosrc/webcgi/snmp.c
modified: proscend/prosrc/webcgi/sntp.c
modified: proscend/prosrc/webcgi/ssh.c
modified: proscend/prosrc/webcgi/status.c
modified: proscend/prosrc/webcgi/switch.c
modified: proscend/prosrc/webcgi/syslog.c
modified: proscend/prosrc/webcgi/system.c
modified: proscend/prosrc/webcgi/upnp.c
modified: proscend/prosrc/webcgi/urlfilter.c
modified: proscend/prosrc/webcgi/usage_display.c
modified: proscend/prosrc/webcgi/vcom.c
modified: proscend/prosrc/webcgi/vlan.c
modified: proscend/prosrc/webcgi/vlan_lan_control.c
modified: proscend/prosrc/webcgi/vrrp.c
modified: proscend/prosrc/webcgi/wanst.c
modified: proscend/prosrc/webcgi/web.c
modified: proscend/prosrc/www/app/feature/factory_and_reboot.js
modified: proscend/prosrc/www/app/feature/firmware.js
modified: proscend/prosrc/www/app/feature/load_factory.js
modified: proscend/prosrc/www/app/feature/lock_pcis.js
modified: proscend/prosrc/www/app/feature/ping.js
modified: proscend/prosrc/www/app/feature/reboot.js
modified: proscend/prosrc/www/app/feature/restart.js
modified: proscend/prosrc/www/app/feature/search_operators.js
modified: proscend/prosrc/www/app/feature/serving_cell.js
modified: proscend/prosrc/www/app/feature/traceroute.js
modified: proscend/prosrc/www/app/feature/usageDisplay.js
modified: proscend/prosrc/www/app/services/icos.service.js
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
both modified: proscend/prosrc/icos/icoslib/web/webcfg.c
both modified: proscend/prosrc/www/app/feature/login.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
โ M300 git:(develop) โ
ๆณจๆๅฐ Unmerged paths ็้จๅ
ไนๅฐฑๆฏ่ก็ช็้จๅ
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
both modified: proscend/prosrc/icos/icoslib/web/webcfg.c
both modified: proscend/prosrc/www/app/feature/login.js
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb ็่ก็ช้จๅๅฆไธ
<<<<<<< HEAD
# nginx (for https proxy)
RDEPENDS_${PN} += " nginx"
=======
# lighttpd
RDEPENDS_${PN} += " lighttpd"
# fcgi
RDEPENDS_${PN} += " fcgi"
>>>>>>> feature/lighttpd
็ถ็ถๆฏไฟ็ lighttpd ็้จๅ
proscend/prosrc/icos/icoslib/web/webcfg.c ่ก็ช็้จๅๅชๅบ็พๅจ daemon_restart()
static void daemon_restart(DAEMON_CTRL_T *dmn_ctrl)
{
sWebConfig *cfg=&gWebCtrl.cfg;
WEB_INFO("[DID%d] remain IP server retry for %d times.\n",dmn_ctrl->did,dmn_ctrl->retry_cnt);
//Daemon shutdown
if(DAEMON_STATUS_OFF!=dmn_ctrl->status)
{
if(DAEMON_STATUS_RUNNING==dmn_ctrl->status &&
BAD_PID!=dmn_ctrl->pid)
{
WEB_INFO("[DMN] killed (%d).\n",dmn_ctrl->pid);
ICOS_kill(dmn_ctrl->pid);
}
dmn_ctrl->status=DAEMON_STATUS_WAIT_EXIT;
WEB_INFO("[DMN] Wait exit(%d).\n",dmn_ctrl->pid);
return;
}
if (DID_HTTPS == dmn_ctrl->did &&
(ATTVAL_WEBMODE_HTTPS == cfg->mode || ATTVAL_WEBMODE_BOTH == cfg->mode)
)
{
gen_key_files();
}
dmn_ctrl->pid=BAD_PID;
dmn_ctrl->status=DAEMON_STATUS_OFF;
//Daemon start
if(ICOS_SUCCESS==is_request_start(dmn_ctrl))
{
char argv[256]= {0};
char *bin_file = WEB_DAEMON_BIN_FILE;
if (DID_HTTPS == dmn_ctrl->did)
{
<<<<<<< HEAD
bin_file = "/usr/sbin/nginx";
_gen_https_proxy_conf();
SysDbgCmd("mkdir -p /var/lib/nginx");
SysDbgCmd("mkdir -p /var/log/nginx");
=======
snprintf(argv, sizeof(argv), WEB_DAEMON_LIGHTTPD_ARGV, WEB_CONFIG__FILE);
>>>>>>> feature/lighttpd
}
else
{
WEB_DBG("[DMN]Do not start when did = DID_HTTPD\n");
return;
//snprintf(argv,sizeof(argv)," -p %d -d %s", cfg->httpdPort, WEB_DAEMON_HTML_DIR);
}
<<<<<<< HEAD
WEB_DBG("[DMN]Lanch=>%s %s\n",bin_file,argv);
dmn_ctrl->pid=ICOS_ProcLaunch(MODULE_WEB,bin_file,argv,NULL);
=======
WEB_DBG("[DMN]Lanch=>%s %s\n", WEB_DAEMON_LIGHTTPD_BIN_FILE, argv);
dmn_ctrl->pid=ICOS_ProcLaunch(MODULE_WEB, WEB_DAEMON_LIGHTTPD_BIN_FILE, argv, NULL);
>>>>>>> feature/lighttpd
if (dmn_ctrl->pid == BAD_PID)
{
dmn_ctrl->status = DAEMON_STATUS_OFF;
// use next NotifyHandler to invoke daemon_restart() again
WEB_DBG("use next NotifyHandler to invoke daemon_restart() again\n");
ICOS_msg_sendto(MODULE_WEB, MODULE_WEB, NULL, 0, ICOS_UCAST_DMN_RESTART);
}
else
{
dmn_ctrl->status = DAEMON_STATUS_RUNNING;
}
}
}็ถ็ถๆฏไฝฟ็จ feature/lighttpd ่ไธๆฏ HEAD ็้จๅ
<<<<<<< HEAD
// part of `HEAD`
=======
// part of `feature/lighttpd`
>>>>>>> feature/lighttpd
ๅไพๆฏ proscend/prosrc/www/app/feature/login.js
<<<<<<< HEAD
var login_ok = function() {
console.log('login_ok');
/*
** workaround
** use following action to let iweb be killed once at the first time after power on
*/
icos.syslog.gen_log()
.then( function(result) {
// iweb reborn already
console.log("iweb reborn already, icos.syslog.gen_log() pass");
console.log("invoke who_am_i() after 0.2 second");
$timeout(who_am_i, 200);
}, function(error) {
// if iweb be killed at the first time
console.log("icos.syslog.gen_log() fail");
console.log("re-invoke login_ok() after 1 second to see if iweb reborn");
$timeout(login_ok, 1000);
});
}
vm.doLogining = false;
=======
>>>>>>> feature/lighttpdๆณจๆๅฐ HEAD ็้จๅๅจ feature/lighttpd ่ฃกๆฏๆฒๆ็
ไนๅฐฑๆฏๆๅไธๅ้่ฆ HEAD ็้จๅ
โ M300 git:(develop) โ git status [103/471]
On branch develop
Your branch is up-to-date with 'origin/develop'.
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
Changes to be committed:
modified: meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
new file: meta-proscend/recipes-extended/lighttpd/lighttpd-1.4.53/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
new file: meta-proscend/recipes-extended/lighttpd/lighttpd-1.4.53/index.html.lighttpd
new file: meta-proscend/recipes-extended/lighttpd/lighttpd-1.4.53/lighttpd
new file: meta-proscend/recipes-extended/lighttpd/lighttpd-1.4.53/lighttpd.conf
new file: meta-proscend/recipes-extended/lighttpd/lighttpd_1.4.36.bbappend
new file: meta-proscend/recipes-extended/lighttpd/lighttpd_1.4.53.bb
new file: meta-proscend/recipes-extended/lighttpd/lighttpd_1.4.53.bbappend
modified: proscend/.gitignore
modified: proscend/prosrc/Makefile
new file: proscend/prosrc/fcgi/.gitignore
new file: proscend/prosrc/fcgi/Makefile
new file: proscend/prosrc/fcgi/api.c
new file: proscend/prosrc/fcgi/app.h
new file: proscend/prosrc/fcgi/app_sntp.c
new file: proscend/prosrc/fcgi/app_status.c
new file: proscend/prosrc/fcgi/cgilib-0.7/AUTHORS
new file: proscend/prosrc/fcgi/cgilib-0.7/COPYING
new file: proscend/prosrc/fcgi/cgilib-0.7/ChangeLog
new file: proscend/prosrc/fcgi/cgilib-0.7/INSTALL
new file: proscend/prosrc/fcgi/cgilib-0.7/Makefile
new file: proscend/prosrc/fcgi/cgilib-0.7/Makefile.am
new file: proscend/prosrc/fcgi/cgilib-0.7/Makefile.in
new file: proscend/prosrc/fcgi/cgilib-0.7/aux.C
new file: proscend/prosrc/fcgi/cgilib-0.7/aux.H
new file: proscend/prosrc/fcgi/cgilib-0.7/aux.O
new file: proscend/prosrc/fcgi/cgilib-0.7/aux_x.c
new file: proscend/prosrc/fcgi/cgilib-0.7/aux_x.h
new file: proscend/prosrc/fcgi/cgilib-0.7/cgi.5
new file: proscend/prosrc/fcgi/cgilib-0.7/cgi.c
new file: proscend/prosrc/fcgi/cgilib-0.7/cgi.h
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiDebug.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiEscape.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiFree.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiFreeList.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetCookie.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetCookies.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetFile.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetFiles.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetValue.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiGetVariables.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiHeader.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiInit.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiRedirect.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiSetHeader.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgiSetType.3
new file: proscend/prosrc/fcgi/cgilib-0.7/cgitest.c
new file: proscend/prosrc/fcgi/cgilib-0.7/config.guess
new file: proscend/prosrc/fcgi/cgilib-0.7/config.sub
new file: proscend/prosrc/fcgi/cgilib-0.7/configure.ac
new file: proscend/prosrc/fcgi/cgilib-0.7/cookies.c
new file: proscend/prosrc/fcgi/cgilib-0.7/cookies.txt
new file: proscend/prosrc/fcgi/cgilib-0.7/depcomp
new file: proscend/prosrc/fcgi/cgilib-0.7/install-sh
new file: proscend/prosrc/fcgi/cgilib-0.7/jumpto.c
new file: proscend/prosrc/fcgi/cgilib-0.7/ltmain.sh
new file: proscend/prosrc/fcgi/cgilib-0.7/missing
new file: proscend/prosrc/fcgi/iweb.c
new file: proscend/prosrc/fcgi/jweb.c
new file: proscend/prosrc/fcgi/jweb.h
new file: proscend/prosrc/fcgi/tiny.c
modified: proscend/prosrc/icos/icoslib/openvpn/openvpn.c
modified: proscend/prosrc/icos/icoslib/web/webcfg.c
new file: proscend/prosrc/icos/script/web_x509_lighttpd.sh
modified: proscend/prosrc/webcgi/Makefile
modified: proscend/prosrc/webcgi/alarm.c
new file: proscend/prosrc/webcgi/api.c
modified: proscend/prosrc/webcgi/bgp.c
modified: proscend/prosrc/webcgi/com.c
modified: proscend/prosrc/webcgi/configuration.c
modified: proscend/prosrc/webcgi/connmgr.c
modified: proscend/prosrc/webcgi/cwmp.c
modified: proscend/prosrc/webcgi/ddns.c
modified: proscend/prosrc/webcgi/dhcp_client_list.c
modified: proscend/prosrc/webcgi/dmz.c
modified: proscend/prosrc/webcgi/dnat.c
modified: proscend/prosrc/webcgi/dns.c
modified: proscend/prosrc/webcgi/fail2ban.c
modified: proscend/prosrc/webcgi/firewall.c
modified: proscend/prosrc/webcgi/firmware.c
modified: proscend/prosrc/webcgi/gre.c
modified: proscend/prosrc/webcgi/icos_config.c
modified: proscend/prosrc/webcgi/icos_msg.c
modified: proscend/prosrc/webcgi/ip_alias.c
modified: proscend/prosrc/webcgi/ipfilter.c
modified: proscend/prosrc/webcgi/ipsec.c
modified: proscend/prosrc/webcgi/ipv6lan.c
modified: proscend/prosrc/webcgi/jweb.c
modified: proscend/prosrc/webcgi/jweb.h
modified: proscend/prosrc/webcgi/l2tp.c
modified: proscend/prosrc/webcgi/lan_control.c
modified: proscend/prosrc/webcgi/lte.c
modified: proscend/prosrc/webcgi/macfilter.c
modified: proscend/prosrc/webcgi/modbus.c
modified: proscend/prosrc/webcgi/mqtt.c
modified: proscend/prosrc/webcgi/netmon.c
modified: proscend/prosrc/webcgi/openvpn.c
modified: proscend/prosrc/webcgi/ospf_2g.c
modified: proscend/prosrc/webcgi/pppoe.c
modified: proscend/prosrc/webcgi/pptpd.c
modified: proscend/prosrc/webcgi/qos.c
modified: proscend/prosrc/webcgi/rip_2g.c
modified: proscend/prosrc/webcgi/route.c
modified: proscend/prosrc/webcgi/schedule_reboot.c
modified: proscend/prosrc/webcgi/smtp.c
modified: proscend/prosrc/webcgi/snat.c
modified: proscend/prosrc/webcgi/snmp.c
modified: proscend/prosrc/webcgi/sntp.c
modified: proscend/prosrc/webcgi/ssh.c
modified: proscend/prosrc/webcgi/status.c
modified: proscend/prosrc/webcgi/switch.c
modified: proscend/prosrc/webcgi/syslog.c
modified: proscend/prosrc/webcgi/system.c
modified: proscend/prosrc/webcgi/upnp.c
modified: proscend/prosrc/webcgi/urlfilter.c
modified: proscend/prosrc/webcgi/usage_display.c
modified: proscend/prosrc/webcgi/vcom.c
modified: proscend/prosrc/webcgi/vlan.c
modified: proscend/prosrc/webcgi/vlan_lan_control.c
modified: proscend/prosrc/webcgi/vrrp.c
modified: proscend/prosrc/webcgi/wanst.c
modified: proscend/prosrc/webcgi/web.c
modified: proscend/prosrc/www/app/feature/factory_and_reboot.js
modified: proscend/prosrc/www/app/feature/firmware.js
modified: proscend/prosrc/www/app/feature/load_factory.js
modified: proscend/prosrc/www/app/feature/lock_pcis.js
modified: proscend/prosrc/www/app/feature/login.js
modified: proscend/prosrc/www/app/feature/ping.js
modified: proscend/prosrc/www/app/feature/reboot.js
modified: proscend/prosrc/www/app/feature/restart.js
modified: proscend/prosrc/www/app/feature/search_operators.js
modified: proscend/prosrc/www/app/feature/serving_cell.js
modified: proscend/prosrc/www/app/feature/traceroute.js
modified: proscend/prosrc/www/app/feature/usageDisplay.js
modified: proscend/prosrc/www/app/services/icos.service.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb.feature
meta-proscend/recipes-core/prosrc/prosrc_0.1_BACKUP_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_LOCAL_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_REMOTE_42388.bb
ๅ้กงไธไธๆฉไธไฝฟ็จ git flow feature finish lighttpd ๆๅพๅฐ็่จๆฏ
There were merge conflicts. To resolve the merge conflict manually, use:
git mergetool
git commit
You can then complete the finish by running it again:
git flow feature finish lighttpd
ๅ commit ็ฎๅ็ไฟฎๆนๅง
ommit 453c9b2bab5c5aabe325e85312ba645ad2c97dd5
Refs: [develop]
Merge: f4437c3 2f0fda8
Author: jeffrey <[email protected]>
Date: Thu Jul 11 13:13:22 2019 +0800
Merge branch 'feature/lighttpd' into develop
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb | 7 +-
...fig-for-pcre-dependency-instead-of-config.patch | 42 +
.../lighttpd/lighttpd-1.4.53/index.html.lighttpd | 1 +
.../lighttpd/lighttpd-1.4.53/lighttpd | 34 +
.../lighttpd/lighttpd-1.4.53/lighttpd.conf | 331 +
.../lighttpd/lighttpd_1.4.36.bbappend | 17 +
.../recipes-extended/lighttpd/lighttpd_1.4.53.bb | 84 +
.../lighttpd/lighttpd_1.4.53.bbappend | 12 +
proscend/.gitignore | 1 +
proscend/prosrc/Makefile | 0
proscend/prosrc/fcgi/.gitignore | 2 +
proscend/prosrc/fcgi/Makefile | 55 +
proscend/prosrc/fcgi/api.c | 53 +
proscend/prosrc/fcgi/app.h | 8 +
proscend/prosrc/fcgi/app_sntp.c | 420 ++
proscend/prosrc/fcgi/app_status.c | 495 ++
proscend/prosrc/fcgi/cgilib-0.7/AUTHORS | 31 +
proscend/prosrc/fcgi/cgilib-0.7/COPYING | 339 +
proscend/prosrc/fcgi/cgilib-0.7/ChangeLog | 60 +
proscend/prosrc/fcgi/cgilib-0.7/INSTALL | 56 +
proscend/prosrc/fcgi/cgilib-0.7/Makefile | 48 +
proscend/prosrc/fcgi/cgilib-0.7/Makefile.am | 33 +
proscend/prosrc/fcgi/cgilib-0.7/Makefile.in | 793 +++
proscend/prosrc/fcgi/cgilib-0.7/aux.C | 243 +
proscend/prosrc/fcgi/cgilib-0.7/aux.H | 31 +
proscend/prosrc/fcgi/cgilib-0.7/aux.O | Bin 0 -> 5224 bytes
proscend/prosrc/fcgi/cgilib-0.7/aux_x.c | 289 +
proscend/prosrc/fcgi/cgilib-0.7/aux_x.h | 31 +
proscend/prosrc/fcgi/cgilib-0.7/cgi.5 | 118 +
proscend/prosrc/fcgi/cgilib-0.7/cgi.c | 1263 ++++
proscend/prosrc/fcgi/cgilib-0.7/cgi.h | 178 +
proscend/prosrc/fcgi/cgilib-0.7/cgiDebug.3 | 48 +
proscend/prosrc/fcgi/cgilib-0.7/cgiEscape.3 | 48 +
proscend/prosrc/fcgi/cgilib-0.7/cgiFree.3 | 51 +
proscend/prosrc/fcgi/cgilib-0.7/cgiFreeList.3 | 43 +
proscend/prosrc/fcgi/cgilib-0.7/cgiGetCookie.3 | 80 +
proscend/prosrc/fcgi/cgilib-0.7/cgiGetCookies.3 | 49 +
proscend/prosrc/fcgi/cgilib-0.7/cgiGetFile.3 | 64 +
proscend/prosrc/fcgi/cgilib-0.7/cgiGetFiles.3 | 48 +
proscend/prosrc/fcgi/cgilib-0.7/cgiGetValue.3 | 55 +
proscend/prosrc/fcgi/cgilib-0.7/cgiGetVariables.3 | 51 +
proscend/prosrc/fcgi/cgilib-0.7/cgiHeader.3 | 49 +
proscend/prosrc/fcgi/cgilib-0.7/cgiInit.3 | 75 +
proscend/prosrc/fcgi/cgilib-0.7/cgiRedirect.3 | 45 +
proscend/prosrc/fcgi/cgilib-0.7/cgiSetHeader.3 | 74 +
proscend/prosrc/fcgi/cgilib-0.7/cgiSetType.3 | 45 +
proscend/prosrc/fcgi/cgilib-0.7/cgitest.c | 308 +
proscend/prosrc/fcgi/cgilib-0.7/config.guess | 1526 +++++
proscend/prosrc/fcgi/cgilib-0.7/config.sub | 1658 +++++
proscend/prosrc/fcgi/cgilib-0.7/configure.ac | 14 +
proscend/prosrc/fcgi/cgilib-0.7/cookies.c | 229 +
proscend/prosrc/fcgi/cgilib-0.7/cookies.txt | 81 +
proscend/prosrc/fcgi/cgilib-0.7/depcomp | 589 ++
proscend/prosrc/fcgi/cgilib-0.7/install-sh | 519 ++
proscend/prosrc/fcgi/cgilib-0.7/jumpto.c | 76 +
proscend/prosrc/fcgi/cgilib-0.7/ltmain.sh | 6964 ++++++++++++++++++++
proscend/prosrc/fcgi/cgilib-0.7/missing | 367 ++
proscend/prosrc/fcgi/iweb.c | 52 +
proscend/prosrc/fcgi/iweb.c | 52 +
proscend/prosrc/fcgi/jweb.c | 409 ++
proscend/prosrc/fcgi/jweb.h | 91 +
proscend/prosrc/fcgi/tiny.c | 52 +
proscend/prosrc/icos/icoslib/openvpn/openvpn.c | 2 +-
proscend/prosrc/icos/icoslib/web/webcfg.c | 189 +-
proscend/prosrc/icos/script/web_x509_lighttpd.sh | 5 +
proscend/prosrc/webcgi/Makefile | 9 +-
proscend/prosrc/webcgi/alarm.c | 78 +-
proscend/prosrc/webcgi/api.c | 114 +
proscend/prosrc/webcgi/bgp.c | 8 +-
proscend/prosrc/webcgi/com.c | 267 +-
proscend/prosrc/webcgi/configuration.c | 8 +-
proscend/prosrc/webcgi/connmgr.c | 18 +-
proscend/prosrc/webcgi/cwmp.c | 8 +-
proscend/prosrc/webcgi/ddns.c | 8 +-
proscend/prosrc/webcgi/dhcp_client_list.c | 6 +-
proscend/prosrc/webcgi/dmz.c | 212 +-
proscend/prosrc/webcgi/dnat.c | 8 +-
proscend/prosrc/webcgi/dns.c | 10 +-
proscend/prosrc/webcgi/fail2ban.c | 8 +-
proscend/prosrc/webcgi/firewall.c | 8 +-
proscend/prosrc/webcgi/firmware.c | 10 +-
proscend/prosrc/webcgi/gre.c | 8 +-
proscend/prosrc/webcgi/icos_config.c | 8 +-
proscend/prosrc/webcgi/icos_msg.c | 2 +-
proscend/prosrc/webcgi/ip_alias.c | 8 +-
proscend/prosrc/webcgi/ipfilter.c | 6 +-
proscend/prosrc/webcgi/ipsec.c | 18 +-
proscend/prosrc/webcgi/ipv6lan.c | 10 +-
proscend/prosrc/webcgi/jweb.c | 594 +-
proscend/prosrc/webcgi/jweb.h | 92 +-
proscend/prosrc/webcgi/l2tp.c | 8 +-
proscend/prosrc/webcgi/lan_control.c | 10 +-
proscend/prosrc/webcgi/lte.c | 59 +-
proscend/prosrc/webcgi/macfilter.c | 6 +-
proscend/prosrc/webcgi/modbus.c | 6 +-
proscend/prosrc/webcgi/mqtt.c | 8 +-
proscend/prosrc/webcgi/netmon.c | 6 +-
proscend/prosrc/webcgi/openvpn.c | 101 +-
proscend/prosrc/webcgi/ospf_2g.c | 8 +-
proscend/prosrc/webcgi/pppoe.c | 292 +-
proscend/prosrc/webcgi/pptpd.c | 8 +-
proscend/prosrc/webcgi/qos.c | 10 +-
proscend/prosrc/webcgi/rip_2g.c | 8 +-
proscend/prosrc/webcgi/route.c | 10 +-
proscend/prosrc/webcgi/schedule_reboot.c | 8 +-
proscend/prosrc/webcgi/smtp.c | 8 +-
proscend/prosrc/webcgi/snat.c | 8 +-
proscend/prosrc/webcgi/snmp.c | 6 +-
proscend/prosrc/webcgi/sntp.c | 10 +-
proscend/prosrc/webcgi/ssh.c | 8 +-
proscend/prosrc/webcgi/status.c | 4 +-
proscend/prosrc/webcgi/switch.c | 12 +-
proscend/prosrc/webcgi/syslog.c | 17 +-
proscend/prosrc/webcgi/system.c | 12 +-
proscend/prosrc/webcgi/upnp.c | 8 +-
proscend/prosrc/webcgi/urlfilter.c | 6 +-
proscend/prosrc/webcgi/usage_display.c | 12 +-
proscend/prosrc/webcgi/vcom.c | 298 +-
proscend/prosrc/webcgi/vlan.c | 8 +-
proscend/prosrc/webcgi/vlan_lan_control.c | 8 +-
proscend/prosrc/webcgi/vrrp.c | 8 +-
proscend/prosrc/webcgi/wanst.c | 10 +-
proscend/prosrc/webcgi/web.c | 8 +-
.../prosrc/www/app/feature/factory_and_reboot.js | 13 +-
proscend/prosrc/www/app/feature/firmware.js | 3 +-
proscend/prosrc/www/app/feature/load_factory.js | 17 +-
proscend/prosrc/www/app/feature/lock_pcis.js | 7 +-
proscend/prosrc/www/app/feature/login.js | 29 +-
proscend/prosrc/www/app/feature/ping.js | 7 +-
proscend/prosrc/www/app/feature/reboot.js | 11 +-
proscend/prosrc/www/app/feature/restart.js | 7 +-
.../prosrc/www/app/feature/search_operators.js | 5 +
proscend/prosrc/www/app/feature/serving_cell.js | 7 +-
proscend/prosrc/www/app/feature/traceroute.js | 7 +-
proscend/prosrc/www/app/feature/usageDisplay.js | 7 +-
proscend/prosrc/www/app/services/icos.service.js | 14 +-
135 files changed, 20756 insertions(+), 934 deletions(-)
M300 - develop - git flow feature finish lighttpd
โ M300 git:(develop) โ git flow feature finish lighttpd
To [email protected]:RD/M300.git
- [deleted] feature/lighttpd
Deleted branch feature/lighttpd (was 2f0fda8).
Summary of actions:
- The feature branch 'feature/lighttpd' was merged into 'develop'
- Feature branch 'feature/lighttpd' has been locally deleted; it has been remotely deleted from 'origin'
- You are now on branch 'develop'
โ M300 git:(develop) โ
่ทๅคชๅฟซไบ
็พๅจๆ้ๅงๆณๅฐ่ฆ build ๅ image ไพ่ฉฆ่ฉฆ
โ ~ ./300.sh
user@f14571e79bb2:/$ cd /home/user/
user@f14571e79bb2:~$ source proenv.sh
Welcome to Freescale Community BSP
The Yocto Project has extensive documentation about OE including a
reference manual which can be found at:
http://yoctoproject.org/documentation
For more information about OpenEmbedded see their website:
http://www.openembedded.org/
You can now run 'bitbake <target>'
Common targets are:
core-image-minimal
meta-toolchain
meta-toolchain-sdk
adt-installer
meta-ide-support
Your configuration files at build_small have not been touched.
user@f14571e79bb2:~/build_small$ rm -rf ~/build_small/tmp/
user@f14571e79bb2:~/build_small$ source bimage.sh
ERROR: ExpansionError during parsing /home/user/meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb: Failure expanding variable PN, expression was ${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'} which triggered exception ParseError: ParseError in /home/user/meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb: Unable to generate default variables from filename (too many underscores)
Summary: There was 1 ERROR message shown, returning a non-zero exit code.
โ ~
ๅบ้ฏไบ
โ M300 git:(develop) โ git pull
First, rewinding head to replay your work on top of it...
Applying: add lighttpd to replace the current web server iweb(mongoose)
Using index info to reconstruct a base tree...
M meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
M proscend/prosrc/icos/icoslib/entry.c
.git/rebase-apply/patch:38: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging proscend/prosrc/icos/icoslib/entry.c
Auto-merging meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
CONFLICT (content): Merge conflict in meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
error: Failed to merge in the changes.
Patch failed at 0001 add lighttpd to replace the current web server iweb(mongoose)
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
โ M300 git:(f4437c3) โ
็ไธไธ
โ M300 git:(f4437c3) โ git status
rebase in progress; onto f4437c3
You are currently rebasing branch 'develop' on 'f4437c3'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: meta-proscend/recipes-extended/lighttpd/lighttpd_1.4.36.bbappend
modified: proscend/prosrc/icos/icoslib/entry.c
Unmerged paths:
(use "git reset HEAD <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb.feature
meta-proscend/recipes-core/prosrc/prosrc_0.1_BACKUP_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_LOCAL_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_REMOTE_42388.bb
โ M300 git:(f4437c3) โ
่งฃ่ก็ชๅง - meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
<<<<<<< f4437c3b174ba51d856d12b33af652184801df0c
# nginx (for https proxy)
RDEPENDS_${PN} += " nginx"
=======
# lighttpd
RDEPENDS_${PN} += " lighttpd"
>>>>>>> add lighttpd to replace the current web server iweb(mongoose)ไฟ็ add lighttpd to replace the current web server iweb(mongoose) ็้จไปฝ
โ M300 git:(f4437c3) โ git status
rebase in progress; onto f4437c3
You are currently rebasing branch 'develop' on 'f4437c3'.
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
new file: meta-proscend/recipes-extended/lighttpd/lighttpd_1.4.36.bbappend
modified: proscend/prosrc/icos/icoslib/entry.c
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb.feature
meta-proscend/recipes-core/prosrc/prosrc_0.1_BACKUP_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_LOCAL_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_REMOTE_42388.bb
proscend/prosrc/icos/icoslib/entry.c.orig
โ M300 git:(f4437c3) โ
โ M300 git:(f4437c3) โ git rebase --continue
Applying: add lighttpd to replace the current web server iweb(mongoose)
Applying: first example for fastcgi with lighttpd
Using index info to reconstruct a base tree...
M conf/bblayers.conf
M meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
.git/rebase-apply/patch:183: trailing whitespace.
(( "host" => "127.0.0.1",
.git/rebase-apply/patch:185: trailing whitespace.
"bin-path" => "/www/fcgi-bin/tiny.fcgi"
.git/rebase-apply/patch:198: trailing whitespace.
ssl.engine = "enable"
.git/rebase-apply/patch:199: trailing whitespace.
ssl.pemfile = "/home/factory/icos/lighttpd/lighttpd.pem"
.git/rebase-apply/patch:201: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
Applying: now tiny.fcgi can use the same libcgi library as previous webcgi
Applying: now our fast cgi can work with original jweb api
Applying: - at FCGI_Accept() while loop, use FCGI_Finish() to replace exit()
Applying: porting status.cgi
Applying: use lighttpd url rewrites to rewrite cgi-related request to fcgi-related request, for ex.
Applying: porting status.cgi
Applying: porting sntp.cgi
Applying: porting /api/ahoAmI
Applying: implement the basic access control for app=sntp:
Applying: give up on fastcgi soluvtion with lighttpd; use cgi solution
Applying: - use url rewirte to rewrite '/api/whoAmI?uuid=0.xxxx' to '/cgi-bin/api.cgi?act=whoAmI'
Applying: according to the session for authorization
Applying: - offer jweb.access.filter for multi-user with different level
Using index info to reconstruct a base tree...
M proscend/prosrc/www/app/feature/login.js
M proscend/prosrc/www/app/services/icos.service.js
.git/rebase-apply/patch:215: trailing whitespace.
icos.login(vm.config)
.git/rebase-apply/patch:219: trailing whitespace.
who_am_i();
.git/rebase-apply/patch:82: new blank line at EOF.
+
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging proscend/prosrc/www/app/services/icos.service.js
Auto-merging proscend/prosrc/www/app/feature/login.js
CONFLICT (content): Merge conflict in proscend/prosrc/www/app/feature/login.js
error: Failed to merge in the changes.
Patch failed at 0015 - offer jweb.access.filter for multi-user with different level
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
ๆ้บผๅไบๅข
โ M300 git:(6546d13) โ git status
rebase in progress; onto f4437c3
You are currently rebasing branch 'develop' on 'f4437c3'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: proscend/prosrc/webcgi/api.c
modified: proscend/prosrc/webcgi/jweb.c
modified: proscend/prosrc/webcgi/jweb.h
modified: proscend/prosrc/webcgi/sntp.c
modified: proscend/prosrc/www/app/services/icos.service.js
Unmerged paths:
(use "git reset HEAD <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: proscend/prosrc/www/app/feature/login.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb.feature
meta-proscend/recipes-core/prosrc/prosrc_0.1_BACKUP_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_LOCAL_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_REMOTE_42388.bb
proscend/prosrc/icos/icoslib/entry.c.orig
โ M300 git:(6546d13) โ
ๅ่งฃ proscend/prosrc/www/app/feature/login.js
<<<<<<< 6546d13283435deb95c04b767636778a92ebd5a9
var login_ok = function() {
console.log('login_ok');
/*
** workaround
** use following action to let iweb be killed once at the first time after power on
*/
icos.syslog.gen_log()
.then( function(result) {
// iweb reborn already
console.log("iweb reborn already, icos.syslog.gen_log() pass");
console.log("invoke who_am_i() after 0.2 second");
$timeout(who_am_i, 200);
}, function(error) {
// if iweb be killed at the first time
console.log("icos.syslog.gen_log() fail");
console.log("re-invoke login_ok() after 1 second to see if iweb reborn");
$timeout(login_ok, 1000);
});
}
vm.doLogining = false;
vm.doLogin = function() {
vm.doLogining = true;
$http(
{
method: 'POST',
url: '/api/login',
headers: {'Content-Type': 'application/x-www-form-urlencoded'},
transformRequest: function(obj) {
var str = [];
for(var p in obj)
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
return str.join("&");
},
data: {user: vm.config.user, pass: vm.config.pass}
}
)
=======
vm.doLogin = function() {
icos.login(vm.config)
>>>>>>> - offer jweb.access.filter for multi-user with different levelๆก็จ - offer jweb.access.filter for multi-user with different level ็้จๅ
โ M300 git:(6546d13) โ git status
rebase in progress; onto f4437c3
You are currently rebasing branch 'develop' on 'f4437c3'.
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: proscend/prosrc/webcgi/api.c
modified: proscend/prosrc/webcgi/jweb.c
modified: proscend/prosrc/webcgi/jweb.h
modified: proscend/prosrc/webcgi/sntp.c
modified: proscend/prosrc/www/app/feature/login.js
modified: proscend/prosrc/www/app/services/icos.service.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb.feature
meta-proscend/recipes-core/prosrc/prosrc_0.1_BACKUP_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_LOCAL_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_REMOTE_42388.bb
proscend/prosrc/icos/icoslib/entry.c.orig
โ M300 git:(6546d13) โ
็นผ็บ git rebase --continue
โ M300 git:(6546d13) โ git rebase --continue
Applying: - offer jweb.access.filter for multi-user with different level
Applying: offer the following api at jweb:
Applying: use jweb.access.filter in status.cgi
Applying: implement jweb.api.logout()
Applying: finish 'System > COM Ports':
Applying: finish 'System > Logging':
Applying: finish 'System > Alarm':
Using index info to reconstruct a base tree...
M proscend/prosrc/webcgi/alarm.c
Falling back to patching base and 3-way merge...
Auto-merging proscend/prosrc/webcgi/alarm.c
Applying: finish 'System > Ethernet':
Applying: finish 'System > Modbus':
Applying: finish 'System > Client List':
Applying: finish 'System > LED':
Applying: finish 'WAN > Priority':
Applying: finish 'WAN > Ethernet'
Applying: finish 'LTE > LTE Config'
Applying: finish 'LTE > GPS'
Applying: finish 'LTE > Dual SIM'
Applying: finish 'LTE > Usage Display'
Applying: finish 'LTE > SMS'
Applying: finish 'LTE > Serving Cell'
Applying: finish 'LTE > Lock PCIs'
Applying: finish 'LTE > Lock Bands'
Applying: finish 'LTE > Search Operators'
Applying: finish 'LAN > IPv4'
Applying: finish 'LAN > VLAN'
Applying: finish 'LAN > Subnet'
Applying: finish 'IP Routing > Static Route'
Applying: finish 'IP Routing > RIP'
Applying: finish 'IP Routing > OSPF'
Applying: finish 'IP Routing > BGP'
Applying: do not specify a PATH for CGI scripts
Applying: do not use jweb.access.filter at 'Status' page
Applying: use the full path of `FilesJSON.sh` or cgi with lighttpd will fail:
Applying: correct typo
Applying: finish 'VPN > Open VPN'
Using index info to reconstruct a base tree...
M proscend/prosrc/webcgi/openvpn.c
Falling back to patching base and 3-way merge...
Auto-merging proscend/prosrc/webcgi/openvpn.c
Applying: finish 'VPN > IPSec'
Applying: finish 'VPN > GRE'
Applying: finish 'VPN > PPTP Server'
Applying: finish 'VPN > L2TP'
Applying: finish 'Firewall > Port Forwarding'
Applying: finish 'Firewall > DMZ'
Applying: finish 'Firewall > IP Filter'
Applying: finish 'Firewall > MAC Filter'
Applying: finish 'Firewall > URL Filter'
Applying: finish 'Firewall > NAT'
Applying: finish 'Firewall > IPS'
Applying: finish 'Service > SNMP'
Applying: finish 'Service > TR069'
Applying: finish 'Service > Dynamic DNS'
Applying: finish 'Service > VRRP'
Applying: finish 'Service > MQTT'
Applying: finish 'Service > UPnP'
Applying: finish 'Service > SMTP'
Applying: finish 'Service > IP Alias'
Applying: finish 'Service > QoS'
Applying: finish 'Management > Identification' and 'Management > Administration'
Applying: finish 'Management > SSH'
Applying: - finish 'Management > Firmware'
Applying: - finish 'Management > Configuartion'
Applying: - finish 'Management > Load Factory'
Applying: - finish 'Management > Restart'
Applying: - finish 'Management > Schedule Reboot'
Applying: - finish 'Management > Fail2Ban'
Applying: - finish 'Diagnosis > Ping'
Applying: - finish 'Diagnosis > Traceroute'
Applying: now we can use the previous login encode method: application/x-www-form-urlencoded
Applying: refactoring
Applying: offer CGI for upload
Applying: offer the following CGI
Applying: use compile flag to wrap the following CGI
Applying: ready for replace the iweb with lighttpd
Using index info to reconstruct a base tree...
M proscend/prosrc/icos/icoslib/entry.c
M proscend/prosrc/icos/icoslib/web/webcfg.c
Falling back to patching base and 3-way merge...
Auto-merging proscend/prosrc/icos/icoslib/web/webcfg.c
Auto-merging proscend/prosrc/icos/icoslib/entry.c
Applying: replace the iweb with lighttpd at icos web module
Using index info to reconstruct a base tree...
M proscend/prosrc/icos/icoslib/web/webcfg.c
Falling back to patching base and 3-way merge...
Auto-merging proscend/prosrc/icos/icoslib/web/webcfg.c
CONFLICT (content): Merge conflict in proscend/prosrc/icos/icoslib/web/webcfg.c
error: Failed to merge in the changes.
Patch failed at 0085 replace the iweb with lighttpd at icos web module
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
โ M300 git:(fbee2ec) โ
็นผ็บ git status
git:(fbee2ec) โ git status
rebase in progress; onto f4437c3
You are currently rebasing branch 'develop' on 'f4437c3'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: proscend/prosrc/icos/script/web_x509_lighttpd.sh
Unmerged paths:
(use "git reset HEAD <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: proscend/prosrc/icos/icoslib/web/webcfg.c
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb.feature
meta-proscend/recipes-core/prosrc/prosrc_0.1_BACKUP_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_LOCAL_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_REMOTE_42388.bb
proscend/prosrc/icos/icoslib/entry.c.orig
โ M300 git:(fbee2ec) โ
ๅ่งฃ proscend/prosrc/icos/icoslib/web/webcfg.c
static void daemon_restart(DAEMON_CTRL_T *dmn_ctrl)
{
sWebConfig *cfg=&gWebCtrl.cfg;
WEB_INFO("[DID%d] remain IP server retry for %d times.\n",dmn_ctrl->did,dmn_ctrl->retry_cnt);
//Daemon shutdown
if(DAEMON_STATUS_OFF!=dmn_ctrl->status)
{
if(DAEMON_STATUS_RUNNING==dmn_ctrl->status &&
BAD_PID!=dmn_ctrl->pid)
{
WEB_INFO("[DMN] killed (%d).\n",dmn_ctrl->pid);
ICOS_kill(dmn_ctrl->pid);
}
dmn_ctrl->status=DAEMON_STATUS_WAIT_EXIT;
WEB_INFO("[DMN] Wait exit(%d).\n",dmn_ctrl->pid);
return;
}
if (DID_HTTPS == dmn_ctrl->did &&
(ATTVAL_WEBMODE_HTTPS == cfg->mode || ATTVAL_WEBMODE_BOTH == cfg->mode)
)
{
gen_key_files();
}
dmn_ctrl->pid=BAD_PID;
dmn_ctrl->status=DAEMON_STATUS_OFF;
//Daemon start
if(ICOS_SUCCESS==is_request_start(dmn_ctrl))
{
char argv[256]= {0};
char *bin_file = WEB_DAEMON_BIN_FILE;
if (DID_HTTPS == dmn_ctrl->did)
{
<<<<<<< fbee2ece1f3066b8f7af3bf63dd15b7f601af547
bin_file = "/usr/sbin/nginx";
_gen_https_proxy_conf();
SysDbgCmd("mkdir -p /var/lib/nginx");
SysDbgCmd("mkdir -p /var/log/nginx");
=======
snprintf(argv, sizeof(argv), WEB_DAEMON_LIGHTTPD_ARGV, WEB_CONFIG__FILE);
>>>>>>> replace the iweb with lighttpd at icos web module
}
else
{
WEB_DBG("[DMN]Do not start when did = DID_HTTPD\n");
return;
//snprintf(argv,sizeof(argv)," -p %d -d %s", cfg->httpdPort, WEB_DAEMON_HTML_DIR);
}
<<<<<<< fbee2ece1f3066b8f7af3bf63dd15b7f601af547
WEB_DBG("[DMN]Lanch=>%s %s\n",bin_file,argv);
dmn_ctrl->pid=ICOS_ProcLaunch(MODULE_WEB,bin_file,argv,NULL);
=======
WEB_DBG("[DMN]Lanch=>%s %s\n", WEB_DAEMON_LIGHTTPD_BIN_FILE, argv);
dmn_ctrl->pid=ICOS_ProcLaunch(MODULE_WEB, WEB_DAEMON_LIGHTTPD_BIN_FILE, argv, NULL);
>>>>>>> replace the iweb with lighttpd at icos web module
if (dmn_ctrl->pid == BAD_PID)
{
dmn_ctrl->status = DAEMON_STATUS_OFF;
// use next NotifyHandler to invoke daemon_restart() again
WEB_DBG("use next NotifyHandler to invoke daemon_restart() again\n");
ICOS_msg_sendto(MODULE_WEB, MODULE_WEB, NULL, 0, ICOS_UCAST_DMN_RESTART);
}
else
{
dmn_ctrl->status = DAEMON_STATUS_RUNNING;
}
}
}ๆก็จ replace the iweb with lighttpd at icos web module ็้จๅ
โ M300 git:(fbee2ec) โ git status
rebase in progress; onto f4437c3
You are currently rebasing branch 'develop' on 'f4437c3'.
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: proscend/prosrc/icos/icoslib/web/webcfg.c
new file: proscend/prosrc/icos/script/web_x509_lighttpd.sh
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb.feature
meta-proscend/recipes-core/prosrc/prosrc_0.1_BACKUP_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_LOCAL_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_REMOTE_42388.bb
proscend/prosrc/icos/icoslib/entry.c.orig
โ M300 git:(fbee2ec) โ
็นผ็บ git rebase --continue
โ M300 git:(fbee2ec) โ git rebase --continue
Applying: replace the iweb with lighttpd at icos web module
Applying: finish 'Management > Web'
Applying: remove the files needed while implementing
Applying: our lighttpd support IPv6 now
โ M300 git:(develop) โ
ๆ้ปไธ็ขบๅฎๆ็็ merge ๆๅไบๅ
โ M300 git:(develop) โ git pull
Current branch develop is up to date.
โ M300 git:(develop) โ git status
On branch develop
Your branch is ahead of 'origin/develop' by 88 commits.
(use "git push" to publish your local commits)
Untracked files:
(use "git add <file>..." to include in what will be committed)
.bash_history
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb.feature
meta-proscend/recipes-core/prosrc/prosrc_0.1_BACKUP_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_BASE_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_LOCAL_42388.bb
meta-proscend/recipes-core/prosrc/prosrc_0.1_REMOTE_42388.bb
proscend/prosrc/icos/icoslib/entry.c.orig
nothing added to commit but untracked files present (use "git add" to track)
โ M300 git:(develop) โ
git push ๅง
โ M300 git:(develop) โ git push
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
Counting objects: 745, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (714/714), done.
Writing objects: 100% (745/745), 108.75 KiB | 0 bytes/s, done.
Total 745 (delta 592), reused 8 (delta 2)
remote: Resolving deltas: 100% (592/592), completed with 86 local objects.
remote:
remote: To create a merge request for develop, visit:
remote: https://192.168.0.124/RD/M300/merge_requests/new?merge_request%5Bsource_branch%5D=develop
remote:
To [email protected]:RD/M300.git
f4437c3..96b4b19 develop -> develop
โ M300 git:(develop) โ
source bimage.sh ๅบ้ฏ็ๅๅ ๆฏไปฅไธ็ Untracked files
โ prosrc git:(develop) โ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
../../../.bash_history
prosrc_0.1.bb.feature
prosrc_0.1_BACKUP_42388.bb
prosrc_0.1_BASE_42388.bb
prosrc_0.1_LOCAL_42388.bb
prosrc_0.1_REMOTE_42388.bb
../../../proscend/prosrc/icos/icoslib/entry.c.orig
nothing added to commit but untracked files present (use "git add" to track)
โ prosrc git:(develop) โ
ๆฎบๅ ๅฎๅๅพๅฐฑๅฏไปฅ build image ไบ
็จ mfgtool ไฝ็้
้ๆฉ...
web ็จ่ตทไพ้็ฎๆญฃๅธธ
aaron ๆ็บไบ VPN > OpenVPN ๅ wizard
็ถ Run OpenVPN as Client ็ๆๅ
security ้ไธ้ ๆๅๆไธๅณๅคๅ files
็ฎๅ jweb ไธฆๆฒๆๆไพ้ๅๆๅ
ๅ ็ไธไธ็ถๆ aaron ็บไบ้ๅๆๅๅจ iweb ๆๅ็ไฟฎๆน