[oe-commits] org.oe.dev merge of '4306fcec612a965372ade12eb91d17331cb56bb4'
pfalcon commit
openembedded-commits at lists.openembedded.org
Mon Jan 14 23:24:30 UTC 2008
merge of '4306fcec612a965372ade12eb91d17331cb56bb4'
and 'cc81b55dbf5b140921173105fea309d7f2b15dd6'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 2deed37a9e4e5e16ae13941b32c64a3fe7f89630
ViewMTN: http://monotone.openembedded.org/revision/info/2deed37a9e4e5e16ae13941b32c64a3fe7f89630
Files:
1
packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb
packages/ppp-dsl/dsl-provider
packages/ppp-dsl/files/dsl-provider
packages/ppp-dsl/ppp_on_boot.dsl
packages/ppp-dsl/files/ppp_on_boot.dsl
packages/ppp/ppp-gprs
packages/ppp/ppp-gprs/chats
packages/ppp/ppp-gprs/peers
packages/ppp-dsl/files
packages/ppp/ppp-gprs/chats/chat-gprs
packages/ppp/ppp-gprs/peers/_gprs
packages/ppp/ppp-gprs/peers/_gprs-ap-internet
packages/ppp/ppp-gprs_1.0.bb
packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch
packages/ppp-dialin/ppp-dialin_0.1.bb
packages/ppp-dsl/ppp-dsl_0.1.bb
packages/rp-pppoe/rp-pppoe_3.8.bb
site/arm-linux
packages/ecj/ecj-native_3.2.2.bb
packages/ecj/ecj-native_3.3.bb
packages/ecj/files/ecj.sh
Diffs:
#
# mt diff -r4306fcec612a965372ade12eb91d17331cb56bb4 -r2deed37a9e4e5e16ae13941b32c64a3fe7f89630
#
#
#
# delete "packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb"
#
# rename "packages/ppp-dsl/dsl-provider"
# to "packages/ppp-dsl/files/dsl-provider"
#
# rename "packages/ppp-dsl/ppp_on_boot.dsl"
# to "packages/ppp-dsl/files/ppp_on_boot.dsl"
#
# add_dir "packages/ppp/ppp-gprs"
#
# add_dir "packages/ppp/ppp-gprs/chats"
#
# add_dir "packages/ppp/ppp-gprs/peers"
#
# add_dir "packages/ppp-dsl/files"
#
# add_file "packages/ppp/ppp-gprs/chats/chat-gprs"
# content [3c17c4742880eb980b1f32c5bfb8ec89be225b16]
#
# add_file "packages/ppp/ppp-gprs/peers/_gprs"
# content [b8d56b83b8ed0db469e296a2adb24896adf7ebf3]
#
# add_file "packages/ppp/ppp-gprs/peers/_gprs-ap-internet"
# content [7ec04eac6aae50cf06036988b2d63e7f754abcd2]
#
# add_file "packages/ppp/ppp-gprs_1.0.bb"
# content [698b8ad36ea9b264cbdc9d217158f578b0635aaf]
#
# add_file "packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch"
# content [4ca15864a833bc6abfdf0c03ffab5d3c5269862d]
#
# patch "packages/ppp-dialin/ppp-dialin_0.1.bb"
# from [f4333082495bb63c50b8db64800d2ecba27c6405]
# to [e838c3f9f295491e08c1860d566389a718c6cb46]
#
# patch "packages/ppp-dsl/ppp-dsl_0.1.bb"
# from [8b0fd04cb574caa5fcd9d34c742789a19b9d0de4]
# to [06eb87eb8e23416d02759d02f5b8733d517967c8]
#
# patch "packages/rp-pppoe/rp-pppoe_3.8.bb"
# from [f96008f57859c05eee60eee5a53f342d0d5ae18a]
# to [f8ae220f213a955ff0c2de626b2b8af37d1481c0]
#
# patch "site/arm-linux"
# from [641c4cf99a3af4480173b3d79e47be6ff22c8c93]
# to [e8c70e76869b6a3fc4d35dfe9beb6db6d0de7c99]
#
============================================================
--- packages/ppp/ppp-gprs/chats/chat-gprs 3c17c4742880eb980b1f32c5bfb8ec89be225b16
+++ packages/ppp/ppp-gprs/chats/chat-gprs 3c17c4742880eb980b1f32c5bfb8ec89be225b16
@@ -0,0 +1,9 @@
+# GPRS AP (Access Point) name should be passed via -T switch
+
+'' ATZ
+OK AT+CGDCONT=1,"IP","\T"
+# We setup profile #1 in the above command, and then use it to call
+# GPRS. This is correct, but some buggy phone may parse only "ATD*99#"
+OK "ATD*99***1#"
+# OK "ATD*99#"
+CONNECT ''
============================================================
--- packages/ppp/ppp-gprs/peers/_gprs b8d56b83b8ed0db469e296a2adb24896adf7ebf3
+++ packages/ppp/ppp-gprs/peers/_gprs b8d56b83b8ed0db469e296a2adb24896adf7ebf3
@@ -0,0 +1,68 @@
+# This is generic pppd config for GPRS connection
+# To connect to specific provider, one
+# more provider-specific config
+# file is required, which will
+# usually just set chat utility params
+# to make connection and call this one.
+# (And in most cases that will be symlink
+# to a file with well-known settings).
+#
+# Usage:
+# pppd <modem_device> call gprs call <country>-<provider>
+# where /etc/ppp/peers/<country>-<provider> ends with line
+# "call _gprs"
+# Example:
+# pppd /dev/rfcomm0 call ua-life
+# Debugging PPP protocol problems:
+# pppd /dev/rfcomm0 call ua-life debug nodetach
+#
+# By default, pppd will go to
+# background once connection is
+# established. 'nodetach' option will
+# prevent this. If you want pppd to
+# even establish connection in
+# background, comment 'updetach' below.
+#
+# To finish connection, use Ctrl+C if
+# 'nodetach' was used, or
+# kill `head -1 /var/run/ppp-gprs.pid`
+# otherwise. If you are sure there is
+# only one pppd connection, you can use
+# killall pppd
+
+##
+## pppd options
+##
+
+# create /var/run/ppp-gprs.pid
+# with pid for this connection
+linkname gprs
+# Connect in foreground, but go
+# to background after that
+updetach
+
+# Treat port as a modem and use
+# reasonable speed
+modem
+crtscts
+115200
+
+# Don't do CCP (compression)
+# negotiation, some providers are
+# rumored to be buggy with this, and
+# most of the rest simply don't support.
+noccp
+# We don't request provider to auth
+# to us
+noauth
+# Don't try to make up our IP address
+noipdefault
+# We want provider to supply us with
+# IP addresses
+ipcp-accept-remote
+ipcp-accept-local
+# Ask provider for DNS and use it
+usepeerdns
+# Route all Internet traffic thru
+# this connection
+defaultroute
============================================================
--- packages/ppp/ppp-gprs/peers/_gprs-ap-internet 7ec04eac6aae50cf06036988b2d63e7f754abcd2
+++ packages/ppp/ppp-gprs/peers/_gprs-ap-internet 7ec04eac6aae50cf06036988b2d63e7f754abcd2
@@ -0,0 +1,3 @@
+# -T options sets value of GPRS AP name. Change this for your cell provider
+connect '/usr/sbin/chat -V -f /etc/ppp/chats/chat-gprs -T internet'
+call gprs
============================================================
--- packages/ppp/ppp-gprs_1.0.bb 698b8ad36ea9b264cbdc9d217158f578b0635aaf
+++ packages/ppp/ppp-gprs_1.0.bb 698b8ad36ea9b264cbdc9d217158f578b0635aaf
@@ -0,0 +1,22 @@
+SECTION = "console/network"
+DESCRIPTION = "PPP scripts for easy GPRS connection"
+LICENSE = "GPL"
+RDEPENDS = "ppp"
+PR = "r1"
+
+SRC_URI = "file://peers/* file://chats/*"
+
+do_install () {
+ install -d ${D}${sysconfdir}/ppp/peers/
+ install -d ${D}${sysconfdir}/ppp/chats/
+ install -m 0644 ${WORKDIR}/peers/* ${D}${sysconfdir}/ppp/peers/
+ install -m 0644 ${WORKDIR}/chats/* ${D}${sysconfdir}/ppp/chats/
+
+ # Add links for providers sharing same well-known config
+ ln -sf _gprs-ap-internet ${D}${sysconfdir}/ppp/peers/ua-life
+}
+
+PACKAGE_ARCH = "all"
+
+# In worst case, user may need to edit anything
+CONFFILES_${PN} = "${sysconfdir}/ppp/peers/_gprs ${sysconfdir}/ppp/chats/chat-gprs"
============================================================
--- packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch 4ca15864a833bc6abfdf0c03ffab5d3c5269862d
+++ packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch 4ca15864a833bc6abfdf0c03ffab5d3c5269862d
@@ -0,0 +1,11 @@
+--- a/src/configure.in.org 2008-01-14 21:08:38.000000000 +0200
++++ a/src/configure.in 2008-01-14 21:20:09.000000000 +0200
+@@ -208,7 +208,7 @@
+ return 2;
+ }
+ }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev,
+-$ECHO "no defaults for cross-compiling"; exit 0)
++$ECHO "no defaults for cross-compiling"; exit 1)
+ ])
+
+ if test "$rpppoe_cv_pack_bitfields" = "rev" ; then
============================================================
--- packages/ppp-dialin/ppp-dialin_0.1.bb f4333082495bb63c50b8db64800d2ecba27c6405
+++ packages/ppp-dialin/ppp-dialin_0.1.bb e838c3f9f295491e08c1860d566389a718c6cb46
@@ -1,8 +1,8 @@ RDEPENDS = "ppp"
SECTION = "console/network"
DESCRIPTION = "Enables PPP dial-in through a serial connection"
DEPENDS = "ppp"
RDEPENDS = "ppp"
-PR = "r4"
+PR = "r5"
LICENSE = "MIT"
SRC_URI = "file://host-peer \
@@ -16,6 +16,7 @@ do_install() {
install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir}
}
+PACKAGE_ARCH = "all"
pkg_postinst() {
if test "x$D" != "x"; then
============================================================
--- packages/ppp-dsl/ppp-dsl_0.1.bb 8b0fd04cb574caa5fcd9d34c742789a19b9d0de4
+++ packages/ppp-dsl/ppp-dsl_0.1.bb 06eb87eb8e23416d02759d02f5b8733d517967c8
@@ -1,10 +1,10 @@ RRECOMMENDS = "kernel-module-ppp-async k
SECTION = "console/network"
DESCRIPTION = "Enables PPP dial-in through a DSL connection"
LICENSE = "PD"
DEPENDS = "ppp rp-pppoe"
RDEPENDS = "ppp rp-pppoe"
RRECOMMENDS = "kernel-module-ppp-async kernel-module-ppp-generic kernel-module-slhc"
-PR = "r2"
+PR = "r5"
SRC_URI = "file://dsl-provider \
file://ppp_on_boot.dsl"
@@ -25,4 +25,6 @@ fi
fi
}
+PACKAGE_ARCH = "all"
+
+CONFFILES_${PN} = "${sysconfdir}/ppp/peers/dsl-provider"
-CONFFILES_${PN}_nylon = "${sysconfdir}/ppp/peers/dsl-provider"
============================================================
--- packages/rp-pppoe/rp-pppoe_3.8.bb f96008f57859c05eee60eee5a53f342d0d5ae18a
+++ packages/rp-pppoe/rp-pppoe_3.8.bb f8ae220f213a955ff0c2de626b2b8af37d1481c0
@@ -5,13 +5,14 @@ RRECOMMENDS_${PN} = "ppp-oe"
RDEPENDS_${PN} = "ppp"
RDEPENDS_${PN}-server = "${PN}"
RRECOMMENDS_${PN} = "ppp-oe"
-PR = "r5"
+PR = "r6"
SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
file://top-autoconf.patch;patch=1 \
file://configure_in_cross.patch;patch=1 \
file://pppoe-src-restrictions.patch;patch=1 \
file://update-config.patch;patch=1 \
+ file://dont-swallow-errors.patch;patch=1 \
file://pppoe-server.default \
file://pppoe-server.init"
============================================================
--- site/arm-linux 641c4cf99a3af4480173b3d79e47be6ff22c8c93
+++ site/arm-linux e8c70e76869b6a3fc4d35dfe9beb6db6d0de7c99
@@ -176,3 +176,6 @@ gnet_sockaddr_family_field_name=${gnet_s
ac_cv_member_struct_sockaddr_sa_len=${ac_cv_member_struct_sockaddr_sa_len=no}
ac_cv_gnet_have_abstract_sockets=${ac_cv_gnet_have_abstract_sockets=no}
gnet_sockaddr_family_field_name=${gnet_sockaddr_family_field_name=ss_family}
+
+# rp-pppoe
+rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
#
# mt diff -rcc81b55dbf5b140921173105fea309d7f2b15dd6 -r2deed37a9e4e5e16ae13941b32c64a3fe7f89630
#
#
#
# delete "packages/ecj/ecj-native_3.2.2.bb"
#
# delete "packages/ecj/ecj-native_3.3.bb"
#
# delete "packages/ecj/files/ecj.sh"
#
More information about the Openembedded-commits
mailing list