Direkt ein Fix fuer eben genannte Sachen...
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Wed, 30 Aug 2006 18:56:53 +0000 (18:56 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Wed, 30 Aug 2006 18:56:53 +0000 (18:56 +0000)
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@265 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

doc/ChangeLog
lfs/boot.img
make.sh
src/pakfire/lib/get_mirror.sh
src/scripts/packager

index 9064a2c..ac7ac62 100644 (file)
@@ -1,4 +1,10 @@
 ------------------------------------------------------------------------
+r264 | ms | 2006-08-30 20:29:15 +0200 (Wed, 30 Aug 2006) | 3 lines
+
+Geaendert:
+  * Pakete haben jetzt die Endung .ipfire
+  * Kleiner Logikfehler im ConnScheduler
+------------------------------------------------------------------------
 r263 | delaco | 2006-08-30 15:10:09 +0200 (Wed, 30 Aug 2006) | 1 line
 
 Typo in der Make.sh, die die LibMAD nicht bauen lies. Sorry :(
index 4e71827..5156c04 100644 (file)
@@ -59,7 +59,7 @@ $(TARGET) :
                done; \
                losetup $$LOOPDEV /install/images/boot-$(VERSION).img; \
                mount -t msdos $$LOOPDEV /install/mnt; \
-               sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
+               sed -e 's/boot IPFire/boot IPFire $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
                        > /install/mnt/message; \
                cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/mnt/syslinux.cfg; \
                cp /boot/vmlinuz-installer                  /install/mnt/vmlinuz; \
diff --git a/make.sh b/make.sh
index ada672e..b466869 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -344,7 +344,7 @@ ipcopmake() {
 
 ipfiredist() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
-#         if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | grep $1` ]; then
+#         if [ ! `ls -w1 $BASEDIR/packages/*.ipfire | grep $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\$ ' \
@@ -866,7 +866,7 @@ buildpackages() {
                cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
        fi
   done
-  cd $BASEDIR/packages; ls -w1 *.tar.gz | awk -F ".tar.gz" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
+  cd $BASEDIR/packages; ls -w1 *.ipfire | awk -F ".ipfire" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
   echo "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
@@ -1191,6 +1191,7 @@ svn)
                        exit 1
                fi
                chmod 755 $0
+               tail log/_build.svn.update.log
                exit 0
          ;;
          commit|ci)
index 0644020..bf90268 100644 (file)
@@ -7,9 +7,9 @@ get_mirror() {
 
 cd $PAKHOME/cache
 
-#if [ -e $PAKHOME/cache/$SERVERS_LIST ]
-# then rm -f $PAKHOME/cache/$SERVERS_LIST
-#fi
+if [ -e $PAKHOME/cache/$SERVERS_LIST ]
+ then rm -f $PAKHOME/cache/$SERVERS_LIST
+fi
 
 if /usr/bin/wget $H_MIRROR >$LOG 2>&1
  then
index f99d409..b634c7c 100644 (file)
@@ -26,7 +26,7 @@ else
 
        cd /    && rm -rf /tmp/*
        cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
-       tar cvz ../$PROG-${VER}_$PAK_VER.$EXT files.tgz install.sh uninstall.sh ROOTFILES depends.txt
+       tar cfz ../$PROG-${VER}_$PAK_VER.$EXT files.tgz install.sh uninstall.sh ROOTFILES depends.txt
 
        cd /install/packages && md5sum $PROG*.$EXT > $PROG-${VER}_$PAK_VER.$EXT.md5
        cd /install/packages && md5sum $PROG*.$EXT >> all-progs.md5