mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
Merge remote-tracking branch 'ms/thirteen' into kernel-update
This commit is contained in:
Arne Fitzenreiter
24
lfs/glibc
24
lfs/glibc
@@ -24,11 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
ifeq "$(MACHINE_TYPE)" "arm"
|
||||
VER = 2.5
|
||||
else
|
||||
VER = 2.3.6
|
||||
endif
|
||||
VER = 2.5
|
||||
|
||||
THISAPP = glibc-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
@@ -73,13 +69,8 @@ objects = $(DL_FILE) \
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
|
||||
|
||||
ifeq "$(MACHINE_TYPE)" "arm"
|
||||
$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
|
||||
glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
|
||||
else
|
||||
$(DL_FILE)_MD5 = bfdce99f82d6dbcb64b7f11c05d6bc96
|
||||
glibc-libidn-$(VER).tar.bz2_MD5 = 49dbe06ce830fc73874d6b38bdc5b4db
|
||||
endif
|
||||
$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
|
||||
glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
|
||||
|
||||
# ARM needs glibc-ports
|
||||
ifeq "$(MACHINE_TYPE)" "arm"
|
||||
@@ -125,15 +116,9 @@ ifeq "$(MACHINE_TYPE)" "arm"
|
||||
|
||||
# asm/page.h should not be included in sysdeps/unix/sysv/linux/arm/ioperm.c.
|
||||
cd $(DIR_APP) && sed "/asm\/page.h/d" -i ports/sysdeps/unix/sysv/linux/arm/ioperm.c
|
||||
else
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-dont_use_origin_on_privil_exec.patch
|
||||
endif
|
||||
|
||||
ifeq "$(ROOT)" ""
|
||||
ifeq "$(MACHINE)" "i586"
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-linux_types-1.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-inotify-1.patch
|
||||
endif
|
||||
# This locale causes a loop on bash login - exclude it
|
||||
cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
|
||||
ifeq "$(MACHINE_TYPE)" "arm"
|
||||
@@ -150,9 +135,6 @@ ifeq "$(ROOT)" ""
|
||||
touch /etc/ld.so.conf
|
||||
cd $(DIR_SRC)/glibc-build && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
|
||||
ifeq "$(MACHINE)" "i586"
|
||||
cp -v $(DIR_APP)/sysdeps/unix/sysv/linux/inotify.h /usr/include/sys
|
||||
endif
|
||||
else
|
||||
-mkdir /tools/etc
|
||||
touch /tools/etc/ld.so.conf
|
||||
|
||||
@@ -1,105 +0,0 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# This program 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 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.6.12.0
|
||||
|
||||
THISAPP = linux-libc-headers-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
|
||||
ifeq "$(ROOT)" ""
|
||||
ifeq "$(LFS_PASS)" "install"
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)-install
|
||||
else
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
endif
|
||||
else
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = eae2f562afe224ad50f65a6acfb4252c
|
||||
|
||||
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 "$(ROOT)" ""
|
||||
ifeq "$(LFS_PASS)" "install"
|
||||
-mkdir -p /opt/$(MACHINE)-uClibc
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-inotify-3.patch
|
||||
cd $(DIR_APP) && install -dv /opt/$(MACHINE)-uClibc/usr/include/asm
|
||||
cd $(DIR_APP) && cp -Rv include/asm-i386/* /opt/$(MACHINE)-uClibc/usr/include/asm
|
||||
cd $(DIR_APP) && cp -Rv include/linux /opt/$(MACHINE)-uClibc/usr/include
|
||||
cd $(DIR_APP) && chown -Rv root:root /opt/$(MACHINE)-uClibc/usr/include/{asm,linux}
|
||||
cd $(DIR_APP) && find /opt/$(MACHINE)-uClibc/usr/include/{asm,linux} -type d -exec chmod -v 755 {} \;
|
||||
cd $(DIR_APP) && find /opt/$(MACHINE)-uClibc/usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;
|
||||
else
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-inotify-3.patch
|
||||
cd $(DIR_APP) && install -dv /usr/include/asm
|
||||
cd $(DIR_APP) && cp -Rv include/asm-i386/* /usr/include/asm
|
||||
cd $(DIR_APP) && cp -Rv include/linux /usr/include
|
||||
cd $(DIR_APP) && chown -Rv root:root /usr/include/{asm,linux}
|
||||
cd $(DIR_APP) && find /usr/include/{asm,linux} -type d -exec chmod -v 755 {} \;
|
||||
cd $(DIR_APP) && find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;
|
||||
endif
|
||||
else
|
||||
cd $(DIR_APP) && cp -Rv include/asm-i386 /tools/include/asm
|
||||
cd $(DIR_APP) && cp -Rv include/linux /tools/include
|
||||
endif
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
1
lfs/man
1
lfs/man
@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
cd $(DIR_APP) && mv man/es{_ES.88591,}
|
||||
cd $(DIR_APP) && mv man/it{_IT.88591,}
|
||||
cd $(DIR_APP) && mv man/ja{_JP.eucJP,}
|
||||
cd $(DIR_APP) && sed -i "s/-I-//g" {lib,src}/Makefile*
|
||||
cd $(DIR_APP) && sed -i 's,\*_\*,??,' man/Makefile.in
|
||||
cd $(DIR_APP) && sed -i '/\t\/usr\/man/d' src/man_db.conf.in
|
||||
cd $(DIR_APP) && echo -e "#define WEB_BROWSER \"exec /usr/bin/lynx\"" >> include/manconfig.h.in
|
||||
|
||||
6
lfs/mbr
6
lfs/mbr
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 1.1.8
|
||||
VER = 1.1.11
|
||||
|
||||
THISAPP = mbr-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = da195c75b26bd45ecbb113b317996f9a
|
||||
$(DL_FILE)_MD5 = 4e406ded185f94c2d2bf5fc793ac1842
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -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)
|
||||
cd $(DIR_APP) && ./configure
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
|
||||
2
lfs/sdl
2
lfs/sdl
@@ -77,10 +77,8 @@ dist:
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
ifeq "$(MACHINE_TYPE)" "arm"
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SDL-1.2.11-asm-page.h.patch
|
||||
cd $(DIR_APP) && sed "/asm\/page.h/d" -i src/video/fbcon/SDL_fbvideo.c
|
||||
endif
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
|
||||
Reference in New Issue
Block a user