Zwischencommit...

Typo von Meisterwinter behoben.
Clamav Update.
Neuen Source-Server unter source.ipfire.eu in Betrieb genommen.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@338 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-11-02 23:59:32 +00:00
parent 0afc6d839b
commit 5bd13f0148
13 changed files with 58 additions and 39 deletions

View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16.27
# Sat Oct 21 21:08:41 2006
# Linux kernel version: 2.6.16
# Fri Nov 3 04:37:54 2006
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
@@ -1533,7 +1533,11 @@ CONFIG_VIDEO_SELECT=y
CONFIG_VGA_CONSOLE=y
# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
CONFIG_FRAMEBUFFER_CONSOLE=m
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
#
# Logo configuration
@@ -1541,6 +1545,10 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_LOGO is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Bootsplash configuration
#
#
# Sound
#
@@ -1730,7 +1738,11 @@ CONFIG_USB_XUSBATM=m
#
# File systems
#
# CONFIG_EXT2_FS is not set
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y

View File

@@ -1522,6 +1522,10 @@ CONFIG_VGA_CONSOLE=y
# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
#
# Bootsplash configuration
#
#
# Sound
#
@@ -1714,7 +1718,11 @@ CONFIG_MMC_WBSD=m
#
# File systems
#
# CONFIG_EXT2_FS is not set
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=m
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y

View File

@@ -1,17 +1,17 @@
TIMEOUT 5000
DISPLAY message
PROMPT 1
DEFAULT vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 rw
LABEL nopcmcia
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 rw nopcmcia
LABEL nousb
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 rw nousb
LABEL nousborpcmcia
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 rw nousb nopcmcia
LABEL dma
KERNEL vmlinuz
APPEND initrd=instroot.gz root=/dev/ram0 rw
TIMEOUT 5000
DISPLAY message
PROMPT 1
DEFAULT vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=11264 rw
LABEL nopcmcia
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=11264 rw nopcmcia
LABEL nousb
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=11264 rw nousb
LABEL nousborpcmcia
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=11264 rw nousb nopcmcia
LABEL dma
KERNEL vmlinuz
APPEND initrd=instroot.gz root=/dev/ram0 ramdisk_size=11264 rw

View File

@@ -1,4 +1,4 @@
== List of softwares used to build IPFire Version: 2.0 ==
== List of softwares used to build IPFire Version: 2.1b ==
* 3c5x9setup-1.00
* Archive-Tar-1.29
* Archive-Zip-1.16

View File

@@ -22,7 +22,8 @@ URL_TUE = ftp://ftp.win.tue.nl/pub
URL_LFS_FTP = http://ftp.at.linuxfromscratch.org/pub/lfs/lfs-packages/5.1.1
URL_LFS = http://www.linuxfromscratch.org/patches/downloads
URL_SFNET = http://kent.dl.sourceforge.net/sourceforge
URL_IPFIRE = http://mirror.ipfire.org/source
URL_IPFIRE = http://source.ipfire.eu/othersrc
URL_TOOLCHAIN = http://source.ipfire.eu/toolchain
URL_IPCOP = http://ipcop.ath.cx
# Default compiler optimizations.

View File

@@ -113,4 +113,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp /usr/lib/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin; \
cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE).iso
-c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(IPFVER).iso

View File

@@ -26,7 +26,7 @@
include Config
VER = 0.88.4
VER = 0.88.5
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7759784aa4506b314e6543e0f2a8587b
$(DL_FILE)_MD5 = d62376205647b208eba4191dde821830
install : $(TARGET)

View File

@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-e 's|HAVE_MII 0|HAVE_MII 1|g' config.h
cd $(DIR_APP) && sed -i -e 's|# HAVE_IP_TOOLS=0|HAVE_IP_TOOLS=1|g' \
-e 's|# HAVE_MII=0|HAVE_MII=1|g' config.make
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make
cd $(DIR_APP) && make update
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -85,9 +85,9 @@ ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && ./configure --without-gpm-support --host $(MACHINE)-uclibc
cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/install/include/slang%' Makefile
cd $(DIR_APP) && make libnewt.a
cd $(DIR_APP) && install -m 0644 libnewt.a /install/lib
-mkdir -p /install/include
cd $(DIR_APP) && install -m 0644 newt.h /install/include/newt.h
cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib
-mkdir -p /install/$(MACHINE)-uClibc/include
cd $(DIR_APP) && install -m 0644 newt.h /install/$(MACHINE)-uClibc/include/newt.h
else
cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support
cd $(DIR_APP) && sed -i \

View File

@@ -82,9 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP)/lib && CFLAGS="-Os -fomit-frame-pointer" ./configure
cd $(DIR_APP)/lib && CFLAGS="-Os -fomit-frame-pointer" make $(MAKETUNING)
-mkdir -p /install/include/pci
cd $(DIR_APP) && install -m 0644 lib/libpci.a /install/lib
cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /install/include/pci
-mkdir -p /install/$(MACHINE)-uClibc/include/pci
cd $(DIR_APP) && install -m 0644 lib/libpci.a /install/$(MACHINE)-uClibc/lib
cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /install/$(MACHINE)-uClibc/include/pci
else
cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING)
cd $(DIR_APP) && make PREFIX=/usr install

View File

@@ -100,7 +100,5 @@ endif
cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/arith.h
cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/mg2ec.h
cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/mg2ec_const.h
# find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
# find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -24,7 +24,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.0" # Version number
VERSION="2.0b" # Version number
SLOGAN="www.ipfire.eu" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10 # Nice level
@@ -890,11 +890,11 @@ gettoolchain)
# arbitrary name to be updated in case of new toolchain package upload
PACKAGE=$SNAME-$VERSION-toolchain-$BUILDMACHINE
if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then
URL_IPFIRE=`grep URL_IPFIRE lfs/Config | awk '{ print $3 }'`
URL_TOOLCHAIN=`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'`
test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
cd $BASEDIR/cache/toolchains
wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null
wget $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
if [ $? -ne 0 ]; then
echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
else