From 9ec1f7e571d627819caed3bcb04f9f0e068ce414 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 17 Aug 2012 17:46:13 +0200 Subject: [PATCH] connman: add optional PPTP support Signed-off-by: Stephan Raue --- CHANGELOG | 1 + packages/network/connman/build | 10 +++++++++- packages/network/connman/install | 3 +++ packages/network/connman/meta | 5 +++++ projects/ATV/options | 3 +++ projects/Fusion/options | 3 +++ projects/Generic/options | 3 +++ projects/Generic_OSS/options | 3 +++ projects/ION/options | 3 +++ projects/Intel/options | 3 +++ projects/RPi/options | 3 +++ projects/Ultra/options | 3 +++ projects/Virtual/options | 3 +++ 13 files changed, 45 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 91c37bfba77..d2d799a2308 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ Package updates: Added functions: - sshd can be enabled via OpenELEC Settings addon + - add PPTP support Changed functions: diff --git a/packages/network/connman/build b/packages/network/connman/build index 914180d9878..223e7ec5770 100755 --- a/packages/network/connman/build +++ b/packages/network/connman/build @@ -22,6 +22,14 @@ . config/options $1 +if [ "$PPTP_SUPPORT" = yes ]; then + CONNMAN_PPTP="--enable-pptp" + export PPPD="/usr/sbin/pppd" + export PPTP="/usr/sbin/pptp" +else + CONNMAN_PPP="--disable-pptp" +fi + export WPASUPPLICANT="/usr/bin/wpa_supplicant" cd $PKG_BUILD @@ -47,7 +55,7 @@ cd $PKG_BUILD --disable-openvpn \ --disable-vpnc \ --disable-l2tp \ - --disable-pptp \ + $CONNMAN_PPTP \ --disable-tist \ --disable-pacrunner \ --disable-iwmx \ diff --git a/packages/network/connman/install b/packages/network/connman/install index c55b4b23c12..25a4d64cce7 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -41,6 +41,9 @@ mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib/connman cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/connman +mkdir -p $INSTALL/usr/lib/connman/scripts + cp -P $PKG_BUILD/scripts/.libs/*.so* $INSTALL/usr/lib/connman/scripts + mkdir -p $INSTALL/usr/sbin cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin diff --git a/packages/network/connman/meta b/packages/network/connman/meta index a380634f975..0235eb140e3 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -34,3 +34,8 @@ PKG_LONGDESC="The ConnMan project provides a daemon for managing internet connec PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +if [ "$PPTP_SUPPORT" = yes ]; then + PKG_DEPENDS="$PKG_DEPENDS ppp pptp" + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS ppp pptp" +fi diff --git a/projects/ATV/options b/projects/ATV/options index 279c66f7d50..21fcb94766b 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -211,6 +211,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="yes" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no) diff --git a/projects/Fusion/options b/projects/Fusion/options index 07dec25269b..bddd7a141dc 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -210,6 +210,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="yes" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no) diff --git a/projects/Generic/options b/projects/Generic/options index f687e21a49d..5eda4bb71e4 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -210,6 +210,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="yes" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no) diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 082e5a8eccd..6cef3c112b3 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -210,6 +210,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="yes" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no) diff --git a/projects/ION/options b/projects/ION/options index de2dc38bc2d..6eb9ba5b981 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -210,6 +210,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="yes" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no) diff --git a/projects/Intel/options b/projects/Intel/options index 325c4d6294c..a3c212ccc77 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -210,6 +210,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="yes" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no) diff --git a/projects/RPi/options b/projects/RPi/options index 7fcb283ae09..c57dcd15dd1 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -212,6 +212,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="no" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no) diff --git a/projects/Ultra/options b/projects/Ultra/options index 67996de5b0b..5a7a42c2f41 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -210,6 +210,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="yes" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no) diff --git a/projects/Virtual/options b/projects/Virtual/options index cd43d274c78..5e7259a8f85 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -206,6 +206,9 @@ # build and install SSH Guard (yes / no) SSHGUARD_SUPPORT="yes" +# build and install PPP support (yes / no) + PPTP_SUPPORT="yes" + # build and install diskmounter service (udisks) # this service provide auto mounting support for external drives # in the mediacenter also automount internally drives at boottime (yes / no)