br2684ctl...

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index df26245fc8235a321125ffb6987d317e330114dd..89c7be3a8a691a3549c907995cfd38e0bb50bcda 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name

-VERSION="2.0beta1"                                                     # Version number
+VERSION="2.0rc1t"                                                              # Version number

 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level


@@ -322,19 +322,17 @@ buildipfire() {
   ipfiremake dhcpcd
   ipfiremake libusb
   ipfiremake libpcap
   ipfiremake dhcpcd
   ipfiremake libusb
   ipfiremake libpcap

-  ipfiremake linux-atm

   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
   ipfiremake linux                     SMP=1
   ipfiremake ipp2p                     SMP=1
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
   ipfiremake linux                     SMP=1
   ipfiremake ipp2p                     SMP=1

-  ipfiremake r8169                     SMP=1

   ipfiremake zaptel                    SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake zaptel                    SMP=1
   ipfiremake linux
   ipfiremake ipp2p

-  ipfiremake r8169

   ipfiremake zaptel
   ipfiremake pkg-config
   ipfiremake zaptel
   ipfiremake pkg-config

+  ipfiremake linux-atm

   ipfiremake cpio
   ipfiremake klibc
   ipfiremake mkinitcpio
   ipfiremake cpio
   ipfiremake klibc
   ipfiremake mkinitcpio


@@ -347,6 +345,7 @@ buildipfire() {
   ipfiremake curl
   ipfiremake python
   ipfiremake libnet
   ipfiremake curl
   ipfiremake python
   ipfiremake libnet

+  ipfiremake libidn

   ipfiremake libjpeg
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libjpeg
   ipfiremake libpng
   ipfiremake libtiff


@@ -388,6 +387,7 @@ buildipfire() {
   ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm

+  ipfiremake sdparm

   ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask
   ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask


@@ -528,6 +528,8 @@ buildipfire() {
   ipfiremake vsftpd
   ipfiremake which
   ipfiremake lsof
   ipfiremake vsftpd
   ipfiremake which
   ipfiremake lsof

+  ipfiremake centerim
+  ipfiremake br2684ctl

 }
 
 buildinstaller() {
 }
 
 buildinstaller() {


@@ -598,7 +600,6 @@ buildpackages() {
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
        ipfiremake usb-stick
   fi
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
        ipfiremake usb-stick
   fi

-  ipfiremake pxe

   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages


@@ -626,7 +627,12 @@ buildpackages() {
 ipfirepackages() {
        ipfiremake core-updates
        for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
 ipfirepackages() {
        ipfiremake core-updates
        for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do

-               [ -e $BASEDIR/lfs/$i ] && ipfiredist $i
+               if [ -e $BASEDIR/lfs/$i ]; then
+                       ipfiredist $i
+               else
+                       echo -n $i
+                       beautify message SKIP
+               fi

        done
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1
        done
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1