From 21e17764249dbd10053811ba581886e3f16d0b66 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 10 Jun 2014 23:08:08 +0200 Subject: [PATCH 1/5] kernel: arm-multi: enable SERIAL_8250_DW needed by mirabox. --- config/kernel/kernel.config.armv5tel-ipfire-multi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 127542f9a..34045f2a6 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -2552,7 +2552,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=y -# CONFIG_SERIAL_8250_DW is not set +CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_EM is not set # From 1445c9e062c6a17a8be1f248e9098cf99d787bf2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 11 Jun 2014 17:53:15 +0200 Subject: [PATCH 2/5] install: fix baudrate for serial console. --- src/install+setup/install/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index db7a6cc72..309e006c9 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -542,7 +542,7 @@ int main(int argc, char *argv[]) replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage"); replace("/harddisk/boot/grub/grub.conf", "#serial", "serial"); 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*/ replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:"); From 3d2415f9242ae312bb4dc1d812e8f4ce0bf9a880 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 11 Jun 2014 20:20:29 +0200 Subject: [PATCH 3/5] udev: fix rule execution for devices that are present before udev start. --- config/rootfiles/core/79/filelists/files | 1 + src/initscripts/init.d/udev | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/79/filelists/files b/config/rootfiles/core/79/filelists/files index 3195bf2c4..d3968f2a6 100644 --- a/config/rootfiles/core/79/filelists/files +++ b/config/rootfiles/core/79/filelists/files @@ -1,6 +1,7 @@ etc/system-release etc/issue etc/rc.d/init.d/sshd +etc/rc.d/init.d/udev srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index b6d01009a..6cf8771ea 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -64,7 +64,7 @@ case "${1}" in # Now traverse /sys in order to "coldplug" devices that have # already been discovered - /bin/udevadm trigger + /bin/udevadm trigger --action=add # Now wait for udevd to process the uevents we triggered /bin/udevadm settle From 8f94a6092cf602d5817332aa4e7d86deb80e67a9 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 12 Jun 2014 10:16:45 +0200 Subject: [PATCH 4/5] kernel: update to 3.10.43. --- lfs/linux | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lfs/linux b/lfs/linux index 74e9b956e..0214bebc0 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.42 +VER = 3.10.43 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) DL_FILE = linux-$(VER).tar.xz @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 47 +PAK_VER = 48 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 = ef927e91cf8b8c4ddf98847341ccf2c8 +$(DL_FILE)_MD5 = b76af402bd1848b533f0b6dab41d3220 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff -$(GRS_PATCHES)_MD5 = 6ada73f5b8a8180b4139c71dd5da9059 +$(GRS_PATCHES)_MD5 = a77f35c2f4cd6d64a50c26ef5513540b install : $(TARGET) From 2734fb7e72015f0615dfdf483f498419e78dea22 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 12 Jun 2014 10:17:08 +0200 Subject: [PATCH 5/5] kernel: use pcieaspm default from bios. --- config/kernel/kernel.config.i586-ipfire | 4 ++-- config/kernel/kernel.config.i586-ipfire-pae | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 8a3e089dd..ea1faff91 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -632,8 +632,8 @@ CONFIG_PCIE_ECRC=y CONFIG_PCIEAER_INJECT=m CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set -# CONFIG_PCIEASPM_DEFAULT is not set -CONFIG_PCIEASPM_POWERSAVE=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y CONFIG_ARCH_SUPPORTS_MSI=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 4f713623f..9ade8729f 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -645,8 +645,8 @@ CONFIG_PCIE_ECRC=y CONFIG_PCIEAER_INJECT=m CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set -# CONFIG_PCIEASPM_DEFAULT is not set -CONFIG_PCIEASPM_POWERSAVE=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y CONFIG_ARCH_SUPPORTS_MSI=y