20171229_jeffrey - silenceuncrio/diary GitHub Wiki

0855

review

1000

commit 6b679ae1b92a52ab14c8ae9b1016816171c776fc
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date:   Fri Dec 29 10:00:12 2017 +0800

    if the verstin of factory config is newer than the saved one in memory storage, use the factory one

 proscend/prosrc/icos/icoslib/customize/customize.c | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)

1305

commit 9c463cf4530ddd82f1e7cc2e24657e58c9652b23
Refs: [release/v1.62], {origin/release/v1.62}
Author: jeffrey <[email protected]>
Date:   Fri Dec 29 13:03:31 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(-)

1420

新增工作 VPN: PPTP

1430

➜  M300 git:(develop) git flow feature start pptp
Switched to a new branch 'feature/pptp'

Summary of actions:
- A new branch 'feature/pptp' was created, based on 'develop'
- You are now on branch 'feature/pptp'

Now, start committing on your feature. When done, use:

     git flow feature finish pptp

直接 build 來看看

build@2f192722794e:/var/m300/sources$ find . -name "*pptp*"
./meta-openembedded/meta-networking/recipes-protocols/pptp-linux
./meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2
./meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
./meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb

發現 prosrc_0.1.bb 已經有該套件

RDEPENDS_${PN} += "ppp ppp-oe iptables iperf dnsmasq pptp-linux bridge-utils dhcp-server dhcp-client openvpn openssl openssl-conf iproute2 iproute2-tc procps socat strongswan cryptodev-module mtd-utils mtd-utils-ubifs imx-kobs tar bzip2 jq shadow net-snmp net-snmp-server-snmpd mosquitto grep keepalived dropbear quagga"

科普一下怎麼用

1450

build@2f192722794e:/var/m300/sources$ cat ./meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
SUMMARY = "Client for Microsoft PPTP VPNs"
DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \
    and OpenBSD client for the proprietary Microsoft Point-to-Point \
    Tunneling Protocol, PPTP. Allows connection to a PPTP based \
    Virtual Private Network (VPN) as used by employers and some \
    cable and ADSL internet service providers."
HOMEPAGE = "http://pptpclient.sourceforge.net"
SECTION = "net"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"

PR = "r1"

SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
           file://options.pptp \
           file://fix-parallel-build.patch \
"

SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857"
SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc"

S = "${WORKDIR}/pptp-${PV}"

do_install() {
    install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8
    install -m 555 pptp ${D}${sbindir}
    install -m 644 pptp.8 ${D}${mandir}/man8
    install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp
}

RDEPENDS_${PN} = "ppp"

沒有 pptpsetup

由 pptp-linux 1.9.0 可知目前我們只有 PPTP Client

1525

找到有支持 pptp server 的 recipe - poptop_1.3.4.bb

1730

目前還無法成功從 poptop recipe compile 成功

不過公司之前的案子 Vdsl170 有 pptpd-1.4.0 可以參考

其實整包 source code 可以從 sourceforge 的 pptpd-1.4.0 下載

下禮拜把從 sourceforge 下載的再對照一下公司 Vdsl170 source code 裡的 pptpd-1.4.0 了解一下當初 cross compile 是怎麼作的