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

diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl
index 9dd752d5e698735b9745c7ec408e9c99a4b05329..cb4ca3dd88306f61290fab895308c0725c1ecdac 100644 (file)
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -256,7 +256,7 @@ sub ip_address_in_network($$) {
        my ($network_bin, $netmask_bin) = &network2bin($network);
 
        # Find end address
-       my $broadcast_bin = $network_bin ^ ~$netmask_bin;
+       my $broadcast_bin = $network_bin ^ (~$netmask_bin % 2 ** 32);
 
        return (($address_bin ge $network_bin) && ($address_bin le $broadcast_bin));
 }
@@ -342,6 +342,9 @@ sub testsuite() {
        $result = &ip_address_in_network("10.0.1.4", "10.0.0.0/8");
        assert($result);
 
+       $result = &ip_address_in_network("192.168.30.11", "192.168.30.0/255.255.255.0");
+       assert($result);
+
        return 0;
 }
 

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index db38aae8f31e310c0037496565423d8c4eb34df0..902b9e114920b115d10be8ddfa052fb35509fcff 100644 (file)
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.43-ipfire Kernel Configuration
+# Linux/x86 3.14.43 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -359,28 +359,7 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
@@ -429,12 +408,6 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MICROCODE_AMD_EARLY is not set
 # CONFIG_X86_MSR is not set
 CONFIG_X86_CPUID=y
-# CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-# CONFIG_HIGHMEM64G is not set
-# CONFIG_VMSPLIT_3G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DIRECT_GBPAGES=y
@@ -444,7 +417,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
@@ -618,10 +590,6 @@ CONFIG_INTEL_IDLE=y
 # Bus options (PCI etc.)
 #
 CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOANY is not set
 CONFIG_PCI_DIRECT=y
 # CONFIG_PCI_MMCONFIG is not set
 CONFIG_PCI_XEN=y
@@ -655,6 +623,7 @@ CONFIG_PCI_LABEL=y
 # PCI host controller drivers
 #
 CONFIG_ISA_DMA_API=y
+CONFIG_APULED=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m

diff --git a/lfs/linux b/lfs/linux
index f2a53919c4350e96686d910aa9e9e9109733db0c..b603b48f237702c012f64f8a79daa5dff22b4e73 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -158,7 +158,7 @@ endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
 
        # Add PC Engines APU led support
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-apu_leds.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-apu_leds.patch
 
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch

diff --git a/src/patches/linux-3.10-apu_leds.patch b/src/patches/linux-3.14-apu_leds.patch
similarity index 80%
rename from src/patches/linux-3.10-apu_leds.patch
rename to src/patches/linux-3.14-apu_leds.patch
index 53d389af1a7a9259bc38c4fc7e3de7426e1dd3f4..13d7c761011cfb784b91fc048c9b1dd03eeb51c2 100644 (file)
--- a/src/patches/linux-3.10-apu_leds.patch
+++ b/src/patches/linux-3.14-apu_leds.patch
@@ -1,22 +1,30 @@
-diff -Naur linux-3.10.33.org/arch/x86/Kconfig linux-3.10.33/arch/x86/Kconfig
---- linux-3.10.33.org/arch/x86/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-3.10.33/arch/x86/Kconfig     2014-03-17 17:02:46.703135023 +0100
-@@ -2199,6 +2199,12 @@
+diff -Naur linux-3.14.43.org/arch/x86/Kconfig linux-3.14.43/arch/x86/Kconfig
+--- linux-3.14.43.org/arch/x86/Kconfig 2015-05-17 18:54:01.000000000 +0200
++++ linux-3.14.43/arch/x86/Kconfig     2015-09-19 20:14:52.436654988 +0200
+@@ -2287,6 +2287,7 @@
           - AC adapter status updates
           - Battery status updates
  
++
+ config ALIX
+       bool "PCEngines ALIX System Support (LED setup)"
+       select GPIOLIB
+@@ -2325,6 +2326,12 @@
+ 
+ endif # X86_32
+ 
 +config APULED
 +      bool "PCEngines APU Led Support"
 +      depends on DMI
 +      ---help---
 +        This option enables system support for the PCEngines APU.
 +
