X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=tools%2Fmake-functions;h=cc66f335dd71c85f71420c7b0862014124a923b1;hp=f3ce22007b18fbf41730beec18d808c4a9b4db11;hb=822c5bd04ccc2641f876bb13b7bafcd967570a26;hpb=71e323840bc1da5dbaa3203b0e7051fea8f9b10f

diff --git a/tools/make-functions b/tools/make-functions
index f3ce22007b..cc66f335dd 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -395,25 +395,31 @@ ipfiremake() {
 }
 
 ipfiredist() {
-	if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
-		echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
-		chroot $LFS /tools/bin/env -i 	HOME=/root \
-						TERM=$TERM PS1='\u:\w\$ ' \
-						PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
-						VERSION=$VERSION \
-						CONFIG_ROOT=$CONFIG_ROOT \
-						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
-						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-						CCACHE_DIR=/usr/src/ccache CCACHE_HASHDIR=1 \
-						KVER=$KVER IPFVER="$IPFVER" \
-						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
-		    /bin/bash -x -c "cd /usr/src/lfs && \
-		    make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1
-		if [ $? -ne 0 ]; then
-			exiterror "Packaging $1"
-		fi
+	lfsmakecommoncheck $*
+	[ $? == 1 ] && return 0
+	
+	local PKG_TIME_START=`date +%s`
+	chroot $LFS /tools/bin/env -i 	HOME=/root \
+					TERM=$TERM PS1='\u:\w\$ ' \
+					PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
+					VERSION=$VERSION \
+					CONFIG_ROOT=$CONFIG_ROOT \
+					NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
+					CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
+					CCACHE_DIR=/usr/src/ccache CCACHE_HASHDIR=1 \
+					KVER=$KVER IPFVER="$IPFVER" \
+					BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
+					/bin/bash -x -c "cd /usr/src/lfs && \
+					make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1
+
+	local COMPILE_SUCCESS=$?
+	local PKG_TIME_END=`date +%s`
+
+	if [ $COMPILE_SUCCESS -ne 0 ]; then
+		beautify result FAIL $[ $PKG_TIME_END - $PKG_TIME_START ]
+		exiterror "Packaging $*";
 	else
-		exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
+		beautify result DONE $[ $PKG_TIME_END - $PKG_TIME_START ]
 	fi
 	return 0
 }
@@ -463,21 +469,17 @@ batch_script() {
 		export IPFIRE_START_TIME=`date`
 		evaluate 1
 
-		echo -ne "### RUNNING SVN-UPDATE"
+		echo "### RUNNING SVN-UPDATE"
 		$0 svn update
 		evaluate 1 mail_me SVNUPDATE
 
 		echo "### EXPORT SOURCES"
 		$0 svn dist
 		evaluate 1 mail_me SVNDIST
-
-		echo "### RUNNING PREFETCH"
-		$0 downloadsrc | grep -q "md5 difference"
-		evaluate 1 mail_me PREFETCH
 	fi
 
 	echo "### RUNNING BUILD"
-	$0 build
+	$0 build --devel
 	evaluate 1 mail_me ERROR
 
 	echo "### UPLOADING ISO"
@@ -485,11 +487,12 @@ batch_script() {
 	evaluate 1 mail_me ISO
 	
 	echo -ne "### UPLOADING PAKS"
+	$0 packages sign
 	$0 upload paks
 	evaluate 1 mail_me PAKS
 
-	echo -n "${BOLD}***SUCCESS!${NORMAL}"
-	evaluate 0 mail_me SUCCESS
+	echo -ne "${BOLD}***SUCCESS!${NORMAL}"
+	mail_me success
 	exit 0
 }
 
@@ -507,7 +510,7 @@ mail_me() {
 			SUBJECT="SUCCESS: IPFIRE-BUILD R$SVN_REVISION on `hostname`"
 			cat <<END > /tmp/ipfire_mail_body
 Building IPFire on `hostname` in Revision $SVN_REVISION was successfull!
-You can find the ISO on your ftp server.
+You can find the ISO on your ftp server if you told the script where it is.
 
 Statistics:
 -----------
@@ -540,12 +543,12 @@ END
 	esac
 	tar cfz $ATTACHMENT log/_build*
 	cat /tmp/ipfire_mail_body | tools/sendEmail -q \
-		-f $IPFIRE_MAIL_FROM \
-		-t $IPFIRE_MAIL_REPORT \
+		-f $MAIL_USER \
+		-t $MAIL_TO \
 		-u $SUBJECT \
-		-s $IPFIRE_MAIL_SERVER:25 \
-		-xu $IPFIRE_MAIL_USER \
-		-xp $IPFIRE_MAIL_PASS \
+		-s $MAIL_SERVER:25 \
+		-xu $MAIL_USER \
+		-xp $MAIL_PASS \
 		-l log/_build.mail.log \
 		-a $ATTACHMENT # -v
 	if [ "$?" -eq "0" ]; then
@@ -630,7 +633,7 @@ make_config() {
 		read -s MAIL_PASS
 		
 	fi
-	echo -ne "${BOLD}***Saving...${NORMAL}"
+	echo -ne "\n${BOLD}***Saving...${NORMAL}"
 	cat <<END > $BASEDIR/.config
 ### iso server
 FTP_ISO_URL=$FTP_ISO_URL
@@ -696,3 +699,36 @@ reload_tftpd() {
 	fi
 	return 1
 }
+
+update_langs() {
+		echo -ne "Checking the translations for missing or obsolete strings..."
+		chmod 755 $BASEDIR/tools/{check_strings.pl,sort_strings.pl,check_langs.sh}
+		$BASEDIR/tools/sort_strings.pl en
+		$BASEDIR/tools/sort_strings.pl de
+		$BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en
+		$BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
+		$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
+		beautify message DONE
+}
+
+sign_packages() {
+	if gpg --list-key 64D96617 ; then
+		if [ -d "$BASEDIR/packages" ]; then
+			cd $BASEDIR/packages
+	  	for i in `ls $BASEDIR/packages`; do
+	  		echo -n "Signing $i"
+				echo $GPG_PASSPHRASE | gpg --sign --armor -u 64D96617 --passphrase-fd 0 $i
+				if [ "$?" -eq "0" ]; then
+					beautify message DONE
+					mv -f $i.asc $i
+				else
+					beautify message FAIL
+				fi
+	  	done
+	  	cd -
+  	fi
+	else
+		echo -n "You don't have the secret key to sign ipfire's packages!"
+		beautify message FAIL
+	fi
+}