Skip to content
This repository
Browse code

connman: add optional PPTP support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
  • Loading branch information...
commit 9ec1f7e571d627819caed3bcb04f9f0e068ce414 1 parent 6770357
Stephan Raue authored August 17, 2012
1  CHANGELOG
@@ -13,6 +13,7 @@ Package updates:
13 13
 
14 14
 Added functions:
15 15
   - sshd can be enabled via OpenELEC Settings addon
  16
+  - add PPTP support
16 17
 
17 18
 Changed functions:
18 19
 
10  packages/network/connman/build
@@ -22,6 +22,14 @@
22 22
 
23 23
 . config/options $1
24 24
 
  25
+if [ "$PPTP_SUPPORT" = yes ]; then
  26
+  CONNMAN_PPTP="--enable-pptp"
  27
+  export PPPD="/usr/sbin/pppd"
  28
+  export PPTP="/usr/sbin/pptp"
  29
+else
  30
+  CONNMAN_PPP="--disable-pptp"
  31
+fi
  32
+
25 33
 export WPASUPPLICANT="/usr/bin/wpa_supplicant"
26 34
 
27 35
 cd $PKG_BUILD
@@ -47,7 +55,7 @@ cd $PKG_BUILD
47 55
             --disable-openvpn \
48 56
             --disable-vpnc \
49 57
             --disable-l2tp \
50  
-            --disable-pptp \
  58
+            $CONNMAN_PPTP \
51 59
             --disable-tist \
52 60
             --disable-pacrunner \
53 61
             --disable-iwmx \
3  packages/network/connman/install
@@ -41,6 +41,9 @@ mkdir -p $INSTALL/usr/bin
41 41
 mkdir -p $INSTALL/usr/lib/connman
42 42
   cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/connman
43 43
 
  44
+mkdir -p $INSTALL/usr/lib/connman/scripts
  45
+  cp -P $PKG_BUILD/scripts/.libs/*.so* $INSTALL/usr/lib/connman/scripts
  46
+
44 47
 mkdir -p $INSTALL/usr/sbin
45 48
   cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin
46 49
 
5  packages/network/connman/meta
@@ -34,3 +34,8 @@ PKG_LONGDESC="The ConnMan project provides a daemon for managing internet connec
34 34
 PKG_IS_ADDON="no"
35 35
 
36 36
 PKG_AUTORECONF="yes"
  37
+
  38
+if [ "$PPTP_SUPPORT" = yes ]; then
  39
+  PKG_DEPENDS="$PKG_DEPENDS ppp pptp"
  40
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS ppp pptp"
  41
+fi
3  projects/ATV/options
@@ -211,6 +211,9 @@
211 211
 # build and install SSH Guard (yes / no)
212 212
   SSHGUARD_SUPPORT="yes"
213 213
 
  214
+# build and install PPP support (yes / no)
  215
+  PPTP_SUPPORT="yes"
  216
+
214 217
 # build and install diskmounter service (udisks)
215 218
 # this service provide auto mounting support for external drives
216 219
 # in the mediacenter also automount internally drives at boottime (yes / no)
3  projects/Fusion/options
@@ -210,6 +210,9 @@
210 210
 # build and install SSH Guard (yes / no)
211 211
   SSHGUARD_SUPPORT="yes"
212 212
 
  213
+# build and install PPP support (yes / no)
  214
+  PPTP_SUPPORT="yes"
  215
+
213 216
 # build and install diskmounter service (udisks)
214 217
 # this service provide auto mounting support for external drives
215 218
 # in the mediacenter also automount internally drives at boottime (yes / no)
3  projects/Generic/options
@@ -210,6 +210,9 @@
210 210
 # build and install SSH Guard (yes / no)
211 211
   SSHGUARD_SUPPORT="yes"
212 212
 
  213
+# build and install PPP support (yes / no)
  214
+  PPTP_SUPPORT="yes"
  215
+
213 216
 # build and install diskmounter service (udisks)
214 217
 # this service provide auto mounting support for external drives
215 218
 # in the mediacenter also automount internally drives at boottime (yes / no)
3  projects/Generic_OSS/options
@@ -210,6 +210,9 @@
210 210
 # build and install SSH Guard (yes / no)
211 211
   SSHGUARD_SUPPORT="yes"
212 212
 
  213
+# build and install PPP support (yes / no)
  214
+  PPTP_SUPPORT="yes"
  215
+
213 216
 # build and install diskmounter service (udisks)
214 217
 # this service provide auto mounting support for external drives
215 218
 # in the mediacenter also automount internally drives at boottime (yes / no)
3  projects/ION/options
@@ -210,6 +210,9 @@
210 210
 # build and install SSH Guard (yes / no)
211 211
   SSHGUARD_SUPPORT="yes"
212 212
 
  213
+# build and install PPP support (yes / no)
  214
+  PPTP_SUPPORT="yes"
  215
+
213 216
 # build and install diskmounter service (udisks)
214 217
 # this service provide auto mounting support for external drives
215 218
 # in the mediacenter also automount internally drives at boottime (yes / no)
3  projects/Intel/options
@@ -210,6 +210,9 @@
210 210
 # build and install SSH Guard (yes / no)
211 211
   SSHGUARD_SUPPORT="yes"
212 212
 
  213
+# build and install PPP support (yes / no)
  214
+  PPTP_SUPPORT="yes"
  215
+
213 216
 # build and install diskmounter service (udisks)
214 217
 # this service provide auto mounting support for external drives
215 218
 # in the mediacenter also automount internally drives at boottime (yes / no)
3  projects/RPi/options
@@ -212,6 +212,9 @@
212 212
 # build and install SSH Guard (yes / no)
213 213
   SSHGUARD_SUPPORT="no"
214 214
 
  215
+# build and install PPP support (yes / no)
  216
+  PPTP_SUPPORT="yes"
  217
+
215 218
 # build and install diskmounter service (udisks)
216 219
 # this service provide auto mounting support for external drives
217 220
 # in the mediacenter also automount internally drives at boottime (yes / no)
3  projects/Ultra/options
@@ -210,6 +210,9 @@
210 210
 # build and install SSH Guard (yes / no)
211 211
   SSHGUARD_SUPPORT="yes"
212 212
 
  213
+# build and install PPP support (yes / no)
  214
+  PPTP_SUPPORT="yes"
  215
+
213 216
 # build and install diskmounter service (udisks)
214 217
 # this service provide auto mounting support for external drives
215 218
 # in the mediacenter also automount internally drives at boottime (yes / no)
3  projects/Virtual/options
@@ -206,6 +206,9 @@
206 206
 # build and install SSH Guard (yes / no)
207 207
   SSHGUARD_SUPPORT="yes"
208 208
 
  209
+# build and install PPP support (yes / no)
  210
+  PPTP_SUPPORT="yes"
  211
+
209 212
 # build and install diskmounter service (udisks)
210 213
 # this service provide auto mounting support for external drives
211 214
 # in the mediacenter also automount internally drives at boottime (yes / no)

0 notes on commit 9ec1f7e

Please sign in to comment.
Something went wrong with that request. Please try again.