- config ALIX
-       bool "PCEngines ALIX System Support (LED setup)"
-       select GPIOLIB
-diff -Naur linux-3.10.33.org/arch/x86/platform/apu/apu-led.c linux-3.10.33/arch/x86/platform/apu/apu-led.c
---- linux-3.10.33.org/arch/x86/platform/apu/apu-led.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.33/arch/x86/platform/apu/apu-led.c      2014-03-17 17:00:36.187188456 +0100
+ config AMD_NB
+       def_bool y
+       depends on CPU_SUP_AMD && PCI
+diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/x86/platform/apu/apu-led.c
+--- linux-3.14.43.org/arch/x86/platform/apu/apu-led.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.14.43/arch/x86/platform/apu/apu-led.c      2015-09-19 20:12:20.520647636 +0200
 @@ -0,0 +1,181 @@
 +/*
 + * LEDs driver for PCEngines apu
@@ -199,14 +207,14 @@ diff -Naur linux-3.10.33.org/arch/x86/platform/apu/apu-led.c linux-3.10.33/arch/
 +MODULE_AUTHOR("Christian Herzog");
 +MODULE_DESCRIPTION("PCEngines apu LED driver");
 +MODULE_LICENSE("GPL");
-diff -Naur linux-3.10.33.org/arch/x86/platform/apu/Makefile linux-3.10.33/arch/x86/platform/apu/Makefile
---- linux-3.10.33.org/arch/x86/platform/apu/Makefile   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.10.33/arch/x86/platform/apu/Makefile       2014-03-17 17:05:19.245651480 +0100
+diff -Naur linux-3.14.43.org/arch/x86/platform/apu/Makefile linux-3.14.43/arch/x86/platform/apu/Makefile
+--- linux-3.14.43.org/arch/x86/platform/apu/Makefile   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.14.43/arch/x86/platform/apu/Makefile       2015-09-19 20:12:20.520647636 +0200
 @@ -0,0 +1 @@
 +obj-$(CONFIG_APULED)          += apu-led.o
-diff -Naur linux-3.10.33.org/arch/x86/platform/Makefile linux-3.10.33/arch/x86/platform/Makefile
---- linux-3.10.33.org/arch/x86/platform/Makefile       2014-03-07 06:58:45.000000000 +0100
-+++ linux-3.10.33/arch/x86/platform/Makefile   2014-03-17 14:53:15.078571307 +0100
+diff -Naur linux-3.14.43.org/arch/x86/platform/Makefile linux-3.14.43/arch/x86/platform/Makefile
+--- linux-3.14.43.org/arch/x86/platform/Makefile       2015-05-17 18:54:01.000000000 +0200
++++ linux-3.14.43/arch/x86/platform/Makefile   2015-09-19 20:12:20.520647636 +0200
 @@ -1,4 +1,5 @@
  # Platform specific code goes here
 +obj-y += apu/

diff --git a/tools/make-functions b/tools/make-functions
index a9baab96d50257230fcf75d5fbe21122f100898e..e297c50cef72a6ef3b579e01294d1fe28d0317b4 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -361,7 +361,7 @@ qemu_is_required() {
        fi
 
        case "${BUILD_ARCH},${target_arch}" in
-               x86_64,arm*|i?86,arm*)
+               x86_64,arm*|i?86,arm*|i?86,x86_64)
                        return 0
                        ;;
                *)
@@ -376,6 +376,15 @@ qemu_install_helper() {
                return 0
        fi
 
+       if [ ! -e /proc/sys/fs/binfmt_misc/status ]; then
+               exiterror "binfmt_misc not mounted. QEMU_TARGET_HELPER not useable."
+       fi
+
+       if [ ! $(cat /proc/sys/fs/binfmt_misc/status) = 'enabled' ]; then
+               exiterror "binfmt_misc not enabled. QEMU_TARGET_HELPER not useable."
+       fi
+
+
        if [ -z "${QEMU_TARGET_HELPER}" ]; then
                exiterror "QEMU_TARGET_HELPER not set"
        fi
@@ -413,12 +422,17 @@ qemu_find_target_helper_name() {
                arm*)
                        magic="7f454c4601010100000000000000000002002800"
                        ;;
+               x86_64)
+                       magic="7f454c4602010100000000000000000002003e00"
+                       ;;
        esac
 
        [ -z "${magic}" ] && return 1
 
        local file
        for file in /proc/sys/fs/binfmt_misc/*; do
+               # skip write only register entry
+               [ $(basename "${file}") = "register" ] && continue
                # Search for the file with the correct magic value.
                grep -qE "^magic ${magic}$" "${file}" || continue