webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Zwischencommit für LFS.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@301 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-10-01 19:57:04 +00:00
parent 90d372c4b4
commit b4b6bcdbdf
8 changed files with 152 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
doc/ChangeLog
View File

@@ -1,4 +1,59 @@
------------------------------------------------------------------------ ------------------------------------------------------------------------
r300 | ms | 2006-10-01 17:04:23 +0200 (Sun, 01 Oct 2006) | 2 lines
Naechster Schritt im LFS.
------------------------------------------------------------------------
r299 | ms | 2006-10-01 12:51:18 +0200 (Sun, 01 Oct 2006) | 3 lines
Zwischencommit beim Umzug auf LFS 6.2.
------------------------------------------------------------------------
r298 | ms | 2006-10-01 00:07:28 +0200 (Sun, 01 Oct 2006) | 2 lines
Make.sh gesplittet und maechtig ueberarbeitet.
------------------------------------------------------------------------
r297 | ms | 2006-09-30 18:33:03 +0200 (Sat, 30 Sep 2006) | 4 lines
Habe IPFire auf LFS 6.2 gebracht.
Das hier ist der erste Teil.
Nur Toolchain bisher.
------------------------------------------------------------------------
r296 | delaco | 2006-09-29 16:42:04 +0200 (Fri, 29 Sep 2006) | 1 line
Fix fuer die packages_list.txt...
------------------------------------------------------------------------
r295 | delaco | 2006-09-23 19:37:59 +0200 (Sat, 23 Sep 2006) | 3 lines
Fixes fuer den Buildprozess. (applejuice, mysql)
Quality of Service: TOS-Regeln und TOS-Matches hinzugefuegt, Graphen uebersichtlicher angeordnet.
------------------------------------------------------------------------
r294 | delaco | 2006-09-23 01:12:12 +0200 (Sat, 23 Sep 2006) | 1 line
WebCyrAdm - Dateien verschoben und nicht in Paket geaendert. Sorry.
------------------------------------------------------------------------
r293 | delaco | 2006-09-23 01:05:21 +0200 (Sat, 23 Sep 2006) | 7 lines
MONSTER-REVISION!
* Alte und ueberfluessige Pakete entfernt.
* Proxy-Pfade gefixt.
* MySQL in ISO gepackt.
* Apache2-Konfigurations-Fix.
* XAMPP entfernt. STILL EXPERIMENTAL
* make.sh aufgeraeumt.
------------------------------------------------------------------------
r292 | ms | 2006-09-21 23:25:43 +0200 (Thu, 21 Sep 2006) | 1 line
stunnel und edonkeyclc geloescht, da wir es nicht nutzen
------------------------------------------------------------------------
r291 | ms | 2006-09-21 21:47:20 +0200 (Thu, 21 Sep 2006) | 1 line
Nicht alle Versionen von Subversion koennen den vollen Befehlsumfang :(
------------------------------------------------------------------------
r290 | delaco | 2006-09-21 20:48:19 +0200 (Thu, 21 Sep 2006) | 5 lines r290 | delaco | 2006-09-21 20:48:19 +0200 (Thu, 21 Sep 2006) | 5 lines
Make.sh: Make.sh:

6
lfs/binutils
View File

@@ -44,7 +44,7 @@ else
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-tools1 TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = --prefix=/tools --disable-nls EXTRA_CONFIG = --prefix=/tools --disable-nls
EXTRA_MAKE = LDFLAGS="-all-static" EXTRA_MAKE = #LDFLAGS="-all-static"
EXTRA_INSTALL = EXTRA_INSTALL =
else else
TARGET = $(DIR_INFO)/$(THISAPP)-tools2 TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@ -94,9 +94,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
@mkdir $(DIR_SRC)/binutils-build @mkdir $(DIR_SRC)/binutils-build
cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG) cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) #$(MAKETUNING)
cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
ifeq "$(ROOT) "" ifeq "$(ROOT)" ""
cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include
else else
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"

8
lfs/bison
View File

@@ -29,7 +29,7 @@ include Config
VER = 2.2 VER = 2.2
THISAPP = bison-$(VER) THISAPP = bison-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE) DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,9 +40,9 @@ TARGET = $(DIR_INFO)/$(THISAPP)
objects =$(DL_FILE) objects =$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 278515c1195194cad633bf40c892f512 $(DL_FILE)_MD5 = e345a5d021db850f06ce49eba78af027
install : $(TARGET) install : $(TARGET)
@@ -71,7 +71,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
# Disable NLS # Disable NLS
#cd $(DIR_APP) && echo '#define YYENABLE_NLS 1' >> config.h #cd $(DIR_APP) && echo '#define YYENABLE_NLS 1' >> config.h

4
lfs/man
View File

@@ -40,9 +40,9 @@ TARGET = $(DIR_INFO)/$(THISAPP)
objects = $(DL_FILE) objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 037d5644f8ef9ea0ef22b271bae0297d $(DL_FILE)_MD5 = 30814a47f209f43b152659ba51fc7937
install : $(TARGET) install : $(TARGET)

79
lfs/mod_perl Normal file
View File

@@ -0,0 +1,79 @@
###############################################################################
# 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 <rod@sunsetsystems.com> #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 2.0.2
THISAPP = mod_perl-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ad0a509fd34e3b8452887d80a1d45dea
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 zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && perl Makefile.PL PREFIX=/usr MP_APXS=/usr/sbin/apxs
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
lfs/vim
View File

@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 821fda8f14d674346b87e3ef9cb96389 $(DL_FILE)_MD5 = 4ca69757678272f718b1041c810d82d8
install : $(TARGET) install : $(TARGET)

9
make.sh
View File

@@ -177,11 +177,10 @@ prepareenv() {
# Make all sources and proc available under lfs build # Make all sources and proc available under lfs build
mount --bind /dev $BASEDIR/build/dev mount --bind /dev $BASEDIR/build/dev
mount --bind /proc $BASEDIR/build/proc mount -t devpts devpts $BASEDIR/build/dev/pts
mount -vt devpts devpts $BASEDIR/build/dev/pts mount -t tmpfs shm $BASEDIR/build/dev/shm
mount -vt tmpfs shm $BASEDIR/build/dev/shm mount -t proc proc $BASEDIR/build/proc
mount -vt proc proc $BASEDIR/build/proc mount -t sysfs sysfs $BASEDIR/build/sys
mount -vt sysfs sysfs $BASEDIR/build/sys
mount --bind $BASEDIR/cache $BASEDIR/build/usr/src/cache mount --bind $BASEDIR/cache $BASEDIR/build/usr/src/cache
mount --bind $BASEDIR/ccache $BASEDIR/build/usr/src/ccache mount --bind $BASEDIR/ccache $BASEDIR/build/usr/src/ccache
mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config

5
tools/make-functions
View File

@@ -182,7 +182,7 @@ if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then
MACHINE=i586 MACHINE=i586
BUILDTARGET=i586-pc-linux-gnu BUILDTARGET=i586-pc-linux-gnu
CFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer" CFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
CXX2FLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer" CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer"
CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer"
else else
@@ -192,7 +192,10 @@ fi
# Define immediately # Define immediately
stdumount() { stdumount() {
umount $BASEDIR/build/sys 2>/dev/null;
umount $BASEDIR/build/dev/shm 2>/dev/null;
umount $BASEDIR/build/dev/pts 2>/dev/null; umount $BASEDIR/build/dev/pts 2>/dev/null;
umount $BASEDIR/build/dev 2>/dev/null;
umount $BASEDIR/build/proc 2>/dev/null; umount $BASEDIR/build/proc 2>/dev/null;
umount $BASEDIR/build/install/mnt 2>/dev/null; umount $BASEDIR/build/install/mnt 2>/dev/null;
umount $BASEDIR/build/usr/src/cache 2>/dev/null; umount $BASEDIR/build/usr/src/cache 2>/dev/null;