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

Introduce MACHINE_TYPE to lfs files.

Browse Source
This commit is contained in:
Michael Tremer
2011-09-15 23:55:16 +02:00
parent df94e866a3
commit cc72d5cbcc
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lfs/binutils
View File

@@ -24,7 +24,7 @@
include Config include Config
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
VER = 2.18 VER = 2.18
else else
VER = 2.17 VER = 2.17
@@ -72,7 +72,7 @@ else
endif endif
endif endif
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
EXTRA_CONFIG += \ EXTRA_CONFIG += \
--host=$(BUILDTARGET) \ --host=$(BUILDTARGET) \
--build=$(BUILDTARGET) \ --build=$(BUILDTARGET) \
@@ -89,7 +89,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01 $(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
else else
$(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1 $(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1

2
lfs/cleanup-toolchain
View File

@@ -29,7 +29,7 @@ VER = ipfire
THISAPP = cleanup-toolchain THISAPP = cleanup-toolchain
TARGET = $(DIR_INFO)/$(THISAPP)-$(PASS)-tools TARGET = $(DIR_INFO)/$(THISAPP)-$(PASS)-tools
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
GCC_VER = 4.1.2 GCC_VER = 4.1.2
else else
GCC_VER = 4.0.4 GCC_VER = 4.0.4

2
lfs/compat-wireless
View File

@@ -97,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Build Updated asix usb-lan driver # Build Updated asix usb-lan driver
cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2 cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
# B43+B44 driver doesn't build on arm # B43+B44 driver doesn't build on arm
cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk
cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk

6
lfs/gcc
View File

@@ -24,7 +24,7 @@
include Config include Config
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
VER = 4.1.2 VER = 4.1.2
else else
VER = 4.0.4 VER = 4.0.4
@@ -117,7 +117,7 @@ else
endif endif
endif endif
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
EXTRA_CONFIG += \ EXTRA_CONFIG += \
--build=$(BUILDTARGET) \ --build=$(BUILDTARGET) \
--host=$(BUILDTARGET) \ --host=$(BUILDTARGET) \
@@ -143,7 +143,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
$(DL_FILE)_MD5 = a4a3eb15c96030906d8494959eeda23c $(DL_FILE)_MD5 = a4a3eb15c96030906d8494959eeda23c
else else
$(DL_FILE)_MD5 = 8970debbc55bea85ee80961d733080f0 $(DL_FILE)_MD5 = 8970debbc55bea85ee80961d733080f0

14
lfs/glibc
View File

@@ -24,7 +24,7 @@
include Config include Config
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
VER = 2.5 VER = 2.5
else else
VER = 2.3.6 VER = 2.3.6
@@ -55,10 +55,10 @@ else
EXTRA_INSTALL = EXTRA_INSTALL =
endif endif
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
# Disable hardware FP for ARM. # Disable hardware FP for ARM.
EXTRA_CONFIG += \ EXTRA_CONFIG += \
--build=$(MACHINE) \ --build=arm \
--host=$(BUILDTARGET) \ --host=$(BUILDTARGET) \
--without-fp \ --without-fp \
--enable-add-ons=nptl,ports --enable-add-ons=nptl,ports
@@ -76,7 +76,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2 glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f $(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01 glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
else else
@@ -85,7 +85,7 @@ else
endif endif
# ARM needs glibc-ports # ARM needs glibc-ports
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
objects += glibc-ports-$(VER).tar.bz2 objects += glibc-ports-$(VER).tar.bz2
glibc-ports-$(VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(VER).tar.bz2 glibc-ports-$(VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(VER).tar.bz2
glibc-ports-$(VER).tar.bz2_MD5 = 183f6d46e8fa5e4b2aff240ab1586c2e glibc-ports-$(VER).tar.bz2_MD5 = 183f6d46e8fa5e4b2aff240ab1586c2e
@@ -120,7 +120,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
@mkdir $(DIR_SRC)/glibc-build @mkdir $(DIR_SRC)/glibc-build
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(VER).tar.bz2 cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(VER).tar.bz2
cd $(DIR_APP) && mv -v glibc-ports-$(VER) ports cd $(DIR_APP) && mv -v glibc-ports-$(VER) ports
@@ -139,7 +139,7 @@ ifeq "$(MACHINE)" "i586"
endif endif
# This locale causes a loop on bash login - exclude it # This locale causes a loop on bash login - exclude it
cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \ cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
scripts/test-installation.pl scripts/test-installation.pl
else else

2
lfs/hostapd
View File

@@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-cp /usr/src/linux/include/linux/netfilter/nfnetlink.h /usr/include/linux/netfilter/ -cp /usr/src/linux/include/linux/netfilter/nfnetlink.h /usr/include/linux/netfilter/
-cp /usr/src/linux/include/linux/netfilter/nfnetlink_compat.h /usr/include/linux/netfilter/ -cp /usr/src/linux/include/linux/netfilter/nfnetlink_compat.h /usr/include/linux/netfilter/
cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP)/hostapd && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config cd $(DIR_APP)/hostapd && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config
endif endif
cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile

6
lfs/linux
View File

@@ -63,7 +63,7 @@ else
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX) TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
endif endif
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
HEADERS_ARCH=arm HEADERS_ARCH=arm
else else
HEADERS_ARCH=x86 HEADERS_ARCH=x86
@@ -188,7 +188,7 @@ ifeq "$(XEN)" "1"
cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX) cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX)
else else
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX) cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
else else
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX) cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
@@ -235,7 +235,7 @@ endif
rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
ifneq "$(MACHINE)" "arm" ifneq "$(MACHINE_TYPE)" "arm"
# Disable geode_aes modul # Disable geode_aes modul
mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \ mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
/lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off

2
lfs/pciutils
View File

@@ -90,7 +90,7 @@ ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && install -m 0644 lib/libpci.a /opt/$(MACHINE)-uClibc/lib cd $(DIR_APP) && install -m 0644 lib/libpci.a /opt/$(MACHINE)-uClibc/lib
cd $(DIR_APP) && install -m 0644 lib/*.h /opt/$(MACHINE)-uClibc/include/pci cd $(DIR_APP) && install -m 0644 lib/*.h /opt/$(MACHINE)-uClibc/include/pci
else else
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP)/lib && ./configure cd $(DIR_APP)/lib && ./configure
cd $(DIR_APP)/lib && sed -e "s/^#error.*$$/#define CPU_ARCH_ARM/" -i config.h cd $(DIR_APP)/lib && sed -e "s/^#error.*$$/#define CPU_ARCH_ARM/" -i config.h
endif endif

2
lfs/sdl
View File

@@ -77,7 +77,7 @@ dist:
$(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 zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SDL-1.2.11-asm-page.h.patch 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 cd $(DIR_APP) && sed "/asm\/page.h/d" -i src/video/fbcon/SDL_fbvideo.c
endif endif

2
lfs/splix
View File

@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP) && sed -e "s/ceill/ceil/g" -i src/*.cpp cd $(DIR_APP) && sed -e "s/ceill/ceil/g" -i src/*.cpp
endif endif
cd $(DIR_APP) && make DISABLE_JBIG=1 $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make DISABLE_JBIG=1 $(MAKETUNING) $(EXTRA_MAKE)

2
lfs/unzip
View File

@@ -70,7 +70,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 zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
# ARM cannot use the x86 assembly code. # ARM cannot use the x86 assembly code.
cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
else else

2
lfs/wpa_supplicant
View File

@@ -75,7 +75,7 @@ $(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 zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP)/wpa_supplicant && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config cd $(DIR_APP)/wpa_supplicant && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config
ifeq "$(MACHINE)" "arm" ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP)/wpa_supplicant && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config cd $(DIR_APP)/wpa_supplicant && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config
endif endif
cd $(DIR_APP)/wpa_supplicant && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile cd $(DIR_APP)/wpa_supplicant && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile