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

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2014-06-12 13:11:46 +02:00
parent 21e1776424 2734fb7e72
commit a7bbea30d4
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/kernel/kernel.config.i586-ipfire
View File

@@ -632,8 +632,8 @@ CONFIG_PCIE_ECRC=y
CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEASPM=y CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set # CONFIG_PCIEASPM_DEBUG is not set
# CONFIG_PCIEASPM_DEFAULT is not set CONFIG_PCIEASPM_DEFAULT=y
CONFIG_PCIEASPM_POWERSAVE=y # CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y CONFIG_PCIE_PME=y
CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_ARCH_SUPPORTS_MSI=y

4
config/kernel/kernel.config.i586-ipfire-pae
View File

@@ -645,8 +645,8 @@ CONFIG_PCIE_ECRC=y
CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEASPM=y CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set # CONFIG_PCIEASPM_DEBUG is not set
# CONFIG_PCIEASPM_DEFAULT is not set CONFIG_PCIEASPM_DEFAULT=y
CONFIG_PCIEASPM_POWERSAVE=y # CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y CONFIG_PCIE_PME=y
CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_ARCH_SUPPORTS_MSI=y

1
config/rootfiles/core/79/filelists/files
View File

@@ -1,6 +1,7 @@
etc/system-release etc/system-release
etc/issue etc/issue
etc/rc.d/init.d/sshd etc/rc.d/init.d/sshd
etc/rc.d/init.d/udev
srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat

10
lfs/linux
View File

@@ -24,10 +24,10 @@
include Config include Config
VER = 3.10.42 VER = 3.10.43
RPI_PATCHES = linux-3.10.38-grsec-1b49b45 RPI_PATCHES = linux-3.10.38-grsec-1b49b45
GRS_PATCHES = grsecurity-2.9.1-3.10.42-ipfire1.patch.xz GRS_PATCHES = grsecurity-2.9.1-3.10.43-ipfire1.patch.xz
THISAPP = linux-$(VER) THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz DL_FILE = linux-$(VER).tar.xz
@@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS = CFLAGS =
CXXFLAGS = CXXFLAGS =
PAK_VER = 47 PAK_VER = 48
DEPS = "" DEPS = ""
VERSUFIX=ipfire$(KCFG) 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 rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
$(DL_FILE)_MD5 = ef927e91cf8b8c4ddf98847341ccf2c8 $(DL_FILE)_MD5 = b76af402bd1848b533f0b6dab41d3220
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff
$(GRS_PATCHES)_MD5 = 6ada73f5b8a8180b4139c71dd5da9059 $(GRS_PATCHES)_MD5 = a77f35c2f4cd6d64a50c26ef5513540b
install : $(TARGET) install : $(TARGET)

2
src/initscripts/init.d/udev
View File

@@ -64,7 +64,7 @@ case "${1}" in
# Now traverse /sys in order to "coldplug" devices that have # Now traverse /sys in order to "coldplug" devices that have
# already been discovered # already been discovered
/bin/udevadm trigger /bin/udevadm trigger --action=add
# Now wait for udevd to process the uevents we triggered # Now wait for udevd to process the uevents we triggered
/bin/udevadm settle /bin/udevadm settle

2
src/install+setup/install/main.c
View File

@@ -542,7 +542,7 @@ int main(int argc, char *argv[])
replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage"); replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage");
replace("/harddisk/boot/grub/grub.conf", "#serial", "serial"); replace("/harddisk/boot/grub/grub.conf", "#serial", "serial");
replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal"); replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal");
replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 "); replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,115200n8 panic=10 ");
/*inittab*/ /*inittab*/
replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:"); replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");