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

Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into arm-port

Browse Source
This commit is contained in:
Michael Tremer
2011-09-24 17:46:11 +02:00
parent cb6cfc0db6 ff1580d89d
commit 5e5979a806
9 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lfs/glibc
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -55,14 +55,12 @@ else
EXTRA_INSTALL =
endif
EXTRA_CONFIG += --build=$(BUILDTARGET)
ifeq "$(MACHINE_TYPE)" "arm"
# Disable hardware FP for ARM.
EXTRA_CONFIG += \
--build=arm \
--host=$(BUILDTARGET) \
--without-fp
else
EXTRA_CONFIG += --build=$(BUILDTARGET)
endif
###############################################################################

2
lfs/linux
View File

@@ -165,7 +165,7 @@ endif
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
ifeq "$(MACHINE)" "arm"
ifeq "$(MACHINE_TYPE)" "arm"
# Add dreamplug support on ARM
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45-arm_kirkwood_dreamplug.patch
endif

4
lfs/python-lzma
View File

@@ -80,8 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && python setup.py install
# unzip the egg because it won't work without
cd /usr/lib/python2.7/site-packages && \
unzip pyliblzma-$(VER)-py2.7-linux-$(shell uname -m).egg
rm -rf /usr/lib/python2.7/site-packages/pyliblzma-$(VER)-py2.7-linux-$(shell uname -m).egg
unzip pyliblzma-$(VER)-py2.7-linux-*.egg
rm -rf /usr/lib/python2.7/site-packages/pyliblzma-$(VER)-py2.7-linux-*.egg
rm -rf /usr/lib/python2.7/site-packages/EGG-INFO
@rm -rf $(DIR_APP)
@$(POSTBUILD)