mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
Update:
* KERNEL 2.4.33 Geändert: * Uploadverhalten überarbeitet. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@245 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.4.32
|
||||
VER = 2.4.33
|
||||
|
||||
THISAPP = linux-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -75,7 +75,7 @@ net4801.kernel.patch_2.4.31 = $(URL_IPFIRE)/net4801.kernel.patch_2.4
|
||||
netfilter-layer7-v2.1.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.1.tar.gz
|
||||
#bootsplash-3.0.7-2.4.31-vanilla.diff = $(URL_IPFIRE)/bootsplash-3.0.7-2.4.31-vanilla.diff
|
||||
|
||||
$(DL_FILE)_MD5 = f01163f627f47030a50dab6976df2eb7
|
||||
$(DL_FILE)_MD5 = 4d258d4267de64f0a22e23f6ab026990
|
||||
openswan-1.0.10rc2.tar.gz_MD5 = 20d51ff963da78f826f4e0f0ebc4bcef
|
||||
patch-o-matic-ng-20060206.tar.bz2_MD5 = eca9893afb753e331caddfe63142b566
|
||||
iptables-1.3.5.tar.bz2_MD5 = 00fb916fa8040ca992a5ace56d905ea5
|
||||
|
||||
42
make.sh
42
make.sh
@@ -1193,7 +1193,7 @@ svn)
|
||||
exit 1
|
||||
fi
|
||||
echo -n "Compress files..."
|
||||
tar cfz ipfire-source-`date +'%Y-%m-%d'`-r`svn info | grep Revision | cut -c 11-`.tar.gz ipfire-source
|
||||
tar cfz ipfire-source-r$SVN_REVISION.tar.gz ipfire-source
|
||||
if [ "$?" -eq "0" ]; then
|
||||
echo ".Done!"
|
||||
else
|
||||
@@ -1338,28 +1338,36 @@ upload)
|
||||
case "$2" in
|
||||
iso)
|
||||
echo -e "Uploading the iso to $IPFIRE_FTP_URL_EXT."
|
||||
ncftpls -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT ftp://$IPFIRE_FTP_URL_EXT$IPFIRE_FTP_PATH_EXT/ | grep $SVN_REVISION
|
||||
if [ "$?" -eq "1" ]; then
|
||||
cp $BASEDIR/ipfire-install-$VERSION.i386.iso $BASEDIR/ipfire-install-$VERSION.i386-r`svn info | grep Revision | cut -c 11-`.iso
|
||||
md5sum ipfire-install-$VERSION.i386-r$SVN_REVISION.iso > ipfire-install-$VERSION.i386-r$SVN_REVISION.iso.md5
|
||||
ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386-r$SVN_REVISION.iso
|
||||
ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386-r$SVN_REVISION.iso.md5
|
||||
ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-source-*-r$SVN_REVISION.tar.gz
|
||||
if [ "$?" -eq "0" ]; then
|
||||
echo -e "The ISO of Revision $SVN_REVISION was successfully uploaded to the ftp server."
|
||||
else
|
||||
echo -e "There was an error while uploading the iso to the ftp server."
|
||||
exit 1
|
||||
fi
|
||||
cat <<EOF > .ftp-commands
|
||||
mkdir $IPFIRE_FTP_PATH_EXT
|
||||
ls -lah
|
||||
quit
|
||||
EOF
|
||||
ncftp -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT < .ftp-commands
|
||||
rm -f .ftp-commands
|
||||
md5sum ipfire-install-$VERSION.i386.iso > ipfire-install-$VERSION.i386.iso.md5
|
||||
ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386.iso
|
||||
ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386.iso.md5
|
||||
ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-source-r$SVN_REVISION.tar.gz
|
||||
ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-sources-cd-$VERSION.$MACHINE.iso
|
||||
if [ "$?" -eq "0" ]; then
|
||||
echo -e "The iso of Revision $SVN_REVISION was successfully uploaded to $IPFIRE_FTP_URL_EXT$IPFIRE_FTP_PATH_EXT/."
|
||||
else
|
||||
echo -e "File with name ipfire-install-$VERSION.i386-r$SVN_REVISION.iso already exists on the ftp server!"
|
||||
echo -e "There was an error while uploading the iso to the ftp server."
|
||||
exit 1
|
||||
fi
|
||||
rm -f ipfire-install-$VERSION.i386-r$SVN_REVISION.iso{,.md5}
|
||||
;;
|
||||
paks)
|
||||
cat <<EOF > .ftp-commands
|
||||
mkdir $IPFIRE_FTP_PATH_PAK
|
||||
ls -lah
|
||||
quit
|
||||
EOF
|
||||
ncftp -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK < .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/*
|
||||
if [ "$?" -eq "0" ]; then
|
||||
echo -e "The packages were successfully uploaded to the ftp server."
|
||||
echo -e "The packages were successfully uploaded to $IPFIRE_FTP_URL_PAK$IPFIRE_FTP_PATH_PAK/."
|
||||
else
|
||||
echo -e "There was an error while uploading the packages to the ftp server."
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user