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 80f9ac7e34dc40fa418a611ff975a4dd23ceac8b..87a8f6e589e0e9b17326544bc1f761768048d19b 100644 (file)
--- 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 286bd332773cf46ac7f09106f3200e089886297f..bde7ae960f985dfa18b263ed4624ba6ee885d2e2 100644 (file)
--- 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