mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
Naechster Schritt im LFS.
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@300 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
23
lfs/binutils
23
lfs/binutils
@@ -38,8 +38,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
ifeq "$(ROOT)" ""
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
|
||||
EXTRA_MAKE =
|
||||
EXTRA_INSTALL =
|
||||
EXTRA_MAKE = tooldir=/usr
|
||||
EXTRA_INSTALL = tooldir=/usr
|
||||
else
|
||||
ifeq "$(PASS)" "1"
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
|
||||
@@ -94,25 +94,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
@mkdir $(DIR_SRC)/binutils-build
|
||||
cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
|
||||
ifeq "$(ROOT)" ""
|
||||
cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
|
||||
ifeq "$(ROOT) ""
|
||||
cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include
|
||||
else
|
||||
ifeq "$(PASS)" "1"
|
||||
cd $(DIR_SRC)/binutils-build && make $(MAKETUNING)
|
||||
cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) clean
|
||||
cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
else
|
||||
cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
endif
|
||||
cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
|
||||
cd $(DIR_SRC)/binutils-build && make -C ld clean
|
||||
ifeq "$(PASS)" "1"
|
||||
cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib
|
||||
else
|
||||
cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
|
||||
endif
|
||||
cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
|
||||
else
|
||||
cd $(DIR_SRC)/binutils-build && make -C ld clean
|
||||
cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
|
||||
cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
|
||||
endif
|
||||
endif
|
||||
@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build
|
||||
@$(POSTBUILD)
|
||||
|
||||
@@ -70,6 +70,7 @@ ifeq "$(PASS)" "2"
|
||||
-strip --strip-debug /tools/lib/*
|
||||
-strip --strip-unneeded /tools/{,s}bin/*
|
||||
rm -rfv /tools/{info,man} /usr/local/man
|
||||
cp -fv /tools/bin/{ld-old.bak,ld}
|
||||
chown -R root:root /tools
|
||||
endif
|
||||
ifeq "$(PASS)" "3"
|
||||
|
||||
4
lfs/flex
4
lfs/flex
@@ -29,7 +29,7 @@ include Config
|
||||
VER = 2.5.33
|
||||
|
||||
THISAPP = flex-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
@@ -71,7 +71,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(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) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
|
||||
|
||||
6
lfs/gcc
6
lfs/gcc
@@ -106,7 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@mkdir $(DIR_SRC)/gcc-build
|
||||
ifeq "$(ROOT)" ""
|
||||
cd $(DIR_APP) && sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
|
||||
#cd $(DIR_APP) && sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in
|
||||
cd $(DIR_APP) && sed 's/^XCFLAGS =$\/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
|
||||
> gcc/Makefile.in
|
||||
cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
|
||||
cd $(DIR_APP) && sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in
|
||||
|
||||
@@ -125,7 +126,8 @@ else
|
||||
cd $(DIR_APP) && cp -v gcc/Makefile.in{,.orig}
|
||||
cd $(DIR_APP) && sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in
|
||||
cd $(DIR_APP) && cp -v gcc/Makefile.in{,.tmp}
|
||||
#cd $(DIR_APP) && sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp > gcc/Makefile.in
|
||||
cd $(DIR_APP) && sed 's/^XCFLAGS =$\/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
|
||||
> gcc/Makefile.in
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-specs-1.patch
|
||||
cd $(DIR_SRC)/gcc-build && /bin/bash $(DIR_APP)/configure $(EXTRA_CONFIG)
|
||||
cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
|
||||
@@ -29,7 +29,7 @@ include Config
|
||||
VER = 1.5.22
|
||||
|
||||
THISAPP = libtool-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
@@ -71,7 +71,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
@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 $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
|
||||
@@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ncurses-5.5-fixes-1.patch
|
||||
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make $(EXTRA_MAKE) #$(MAKETUNING) # Causes an error!
|
||||
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
|
||||
ifeq "$(ROOT)" ""
|
||||
chmod -v 755 /usr/lib/*.5.5
|
||||
|
||||
12
lfs/stage2
12
lfs/stage2
@@ -59,12 +59,9 @@ $(TARGET) :
|
||||
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
|
||||
-mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo}
|
||||
-mkdir -pv /usr/{,local/}share/man/man{1..8}
|
||||
-for dir in /usr /usr/local; do \
|
||||
ln -sv share/{man,doc,info} $$dir; \
|
||||
done
|
||||
|
||||
# Permissions
|
||||
chmod 0711 /var/empty
|
||||
#-for dir in /usr /usr/local; do \
|
||||
# ln -sv share/{man,doc,info} $$dir; \
|
||||
#done
|
||||
|
||||
# Symlinks
|
||||
# for this reason, stage2 rebuild will broke the iso:perl, grubbatch
|
||||
@@ -97,4 +94,7 @@ $(TARGET) :
|
||||
chgrp -v utmp /var/run/utmp /var/log/lastlog
|
||||
chmod -v 664 /var/run/utmp /var/log/lastlog
|
||||
|
||||
# Permissions
|
||||
chmod 0711 /var/empty
|
||||
|
||||
@$(POSTBUILD)
|
||||
|
||||
2
lfs/tar
2
lfs/tar
@@ -87,8 +87,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fix_tests-1.patch
|
||||
ifeq "$(ROOT)" ""
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-sparse_fix-1.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fixes-1.patch
|
||||
endif
|
||||
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
|
||||
|
||||
@@ -85,8 +85,10 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
ifeq "$(ROOT)" ""
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-multibyte-1.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-tempfile_fix-2.patch
|
||||
endif
|
||||
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
|
||||
|
||||
95
lfs/udev
Normal file
95
lfs/udev
Normal file
@@ -0,0 +1,95 @@
|
||||
###############################################################################
|
||||
# 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 = 096
|
||||
|
||||
THISAPP = udev-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE) udev-config-6.2.tar.bz2
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
udev-config-6.2.tar.bz2 = $(DL_FROM)/udev-config-6.2.tar.bz2
|
||||
|
||||
$(DL_FILE)_MD5 = f4effef7807ce1dc91ab581686ef197b
|
||||
udev-config-6.2.tar.bz2_MD5 = 9ff2667ab0f7bfe8182966ef690078a0
|
||||
|
||||
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)
|
||||
cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2
|
||||
install -dv /lib/{firmware,udev/devices/{pts,shm}}
|
||||
mknod -m0666 /lib/udev/devices/null c 1 3
|
||||
ln -sv /proc/self/fd /lib/udev/devices/fd
|
||||
ln -sv /proc/self/fd/0 /lib/udev/devices/stdin
|
||||
ln -sv /proc/self/fd/1 /lib/udev/devices/stdout
|
||||
ln -sv /proc/self/fd/2 /lib/udev/devices/stderr
|
||||
ln -sv /proc/kcore /lib/udev/devices/core
|
||||
cd $(DIR_APP) && make $(MAKETUNING) EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
|
||||
extras/firmware extras/floppy extras/path_id \
|
||||
extras/scsi_id extras/usb_id extras/volume_id"
|
||||
cd $(DIR_APP) && make DESTDIR=/ EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
|
||||
extras/firmware extras/floppy extras/path_id \
|
||||
extras/scsi_id extras/usb_id extras/volume_id" install
|
||||
cd $(DIR_APP) && cp -v udev-config-6.2/[0-9]* /etc/udev/rules.d/
|
||||
cd $(DIR_APP) && install -m644 -D -v docs/writing_udev_rules/index.html \
|
||||
/usr/share/doc/udev-096/index.html
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
34
lfs/vim
34
lfs/vim
@@ -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: vim,v 1.3.2.3 2005/04/13 23:52:04 gespinasse Exp $
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
@@ -32,26 +26,23 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 6.3
|
||||
VER = 7.0
|
||||
|
||||
THISAPP = vim-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/vim63
|
||||
DIR_APP = $(DIR_SRC)/vim70
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE) \
|
||||
vim-6.3-security_fix-1.patch
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
vim-6.3-security_fix-1.patch = $(URL_IPFIRE)/vim-6.3-security_fix-1.patch
|
||||
|
||||
$(DL_FILE)_MD5 = 821fda8f14d674346b87e3ef9cb96389
|
||||
vim-6.3-security_fix-1.patch_MD5 = ef9a421f1d29993ce5bbd709cece4624
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -81,14 +72,19 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/vim-6.3-security_fix-1.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.0-fixes-7.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.0-mandir-1.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.0-spellfile-1.patch
|
||||
cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
|
||||
cd $(DIR_APP) && echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --with-features=tiny --disable-gpm
|
||||
cd $(DIR_APP) && make
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --enable-multibyte --disable-nls
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
ln -sf vim /usr/bin/vi
|
||||
echo "set nocompatible" > /root/.vimrc
|
||||
echo "set bs=2" >> /root/.vimrc
|
||||
ln -sv vim /usr/bin/vi
|
||||
echo "set nocompatible" > /etc/vimrc
|
||||
echo "set backspace=2" >> /etc/vimrc
|
||||
echo "syntax on" >> /etc/vimrc
|
||||
echo -e "if (&term == \"iterm\") || (&term == \"putty\")" >> /etc/vimrc
|
||||
echo "set background=dark" >> /etc/vimrc
|
||||
echo "endif" >> /etc/vimrc
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
|
||||
28
make.sh
28
make.sh
@@ -168,12 +168,20 @@ prepareenv() {
|
||||
|
||||
# Make some extra directories
|
||||
mkdir -p $BASEDIR/build/{tools,etc,usr/src} 2>/dev/null
|
||||
mkdir -p $BASEDIR/build/{dev/{shm,pts},proc,sys}
|
||||
mkdir -p $BASEDIR/{cache,ccache} 2>/dev/null
|
||||
mkdir -p $BASEDIR/build/dev/pts $BASEDIR/build/proc $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
|
||||
mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
|
||||
|
||||
mknod -m 600 $BASEDIR/build/dev/console c 5 1 2>/dev/null
|
||||
mknod -m 666 $BASEDIR/build/dev/null c 1 3 2>/dev/null
|
||||
|
||||
# Make all sources and proc available under lfs build
|
||||
mount --bind /dev/pts $BASEDIR/build/dev/pts
|
||||
mount --bind /dev $BASEDIR/build/dev
|
||||
mount --bind /proc $BASEDIR/build/proc
|
||||
mount -vt devpts devpts $BASEDIR/build/dev/pts
|
||||
mount -vt tmpfs shm $BASEDIR/build/dev/shm
|
||||
mount -vt proc proc $BASEDIR/build/proc
|
||||
mount -vt sysfs sysfs $BASEDIR/build/sys
|
||||
mount --bind $BASEDIR/cache $BASEDIR/build/usr/src/cache
|
||||
mount --bind $BASEDIR/ccache $BASEDIR/build/usr/src/ccache
|
||||
mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config
|
||||
@@ -283,16 +291,16 @@ buildbase() {
|
||||
lfsmake2 shadow
|
||||
lfsmake2 sysklogd
|
||||
lfsmake2 sysvinit
|
||||
####
|
||||
lfsmake2 vim
|
||||
lfsmake2 net-tools
|
||||
lfsmake2 inetutils
|
||||
lfsmake2 texinfo
|
||||
lfsmake2 ed
|
||||
lfsmake2 procinfo
|
||||
|
||||
lfsmake2 tar
|
||||
lfsmake2 texinfo
|
||||
lfsmake2 udev
|
||||
lfsmake2 util-linux
|
||||
lfsmake2 vim
|
||||
####
|
||||
# lfsmake2 net-tools
|
||||
# lfsmake2 inetutils
|
||||
# lfsmake2 ed
|
||||
# lfsmake2 procinfo
|
||||
}
|
||||
|
||||
buildipfire() {
|
||||
|
||||
1473
src/patches/vim-7.0-fixes-7.patch
Normal file
1473
src/patches/vim-7.0-fixes-7.patch
Normal file
File diff suppressed because it is too large
Load Diff
82
src/patches/vim-7.0-mandir-1.patch
Normal file
82
src/patches/vim-7.0-mandir-1.patch
Normal file
@@ -0,0 +1,82 @@
|
||||
Submitted By: Alexander E. Patrakov
|
||||
Date: 2006-05-27
|
||||
Initial Package Version: 7.0
|
||||
Upstream status: LFS specific
|
||||
Description: Adjusts installation of manual pages to meet Man-DB expectations.
|
||||
|
||||
Additional change to explicitly install the man pages into
|
||||
/usr/share/man instead of /usr/man by Ag Hatzim.
|
||||
|
||||
--- vim70/src/Makefile.orig 2006-05-27 12:49:31.767959808 +0300
|
||||
+++ vim70/src/Makefile 2006-05-27 12:49:55.778309680 +0300
|
||||
@@ -867,7 +867,7 @@
|
||||
# Uncomment the next line to install Vim in "/usr/bin"
|
||||
#BINDIR = /usr/bin
|
||||
# Uncomment the next line to install Vim manuals in "/usr/share/man/man1"
|
||||
-#MANDIR = /usr/share/man
|
||||
+MANDIR = /usr/share/man
|
||||
# Uncomment the next line to install Vim help files in "/usr/share/vim"
|
||||
#DATADIR = /usr/share
|
||||
|
||||
@@ -1325,7 +1325,7 @@
|
||||
DEST_MAN_PL = $(DEST_MAN_TOP)/pl$(MAN1DIR)
|
||||
DEST_MAN_PL_I = $(DEST_MAN_TOP)/pl.ISO8859-2$(MAN1DIR)
|
||||
DEST_MAN_PL_U = $(DEST_MAN_TOP)/pl.UTF-8$(MAN1DIR)
|
||||
-DEST_MAN_RU = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR)
|
||||
+DEST_MAN_RU = $(DEST_MAN_TOP)/ru$(MAN1DIR)
|
||||
DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR)
|
||||
|
||||
# BASIC_SRC: files that are always used
|
||||
@@ -1905,52 +1905,24 @@
|
||||
# install the language specific files for tools, if they were unpacked
|
||||
install-tool-languages:
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
|
||||
|
||||
# install the language specific files, if they were unpacked
|
||||
install-languages: languages $(DEST_LANG) $(DEST_KMAP)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_FR) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_FR_I) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_FR_U) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_IT) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_IT_I) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_IT_U) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_PL) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_PL_I) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_PL_U) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_RU) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_RU_U) $(INSTALLMLARGS)
|
||||
if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
|
||||
cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
|
||||
INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
|
||||
29
src/patches/vim-7.0-spellfile-1.patch
Normal file
29
src/patches/vim-7.0-spellfile-1.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
Submitted By: Alexander E. Patrakov
|
||||
Date: 2006-07-25
|
||||
Initial Package Version: 7.0
|
||||
Origin: Alexander E. Patrakov
|
||||
Upstream Status: Sent
|
||||
Description: Allows downloading spellfiles via HTTP,
|
||||
thus reverting the negative effect of ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.010
|
||||
|
||||
--- vim70/runtime/autoload/spellfile.vim.orig 2006-07-25 19:05:38.000000000 +0600
|
||||
+++ vim70/runtime/autoload/spellfile.vim 2006-07-25 19:39:32.000000000 +0600
|
||||
@@ -110,9 +110,14 @@
|
||||
endif
|
||||
endfunc
|
||||
|
||||
-" Read "fname" from the ftp server.
|
||||
+" Read "fname" from the server.
|
||||
function! spellfile#Nread(fname)
|
||||
- let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
|
||||
- let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
|
||||
- exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
|
||||
+ if strpart(g:spellfile_URL, 0, 6) == 'ftp://'
|
||||
+ " Avoid the password prompt by providing the default username and password
|
||||
+ let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
|
||||
+ let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
|
||||
+ exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
|
||||
+ else
|
||||
+ exe 'Nread "' . g:spellfile_URL . '/' . a:fname . '"'
|
||||
+ endif
|
||||
endfunc
|
||||
Reference in New Issue
Block a user