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

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Michael Tremer
2014-02-21 11:56:52 +01:00
parent 27b2adbf4f fffb777ee6
commit 582fa15555
5 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/i586/linux
View File

@@ -1879,6 +1879,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/scsi/hpsa.ko
#lib/modules/KVER-ipfire/kernel/drivers/scsi/hptiop.ko
#lib/modules/KVER-ipfire/kernel/drivers/scsi/hv_storvsc.ko
#lib/modules/KVER-ipfire/kernel/drivers/scsi/imm.ko
#lib/modules/KVER-ipfire/kernel/drivers/scsi/in2000.ko
#lib/modules/KVER-ipfire/kernel/drivers/scsi/initio.ko
#lib/modules/KVER-ipfire/kernel/drivers/scsi/ipr.ko

13
lfs/e1000e
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 #
@@ -25,14 +25,9 @@
include Config
VERSUFIX = ipfire$(KCFG)
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.61
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
else
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e
endif
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
VER = 2.4.14
VER = 2.5.4
THISAPP = e1000e-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -48,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 05bae01409bb699f14297d726df2aa23
$(DL_FILE)_MD5 = 8a57fc73335bf1ab0e16a02ecccdae76
install : $(TARGET)

15
lfs/igb
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 #
@@ -25,14 +25,9 @@
include Config
VERSUFIX = ipfire$(KCFG)
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.61
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/igb/
else
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/
endif
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/
VER = 4.3.0
VER = 5.0.6
THISAPP = igb-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -48,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = dcbf7271c016bdb71102eb623b807f83
$(DL_FILE)_MD5 = 701717fbbba6065af4ff5138bd3a3a9c
install : $(TARGET)
@@ -82,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
#Save original igb module
-mv $(MODPATH)/igb.ko \
$(MODPATH)//igb.ko.org
$(MODPATH)/igb.ko.org
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX)
cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH)

10
lfs/linux
View File

@@ -24,10 +24,10 @@
include Config
VER = 3.10.30
VER = 3.10.31
RPI_PATCHES = linux-3.10.27-grsec-943b563
GRS_PATCHES = grsecurity-2.9.1-3.10.30-ipfire1.patch.xz
GRS_PATCHES = grsecurity-2.9.1-3.10.31-ipfire1.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 35
PAK_VER = 36
DEPS = ""
VERSUFIX=ipfire$(KCFG)
@@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
$(DL_FILE)_MD5 = f48ca7dd9f2eb14a2903cb6a4fbe07ed
$(DL_FILE)_MD5 = 19e2b31f6883822ef35b974813e8e98e
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 8cf81f48408306d93ccee59b58af2e92
$(GRS_PATCHES)_MD5 = 044e29280d4717441e89e8d80abba563
$(GRS_PATCHES)_MD5 = ac71d9a1a5b7fabeb76ddef95518acd0
install : $(TARGET)

8
make.sh
View File

@@ -411,8 +411,8 @@ buildipfire() {
# ipfiremake r8169 KCFG="-pae"
# ipfiremake r8168 KCFG="-pae"
# ipfiremake r8101 KCFG="-pae"
# ipfiremake e1000e KCFG="-pae"
# ipfiremake igb KCFG="-pae"
ipfiremake e1000e KCFG="-pae"
ipfiremake igb KCFG="-pae"
# x86 kernel build
ipfiremake linux KCFG=""
@@ -424,8 +424,8 @@ buildipfire() {
# ipfiremake r8169 KCFG=""
# ipfiremake r8168 KCFG=""
# ipfiremake r8101 KCFG=""
# ipfiremake e1000e KCFG=""
# ipfiremake igb KCFG=""
ipfiremake e1000e KCFG=""
ipfiremake igb KCFG=""
else
# arm-rpi (Raspberry Pi) kernel build