X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=2487b94abca78f60bf20a5cf5b0bb851b3bc6786;hb=69dcc42551e024d0a63a1d6749fb512c67c6b1ff;hp=ebdb1bcba209f5409417dc0d7c5d1704b290ed3f;hpb=0d909a4a5ecadcb6808a31fd7c9a8187c3de804a;p=ipfire-2.x.git diff --git a/make.sh b/make.sh old mode 100644 new mode 100755 index ebdb1bcba2..2487b94abc --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.0b" # Version number +VERSION="2.0t4" # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level @@ -298,6 +298,7 @@ buildbase() { lfsmake2 man lfsmake2 mktemp lfsmake2 modutils + lfsmake2 mtd lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc @@ -329,13 +330,13 @@ buildipfire() { ipfiremake ipp2p SMP=1 ipfiremake fcdsl SMP=1 ipfiremake fcdsl2 SMP=1 - ipfiremake fcdslsl SMP=1 + ipfiremake fcdslsl SMP=1 ipfiremake fcdslusb SMP=1 - ipfiremake fcdslslusb SMP=1 - ipfiremake fcpci SMP=1 + ipfiremake fcdslslusb SMP=1 # ipfiremake promise-sata-300-tx SMP=1 ipfiremake zaptel SMP=1 - ipfiremake fuse SMP=1 + ipfiremake fuse SMP=1 + #ipfiremake linux XEN=1 ipfiremake linux ipfiremake ipp2p ipfiremake fcdsl @@ -343,12 +344,14 @@ buildipfire() { ipfiremake fcdslsl ipfiremake fcdslusb ipfiremake fcdslslusb - ipfiremake fcpci # ipfiremake promise-sata-300-tx ipfiremake zaptel ipfiremake fuse ipfiremake pkg-config ipfiremake cpio + ipfiremake klibc + ipfiremake mkinitcpio + ipfiremake udev KLIBC=1 ipfiremake expat ipfiremake gdbm ipfiremake gmp @@ -359,10 +362,8 @@ buildipfire() { ipfiremake libjpeg ipfiremake libpng ipfiremake libtiff - ipfiremake lcms - ipfiremake libmng - ipfiremake freetype ipfiremake libart + ipfiremake freetype ipfiremake gd ipfiremake popt ipfiremake pcre @@ -371,6 +372,7 @@ buildipfire() { ipfiremake libcap ipfiremake pciutils ipfiremake libxml2 + ipfiremake libxslt ipfiremake BerkeleyDB ipfiremake mysql ipfiremake cyrus-sasl @@ -384,7 +386,6 @@ buildipfire() { ipfiremake capi4k-utils ipfiremake cdrtools ipfiremake dnsmasq - ipfiremake libaal ipfiremake dosfstools ipfiremake reiserfsprogs ipfiremake squashfstools @@ -411,8 +412,8 @@ buildipfire() { ipfiremake iptstate ipfiremake iputils ipfiremake l7-protocols - ipfiremake isapnptools -# ipfiremake isdn4k-utils # What about mISDN??? + ipfiremake isdn4k-utils + ipfiremake mISDN ipfiremake hwdata ipfiremake kudzu ipfiremake logrotate @@ -420,7 +421,6 @@ buildipfire() { ipfiremake misc-progs ipfiremake mtools ipfiremake nano - ipfiremake nash ipfiremake nasm ipfiremake URI ipfiremake HTML-Tagset @@ -450,7 +450,6 @@ buildipfire() { ipfiremake fwhits ipfiremake noip_updater ipfiremake ntp - ipfiremake oinkmaster ipfiremake openssh ipfiremake openswan ipfiremake pptpclient @@ -458,6 +457,8 @@ buildipfire() { ipfiremake setserial ipfiremake setup ipfiremake snort + ipfiremake snortsnarf + ipfiremake oinkmaster ipfiremake squid ipfiremake squid-graph ipfiremake squidguard @@ -470,33 +471,27 @@ buildipfire() { ipfiremake 3c5x9setup ipfiremake pakfire ipfiremake java - ipfiremake bootsplash ipfiremake spandsp ipfiremake lzo ipfiremake openvpn ipfiremake pammysql - ipfiremake xinetd ipfiremake ghostscript ipfiremake cups ipfiremake samba ipfiremake sudo ipfiremake mc ipfiremake wget - ipfiremake wput ipfiremake bridge-utils ipfiremake screen ipfiremake hddtemp ipfiremake smartmontools ipfiremake htop - ipfiremake lynx ipfiremake postfix - ipfiremake procmail ipfiremake fetchmail ipfiremake cyrusimap ipfiremake webcyradm ipfiremake mailx ipfiremake clamav - ipfiremake razor ipfiremake spamassassin ipfiremake amavisd ipfiremake stund @@ -508,16 +503,12 @@ buildipfire() { ipfiremake libogg ipfiremake libvorbis ipfiremake lame - ipfiremake xvid - ipfiremake mpeg2dec - ipfiremake ffmpeg ipfiremake sox ipfiremake gnump3d - ipfiremake videolan + ipfiremake ctorrent ipfiremake applejuice ipfiremake ocaml ipfiremake mldonkey - ipfiremake ntop ipfiremake rsync ipfiremake tcpwrapper ipfiremake portmap @@ -533,6 +524,9 @@ buildipfire() { ipfiremake bwm-ng ipfiremake tripwire ipfiremake sysstat + ipfiremake vsftpd + ipfiremake alsa + ipfiremake mp3blaster } buildinstaller() { @@ -567,6 +561,7 @@ buildinstaller() { installmake util-linux installmake pciutils installmake zlib + installmake mtd installmake wget installmake hwdata installmake kudzu @@ -632,25 +627,33 @@ buildpackages() { } ipfirepackages() { + ipfiredist alsa # ipfiredist amavisd # ipfiredist applejuice # ipfiredist asterisk ipfiredist clamav -# ipfiredist cups -# ipfiredist cyrusimap + ipfiredist cups + ipfiredist cyrus-sasl # ipfiredist fetchmail # ipfiredist gnump3d # ipfiredist java + ipfiredist libogg + ipfiredist libvorbis # ipfiredist mailx # ipfiredist mldonkey + ipfiredist mp3blaster + ipfiredist mpg123 # ipfiredist nfs + ipfiredist openldap # ipfiredist postfix -# ipfiredist samba + ipfiredist samba # ipfiredist sox # ipfiredist spamassassin + ipfiredist tripwire + ipfiredist vsftpd # ipfiredist webcyradm test -d $BASEDIR/packages || mkdir $BASEDIR/packages - mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1 + mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1 rm -rf $BASEDIR/build/install/packages/* } @@ -955,7 +958,7 @@ upload) iso) echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION." cat < .ftp-commands -mkdir -p $FTP_ISO_PATH/$SVN_REVISION +mkdir -p $FTP_ISO_PATH$SVN_REVISION ls -lah quit EOF @@ -983,15 +986,15 @@ EOF ;; paks) cat < .ftp-commands -mkdir $IPFIRE_FTP_PATH_PAK +mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks ls -lah quit EOF - ncftp -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK < .ftp-commands + ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands rm -f .ftp-commands - ncftpput -z -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK $IPFIRE_FTP_PATH_PAK/ packages/* + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/* if [ "$?" -eq "0" ]; then - echo -e "The packages were successfully uploaded to $IPFIRE_FTP_URL_PAK$IPFIRE_FTP_PATH_PAK/." + echo -e "The packages were successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/." else echo -e "There was an error while uploading the packages to the ftp server." exit 1