webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Zwischencommit fuer LFS.

Browse Source 
EXPERIMENTELLE KERNEL-KONFIGURATION.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@317 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-10-12 20:44:44 +00:00
parent a5ee5623d2
commit 6b8cff4166
13 changed files with 2893 additions and 1934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/kernel/aboot.conf
View File

@@ -1,4 +0,0 @@
0:vmlinuz ide=nodma initrd=instroot.gz root=/dev/ram0 rw
1:vmlinuz ide=nodma initrd=instroot.gz root=/dev/ram0 rw nopcmcia
2:vmlinuz ide=nodma initrd=instroot.gz root=/dev/ram0 rw nousb
3:vmlinuz ide=nodma initrd=instroot.gz root=/dev/ram0 rw nopcmcia nousb

2307
config/kernel/kernel.config.i586
View File

File diff suppressed because it is too large Load Diff

2293
config/kernel/kernel.config.i586.smp
View File

File diff suppressed because it is too large Load Diff

7
html/cgi-bin/index.cgi
View File

@@ -65,6 +65,13 @@ my $dialButtonDisabled = "disabled='disabled'";
&Header::openpage($Lang::tr{'main page'}, 1, $refresh);
&Header::openbigbox('', 'center');
&Header::openbox('100%', 'center', "Willkommen");
print <<END
<h2>Willkommen in ihrem Administrationsmenue</h2>
<p>In diesem Menue koennen Sie ihren IPFire administrieren.</p>
END
;
&Header::closebox();
&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {

2
lfs/ed
View File

@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-mkstemp-1.patch
cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix="" --disable-nls
cd $(DIR_APP) && make
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

16
lfs/expat
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
# Modifications by: #
# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
# $Id: expat,v 1.3.2.2 2005/02/05 15:38:14 gespinasse Exp $
# #
###############################################################################
###############################################################################
@@ -32,11 +26,11 @@
include Config
VER = 1.95.7
VER = 2.0.0
THISAPP = expat-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_SFNET)/expat
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2ff59c2a5cbdd21a285c5f343e214fa9
$(DL_FILE)_MD5 = d945df7f1c0868c5c73cf66ba9596f3f
install : $(TARGET)
@@ -79,7 +73,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/expat-2.0.0
cd $(DIR_APP) && install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-2.0.0
@rm -rf $(DIR_APP)
@$(POSTBUILD)

8
lfs/gdbm
View File

@@ -36,7 +36,7 @@ VER = 1.8.3
THISAPP = gdbm-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_GNU)/gdbm
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -79,8 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && sed -i 's%^prefix.*$$%prefix = /usr%' Makefile
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make BINOWN=root BINGRP=root install
cd $(DIR_APP) && make BINOWN=root BINGRP=root install-compat
@rm -rf $(DIR_APP)
@$(POSTBUILD)

20
lfs/gmp
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
# Modifications by: #
# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
# $Id: gmp,v 1.5.2.3 2005/02/05 15:38:15 gespinasse Exp $
# #
###############################################################################
###############################################################################
@@ -32,11 +26,11 @@
include Config
VER = 4.1.2
VER = 4.2
THISAPP = gmp-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_GNU)/gmp
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 01c7fbd6abbb8824a22161f6c6bbdaf0
$(DL_FILE)_MD5 = aa4a4534e8870ab8ba3c093239057cca
install : $(TARGET)
@@ -77,9 +71,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --build=$(BUILDTARGET) --disable-nls
cd $(DIR_APP) && make -j 3
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --enable-cxx --enable-mpbsd --build=$(BUILDTARGET) --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

28
lfs/linux
View File

