From: delaco <delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Fri, 29 Sep 2006 14:42:04 +0000 (+0000)
Subject: Fix fuer die packages_list.txt...
X-Git-Tag: v2.3-beta1~958
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f522e3076bd5ed0b858ac687238a272512801ded

Fix fuer die packages_list.txt...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@296 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 80f9ac7e34..87a8f6e589 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -107,7 +107,6 @@
 * hdparm-6.3
 * htop-0.6.2
 * httpd-2.2.2
-* httpd-2.2.2-config
 * iana-etc-2.00
 * ibod
 * iftop-0.17
diff --git a/make.sh b/make.sh
index 286bd33277..bde7ae960f 100644
--- a/make.sh
+++ b/make.sh
@@ -834,12 +834,12 @@ buildpackages() {
 	fi
   done
   echo "== List of softwares used to build $NAME Version: $VERSION ==" > $BASEDIR/doc/packages-list.txt
-  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipfire$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$' \
+  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipfire$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$' \
 	$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
 
-  # Create ISO for CDRom and USB-superfloppy
+  # Create ISO for CDROM
   ipcopmake cdrom
   rm -f $LFS/install/images/*usb*
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1