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

Merge remote-tracking branch 'origin/master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2016-03-27 22:17:16 +02:00
parent e2347f49bb ae04f2400a
commit 046894ab7f
12 changed files with 269 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/backports
View File

@@ -101,6 +101,7 @@ endif
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch
# smsc mac address patch for pandaboard and raspberry pi
ifeq "$(KCFG)" "-multi"

4
lfs/hostapd
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2016 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 #
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
PAK_VER = 34
PAK_VER = 35
DEPS = ""

5
lfs/linux
View File

@@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 65
PAK_VER = 66
DEPS = ""
KERNEL_ARCH = $(MACHINE)
@@ -160,6 +160,9 @@ endif
# Add PC Engines APU led support
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-apu_leds.patch
# Add APU2 SoC ID to k10temp
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch
# Fix uevent PHYSDEVDRIVER
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch

21
lfs/memtest
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2016 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 #
@@ -73,17 +73,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-mkdir -p /usr/lib/memtest86+
ifeq "$(MACHINE)" "i586"
# Enable SMP as default
cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h
cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile
cd $(DIR_APP) && make $(EXTRA_MAKE)
cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
else
# gcc-4.9.3 produce a corrupted version of memtest
# we use the precomp version at the moment
#ifeq "$(MACHINE)" "i586"
# # Enable SMP as default
# cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h
# cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile
# cd $(DIR_APP) && make $(EXTRA_MAKE)
# cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
#else
# 64bit only systems cannot link mentest without 32bit gcc libs
# so we use the precompiled binary from memtest author
cd $(DIR_APP) && cp -f precomp.bin /usr/lib/memtest86+/memtest.bin
endif
#endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)