From 65f8f30f72cbf8173eab446e3f535f984e77d64f Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 9 May 2007 09:27:05 +0000 Subject: [PATCH] JFFS2-Dateisystem hinzugefuegt fuer eventuelle Flash-Version der Firewall. Installer braucht nichtmehr die Font einzustellen. Oinkmasterscript war nicht in der ISO. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@545 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/kernel/kernel.config.i586 | 84 +++++++++++++++++++++++++- config/kernel/kernel.config.i586.smp | 84 +++++++++++++++++++++++++- config/rootfiles/common/mtd | 1 + config/rootfiles/common/oinkmaster | 2 +- doc/packages-list.txt | 12 ++++ lfs/mtd | 89 ++++++++++++++++++++++++++++ make.sh | 2 + src/install+setup/install/main.c | 2 - 8 files changed, 269 insertions(+), 7 deletions(-) create mode 100644 config/rootfiles/common/mtd create mode 100644 lfs/mtd diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index b7b89b7c8f..dd88f74200 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.50-ipfire -# Sun May 6 14:35:41 2007 +# Wed May 9 08:33:53 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -642,7 +642,75 @@ CONFIG_CONNECTOR=m # # Memory Technology Devices (MTD) # -# CONFIG_MTD is not set +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_PARTITIONS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_TS5500 is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set # # Parallel port support @@ -1817,6 +1885,18 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_EMBEDDED is not set diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index 1a813b92e9..9df9beb5ea 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.50-ipfire -# Sun May 6 14:36:07 2007 +# Wed May 9 08:34:23 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -648,7 +648,75 @@ CONFIG_CONNECTOR=m # # Memory Technology Devices (MTD) # -# CONFIG_MTD is not set +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_PARTITIONS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_TS5500 is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set # # Parallel port support @@ -1820,6 +1888,18 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_EMBEDDED is not set diff --git a/config/rootfiles/common/mtd b/config/rootfiles/common/mtd new file mode 100644 index 0000000000..3940cd759d --- /dev/null +++ b/config/rootfiles/common/mtd @@ -0,0 +1 @@ +sbin/mkfs.jffs2 diff --git a/config/rootfiles/common/oinkmaster b/config/rootfiles/common/oinkmaster index c5251958b9..be14b54d60 100644 --- a/config/rootfiles/common/oinkmaster +++ b/config/rootfiles/common/oinkmaster @@ -1,2 +1,2 @@ -#usr/local/bin/oinkmaster.pl +usr/local/bin/oinkmaster.pl var/ipfire/snort/oinkmaster.conf diff --git a/doc/packages-list.txt b/doc/packages-list.txt index ef324a55e9..c1f6e9e2b5 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -55,6 +55,7 @@ * cdrtools-2.01 * cftp-0.12 * clamav-0.90.2 +* clamav-0.90.2 * coreutils-5.96 * cpio-2.6 * cups-1.2.2 @@ -82,6 +83,7 @@ * fcpci-suse93-3.11-07 * fcron-3.0.1 * fetchmail-6.3.4 +* ffmpeg-20051126 * file-4.17 * findutils-4.2.27 * flex-2.5.33 @@ -153,6 +155,7 @@ * linuxigd-0.95 * logrotate-3.7.1 * logwatch_7.3.1 +* lynx2.8.5 * lzo-2.02 * m4-1.4.4 * mailx-12.0 @@ -166,7 +169,9 @@ * mktemp-1.5 * mldonkey-2.7.7 * module-init-tools-3.2.2 +* mpeg2dec-20050802 * mpg123-0.59r +* mtd-CVS-20070507 * mtools-3.9.10 * mysql-5.0.24a * nano-1.2.5 @@ -180,6 +185,7 @@ * nmap-4.03 * noip_updater_v1.6 * ntfs-3g-1.0 +* ntop-3.2 * ntp-4.2.2 * ocaml-3.09.2 * oinkmaster-2.0 @@ -200,8 +206,10 @@ * postfix-2.2.11 * ppp-2.4.4 * pptp-1.7.1 +* procmail-3.22 * procps-3.2.6 * psmisc-22.2 +* razor-agents-2.81 * readline-5.1 * reiser4progs-1.0.5 * reiserfsprogs-3.6.19 @@ -245,10 +253,14 @@ * util-linux-2.12r * vim-7.0 * vlan.1.9 +* vlc-0.8.5 * web-cyradm-0.5.5-CVS-for-ipfire * wget-1.10.2 * whatmask-1.2 * wireless_tools.28 +* wput-0.6 +* xinetd-2.3.14 * xmbmon205 +* xvidcore-1.1.0 * zaptel-1.4.0 * zlib-1.2.3 diff --git a/lfs/mtd b/lfs/mtd new file mode 100644 index 0000000000..0d54ad239d --- /dev/null +++ b/lfs/mtd @@ -0,0 +1,89 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = CVS-20070507 + +THISAPP = mtd-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/mtd +ifeq "$(LFS_PASS)" "install" + TARGET = $(DIR_INFO)/$(THISAPP)-install +else + TARGET = $(DIR_INFO)/$(THISAPP) +endif + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 788e4255023e325172ad42a26f4685bb + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + +ifeq "$(LFS_PASS)" "install" + cd $(DIR_APP)/util && make mkfs.jffs2 CFLAGS="$(CFLAGS) -I ../include -I/opt/$(MACHINE)-uClibc/include" \ + LDFLAGS=-static + cd $(DIR_APP)/util && install -m 755 mkfs.jffs2 /install/initrd/sbin/mkfs.jffs2 +else + cd $(DIR_APP)/util && make mkfs.jffs2 CFLAGS="$(CFLAGS) -I ../include" + cd $(DIR_APP)/util && install -m 755 mkfs.jffs2 /sbin/mkfs.jffs2 +endif + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 8a1b983222..d0680400af 100644 --- a/make.sh +++ b/make.sh @@ -298,6 +298,7 @@ buildbase() { lfsmake2 man lfsmake2 mktemp lfsmake2 modutils + lfsmake2 mtd lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc @@ -558,6 +559,7 @@ buildinstaller() { installmake util-linux installmake pciutils installmake zlib + installmake mtd installmake wget installmake hwdata installmake kudzu diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 5dc53bbc20..85c021b0a2 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -155,8 +155,6 @@ int main(int argc, char *argv[]) strcpy(shortlangname, shortlangnames[choice]); fprintf(flog, "Selected language: %s\n", shortlangname); - mysystem("/bin/setfont lat0-16"); - newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN ); newtPushHelpLine(ctr[TR_HELPLINE]); sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN); -- 2.39.2