From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c9f0174979e9de685906e12a22e7625cd92dc90f Date: Sun, 27 Sep 2015 13:02:49 +0200 Message-ID: <20150927110249.9F4CA20FF1@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3196744609829054116==" List-Id: --===============3196744609829054116== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c9f0174979e9de685906e12a22e7625cd92dc90f (commit) via 1f2bda9ba3b58eaf186a90369d64aad914217908 (commit) from 8f1fe7c5314aae2893a52959f0d06dd9c0d28d00 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c9f0174979e9de685906e12a22e7625cd92dc90f Author: Arne Fitzenreiter Date: Sun Sep 27 12:58:22 2015 +0200 kernel: update to 3.14.53 =20 Signed-off-by: Arne Fitzenreiter commit 1f2bda9ba3b58eaf186a90369d64aad914217908 Author: Arne Fitzenreiter Date: Sun Sep 27 11:23:11 2015 +0200 backports: enable build on x86_64. =20 backports 4.1.1-1 is not stable so we need to stay on the older version. =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 3 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 3 +- config/kernel/kernel.config.armv5tel-ipfire-rpi | 3 +- config/kernel/kernel.config.i586-ipfire | 6 +-- config/kernel/kernel.config.i586-ipfire-pae | 6 +-- config/kernel/kernel.config.x86_64-ipfire | 56 +++++++++++++++-----= -- config/rootfiles/common/x86_64/linux | 13 +++++ lfs/backports | 3 ++ lfs/linux | 20 ++++---- make.sh | 4 +- ...ckports-3.18.1-1_no_dma_sgtable_on_x86_64.patch | 26 ++++++++++ 11 files changed, 101 insertions(+), 42 deletions(-) create mode 100644 src/patches/backports-3.18.1-1_no_dma_sgtable_on_x86_64.p= atch Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/ke= rnel/kernel.config.armv5tel-ipfire-kirkwood index cf44486..325add2 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.37 Kernel Configuration +# Linux/arm 3.14.53 Kernel Configuration # CONFIG_ARM=3Dy CONFIG_SYS_SUPPORTS_APM_EMULATION=3Dy @@ -924,7 +924,6 @@ CONFIG_IP_NF_SECURITY=3Dm CONFIG_IP_NF_ARPTABLES=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_IP_NF_MATCH_IPP2P=3Dm =20 # # IPv6: Netfilter Configuration diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kerne= l/kernel.config.armv5tel-ipfire-multi index 25de266..9729903 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.37 Kernel Configuration +# Linux/arm 3.14.53 Kernel Configuration # CONFIG_ARM=3Dy CONFIG_MIGHT_HAVE_PCI=3Dy @@ -1098,7 +1098,6 @@ CONFIG_IP_NF_SECURITY=3Dm CONFIG_IP_NF_ARPTABLES=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_IP_NF_MATCH_IPP2P=3Dm =20 # # IPv6: Netfilter Configuration diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/= kernel.config.armv5tel-ipfire-rpi index b25210a..6e584cb 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.37 Kernel Configuration +# Linux/arm 3.14.53 Kernel Configuration # CONFIG_ARM=3Dy CONFIG_SYS_SUPPORTS_APM_EMULATION=3Dy @@ -863,7 +863,6 @@ CONFIG_IP_NF_SECURITY=3Dm CONFIG_IP_NF_ARPTABLES=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_IP_NF_MATCH_IPP2P=3Dm =20 # # IPv6: Netfilter Configuration diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.c= onfig.i586-ipfire index f5ff73e..adac4fb 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.37 Kernel Configuration +# Linux/x86 3.14.53 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=3Dy @@ -514,6 +514,7 @@ CONFIG_HOTPLUG_CPU=3Dy # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_CMDLINE_BOOL is not set +# CONFIG_DEFAULT_MODIFY_LDT_SYSCALL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=3Dy =20 # @@ -677,10 +678,10 @@ CONFIG_EISA_NAMES=3Dy CONFIG_SCx200=3Dm CONFIG_SCx200HR_TIMER=3Dm # CONFIG_OLPC is not set -CONFIG_APULED=3Dy CONFIG_ALIX=3Dy CONFIG_NET5501=3Dy CONFIG_GEOS=3Dy +CONFIG_APULED=3Dy CONFIG_AMD_NB=3Dy CONFIG_PCCARD=3Dm CONFIG_PCMCIA=3Dm @@ -1068,7 +1069,6 @@ CONFIG_IP_NF_SECURITY=3Dm CONFIG_IP_NF_ARPTABLES=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_IP_NF_MATCH_IPP2P=3Dm =20 # # IPv6: Netfilter Configuration diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.config.i586-ipfire-pae index 8e72201..c94a235 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.37 Kernel Configuration +# Linux/x86 3.14.53 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=3Dy @@ -527,6 +527,7 @@ CONFIG_HOTPLUG_CPU=3Dy # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_CMDLINE_BOOL is not set +# CONFIG_DEFAULT_MODIFY_LDT_SYSCALL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=3Dy =20 # @@ -691,10 +692,10 @@ CONFIG_EISA_PCI_EISA=3Dy CONFIG_EISA_VIRTUAL_ROOT=3Dy CONFIG_EISA_NAMES=3Dy # CONFIG_SCx200 is not set -CONFIG_APULED=3Dy # CONFIG_ALIX is not set # CONFIG_NET5501 is not set # CONFIG_GEOS is not set +CONFIG_APULED=3Dy CONFIG_AMD_NB=3Dy CONFIG_PCCARD=3Dm CONFIG_PCMCIA=3Dm @@ -1082,7 +1083,6 @@ CONFIG_IP_NF_SECURITY=3Dm CONFIG_IP_NF_ARPTABLES=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_IP_NF_MATCH_IPP2P=3Dm =20 # # IPv6: Netfilter Configuration diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel= .config.x86_64-ipfire index 902b9e1..cc36ada 100644 --- 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 Kernel Configuration +# Linux/x86 3.14.53 Kernel Configuration # CONFIG_64BIT=3Dy CONFIG_X86_64=3Dy @@ -177,9 +177,11 @@ CONFIG_RD_LZ4=3Dy # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=3Dy CONFIG_ANON_INODES=3Dy +CONFIG_HAVE_UID16=3Dy CONFIG_SYSCTL_EXCEPTION_TRACE=3Dy CONFIG_HAVE_PCSPKR_PLATFORM=3Dy CONFIG_EXPERT=3Dy +CONFIG_UID16=3Dy # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=3Dy CONFIG_KALLSYMS_ALL=3Dy @@ -244,6 +246,8 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=3Dy CONFIG_HAVE_ALIGNED_STRUCT_PAGE=3Dy CONFIG_HAVE_CMPXCHG_LOCAL=3Dy CONFIG_HAVE_CMPXCHG_DOUBLE=3Dy +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=3Dy +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=3Dy CONFIG_HAVE_ARCH_SECCOMP_FILTER=3Dy CONFIG_SECCOMP_FILTER=3Dy CONFIG_HAVE_CC_STACKPROTECTOR=3Dy @@ -258,6 +262,8 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=3Dy CONFIG_HAVE_ARCH_SOFT_DIRTY=3Dy CONFIG_MODULES_USE_ELF_RELA=3Dy CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=3Dy +CONFIG_OLD_SIGSUSPEND3=3Dy +CONFIG_COMPAT_OLD_SIGACTION=3Dy =20 # # GCOV-based kernel profiling @@ -306,6 +312,7 @@ CONFIG_LDM_PARTITION=3Dy CONFIG_EFI_PARTITION=3Dy # CONFIG_SYSV68_PARTITION is not set # CONFIG_CMDLINE_PARTITION is not set +CONFIG_BLOCK_COMPAT=3Dy =20 # # IO Schedulers @@ -335,6 +342,7 @@ CONFIG_FREEZER=3Dy # CONFIG_ZONE_DMA=3Dy CONFIG_SMP=3Dy +# CONFIG_X86_X2APIC is not set CONFIG_X86_MPPARSE=3Dy CONFIG_X86_EXTENDED_PLATFORM=3Dy # CONFIG_X86_VSMP is not set @@ -352,7 +360,7 @@ CONFIG_XEN_PVHVM=3Dy CONFIG_XEN_MAX_DOMAIN_MEMORY=3D500 CONFIG_XEN_SAVE_RESTORE=3Dy CONFIG_XEN_DEBUG_FS=3Dy -# CONFIG_XEN_PVH is not set +CONFIG_XEN_PVH=3Dy CONFIG_KVM_GUEST=3Dy # CONFIG_KVM_DEBUG_FS is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=3Dy @@ -371,7 +379,7 @@ CONFIG_X86_CMPXCHG64=3Dy CONFIG_X86_CMOV=3Dy CONFIG_X86_MINIMUM_CPU_FAMILY=3D64 CONFIG_X86_DEBUGCTLMSR=3Dy -CONFIG_PROCESSOR_SELECT=3Dy +# CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=3Dy CONFIG_CPU_SUP_AMD=3Dy CONFIG_CPU_SUP_CENTAUR=3Dy @@ -484,6 +492,7 @@ CONFIG_HOTPLUG_CPU=3Dy # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_CMDLINE_BOOL is not set +# CONFIG_DEFAULT_MODIFY_LDT_SYSCALL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=3Dy =20 # @@ -591,7 +600,7 @@ CONFIG_INTEL_IDLE=3Dy # CONFIG_PCI=3Dy CONFIG_PCI_DIRECT=3Dy -# CONFIG_PCI_MMCONFIG is not set +CONFIG_PCI_MMCONFIG=3Dy CONFIG_PCI_XEN=3Dy CONFIG_PCI_DOMAINS=3Dy # CONFIG_PCI_CNB20LE_QUIRK is not set @@ -614,8 +623,8 @@ CONFIG_XEN_PCIDEV_FRONTEND=3Dm CONFIG_HT_IRQ=3Dy CONFIG_PCI_ATS=3Dy CONFIG_PCI_IOV=3Dy -# CONFIG_PCI_PRI is not set -# CONFIG_PCI_PASID is not set +CONFIG_PCI_PRI=3Dy +CONFIG_PCI_PASID=3Dy CONFIG_PCI_IOAPIC=3Dy CONFIG_PCI_LABEL=3Dy =20 @@ -654,16 +663,24 @@ CONFIG_X86_SYSFB=3Dy # Executable file formats / Emulations # CONFIG_BINFMT_ELF=3Dy +CONFIG_COMPAT_BINFMT_ELF=3Dy CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=3Dy CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=3Dy CONFIG_BINFMT_SCRIPT=3Dy # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=3Dy CONFIG_COREDUMP=3Dy -# CONFIG_IA32_EMULATION is not set +CONFIG_IA32_EMULATION=3Dy +CONFIG_IA32_AOUT=3Dm +# CONFIG_X86_X32 is not set +CONFIG_COMPAT=3Dy +CONFIG_COMPAT_FOR_U64_ALIGNMENT=3Dy +CONFIG_SYSVIPC_COMPAT=3Dy +CONFIG_KEYS_COMPAT=3Dy CONFIG_X86_DEV_DMA_OPS=3Dy CONFIG_IOSF_MBI=3Dm CONFIG_NET=3Dy +CONFIG_COMPAT_NETLINK_MESSAGES=3Dy =20 # # Networking options @@ -1195,7 +1212,7 @@ CONFIG_CGROUP_NET_PRIO=3Dm CONFIG_CGROUP_NET_CLASSID=3Dy CONFIG_NET_RX_BUSY_POLL=3Dy CONFIG_BQL=3Dy -# CONFIG_BPF_JIT is not set +CONFIG_BPF_JIT=3Dy CONFIG_NET_FLOW_LIMIT=3Dy =20 # @@ -1348,7 +1365,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=3Dm # CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_NVME=3Dm -# CONFIG_BLK_DEV_SKD is not set +CONFIG_BLK_DEV_SKD=3Dm # CONFIG_BLK_DEV_OSD is not set CONFIG_BLK_DEV_SX8=3Dm CONFIG_BLK_DEV_RAM=3Dy @@ -1428,13 +1445,13 @@ CONFIG_VMWARE_VMCI=3Dm # # Intel MIC Host Driver # -# CONFIG_INTEL_MIC_HOST is not set +CONFIG_INTEL_MIC_HOST=3Dm =20 # # Intel MIC Card Driver # -# CONFIG_INTEL_MIC_CARD is not set -# CONFIG_GENWQE is not set +CONFIG_INTEL_MIC_CARD=3Dm +CONFIG_GENWQE=3Dm CONFIG_HAVE_IDE=3Dy # CONFIG_IDE is not set =20 @@ -4540,7 +4557,8 @@ CONFIG_EDAC=3Dy CONFIG_EDAC_DECODE_MCE=3Dm CONFIG_EDAC_MCE_INJ=3Dm CONFIG_EDAC_MM_EDAC=3Dm -# CONFIG_EDAC_AMD64 is not set +CONFIG_EDAC_AMD64=3Dm +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set CONFIG_EDAC_E752X=3Dm CONFIG_EDAC_I82975X=3Dm CONFIG_EDAC_I3000=3Dm @@ -4551,6 +4569,7 @@ CONFIG_EDAC_I7CORE=3Dm CONFIG_EDAC_I5000=3Dm CONFIG_EDAC_I5100=3Dm CONFIG_EDAC_I7300=3Dm +CONFIG_EDAC_SBRIDGE=3Dm CONFIG_RTC_LIB=3Dy CONFIG_RTC_CLASS=3Dy CONFIG_RTC_HCTOSYS=3Dy @@ -4896,12 +4915,13 @@ CONFIG_CLKBLD_I8253=3Dy CONFIG_MAILBOX=3Dy CONFIG_IOMMU_API=3Dy CONFIG_IOMMU_SUPPORT=3Dy -# CONFIG_AMD_IOMMU is not set +CONFIG_AMD_IOMMU=3Dy +# CONFIG_AMD_IOMMU_STATS is not set CONFIG_DMAR_TABLE=3Dy CONFIG_INTEL_IOMMU=3Dy # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=3Dy -# CONFIG_IRQ_REMAP is not set +CONFIG_IRQ_REMAP=3Dy =20 # # Remoteproc drivers @@ -5119,6 +5139,7 @@ CONFIG_QUOTA_TREE=3Dy # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=3Dy CONFIG_QUOTACTL=3Dy +CONFIG_QUOTACTL_COMPAT=3Dy CONFIG_AUTOFS4_FS=3Dy CONFIG_FUSE_FS=3Dm CONFIG_CUSE=3Dm @@ -5561,10 +5582,11 @@ CONFIG_PAX_USERCOPY=3Dy # # CONFIG_GRKERNSEC_KMEM is not set # CONFIG_GRKERNSEC_IO is not set +CONFIG_GRKERNSEC_JIT_HARDEN=3Dy # CONFIG_GRKERNSEC_PERF_HARDEN is not set CONFIG_GRKERNSEC_RAND_THREADSTACK=3Dy CONFIG_GRKERNSEC_PROC_MEMMAP=3Dy -# CONFIG_GRKERNSEC_KSTACKOVERFLOW is not set +CONFIG_GRKERNSEC_KSTACKOVERFLOW=3Dy CONFIG_GRKERNSEC_BRUTE=3Dy CONFIG_GRKERNSEC_MODHARDEN=3Dy CONFIG_GRKERNSEC_HIDESYM=3Dy @@ -5747,7 +5769,7 @@ CONFIG_CRYPTO_CRC32C_INTEL=3Dy CONFIG_CRYPTO_CRC32=3Dy CONFIG_CRYPTO_CRC32_PCLMUL=3Dm CONFIG_CRYPTO_CRCT10DIF=3Dy -# CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=3Dm CONFIG_CRYPTO_GHASH=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MD5=3Dy diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x= 86_64/linux index 4f1ac7a..2cae007 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -18,6 +18,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/cast5-avx-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/cast6-avx-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/crc32-pclmul.ko +#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/crct10dif-pclmul.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/ghash-clmulni-intel.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx-x86_64.ko @@ -29,6 +30,8 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/twofish-avx-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/twofish-x86_64-3way.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/twofish-x86_64.ko +#lib/modules/KVER-ipfire/kernel/arch/x86/ia32 +#lib/modules/KVER-ipfire/kernel/arch/x86/ia32/ia32_aout.ko #lib/modules/KVER-ipfire/kernel/arch/x86/kernel #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu/microcode @@ -207,6 +210,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/block/nvme.ko #lib/modules/KVER-ipfire/kernel/drivers/block/rsxx #lib/modules/KVER-ipfire/kernel/drivers/block/rsxx/rsxx.ko +#lib/modules/KVER-ipfire/kernel/drivers/block/skd.ko #lib/modules/KVER-ipfire/kernel/drivers/block/sx8.ko #lib/modules/KVER-ipfire/kernel/drivers/block/umem.ko #lib/modules/KVER-ipfire/kernel/drivers/block/virtio_blk.ko @@ -279,6 +283,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/dma/pch_dma.ko #lib/modules/KVER-ipfire/kernel/drivers/dma/timb_dma.ko #lib/modules/KVER-ipfire/kernel/drivers/edac +#lib/modules/KVER-ipfire/kernel/drivers/edac/amd64_edac_mod.ko #lib/modules/KVER-ipfire/kernel/drivers/edac/e752x_edac.ko #lib/modules/KVER-ipfire/kernel/drivers/edac/edac_core.ko #lib/modules/KVER-ipfire/kernel/drivers/edac/edac_mce_amd.ko @@ -291,6 +296,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/edac/i7core_edac.ko #lib/modules/KVER-ipfire/kernel/drivers/edac/i82975x_edac.ko #lib/modules/KVER-ipfire/kernel/drivers/edac/mce_amd_inj.ko +#lib/modules/KVER-ipfire/kernel/drivers/edac/sb_edac.ko #lib/modules/KVER-ipfire/kernel/drivers/edac/x38_edac.ko #lib/modules/KVER-ipfire/kernel/drivers/firewire #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-core.ko @@ -1342,12 +1348,19 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom/max6875.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/enclosure.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/fsa9480.ko +#lib/modules/KVER-ipfire/kernel/drivers/misc/genwqe +#lib/modules/KVER-ipfire/kernel/drivers/misc/genwqe/genwqe_card.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/hpilo.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/ibmasm #lib/modules/KVER-ipfire/kernel/drivers/misc/ibmasm/ibmasm.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/ics932s401.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d #lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko +#lib/modules/KVER-ipfire/kernel/drivers/misc/mic +#lib/modules/KVER-ipfire/kernel/drivers/misc/mic/card +#lib/modules/KVER-ipfire/kernel/drivers/misc/mic/card/mic_card.ko +#lib/modules/KVER-ipfire/kernel/drivers/misc/mic/host +#lib/modules/KVER-ipfire/kernel/drivers/misc/mic/host/mic_host.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/pch_phub.ko #lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st #lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st/st_drv.ko diff --git a/lfs/backports b/lfs/backports index 0bc6447..b5aabef 100644 --- a/lfs/backports +++ b/lfs/backports @@ -82,6 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-ipf= ire-build.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-grs= ecurity.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-add= _usbnet_modules.patch +ifeq "$(MACHINE)" "x86_64" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_no_= dma_sgtable_on_x86_64.patch +endif =20 # DVB patches cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pl= l.patch diff --git a/lfs/linux b/lfs/linux index b603b48..fe74ad1 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,11 +24,11 @@ =20 include Config =20 -VER =3D 3.14.43 +VER =3D 3.14.53 +RPI_PATCHES =3D 3.14.53-grsec-ipfire1 +A7M_PATCHES =3D 3.14.53-grsec-ipfire1 +GRS_PATCHES =3D grsecurity-3.1ipfire-3.14.53-v1.patch.xz =20 -RPI_PATCHES =3D 3.14.43-grsec-ipfire1 -A7M_PATCHES =3D 3.14.43-grsec-ipfire1 -GRS_PATCHES =3D grsecurity-3.1-3.14.43-201505191737.patch.xz =20 THISAPP =3D linux-$(VER) DL_FILE =3D linux-$(VER).tar.xz @@ -37,7 +37,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) CFLAGS =3D CXXFLAGS =3D =20 -PAK_VER =3D 62 +PAK_VER =3D 63 DEPS =3D "" =20 KERNEL_ARCH =3D $(MACHINE) @@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz =3D $(URL_IPFIRE)/rp= i-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz =3D $(URL_IPFIRE)/arm7-multi-patc= hes-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) =3D $(URL_IPFIRE)/$(GRS_PATCHES) =20 -$(DL_FILE)_MD5 =3D 927f2343f298dfe531a8371f81356e53 -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 =3D b5ba925ae1d4279d3ac0f03c27dd16eb -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 =3D b9c696fe4f22b05b81c168329= ca33c94 -$(GRS_PATCHES)_MD5 =3D 35e26b1214b1b0b515ee67e5ce50633a +$(DL_FILE)_MD5 =3D 5c5d18ddcc80b008826c2f43b322a34a +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 =3D de5350ee7c3e4aa82289916963796fd9 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 =3D 25fc733bb657a84eea338104f= 88bcf70 +$(GRS_PATCHES)_MD5 =3D 4c1f6e73f04bfc92b105afff24d0308c =20 install : $(TARGET) =20 @@ -167,8 +167,6 @@ endif # r8169 L23 patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.32-r8169_di= sable_L23.patch =20 - # SuperSSpeed S238 NOTRIM patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.43_SuperSSp= eed_NOTRIM.patch # update the queued trim blacklist from kernel 4.2rc1 cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.43_new_qtri= m_blacklist.patch =20 diff --git a/make.sh b/make.sh index f307258..c5cf466 100755 --- a/make.sh +++ b/make.sh @@ -421,10 +421,10 @@ buildipfire() { case "${TARGET_ARCH}" in x86_64) ipfiremake linux KCFG=3D"" -# ipfiremake backports KCFG=3D"" + ipfiremake backports KCFG=3D"" ipfiremake cryptodev KCFG=3D"" ipfiremake e1000e KCFG=3D"" - ipfiremake igb KCFG=3D"" +# ipfiremake igb KCFG=3D"" ipfiremake ixgbe KCFG=3D"" ipfiremake xtables-addons KCFG=3D"" ipfiremake linux-initrd KCFG=3D"" diff --git a/src/patches/backports-3.18.1-1_no_dma_sgtable_on_x86_64.patch b/= src/patches/backports-3.18.1-1_no_dma_sgtable_on_x86_64.patch new file mode 100644 index 0000000..5a2d04e --- /dev/null +++ b/src/patches/backports-3.18.1-1_no_dma_sgtable_on_x86_64.patch @@ -0,0 +1,26 @@ +diff -Naur backports-4.1.1-1.org/compat/dma-shared-helpers.c backports-4.1.1= -1/compat/dma-shared-helpers.c +--- backports-4.1.1-1.org/compat/dma-shared-helpers.c 2015-07-01 23:10:37.00= 0000000 +0200 ++++ backports-4.1.1-1/compat/dma-shared-helpers.c 2015-09-25 13:29:14.006762= 269 +0200 +@@ -20,22 +20,3 @@ + #endif /* LINUX_VERSION_CODE <=3D KERNEL_VERSION(3,6,0) */ + #endif /* LINUX_VERSION_CODE >=3D KERNEL_VERSION(3,3,0) */ +=20 +-#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) +-/* +- * Create scatter-list for the already allocated DMA buffer. +- */ +-int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, +- void *cpu_addr, dma_addr_t handle, size_t size) +-{ +- struct page *page =3D virt_to_page(cpu_addr); +- int ret; +- +- ret =3D sg_alloc_table(sgt, 1, GFP_KERNEL); +- if (unlikely(ret)) +- return ret; +- +- sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); +- return 0; +-} +-EXPORT_SYMBOL_GPL(dma_common_get_sgtable); +-#endif /* RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) */ hooks/post-receive -- IPFire 2.x development tree --===============3196744609829054116==--