diff options
author | Roy.Li <rongqing.li@windriver.com> | 2013-06-07 10:43:48 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-11 15:38:01 +0100 |
commit | b4ad8ff0d70d1dc952181da404a5ad6c6d4c8d74 (patch) | |
tree | 9ea2e550f98c70f4fe15dd1eb37586cec55ac80c /meta/recipes-connectivity/ppp/ppp_2.4.5.bb | |
parent | e486242db83297701803866bea971a2f1a1135fe (diff) | |
download | poky-b4ad8ff0d70d1dc952181da404a5ad6c6d4c8d74.tar.gz |
PPP: add default configuration file and fix hard-coded CFLAGS
1. Add three ppp configuration files, make "/etc/init.d/ppp start"
be able to work with little change. provider and pap are adopted from
Ubuntu. ppp_on_boot is adopted from http://www.wlug.org.nz.
2. Use build system CFLAGS when compiling
(From OE-Core rev: 6ab8adf980f90040d3a24dd9c0f12dc04d7aadeb)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp_2.4.5.bb')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index 6af4e984d2..39354efb17 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb | |||
@@ -25,7 +25,11 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ | |||
25 | file://ip-up \ | 25 | file://ip-up \ |
26 | file://ip-down \ | 26 | file://ip-down \ |
27 | file://08setupdns \ | 27 | file://08setupdns \ |
28 | file://92removedns" | 28 | file://92removedns \ |
29 | file://copts.patch \ | ||
30 | file://pap \ | ||
31 | file://ppp_on_boot \ | ||
32 | file://provider " | ||
29 | 33 | ||
30 | SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" | 34 | SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" |
31 | SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505" | 35 | SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505" |
@@ -36,6 +40,11 @@ TARGET_CC_ARCH += " ${LDFLAGS}" | |||
36 | EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" | 40 | EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" |
37 | EXTRA_OECONF = "--disable-strip" | 41 | EXTRA_OECONF = "--disable-strip" |
38 | 42 | ||
43 | # Package Makefile computes CFLAGS, referencing COPTS. | ||
44 | # Typically hard-coded to '-O2 -g' in the Makefile's. | ||
45 | # | ||
46 | EXTRA_OEMAKE += ' COPTS="${CFLAGS}"' | ||
47 | |||
39 | do_install_append () { | 48 | do_install_append () { |
40 | make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp | 49 | make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp |
41 | mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d | 50 | mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d |
@@ -48,6 +57,11 @@ do_install_append () { | |||
48 | install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/ | 57 | install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/ |
49 | install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ | 58 | install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ |
50 | install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ | 59 | install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ |
60 | mkdir -p ${D}${sysconfdir}/chatscripts | ||
61 | mkdir -p ${D}${sysconfdir}/ppp/peers | ||
62 | install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts | ||
63 | install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot | ||
64 | install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider | ||
51 | rm -rf ${D}/${mandir}/man8/man8 | 65 | rm -rf ${D}/${mandir}/man8/man8 |
52 | chmod u+s ${D}${sbindir}/pppd | 66 | chmod u+s ${D}${sbindir}/pppd |
53 | } | 67 | } |