X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=8a3adb55dcc10aa59acccb1834da61ee721643f6;hp=d641bc0889f5cc481c5ec55219fb7075de671213;hb=350b52c5c9368951ff2a9139817b42d0aec03ad7;hpb=1179dc27912f1937f7dcf432c67036a9fca1e035

diff --git a/make.sh b/make.sh
old mode 100644
new mode 100755
index d641bc0889..8a3adb55dc
--- a/make.sh
+++ b/make.sh
@@ -298,6 +298,7 @@ buildbase() {
     lfsmake2 man
     lfsmake2 mktemp
     lfsmake2 modutils
+    lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
@@ -349,6 +350,9 @@ buildipfire() {
   ipfiremake fuse
   ipfiremake pkg-config
   ipfiremake cpio
+  ipfiremake klibc
+  ipfiremake mkinitcpio
+  ipfiremake udev				KLIBC=1
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -384,7 +388,6 @@ buildipfire() {
   ipfiremake capi4k-utils
   ipfiremake cdrtools
   ipfiremake dnsmasq
-  ipfiremake libaal
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake squashfstools
@@ -450,7 +453,6 @@ buildipfire() {
   ipfiremake fwhits
   ipfiremake noip_updater
   ipfiremake ntp
-  ipfiremake oinkmaster
   ipfiremake openssh
   ipfiremake openswan
   ipfiremake pptpclient
@@ -458,6 +460,8 @@ buildipfire() {
   ipfiremake setserial
   ipfiremake setup
   ipfiremake snort
+  ipfiremake snortsnarf
+  ipfiremake oinkmaster
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard
@@ -475,28 +479,23 @@ buildipfire() {
   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 +507,11 @@ buildipfire() {
   ipfiremake libogg
   ipfiremake libvorbis
   ipfiremake lame
-  ipfiremake xvid
-  ipfiremake mpeg2dec
-  ipfiremake ffmpeg
   ipfiremake sox
   ipfiremake gnump3d
-  ipfiremake videolan
   ipfiremake applejuice
   ipfiremake ocaml
   ipfiremake mldonkey
-  ipfiremake ntop
   ipfiremake rsync
   ipfiremake tcpwrapper
   ipfiremake portmap
@@ -567,6 +561,7 @@ buildinstaller() {
   installmake util-linux
   installmake pciutils
   installmake zlib
+  installmake mtd
   installmake wget
   installmake hwdata
   installmake kudzu
@@ -609,14 +604,14 @@ buildpackages() {
   ipfiremake pxe
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
-#  ipfirepackages
+  ipfirepackages
 
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
 
   # Generating total list of files
-  echo "Generating files list from logs" | tee -a $LOGFILE
+  echo -n "Generating files list from logs" | tee -a $LOGFILE
   rm -f $BASEDIR/log/FILES
   for i in `ls -1tr $BASEDIR/log/[^_]*`; do
 	if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
@@ -626,53 +621,32 @@ buildpackages() {
 		cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
 	fi
   done
-  cd $BASEDIR/packages; ls -w1 *.ipfire | awk -F ".ipfire" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
-  echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
+  beautify message DONE
 
   cd $PWD
 }
 
 ipfirepackages() {
-  if [ -d "$BASEDIR/packages" ]; then
-	  for i in `ls $BASEDIR/packages`; do
-		touch $BASEDIR/build/install/packages/$i.empty
-	  done
-  fi
 #  ipfiredist amavisd
-  ipfiredist applejuice
-  ipfiredist asterisk
+#  ipfiredist applejuice
+#  ipfiredist asterisk
   ipfiredist clamav
-  ipfiredist cups
-  ipfiredist cyrusimap
-  ipfiredist fetchmail
-  ipfiredist ffmpeg
-  ipfiredist gnump3d
-  ipfiredist iptraf
-  ipfiredist java
-  ipfiredist lame
-  ipfiredist libmad
-  ipfiredist libogg
-  ipfiredist libvorbis
-  ipfiredist mailx
-  ipfiredist mldonkey
-  ipfiredist mpeg2dec
-  ipfiredist nagios
-  ipfiredist nfs
-  ipfiredist nmap
-  ipfiredist ntop
-  ipfiredist portmap
-  ipfiredist postfix
-  ipfiredist procmail
+#  ipfiredist cups
+#  ipfiredist cyrusimap
+#  ipfiredist fetchmail
+#  ipfiredist gnump3d
+#  ipfiredist java
+#  ipfiredist mailx
+#  ipfiredist mldonkey
+#  ipfiredist nfs
+#  ipfiredist postfix
   ipfiredist samba
-  ipfiredist sox
-  ipfiredist spamassassin
-  ipfiredist subversion
-  ipfiredist videolan
-  ipfiredist webcyradm
-  ipfiredist xvid
-  ipfiredist yasuc
+#  ipfiredist sox
+#  ipfiredist spamassassin
+  ipfiredist tripwire
+#  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/*
 }
 
@@ -1005,15 +979,15 @@ EOF
 		;;
 	  paks)
 		cat <<EOF > .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
@@ -1062,6 +1036,13 @@ pxe)
 lang)
 	update_langs
 	;;
+packages)
+	case "$2" in
+		sign)
+			sign_packages
+			;;
+	esac
+	;;
 "")
 	clear
 	svn info