@@ -41,10 +41,10 @@ CXXFLAGS =
ifeq "$(PASS)" ""
TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire
endif
ifeq "$(PASS)" "SMP"
ifeq "$(PASS)" "S"
TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire-smp
endif
ifeq "$(PASS)" "installer"
ifeq "$(PASS)" "I"
TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire-installer
endif
@@ -183,10 +183,10 @@ endif
ifeq "$(PASS)" ""
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config
endif
ifeq "$(PASS)" "SMP"
ifeq "$(PASS)" "S"
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).smp $(DIR_APP)/.config
endif
ifeq "$(PASS)" "installer"
ifeq "$(PASS)" "I"
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).installer $(DIR_APP)/.config
cd $(DIR_APP) && sed -i -e 's/-O2/-Os/g' Makefile
endif
@@ -201,18 +201,18 @@ endif
cd $(DIR_APP) && cp -v .config /boot/config-$(VER); \
ln -sf vmlinuz-$(VER) /boot/vmlinuz; \
ln -sf System.map-$(VER) /boot/System.map; \
cd $(DIR_APP) && make CC="$(KGCC)" modules; \
cd $(DIR_APP) && make CC="$(KGCC)" modules_install; \
elif [ "$(PASS)" = "1" ]; then \
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules; \
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install; \
elif [ "$(PASS)" = "S" ]; then \
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =/EXTRAVERSION\ =\ -smp/' Makefile; \
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage; \
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-smp; \
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-smp; \
cd $(DIR_APP) && cp -v .config /boot/config-$(VER); \
ln -sf vmlinuz-$(VER)-smp /boot/vmlinuz-smp; \
cd $(DIR_APP) && make CC="$(KGCC)" modules; \
cd $(DIR_APP) && make CC="$(KGCC)" modules_install; \
elif [ "$(PASS)" = "installer" ]; then \
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules; \
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install; \
elif [ "$(PASS)" = "I" ]; then \
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage; \
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-installer; \
cd $(DIR_APP) && cp -v .config /boot/config-$(VER); \
@@ -230,7 +230,7 @@ ifeq "$(PASS)" ""
mv -f /lib/modules/$(VER)/kernel/drivers/scsi/sym53c8xx_2/* /lib/modules/$(VER)/kernel/drivers/scsi
rm -rf /lib/modules/$(VER)/kernel/drivers/scsi/sym53c8xx_2
endif
ifeq "$(PASS)" "SMP"
ifeq "$(PASS)" "S"
rm -rf /lib/modules/$(VER)-smp/pcmcia
find /lib/modules/$(VER)-smp/ -name '*.o' -a -type f | xargs gzip -f9
@@ -245,9 +245,9 @@ endif
ifeq "$(PASS)" ""
# Only do this once on the non-SMP pass
cd $(DIR_APP) && make mandocs
-mkdir -p /usr/share/man/man9/
cd $(DIR_APP) && cp -af Documentation/man/* /usr/share/man/man9/
# cd $(DIR_APP) && make mandocs
#-mkdir -p /usr/share/man/man9/
#cd $(DIR_APP) && cp -af Documentation/man/* /usr/share/man/man9/
endif
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables*
@$(POSTBUILD)

2
lfs/net-tools
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
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make update
@rm -rf $(DIR_APP)
@$(POSTBUILD)

13
lfs/openssl
View File

@@ -26,7 +26,7 @@
include Config
VER = 0.9.7k
VER = 0.9.8d
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = be6bba1d67b26eabb48cf1774925416f
$(DL_FILE)_MD5 = 8ed1853538e1d05a1f5ada61ebf8bffa
install : $(TARGET)
@@ -73,12 +73,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
@rm -rf /etc/ssl
cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-m486/-mcpu=i386/' Configure
cd $(DIR_APP) && chmod 755 Configure
cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr 386 \
no-idea no-threads no-mdc2 no-rc5 no-ec zlib-dynamic shared
cd $(DIR_APP) && sed -i 's/^PROCESSOR= 386/PROCESSOR=386/g' Makefile
cd $(DIR_APP) && make depend
cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_manpages-1.patch
cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr shared
cd $(DIR_APP) && make MANDIR=/usr/share/man
cd $(DIR_APP) && make MANDIR=/usr/share/man install
rm -rf /etc/ssl/lib

45
lfs/pcmcia-cs → lfs/pcmciautils
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
# Modifications by: #
# ??-12-2003 Alan Hourihane <alanh@fairlite.demon.co.uk> #
# - Modified Makefile for IPCop build #
# #
# $Id: pcmcia-cs,v 1.10.2.6 2005/07/05 15:11:12 gespinasse Exp $
# #
###############################################################################
###############################################################################
@@ -32,10 +26,10 @@
include Config
VER = 3.2.8
VER = 014
THISAPP = pcmcia-cs-$(VER)
DL_FILE = $(THISAPP).tar.gz
THISAPP = pcmciautils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_SFNET)/pcmcia-cs
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(LFS_PASS)" "install"
@@ -52,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0d6d65be8896eff081aee996049afaa5
$(DL_FILE)_MD5 = 3f07c926875f6c5dcb83240f39725177
install : $(TARGET)
@@ -81,20 +75,23 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && ./Configure -n --kernel=/usr/src/linux --notrust --cardbus --pnp --apm --nox11 --srctree --ucc=gcc --kcc="$(KGCC)"
cd $(DIR_APP) && make -C cardmgr
cd $(DIR_APP) && mkdir -p /install/misc/bin
cd $(DIR_APP) && install -s -m 0755 cardmgr/cardmgr /install/misc/bin
cd $(DIR_APP) && install -s -m 0755 cardmgr/cardctl /install/misc/bin
else
cd $(DIR_APP) && ./Configure -n --kernel=/usr/src/linux --notrust --cardbus --pnp --apm --nox11 --srctree --ucc=gcc --kcc="$(KGCC)"
cd $(DIR_APP) && make all
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make #$(MAKETUNING)
cd $(DIR_APP) && make install
# Install our own extra pcmcia configs
cp $(DIR_SRC)/src/pcmcia/*.conf /etc/pcmcia
endif
## This is saved...
#ifeq "$(LFS_PASS)" "install"
# cd $(DIR_APP) && ./Configure -n --kernel=/usr/src/linux --notrust --cardbus --pnp --apm --nox11 --srctree --ucc=gcc --kcc="$(KGCC)"
# cd $(DIR_APP) && make -C cardmgr
# cd $(DIR_APP) && mkdir -p /install/misc/bin
# cd $(DIR_APP) && install -s -m 0755 cardmgr/cardmgr /install/misc/bin
# cd $(DIR_APP) && install -s -m 0755 cardmgr/cardctl /install/misc/bin
#else
# cd $(DIR_APP) && ./Configure -n --kernel=/usr/src/linux --notrust --cardbus --pnp --apm --nox11 --srctree --ucc=gcc --kcc="$(KGCC)"
# cd $(DIR_APP) && make all
# cd $(DIR_APP) && make install
#
# # Install our own extra pcmcia configs
# cp $(DIR_SRC)/src/pcmcia/*.conf /etc/pcmcia
#endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

82
make.sh
View File

@@ -66,7 +66,13 @@ mkdir $BASEDIR/log/ 2>/dev/null
if [ -f .config ]; then
. .config
else
make_config
echo -e "${BOLD}No configuration found!${NORMAL}"
echo -ne "Do you want to create one (y/N)?"
read CREATE_CONFIG
echo ""
if [ "$CREATE_CONFIG" == "y" ]; then
make_config
fi
fi
prepareenv() {
@@ -194,7 +200,9 @@ prepareenv() {
mount --bind $BASEDIR/src $BASEDIR/build/usr/src/src
# This is a temporary hack!!!
cp -f /bin/hostname /tools/bin/hostname 2>/dev/null
if [ ! -f /tools/bin/hostname ]; then
cp -f /bin/hostname /tools/bin/hostname 2>/dev/null
fi
# Run LFS static binary creation scripts one by one
export CCACHE_DIR=$BASEDIR/ccache
@@ -318,8 +326,8 @@ buildipfire() {
ipfiremake ppp
ipfiremake rp-pppoe
ipfiremake unzip
ipfiremake linux PASS=installer
ipfiremake linux PASS=SMP
ipfiremake linux PASS=I
ipfiremake linux PASS=S
# ipfiremake 3cp4218 PASS=SMP
# ipfiremake amedyn PASS=SMP
# ipfiremake cxacru PASS=SMP
@@ -336,24 +344,24 @@ buildipfire() {
# ipfiremake unicorn PASS=SMP
# ipfiremake promise-sata-300-tx PASS=SMP
ipfiremake linux
# ipfiremake 3cp4218
# ipfiremake amedyn
# ipfiremake cxacru
# ipfiremake eciadsl
# ipfiremake eagle
# ipfiremake speedtouch
# ipfiremake cnx_pci
# ipfiremake fcdsl
# ipfiremake fcdsl2
# ipfiremake fcdslsl
# ipfiremake fcdslusb
# ipfiremake fcdslslusb
# ipfiremake 3cp4218
# ipfiremake amedyn
# ipfiremake cxacru
# ipfiremake eciadsl
# ipfiremake eagle
# ipfiremake speedtouch
# ipfiremake cnx_pci
# ipfiremake fcdsl
# ipfiremake fcdsl2
# ipfiremake fcdslsl
# ipfiremake fcdslusb
# ipfiremake fcdslslusb
# ipfiremake fcpci
# ipfiremake fcclassic
# ipfiremake pulsar
# ipfiremake pulsar
# ipfiremake unicorn
# ipfiremake promise-sata-300-tx
ipfiremake pcmcia-cs
# ipfiremake pcmciautils
ipfiremake expat
ipfiremake gdbm
ipfiremake gmp
@@ -373,10 +381,8 @@ buildipfire() {
ipfiremake libcap
ipfiremake pciutils
ipfiremake pcre
ipfiremake readline
ipfiremake libxml2
ipfiremake berkeley
ipfiremake BerkeleyDB ## The Perl module
ipfiremake BerkeleyDB
ipfiremake mysql
ipfiremake saslauthd PASS=1
ipfiremake openldap
@@ -944,15 +950,23 @@ svn)
;;
commit|ci)
clear
if [ -f /usr/bin/mcedit ]; then
export EDITOR=/usr/bin/mcedit
else
if [ -f /usr/bin/nano ]; then
export EDITOR=/usr/bin/nano
fi
fi
echo -ne "Selecting editor $EDITOR..."
beautify message DONE
if [ -e /sbin/yast ]; then
if [ "`echo $SVN_REVISION | cut -c 3`" -eq "0" ]; then
$0 changelog
fi
fi
echo "Upload the changed files..."
sleep 1
svn commit
$0 svn up
$0 uploadsrc
;;
dist)
if [ $3 ]; then
@@ -1085,7 +1099,7 @@ batch)
watch)
watch_screen
;;
*)
"")
clear
svn info
select name in "Exit" "IPFIRE: Prefetch" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help"
@@ -1106,25 +1120,9 @@ watch)
"IPFIRE: Clean")
$0 clean
;;
"SVN: Commit")
if [ -f /usr/bin/mcedit ]; then
export EDITOR=/usr/bin/mcedit
fi
if [ -f /usr/bin/nano ]; then
export EDITOR=/usr/bin/nano
fi
$0 svn commit
$0 uploadsrc
;;
"SVN: Update")
$0 svn update
;;
"SVN: Status")
svn status # | grep -v ^?
;;
"SVN: Diff")
$0 svn diff
;;
"Help")
echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}"
cat doc/make.sh-usage
@@ -1138,4 +1136,8 @@ watch)
esac
done
;;
*)
echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}"
cat doc/make.sh-usage
;;
esac