From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 5 Jul 2010 20:53:59 +0000 (+0200)
Subject: Merge commit 'ms/ppp-update'
X-Git-Tag: v2.9-beta1~171^2~8^2~5
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=871956e932f429b5e20b68e03e00d7886feab5d2;hp=-c

Merge commit 'ms/ppp-update'
---

871956e932f429b5e20b68e03e00d7886feab5d2
diff --combined make.sh
index c0169a30f6,03806c824b..c4511edffa
--- a/make.sh
+++ b/make.sh
@@@ -337,7 -337,6 +337,6 @@@ buildipfire() 
    ipfiremake libusb
    ipfiremake libpcap
    ipfiremake ppp
-   ipfiremake rp-pppoe
    ipfiremake pptp
    ipfiremake unzip
    ipfiremake which
@@@ -625,7 -624,7 +624,7 @@@
    ipfiremake perl-DBD-mysql
    ipfiremake cacti
    ipfiremake icecc
 -  ipfiremake open-vm-tools
 +  ipfiremake openvmtools
    ipfiremake nagiosql
    ipfiremake iftop
    ipfiremake motion
@@@ -641,7 -640,6 +640,7 @@@
    ipfiremake mdadm
    ipfiremake eject
    ipfiremake pound
 +  ipfiremake minicom
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild