ipfiredist() {
if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
- cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/sbin/
+ cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/local/bin
chroot $LFS /tools/bin/env -i HOME=/root \
TERM=$TERM PS1='\u:\w\$ ' \
PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
else
exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
fi
- if [ -e $BASEDIR/packages ]; then
- mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
- else
- mkdir -p $BASEDIR/packages
- mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
- fi
+# test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+# mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
return 0
}
ipcopmake libsafe
ipcopmake 3c5x9setup
echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
+## Zuerst die Libs und dann die Programme. Ordnung muss sein!
+ ipcopmake berkeley
+ ipcopmake libtiff
+ ipcopmake libjpeg
+ ipcopmake libxml2
+ ipcopmake spandsp
+ ipcopmake lzo
ipcopmake pkg-config
ipcopmake glib
- ipcopmake wget
- ipcopmake berkeley-DB
ipcopmake xampp
- ipcopmake bridge-utils
ipcopmake pam
ipcopmake pammysql
ipcopmake saslauthd PASS=1
ipcopmake openldap
ipcopmake saslauthd PASS=2
-# ipcopmake samba
+ ipcopmake xinetd
+ ipcopmake ghostscript
+ ipcopmake cups
+ ipcopmake samba
+ ipcopmake sudo
ipcopmake mc
- ipcopmake postfix
- ipcopmake stund
- ipcopmake lpd
ipcopmake pwlib
ipcopmake openh323
+ ipcopmake wget
+ ipcopmake bridge-utils
+ ipcopmake postfix
+ ipcopmake fetchmail
+ ipcopmake cyrusimap
+ ipcopmake stund
+# ipcopmake lpd
+ ipcopmake openvpn
+ ipcopmake asterisk
+ ipcopmake edonkeyclc
+ ipcopmake sane
+ ipcopmake lame
+ ipcopmake gnump3d
+ ipcopmake clamav
+# ipcopmake spamassassin
+ ipcopmake rsync
+ ipcopmake tcpwrapper
# wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
# ipcopmake hddtemp
-
+# ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
}
buildinstaller() {
grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|setup$\|stage2$\|smp$\|tools$\|tools1$\|tools2$' \
$BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
rm -f $BASEDIR/doc/packages-list
- # packages-list.txt is ready to be displayed for wiki page IPCopSoftwares
+ # packages-list.txt is ready to be displayed for wiki page
# Create ISO for CDRom and USB-superfloppy
ipcopmake cdrom
cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
-
+
# Build IPFire packages
- ipfiredist postfix
+ ipfiredist asterisk
+ ipfiredist cyrusimap
+ ipfiredist fetchmail
+ ipfiredist gnump3d
+ ipfiredist libtiff
+ ipfiredist libxml2
ipfiredist mc
+ ipfiredist postfix
+ ipfiredist pwlib
+ ipfiredist sane
+ ipfiredist spandsp
+ ipfiredist sudo
+ ipfiredist xampp
+ ipfiredist xinetd
+ test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+ cp -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+
# Cleanup
stdumount
rm -rf $BASEDIR/build/tmp/*
entershell
;;
changelog)
- echo "Building doc/Changelog from CVS"
- # cv2cl script come from http://www.red-bean.com/cvs2cl/
- if [ ! -s $BASEDIR/doc/CVS/Tag ]; then
- BRANCHOPTS=""
- else
- BRANCH=`cat $BASEDIR/doc/CVS/Tag`
- BRANCH=${BRANCH:1}
- BRANCHOPTS="--follow-only $BRANCH"
- fi
-
- $BASEDIR/tools/cvs2cl.pl --gmt --show-dead $BRANCHOPTS -f $BASEDIR/doc/ChangeLog
- rm -f $BASEDIR/doc/ChangeLog.bak
- echo
- echo "Commit the change now to update CVS"
+ echo -n "Loading new Changelog from SVN: "
+ svn log > doc/ChangeLog
+ echo "Finished!"
;;
check)
echo "Checking sources files availability on the web"
fi
;;
dist)
- echo "Building source package from CVS, list of changed files, MD5 of release files"
- if [ ! -s $BASEDIR/doc/CVS/Tag ]; then
- BRANCH=""
- BRANCHOPTS="-D `date +'%Y-%m-%d'`"
- else
- BRANCH=`cat $BASEDIR/doc/CVS/Tag`
- BRANCH=${BRANCH:1}
- BRANCHOPTS="-r $BRANCH"
- fi
-
- rm -rf $BASEDIR/build/tmp/$SNAME-$VERSION $BASEDIR/doc/release.txt
- cd $BASEDIR/build/tmp
- # build sources tgz
- echo "Export tree $BRANCH $SNAME-$VERSION"
- cvs -z3 -d `cat $BASEDIR/CVS/Root` export $BRANCHOPTS ipcop
- if [ $? -eq 0 ]; then
- mv ipcop $SNAME-$VERSION
- tar cfz $BASEDIR/$SNAME-sources-$VERSION.tgz $SNAME-$VERSION
- cd $BASEDIR
-
- if [ ! -d $BASEDIR/build/tmp/$PREVIOUSTAG ]; then
- # export previous version to be compared with actual, this help to check wich files need to go in update
- cd $BASEDIR/build/tmp
- echo "Export tree $PREVIOUSTAG"
- cvs -z3 -d `cat $BASEDIR/CVS/Root` export -r $PREVIOUSTAG ipcop
- mv ipcop $PREVIOUSTAG
- fi
- if [ -d $BASEDIR/build/tmp/$PREVIOUSTAG -o -d $BASEDIR/build/tmp/$SNAME-$VERSION ]; then
- cd $BASEDIR/build/tmp
- echo "diff $PREVIOUSTAG <> $BRANCH $SNAME-$VERSION >doc/updated-sources.txt"
- diff -rq $PREVIOUSTAG $SNAME-$VERSION > $BASEDIR/doc/updated-sources.txt
- mv $BASEDIR/doc/updated-sources.txt $BASEDIR/doc/updated-sources.bak
- sed -e "s+Files $PREVIOUSTAG\/++" \
- -e "s+ and .*$++" \
- -e "s+src/rc.d+etc/rc.d+" \
- -e "s+^langs/+var/ipcop/langs/+" \
- -e "s+html/cgi-bin+home/httpd/cgi-bin+" $BASEDIR/doc/updated-sources.bak \
- > $BASEDIR/doc/updated-sources.txt
- rm -f $BASEDIR/doc/updated-sources.bak
- fi
- fi
+ echo "Building source package from SVN: "
+ svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force
+ tar cfz ipfire-source-`date +'%Y-%m-%d'`-r`svn info | grep Revision | cut -c 11-`.tar.gz ipfire-source
+ rm ipfire-source/ -r
;;
newpak)
- # create structure for $VERSION update
- echo -e "What is the name of the new package?"
- read $NAME
- if [ ! -f "lfs/$NAME" ]; then
- echo "`date -u '+%b %e %T'`: Creating directory src/paks/$NAME"
- mkdir -p src/paks/$NAME
- cd src/paks/$NAME
+ # create structure for a new package
+ echo -e "Name of the new package: $2"
+ if [ ! -f "lfs/$2" ]; then
+ echo "`date -u '+%b %e %T'`: Creating directory src/paks/$2"
+ mkdir -p src/paks/$2
+ cd src/paks/$2
echo "`date -u '+%b %e %T'`: Creating files"
- cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$NAME
+ cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2
+
touch ROOTFILES
touch CONFFILES
touch {,un}install.sh
-
-## install.sh
+ ## install.sh
echo '#!/bin/bash' > install.sh
echo '#' >> install.sh
echo '#################################################################' >> install.sh
echo '#' >> install.sh
echo '# Extract the files' >> install.sh
echo 'tar xfz files.tgz -C /' >> install.sh
- echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$NAME' >> install.sh
-
-## uninstall.sh
+ echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2' >> install.sh
+ ## uninstall.sh
echo '#!/bin/bash' > uninstall.sh
echo '#################################################################' >> uninstall.sh
echo '# #' >> uninstall.sh
echo '#' >> uninstall.sh
echo '# Delete the files' >> uninstall.sh
echo '## Befehl fehlt noch' >> uninstall.sh
- echo 'rm -f /opt/pakfire/installed/ROOTFILES.$NAME' >> uninstall.sh
-
+ echo 'rm -f /opt/pakfire/installed/ROOTFILES.$2' >> uninstall.sh
echo "`date -u '+%b %e %T'`: Adding files to SVN"
- cd - && svn add src/paks/$NAME
+ cd - && svn add lfs/$2 && svn add src/paks/$2
+
+ echo -n "Do you want to remove the folders? [y/n]"
+ read REM
+ if [ "$REM" == "y" ]; then
+ echo "Removing the folders..."
+ svn del src/paks/$2 --force
+ else
+ echo "Folders are kept."
+ fi
else
- echo "$NAME already exists"
+ echo "$2 already exists"
fi
exit 0
;;
fi
cd -
;;
-rootfiles)
- PREVIOUSVERSION=`echo $PREVIOUSTAG | sed -e 's/IPCOP_v//' -e 's/_FINAL//' -e 's/_/\./g'`
- # make md5 list of actual build
- # some packages include a timestamp (kernel/perl/python/vim and more), so md5 vary at each build
- # anyway, it is sometime usable after a patch or a minor upgrade to know wich files include in update
- if [ ! -f "$BASEDIR/build/install/cdrom/$SNAME-$VERSION.tgz" ]; then
- echo "need cdrom be build to read include files list, use ./make.sh build before."
- else
- tar tzf $BASEDIR/build/install/cdrom/$SNAME-$VERSION.tgz > $BASEDIR/updates/$VERSION/FILES.tmp
- cd $BASEDIR/build
- rm -f $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5
- for line in `cat $BASEDIR/updates/$VERSION/FILES.tmp`; do
- if [ -f "$line" -a ! -L "$line" ]; then
- md5sum "$line" >> $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5
- fi
- done
- diff $BASEDIR/updates/$PREVIOUSVERSION/FILES-$MACHINE-$PREVIOUSVERSION.md5 \
- $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5 \
- > $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff
- awk '$1==">" {print $3}' $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff \
- > $BASEDIR/updates/$VERSION/ROOTFILES.add.$MACHINE
- awk '$1=="<" {print $3}' $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff \
- > $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE.tmp
- rm -f $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE
- for line in `cat $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE.tmp`; do
- # a file is only removed when not in add file
- if ( ! grep -q "^$line$" $BASEDIR/updates/$VERSION/ROOTFILES.add.$MACHINE ); then
- echo $line >> $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE
- fi
- done
- rm -f $BASEDIR/updates/$VERSION/{FILES.tmp,FILES-*.diff,ROOTFILES.remove.*.tmp}
- fi
- exit 0
- ;;
toolchain)
prepareenv
buildtoolchain
URL_IPFIRE=`grep URL_IPFIRE lfs/Config | awk '{ print $3 }'`
echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
cd $BASEDIR/cache
- wget -c $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
+ wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
if [ $? -ne 0 ]; then
echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
else
fi
fi
;;
+update)
+ echo "Load the latest source-files:"
+ svn update
+ ;;
+commit)
+ echo "Upload the changed files:"
+ ./make.sh changelog
+ svn commit
+ ;;
*)
- echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newupdate|prefetch|rootfiles|shell|toolchain}"
+ echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|dist|gettoolchain|newpak|prefetch|shell|toolchain|update}"
cat doc/make.sh-usage
exit 1
;;
projects / ipfire-2.x.git / blobdiff