20170814_jeffrey - silenceuncrio/diary GitHub Wiki
0915
review
1145
ĺĺ branch develop
â M300 git:(release/v1.52) git checkout develop
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
â M300 git:(develop) â
pull ä¸ä¸
â M300 git:(develop) â git pull
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From 192.168.0.242:RD/M300
0abce1a..84169d8 develop -> origin/develop
49c94f4..be61a60 master -> origin/master
* [new tag] v1.52 -> v1.52
First, rewinding head to replay your work on top of it...
Fast-forwarded develop to 84169d80e341d8e6c625fcf0de39e96f643d1635.
â M300 git:(develop)
ĺĺ° branch feature/rip
â M300 git:(develop) git checkout feature/rip
Switched to branch 'feature/rip'
â M300 git:(feature/rip) â git flow ?
佾ĺ branch develop
â M300 git:(feature/rip) â git flow feature finish rip
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Auto-merging meta-proscend/recipes-core/prosrc/prosrc_0.1.bb
Merge made by the 'recursive' strategy.
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb | 2 +-
meta-proscend/recipes-extended/quagga/quagga_0.99.24.1.bbappend | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 meta-proscend/recipes-extended/quagga/quagga_0.99.24.1.bbappend
Deleted branch feature/rip (was 76f4478).
Summary of actions:
- The feature branch 'feature/rip' was merged into 'develop'
- Feature branch 'feature/rip' has been removed
- You are now on branch 'develop'
â M300 git:(develop)
pull ä¸ä¸
â M300 git:(develop) git pull
First, rewinding head to replay your work on top of it...
Applying: Add 'quagga' recipe for implementing 'RIP I/II' feature
Applying: Use .bbappend to cause update-rc.d to disable init script start links of quagga service
â M300 git:(develop)
ä˝żç¨ tig log çĺ°ĺ¨ feature/rip ĺç俎ćš
commit 3cd745234a1081cf17aab71469ba6b6016f1dc8e
Refs: [develop]
Author: jeffrey <[email protected]>
Date: Tue Aug 1 15:20:30 2017 +0800
Use .bbappend to cause update-rc.d to disable init script start links of quagga service
meta-proscend/recipes-extended/quagga/quagga_0.99.24.1.bbappend | 5 +++++
1 file changed, 5 insertions(+)
commit d6852d62dd50f7a66668f4fb3dfe331de4c53af8
Author: jeffrey <[email protected]>
Date: Mon Jul 17 15:28:02 2017 +0800
Add 'quagga' recipe for implementing 'RIP I/II' feature
meta-proscend/recipes-core/prosrc/prosrc_0.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
push ä¸ server
â 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: 12, done.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 1.15 KiB | 0 bytes/s, done.
Total 12 (delta 7), reused 0 (delta 0)
remote:
remote: To create a merge request for develop, visit:
remote: http://192.168.0.242/RD/M300/merge_requests/new?merge_request%5Bsource_branch%5D=develop
remote:
To [email protected]:RD/M300.git
cb470c0..3cd7452 develop -> develop
â M300 git:(develop)
compile 芌芌
1200
compile ćŁĺ¸¸
1330
commit 1e2fe76da25d6edf121c71b0e3b1887a8716bb84
Author: jeffrey <[email protected]>
Date: Mon Aug 14 13:30:50 2017 +0800
'ZEBRA' ICOS Module implementing
- let the proscend 'make menuconfig' recognize it
proscend/mconfig/Config.in | 1 +
proscend/mconfig/configs/M300/0_GENERIC/defconfig | 2 ++
proscend/mconfig/configs/M300/1_GPS/defconfig | 2 ++
proscend/mconfig/configs/M300/2_PLANET/defconfig | 2 ++
proscend/mconfig/configs/M300/3_GPS_PLANET/defconfig | 2 ++
5 files changed, 9 insertions(+)
1515
commit 3a6911fefac1bf29c338eea141d09e4d77882d70
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Mon Aug 14 15:18:14 2017 +0800
'ZEBRA' ICOS Module implementing
- add 'MODULE_ZEBRA' into moduleInitAry[]
- add zebraModule
- add factory default configuration
- in zebraModule._notify()
- PRO_EVENT 'ICOS_UCAST_MODULE_APPLY' not implement yet
.../rootfs/home/factory/icos/zebra/zebracfg.ini | 4 +
proscend/prosrc/icos/icoslib/Makefile | 3 +
proscend/prosrc/icos/icoslib/entry.c | 11 +-
proscend/prosrc/icos/icoslib/zebra/Makefile | 13 +
proscend/prosrc/icos/icoslib/zebra/zebra.c | 273 +++++++++++++++++++++
proscend/prosrc/icos/include/icos_common.h | 1 +
proscend/prosrc/icos/include/icos_module.h | 1 +
proscend/prosrc/icos/include/module_zebra.h | 25 ++
8 files changed, 329 insertions(+), 2 deletions(-)
1610
commit f6afbc3f998190dbdde3c296a64ea1402f8a73cc
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Mon Aug 14 16:10:50 2017 +0800
'ZEBRA' ICOS Module implementing
- implement PRO_EVENT 'ICOS_UCAST_MODULE_APPLY'
proscend/prosrc/icos/icoslib/zebra/zebra.c | 57 ++++++++++++++++++++++++++----
1 file changed, 50 insertions(+), 7 deletions(-)