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

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 50cc045afcfb0d1896bdff9b0f03ce5129a3a7ff..dcd21e8203912950458f3b49e523b24156d5ca94 100644 (file)
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.166-ipfire Kernel Configuration
+# Linux/arm64 4.14.183-ipfire Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -6513,7 +6513,7 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_IO_STRICT_DEVMEM=y
-# CONFIG_ARM64_PTDUMP_CORE is not set
+CONFIG_ARM64_PTDUMP_CORE=y
 # CONFIG_ARM64_PTDUMP_DEBUGFS is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 3805b209d6ca212159e4927c2a3422871bd27be8..9c7ecb524c2b854d0ff53496d03e1331e84b0c5b 100644 (file)
--- 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 4.14.166-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.183-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index d3137d337a4c4822a46d073115f2b1b72ec418e9..0b6e0ca08ab7fd5450d13ad9ab6fdb8c62c9b125 100644 (file)
--- 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 4.14.170-ipfire Kernel Configuration
+# Linux/x86 4.14.183-ipfire Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index be5f6c8198deda4d5d5b88ba2642cc97e26297ed..27b073ec795aa34a1103ead20a10126782a9b3de 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 4.14.173-ipfire Kernel Configuration
+# Linux/x86 4.14.183-ipfire Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y

diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index b130268a926a7aaa9dca2abbb037115a0561b771..5c2bba93f6d85cc1bcdb717ccac4701c985be4cc 100644 (file)
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -5960,6 +5960,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/arm64/page
 #lib/modules/KVER-ipfire/build/include/config/arm64/page/shift.h
 #lib/modules/KVER-ipfire/build/include/config/arm64/pan.h
+#lib/modules/KVER-ipfire/build/include/config/arm64/ptdump
+#lib/modules/KVER-ipfire/build/include/config/arm64/ptdump/core.h
 #lib/modules/KVER-ipfire/build/include/config/arm64/ssbd.h
 #lib/modules/KVER-ipfire/build/include/config/arm64/uao.h
 #lib/modules/KVER-ipfire/build/include/config/arm64/va
@@ -6299,50 +6301,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/bsd
 #lib/modules/KVER-ipfire/build/include/config/bsd/process
 #lib/modules/KVER-ipfire/build/include/config/bsd/process/acct.h
-#lib/modules/KVER-ipfire/build/include/config/bt
-#lib/modules/KVER-ipfire/build/include/config/bt.h
-#lib/modules/KVER-ipfire/build/include/config/bt/ath3k.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bcm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/mc
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/mc/filter.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/proto
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/proto/filter.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bredr.h
-#lib/modules/KVER-ipfire/build/include/config/bt/debugfs.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibcm203x.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibfusb.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibpa10x.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtsdio.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb/bcm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb/rtl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/ag6xx.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/ath3k.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/bcsp.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/h4.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/intel.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/mrvl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/qca.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcivhci.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hidp.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hs.h
-#lib/modules/KVER-ipfire/build/include/config/bt/intel.h
-#lib/modules/KVER-ipfire/build/include/config/bt/le.h
-#lib/modules/KVER-ipfire/build/include/config/bt/leds.h
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl/sdio.h
-#lib/modules/KVER-ipfire/build/include/config/bt/qca.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm/tty.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rtl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/wilink.h
 #lib/modules/KVER-ipfire/build/include/config/btrfs
 #lib/modules/KVER-ipfire/build/include/config/btrfs/assert.h
 #lib/modules/KVER-ipfire/build/include/config/btrfs/fs
@@ -6681,6 +6639,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/debug/fs.h
 #lib/modules/KVER-ipfire/build/include/config/debug/kernel.h
 #lib/modules/KVER-ipfire/build/include/config/debug/shirq.h
+#lib/modules/KVER-ipfire/build/include/config/debug/wx.h
 #lib/modules/KVER-ipfire/build/include/config/decompress
 #lib/modules/KVER-ipfire/build/include/config/decompress/bzip2.h
 #lib/modules/KVER-ipfire/build/include/config/decompress/gzip.h
@@ -8301,7 +8260,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/memory.h
 #lib/modules/KVER-ipfire/build/include/config/memory/balloon.h
 #lib/modules/KVER-ipfire/build/include/config/memory/isolation.h
-#lib/modules/KVER-ipfire/build/include/config/memstick.h
 #lib/modules/KVER-ipfire/build/include/config/men
 #lib/modules/KVER-ipfire/build/include/config/men/a21
 #lib/modules/KVER-ipfire/build/include/config/men/a21/wdt.h
@@ -8452,13 +8410,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched/deadline.h
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched/kyber.h
-#lib/modules/KVER-ipfire/build/include/config/ms
-#lib/modules/KVER-ipfire/build/include/config/ms/block.h
 #lib/modules/KVER-ipfire/build/include/config/msdos
 #lib/modules/KVER-ipfire/build/include/config/msdos/fs.h
 #lib/modules/KVER-ipfire/build/include/config/msdos/partition.h
-#lib/modules/KVER-ipfire/build/include/config/mspro
-#lib/modules/KVER-ipfire/build/include/config/mspro/block.h
 #lib/modules/KVER-ipfire/build/include/config/mt7601u.h
 #lib/modules/KVER-ipfire/build/include/config/mtd
 #lib/modules/KVER-ipfire/build/include/config/mtd.h
@@ -9613,6 +9567,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/sched/info.h
 #lib/modules/KVER-ipfire/build/include/config/sched/mc.h
 #lib/modules/KVER-ipfire/build/include/config/sched/smt.h
+#lib/modules/KVER-ipfire/build/include/config/sched/stack
+#lib/modules/KVER-ipfire/build/include/config/sched/stack/end
+#lib/modules/KVER-ipfire/build/include/config/sched/stack/end/check.h
 #lib/modules/KVER-ipfire/build/include/config/sched/tracer.h
 #lib/modules/KVER-ipfire/build/include/config/schedstats.h
 #lib/modules/KVER-ipfire/build/include/config/scsi
@@ -17293,22 +17250,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/block
 #lib/modules/KVER-ipfire/kernel/drivers/block/cryptoloop.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/block/virtio_blk.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bfusb.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bpa10x.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btbcm.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btintel.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btqca.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btrtl.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btsdio.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btusb.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btwilink.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_uart.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_vhci.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/timeriomem-rng.ko.xz
@@ -18222,11 +18163,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videobuf2-v4l2.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videodev.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/memstick.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/ms_block.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/mspro_block.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/mfd
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/lm3533-core.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/lm3533-ctrlbank.ko.xz
@@ -19198,14 +19134,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/atm/pppoatm.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/batman-adv
 #lib/modules/KVER-ipfire/kernel/net/batman-adv/batman-adv.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bluetooth.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep/bnep.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp/hidp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/bridge
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_802_3.ko.xz

diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi
index 37e8273d6911d6ea32a637bec959aee3b542116d..aab9e1737ff26076e5b0bc94c5ad7d1e7f8d64dc 100644 (file)
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -763,6 +763,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire-multi/build/arch/arm/include/asm/topology.h
 #lib/modules/KVER-ipfire-multi/build/arch/arm/include/asm/traps.h
 #lib/modules/KVER-ipfire-multi/build/arch/arm/include/asm/trusted_foundations.h
+#lib/modules/KVER-ipfire-multi/build/arch/arm/include/asm/uaccess-asm.h
 #lib/modules/KVER-ipfire-multi/build/arch/arm/include/asm/uaccess.h
 #lib/modules/KVER-ipfire-multi/build/arch/arm/include/asm/ucontext.h
 #lib/modules/KVER-ipfire-multi/build/arch/arm/include/asm/unaligned.h
@@ -6870,50 +6871,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire-multi/build/include/config/bsd
 #lib/modules/KVER-ipfire-multi/build/include/config/bsd/process
 #lib/modules/KVER-ipfire-multi/build/include/config/bsd/process/acct.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt
-#lib/modules/KVER-ipfire-multi/build/include/config/bt.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/ath3k.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/bcm.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/bnep
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/bnep.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/bnep/mc
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/bnep/mc/filter.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/bnep/proto
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/bnep/proto/filter.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/bredr.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/debugfs.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcibcm203x.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcibfusb.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcibpa10x.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcibtsdio.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcibtusb
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcibtusb.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcibtusb/bcm.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcibtusb/rtl.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart/ag6xx.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart/ath3k.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart/bcsp.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart/h4.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart/intel.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart/mrvl.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hciuart/qca.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hcivhci.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hidp.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/hs.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/intel.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/le.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/leds.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/mrvl
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/mrvl.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/mrvl/sdio.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/qca.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/rfcomm
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/rfcomm.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/rfcomm/tty.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/rtl.h
-#lib/modules/KVER-ipfire-multi/build/include/config/bt/wilink.h
 #lib/modules/KVER-ipfire-multi/build/include/config/btrfs
 #lib/modules/KVER-ipfire-multi/build/include/config/btrfs/assert.h
 #lib/modules/KVER-ipfire-multi/build/include/config/btrfs/fs
@@ -9048,7 +9005,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire-multi/build/include/config/memory
 #lib/modules/KVER-ipfire-multi/build/include/config/memory.h
 #lib/modules/KVER-ipfire-multi/build/include/config/memory/isolation.h
-#lib/modules/KVER-ipfire-multi/build/include/config/memstick.h
 #lib/modules/KVER-ipfire-multi/build/include/config/men
 #lib/modules/KVER-ipfire-multi/build/include/config/men/a21
 #lib/modules/KVER-ipfire-multi/build/include/config/men/a21/wdt.h
@@ -9218,13 +9174,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire-multi/build/include/config/mq/iosched
 #lib/modules/KVER-ipfire-multi/build/include/config/mq/iosched/deadline.h
 #lib/modules/KVER-ipfire-multi/build/include/config/mq/iosched/kyber.h
-#lib/modules/KVER-ipfire-multi/build/include/config/ms
-#lib/modules/KVER-ipfire-multi/build/include/config/ms/block.h
 #lib/modules/KVER-ipfire-multi/build/include/config/msdos
 #lib/modules/KVER-ipfire-multi/build/include/config/msdos/fs.h
 #lib/modules/KVER-ipfire-multi/build/include/config/msdos/partition.h
-#lib/modules/KVER-ipfire-multi/build/include/config/mspro
-#lib/modules/KVER-ipfire-multi/build/include/config/mspro/block.h
 #lib/modules/KVER-ipfire-multi/build/include/config/mt7601u.h
 #lib/modules/KVER-ipfire-multi/build/include/config/mtd
 #lib/modules/KVER-ipfire-multi/build/include/config/mtd.h
@@ -10533,6 +10485,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire-multi/build/include/config/sched/info.h
 #lib/modules/KVER-ipfire-multi/build/include/config/sched/mc.h
 #lib/modules/KVER-ipfire-multi/build/include/config/sched/smt.h
+#lib/modules/KVER-ipfire-multi/build/include/config/sched/stack
+#lib/modules/KVER-ipfire-multi/build/include/config/sched/stack/end
+#lib/modules/KVER-ipfire-multi/build/include/config/sched/stack/end/check.h
 #lib/modules/KVER-ipfire-multi/build/include/config/sched/tracer.h
 #lib/modules/KVER-ipfire-multi/build/include/config/schedstats.h
 #lib/modules/KVER-ipfire-multi/build/include/config/scsi
@@ -18334,22 +18289,6 @@ lib/modules/KVER-ipfire-multi/kernel
 #lib/modules/KVER-ipfire-multi/kernel/drivers/bcma/bcma.ko.xz
 #lib/modules/KVER-ipfire-multi/kernel/drivers/block
 #lib/modules/KVER-ipfire-multi/kernel/drivers/block/cryptoloop.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/ath3k.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/bcm203x.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/bfusb.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/bpa10x.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btbcm.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btintel.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btmrvl.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btmrvl_sdio.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btqca.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btrtl.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btsdio.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btusb.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btwilink.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/hci_uart.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/hci_vhci.ko.xz
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/hw_random
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/hw_random/timeriomem-rng.ko.xz
@@ -19306,11 +19245,6 @@ lib/modules/KVER-ipfire-multi/kernel
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-v4l2.ko.xz
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko.xz
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videodev.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core/memstick.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core/ms_block.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core/mspro_block.ko.xz
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/lm3533-core.ko.xz
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/lm3533-ctrlbank.ko.xz
@@ -20333,14 +20267,6 @@ lib/modules/KVER-ipfire-multi/kernel
 #lib/modules/KVER-ipfire-multi/kernel/net/atm/pppoatm.ko.xz
 #lib/modules/KVER-ipfire-multi/kernel/net/batman-adv
 #lib/modules/KVER-ipfire-multi/kernel/net/batman-adv/batman-adv.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/bluetooth.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/bnep
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/bnep/bnep.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/hidp
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/hidp/hidp.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/rfcomm
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/rfcomm/rfcomm.ko.xz
 #lib/modules/KVER-ipfire-multi/kernel/net/bridge
 #lib/modules/KVER-ipfire-multi/kernel/net/bridge/netfilter
 #lib/modules/KVER-ipfire-multi/kernel/net/bridge/netfilter/ebt_802_3.ko.xz

diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 6eef2032f3b428e6cdcd6a4b2c0fcc09a3340765..e7829cade35cec1512716aa210941a49ff3cb94f 100644 (file)
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -6535,52 +6535,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/bsd
 #lib/modules/KVER-ipfire/build/include/config/bsd/process
 #lib/modules/KVER-ipfire/build/include/config/bsd/process/acct.h
-#lib/modules/KVER-ipfire/build/include/config/bt
-#lib/modules/KVER-ipfire/build/include/config/bt.h
-#lib/modules/KVER-ipfire/build/include/config/bt/ath3k.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bcm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/mc
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/mc/filter.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/proto
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/proto/filter.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bredr.h
-#lib/modules/KVER-ipfire/build/include/config/bt/debugfs.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibcm203x.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibfusb.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibluecard.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibpa10x.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtsdio.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtuart.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb/bcm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb/rtl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/ag6xx.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/ath3k.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/bcsp.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/h4.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/intel.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/mrvl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/qca.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcivhci.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hidp.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hs.h
-#lib/modules/KVER-ipfire/build/include/config/bt/intel.h
-#lib/modules/KVER-ipfire/build/include/config/bt/le.h
-#lib/modules/KVER-ipfire/build/include/config/bt/leds.h
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl/sdio.h
-#lib/modules/KVER-ipfire/build/include/config/bt/qca.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm/tty.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rtl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/wilink.h
 #lib/modules/KVER-ipfire/build/include/config/btree.h
 #lib/modules/KVER-ipfire/build/include/config/btrfs
 #lib/modules/KVER-ipfire/build/include/config/btrfs/assert.h
@@ -6965,7 +6919,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/debug/bugverbose.h
 #lib/modules/KVER-ipfire/build/include/config/debug/fs.h
 #lib/modules/KVER-ipfire/build/include/config/debug/kernel.h
-#lib/modules/KVER-ipfire/build/include/config/debug/list.h
 #lib/modules/KVER-ipfire/build/include/config/debug/page
 #lib/modules/KVER-ipfire/build/include/config/debug/page/ref.h
 #lib/modules/KVER-ipfire/build/include/config/debug/rodata
@@ -8964,15 +8917,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/memory/balloon.h
 #lib/modules/KVER-ipfire/build/include/config/memory/failure.h
 #lib/modules/KVER-ipfire/build/include/config/memory/isolation.h
-#lib/modules/KVER-ipfire/build/include/config/memstick
-#lib/modules/KVER-ipfire/build/include/config/memstick.h
-#lib/modules/KVER-ipfire/build/include/config/memstick/jmicron
-#lib/modules/KVER-ipfire/build/include/config/memstick/jmicron/38x.h
-#lib/modules/KVER-ipfire/build/include/config/memstick/r592.h
-#lib/modules/KVER-ipfire/build/include/config/memstick/realtek
-#lib/modules/KVER-ipfire/build/include/config/memstick/realtek/pci.h
-#lib/modules/KVER-ipfire/build/include/config/memstick/tifm
-#lib/modules/KVER-ipfire/build/include/config/memstick/tifm/ms.h
 #lib/modules/KVER-ipfire/build/include/config/men
 #lib/modules/KVER-ipfire/build/include/config/men/a21
 #lib/modules/KVER-ipfire/build/include/config/men/a21/wdt.h
@@ -9140,16 +9084,12 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched/deadline.h
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched/kyber.h
-#lib/modules/KVER-ipfire/build/include/config/ms
-#lib/modules/KVER-ipfire/build/include/config/ms/block.h
 #lib/modules/KVER-ipfire/build/include/config/msdos
 #lib/modules/KVER-ipfire/build/include/config/msdos/fs.h
 #lib/modules/KVER-ipfire/build/include/config/msdos/partition.h
 #lib/modules/KVER-ipfire/build/include/config/msi
 #lib/modules/KVER-ipfire/build/include/config/msi/laptop.h
 #lib/modules/KVER-ipfire/build/include/config/msi/wmi.h
-#lib/modules/KVER-ipfire/build/include/config/mspro
-#lib/modules/KVER-ipfire/build/include/config/mspro/block.h
 #lib/modules/KVER-ipfire/build/include/config/mt7601u.h
 #lib/modules/KVER-ipfire/build/include/config/mtrr
 #lib/modules/KVER-ipfire/build/include/config/mtrr.h
@@ -11405,8 +11345,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/topstar/laptop.h
 #lib/modules/KVER-ipfire/build/include/config/toshiba
 #lib/modules/KVER-ipfire/build/include/config/toshiba.h
-#lib/modules/KVER-ipfire/build/include/config/toshiba/bt
-#lib/modules/KVER-ipfire/build/include/config/toshiba/bt/rfkill.h
 #lib/modules/KVER-ipfire/build/include/config/toshiba/haps.h
 #lib/modules/KVER-ipfire/build/include/config/toshiba/wmi.h
 #lib/modules/KVER-ipfire/build/include/config/trace
@@ -11791,7 +11729,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/usbip/vhci/nr
 #lib/modules/KVER-ipfire/build/include/config/usbip/vhci/nr/hcs.h
 #lib/modules/KVER-ipfire/build/include/config/usbpcwatchdog.h
-#lib/modules/KVER-ipfire/build/include/config/uselib.h
 #lib/modules/KVER-ipfire/build/include/config/user
 #lib/modules/KVER-ipfire/build/include/config/user/ns.h
 #lib/modules/KVER-ipfire/build/include/config/user/return
@@ -18685,24 +18622,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/block/sx8.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/block/umem.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/block/virtio_blk.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bfusb.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bpa10x.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btbcm.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btintel.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btqca.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btrtl.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btsdio.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btuart_cs.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btusb.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btwilink.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_uart.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_vhci.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char
 #lib/modules/KVER-ipfire/kernel/drivers/char/hangcheck-timer.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random
@@ -19856,16 +19775,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videobuf2-v4l2.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videodev.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/memstick.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/ms_block.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/mspro_block.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host/jmb38x_ms.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host/r592.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host/rtsx_pci_ms.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host/tifm_ms.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/message
 #lib/modules/KVER-ipfire/kernel/drivers/message/fusion
 #lib/modules/KVER-ipfire/kernel/drivers/message/fusion/mptbase.ko.xz
@@ -20591,7 +20500,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/topstar-laptop.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/toshiba-wmi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/toshiba_acpi.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/toshiba_bluetooth.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/toshiba_haps.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/wmi-bmof.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/wmi.ko.xz
@@ -21267,14 +21175,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/atm/pppoatm.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/batman-adv
 #lib/modules/KVER-ipfire/kernel/net/batman-adv/batman-adv.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bluetooth.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep/bnep.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp/hidp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/bridge
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_802_3.ko.xz

diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index a2d73b4e2f3ed18203b9b6cb572a535e8427373e..caea5dae19d2615c472d4d3a7254d87d371023f9 100644 (file)
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -6576,54 +6576,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/bsd
 #lib/modules/KVER-ipfire/build/include/config/bsd/process
 #lib/modules/KVER-ipfire/build/include/config/bsd/process/acct.h
-#lib/modules/KVER-ipfire/build/include/config/bt
-#lib/modules/KVER-ipfire/build/include/config/bt.h
-#lib/modules/KVER-ipfire/build/include/config/bt/ath3k.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bcm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/mc
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/mc/filter.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/proto
-#lib/modules/KVER-ipfire/build/include/config/bt/bnep/proto/filter.h
-#lib/modules/KVER-ipfire/build/include/config/bt/bredr.h
-#lib/modules/KVER-ipfire/build/include/config/bt/debugfs.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibcm203x.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibfusb.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibluecard.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibpa10x.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibt3c.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtsdio.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtuart.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb/bcm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcibtusb/rtl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcidtl1.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/ag6xx.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/ath3k.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/bcsp.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/h4.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/intel.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/mrvl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hciuart/qca.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hcivhci.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hidp.h
-#lib/modules/KVER-ipfire/build/include/config/bt/hs.h
-#lib/modules/KVER-ipfire/build/include/config/bt/intel.h
-#lib/modules/KVER-ipfire/build/include/config/bt/le.h
-#lib/modules/KVER-ipfire/build/include/config/bt/leds.h
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/mrvl/sdio.h
-#lib/modules/KVER-ipfire/build/include/config/bt/qca.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rfcomm/tty.h
-#lib/modules/KVER-ipfire/build/include/config/bt/rtl.h
-#lib/modules/KVER-ipfire/build/include/config/bt/wilink.h
 #lib/modules/KVER-ipfire/build/include/config/btree.h
 #lib/modules/KVER-ipfire/build/include/config/btrfs
 #lib/modules/KVER-ipfire/build/include/config/btrfs/assert.h
@@ -9025,15 +8977,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/memory/balloon.h
 #lib/modules/KVER-ipfire/build/include/config/memory/failure.h
 #lib/modules/KVER-ipfire/build/include/config/memory/isolation.h
-#lib/modules/KVER-ipfire/build/include/config/memstick
-#lib/modules/KVER-ipfire/build/include/config/memstick.h
-#lib/modules/KVER-ipfire/build/include/config/memstick/jmicron
-#lib/modules/KVER-ipfire/build/include/config/memstick/jmicron/38x.h
-#lib/modules/KVER-ipfire/build/include/config/memstick/r592.h
-#lib/modules/KVER-ipfire/build/include/config/memstick/realtek
-#lib/modules/KVER-ipfire/build/include/config/memstick/realtek/pci.h
-#lib/modules/KVER-ipfire/build/include/config/memstick/tifm
-#lib/modules/KVER-ipfire/build/include/config/memstick/tifm/ms.h
 #lib/modules/KVER-ipfire/build/include/config/men
 #lib/modules/KVER-ipfire/build/include/config/men/a21
 #lib/modules/KVER-ipfire/build/include/config/men/a21/wdt.h
@@ -9194,16 +9137,12 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched/deadline.h
 #lib/modules/KVER-ipfire/build/include/config/mq/iosched/kyber.h
-#lib/modules/KVER-ipfire/build/include/config/ms
-#lib/modules/KVER-ipfire/build/include/config/ms/block.h
 #lib/modules/KVER-ipfire/build/include/config/msdos
 #lib/modules/KVER-ipfire/build/include/config/msdos/fs.h
 #lib/modules/KVER-ipfire/build/include/config/msdos/partition.h
 #lib/modules/KVER-ipfire/build/include/config/msi
 #lib/modules/KVER-ipfire/build/include/config/msi/laptop.h
 #lib/modules/KVER-ipfire/build/include/config/msi/wmi.h
-#lib/modules/KVER-ipfire/build/include/config/mspro
-#lib/modules/KVER-ipfire/build/include/config/mspro/block.h
 #lib/modules/KVER-ipfire/build/include/config/mt7601u.h
 #lib/modules/KVER-ipfire/build/include/config/mtrr
 #lib/modules/KVER-ipfire/build/include/config/mtrr.h
@@ -9876,6 +9815,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/packet/diag.h
 #lib/modules/KVER-ipfire/build/include/config/padata.h
 #lib/modules/KVER-ipfire/build/include/config/page
+#lib/modules/KVER-ipfire/build/include/config/page/poisoning
+#lib/modules/KVER-ipfire/build/include/config/page/poisoning.h
+#lib/modules/KVER-ipfire/build/include/config/page/poisoning/zero.h
 #lib/modules/KVER-ipfire/build/include/config/page/table
 #lib/modules/KVER-ipfire/build/include/config/page/table/isolation.h
 #lib/modules/KVER-ipfire/build/include/config/panasonic
@@ -10479,6 +10421,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/sched/omit/frame
 #lib/modules/KVER-ipfire/build/include/config/sched/omit/frame/pointer.h
 #lib/modules/KVER-ipfire/build/include/config/sched/smt.h
+#lib/modules/KVER-ipfire/build/include/config/sched/stack
+#lib/modules/KVER-ipfire/build/include/config/sched/stack/end
+#lib/modules/KVER-ipfire/build/include/config/sched/stack/end/check.h
 #lib/modules/KVER-ipfire/build/include/config/sched/tracer.h
 #lib/modules/KVER-ipfire/build/include/config/schedstats.h
 #lib/modules/KVER-ipfire/build/include/config/scsi
@@ -11378,9 +11323,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/tmpfs/xattr.h
 #lib/modules/KVER-ipfire/build/include/config/topstar
 #lib/modules/KVER-ipfire/build/include/config/topstar/laptop.h
-#lib/modules/KVER-ipfire/build/include/config/toshiba
-#lib/modules/KVER-ipfire/build/include/config/toshiba/bt
-#lib/modules/KVER-ipfire/build/include/config/toshiba/bt/rfkill.h
 #lib/modules/KVER-ipfire/build/include/config/trace
 #lib/modules/KVER-ipfire/build/include/config/trace/clock.h
 #lib/modules/KVER-ipfire/build/include/config/trace/irqflags
@@ -11755,7 +11697,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/usbip/vhci/nr
 #lib/modules/KVER-ipfire/build/include/config/usbip/vhci/nr/hcs.h
 #lib/modules/KVER-ipfire/build/include/config/usbpcwatchdog.h
-#lib/modules/KVER-ipfire/build/include/config/uselib.h
 #lib/modules/KVER-ipfire/build/include/config/user
 #lib/modules/KVER-ipfire/build/include/config/user/ns.h
 #lib/modules/KVER-ipfire/build/include/config/user/return
@@ -18724,26 +18665,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/block/xen-blkback
 #lib/modules/KVER-ipfire/kernel/drivers/block/xen-blkback/xen-blkback.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/block/xen-blkfront.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bfusb.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bpa10x.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btbcm.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btintel.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btqca.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btrtl.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btsdio.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btuart_cs.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btusb.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btwilink.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_uart.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_vhci.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char
 #lib/modules/KVER-ipfire/kernel/drivers/char/hangcheck-timer.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random
@@ -19873,16 +19794,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videobuf2-v4l2.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/v4l2-core/videodev.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/memstick.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/ms_block.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/core/mspro_block.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host/jmb38x_ms.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host/r592.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host/rtsx_pci_ms.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/memstick/host/tifm_ms.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/message
 #lib/modules/KVER-ipfire/kernel/drivers/message/fusion
 #lib/modules/KVER-ipfire/kernel/drivers/message/fusion/mptbase.ko.xz
@@ -20599,7 +20510,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/thinkpad_acpi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/topstar-laptop.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/toshiba_acpi.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/toshiba_bluetooth.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/wmi-bmof.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/wmi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/power
@@ -21256,14 +21166,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/atm/pppoatm.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/batman-adv
 #lib/modules/KVER-ipfire/kernel/net/batman-adv/batman-adv.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bluetooth.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep/bnep.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp/hidp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/bridge
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_802_3.ko.xz

diff --git a/config/rootfiles/core/145/exclude b/config/rootfiles/core/146/exclude
similarity index 100%
rename from config/rootfiles/core/145/exclude
rename to config/rootfiles/core/146/exclude

diff --git a/config/rootfiles/core/146/filelists/aarch64/linux b/config/rootfiles/core/146/filelists/aarch64/linux
new file mode 120000 (symlink)
index 0000000..3a2532b
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file

diff --git a/config/rootfiles/core/146/filelists/aarch64/linux-initrd b/config/rootfiles/core/146/filelists/aarch64/linux-initrd
new file mode 120000 (symlink)
index 0000000..8acdb0f
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/aarch64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file

diff --git a/config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi
new file mode 120000 (symlink)
index 0000000..0b1b453
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file

diff --git a/config/rootfiles/core/146/filelists/armv5tel/linux-multi b/config/rootfiles/core/146/filelists/armv5tel/linux-multi
new file mode 120000 (symlink)
index 0000000..204eb4c
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file

diff --git a/config/rootfiles/core/146/filelists/files b/config/rootfiles/core/146/filelists/files
new file mode 100644 (file)
index 0000000..ce4e517
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/files
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs

diff --git a/config/rootfiles/core/146/filelists/i586/linux b/config/rootfiles/core/146/filelists/i586/linux
new file mode 120000 (symlink)
index 0000000..693ec4b
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file

diff --git a/config/rootfiles/core/146/filelists/i586/linux-initrd b/config/rootfiles/core/146/filelists/i586/linux-initrd
new file mode 120000 (symlink)
index 0000000..32a03e6
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file

diff --git a/config/rootfiles/core/146/filelists/x86_64/linux b/config/rootfiles/core/146/filelists/x86_64/linux
new file mode 120000 (symlink)
index 0000000..0615b5b
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file

diff --git a/config/rootfiles/core/146/filelists/x86_64/linux-initrd b/config/rootfiles/core/146/filelists/x86_64/linux-initrd
new file mode 120000 (symlink)
index 0000000..1b9fff7
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file

diff --git a/config/rootfiles/core/146/update.sh b/config/rootfiles/core/146/update.sh
new file mode 100644 (file)
index 0000000..da00a38
--- /dev/null
+++ b/config/rootfiles/core/146/update.sh
@@ -0,0 +1,149 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2020 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=146
+
+exit_with_error() {
+       # Set last succesfull installed core.
+       echo $(($core-1)) > /opt/pakfire/db/core/mine
+       # force fsck at next boot, this may fix free space on xfs
+       touch /forcefsck
+       # don't start pakfire again at error
+       killall -KILL pak_update
+       /usr/bin/logger -p syslog.emerg -t ipfire \
+               "core-update-${core}: $1"
+       exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+       cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# Do some sanity checks.
+case $(uname -r) in
+       *-ipfire-kirkwood)
+               exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1
+               ;;
+       *-ipfire*)
+               # Ok.
+               ;;
+       *)
+               exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+               ;;
+esac
+if [ -e /boot/grub/grub.conf ]; then
+       exit_with_error "ERROR unsupported GRUB1/pygrub found!" 1
+fi
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+       exit_with_error "ERROR cannot update because not enough free space on root." 2
+       exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-*-ipfire-*
+rm -rf /boot/zImage-*-ipfire-*
+rm -rf /boot/uInit-*-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+# Remove files
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# remove dropped packages
+for package in linux-pae; do
+        if [ -e /opt/pakfire/db/installed/meta-$package ]; then
+               stop_service $package
+               for i in $(cat /opt/pakfire/db/rootfiles/$package); do
+                       rm -rfv /${i}
+               done
+        fi
+        rm -f /opt/pakfire/db/installed/meta-$package
+        rm -f /opt/pakfire/db/meta/meta-$package
+        rm -f /opt/pakfire/db/rootfiles/$package
+done
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+
+# remove lm_sensor config after collectd was started
+# to reserch sensors at next boot with updated kernel
+rm -f  /etc/sysconfig/lm_sensors
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+       sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+       /boot/pakfire-kernel-update ${KVER}
+fi
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+       grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/oldcore/145/exclude b/config/rootfiles/oldcore/145/exclude
new file mode 100644 (file)
index 0000000..b221598
--- /dev/null
+++ b/config/rootfiles/oldcore/145/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache

diff --git a/config/rootfiles/core/145/filelists/BerkeleyDB b/config/rootfiles/oldcore/145/filelists/BerkeleyDB
similarity index 100%
rename from config/rootfiles/core/145/filelists/BerkeleyDB
rename to config/rootfiles/oldcore/145/filelists/BerkeleyDB

diff --git a/config/rootfiles/core/145/filelists/berkeley b/config/rootfiles/oldcore/145/filelists/berkeley
similarity index 100%
rename from config/rootfiles/core/145/filelists/berkeley
rename to config/rootfiles/oldcore/145/filelists/berkeley

diff --git a/config/rootfiles/core/145/filelists/berkeley-compat b/config/rootfiles/oldcore/145/filelists/berkeley-compat
similarity index 100%
rename from config/rootfiles/core/145/filelists/berkeley-compat
rename to config/rootfiles/oldcore/145/filelists/berkeley-compat

diff --git a/config/rootfiles/core/145/filelists/bind b/config/rootfiles/oldcore/145/filelists/bind
similarity index 100%
rename from config/rootfiles/core/145/filelists/bind
rename to config/rootfiles/oldcore/145/filelists/bind

diff --git a/config/rootfiles/core/145/filelists/coreutils b/config/rootfiles/oldcore/145/filelists/coreutils
similarity index 100%
rename from config/rootfiles/core/145/filelists/coreutils
rename to config/rootfiles/oldcore/145/filelists/coreutils

diff --git a/config/rootfiles/core/145/filelists/files b/config/rootfiles/oldcore/145/filelists/files
similarity index 100%
rename from config/rootfiles/core/145/filelists/files
rename to config/rootfiles/oldcore/145/filelists/files

diff --git a/config/rootfiles/core/145/filelists/gnupg b/config/rootfiles/oldcore/145/filelists/gnupg
similarity index 100%
rename from config/rootfiles/core/145/filelists/gnupg
rename to config/rootfiles/oldcore/145/filelists/gnupg

diff --git a/config/rootfiles/core/145/filelists/gzip b/config/rootfiles/oldcore/145/filelists/gzip
similarity index 100%
rename from config/rootfiles/core/145/filelists/gzip
rename to config/rootfiles/oldcore/145/filelists/gzip

diff --git a/config/rootfiles/core/145/filelists/i586/hyperscan b/config/rootfiles/oldcore/145/filelists/i586/hyperscan
similarity index 100%
rename from config/rootfiles/core/145/filelists/i586/hyperscan
rename to config/rootfiles/oldcore/145/filelists/i586/hyperscan

diff --git a/config/rootfiles/core/145/filelists/iproute2 b/config/rootfiles/oldcore/145/filelists/iproute2
similarity index 100%
rename from config/rootfiles/core/145/filelists/iproute2
rename to config/rootfiles/oldcore/145/filelists/iproute2

diff --git a/config/rootfiles/core/145/filelists/ipset b/config/rootfiles/oldcore/145/filelists/ipset
similarity index 100%
rename from config/rootfiles/core/145/filelists/ipset
rename to config/rootfiles/oldcore/145/filelists/ipset

diff --git a/config/rootfiles/core/145/filelists/knot b/config/rootfiles/oldcore/145/filelists/knot
similarity index 100%
rename from config/rootfiles/core/145/filelists/knot
rename to config/rootfiles/oldcore/145/filelists/knot

diff --git a/config/rootfiles/core/145/filelists/libenvent2 b/config/rootfiles/oldcore/145/filelists/libenvent2
similarity index 100%
rename from config/rootfiles/core/145/filelists/libenvent2
rename to config/rootfiles/oldcore/145/filelists/libenvent2

diff --git a/config/rootfiles/core/145/filelists/libhtp b/config/rootfiles/oldcore/145/filelists/libhtp
similarity index 100%
rename from config/rootfiles/core/145/filelists/libhtp
rename to config/rootfiles/oldcore/145/filelists/libhtp

diff --git a/config/rootfiles/core/145/filelists/libjpeg b/config/rootfiles/oldcore/145/filelists/libjpeg
similarity index 100%
rename from config/rootfiles/core/145/filelists/libjpeg
rename to config/rootfiles/oldcore/145/filelists/libjpeg

diff --git a/config/rootfiles/core/145/filelists/libpng b/config/rootfiles/oldcore/145/filelists/libpng
similarity index 100%
rename from config/rootfiles/core/145/filelists/libpng
rename to config/rootfiles/oldcore/145/filelists/libpng

diff --git a/config/rootfiles/core/145/filelists/libusb b/config/rootfiles/oldcore/145/filelists/libusb
similarity index 100%
rename from config/rootfiles/core/145/filelists/libusb
rename to config/rootfiles/oldcore/145/filelists/libusb

diff --git a/config/rootfiles/core/145/filelists/libwww-perl b/config/rootfiles/oldcore/145/filelists/libwww-perl
similarity index 100%
rename from config/rootfiles/core/145/filelists/libwww-perl
rename to config/rootfiles/oldcore/145/filelists/libwww-perl

diff --git a/config/rootfiles/core/145/filelists/openldap b/config/rootfiles/oldcore/145/filelists/openldap
similarity index 100%
rename from config/rootfiles/core/145/filelists/openldap
rename to config/rootfiles/oldcore/145/filelists/openldap

diff --git a/config/rootfiles/core/145/filelists/perl-DBD-SQLite b/config/rootfiles/oldcore/145/filelists/perl-DBD-SQLite
similarity index 100%
rename from config/rootfiles/core/145/filelists/perl-DBD-SQLite
rename to config/rootfiles/oldcore/145/filelists/perl-DBD-SQLite

diff --git a/config/rootfiles/core/145/filelists/perl-DBI b/config/rootfiles/oldcore/145/filelists/perl-DBI
similarity index 100%
rename from config/rootfiles/core/145/filelists/perl-DBI
rename to config/rootfiles/oldcore/145/filelists/perl-DBI

diff --git a/config/rootfiles/core/145/filelists/squid b/config/rootfiles/oldcore/145/filelists/squid
similarity index 100%
rename from config/rootfiles/core/145/filelists/squid
rename to config/rootfiles/oldcore/145/filelists/squid

diff --git a/config/rootfiles/core/145/filelists/suricata b/config/rootfiles/oldcore/145/filelists/suricata
similarity index 100%
rename from config/rootfiles/core/145/filelists/suricata
rename to config/rootfiles/oldcore/145/filelists/suricata

diff --git a/config/rootfiles/core/145/filelists/unbound b/config/rootfiles/oldcore/145/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/145/filelists/unbound
rename to config/rootfiles/oldcore/145/filelists/unbound

diff --git a/config/rootfiles/core/145/filelists/vnstat b/config/rootfiles/oldcore/145/filelists/vnstat
similarity index 100%
rename from config/rootfiles/core/145/filelists/vnstat
rename to config/rootfiles/oldcore/145/filelists/vnstat

diff --git a/config/rootfiles/core/145/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/145/filelists/x86_64/hyperscan
similarity index 100%
rename from config/rootfiles/core/145/filelists/x86_64/hyperscan
rename to config/rootfiles/oldcore/145/filelists/x86_64/hyperscan

diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/oldcore/145/update.sh
similarity index 100%
rename from config/rootfiles/core/145/update.sh
rename to config/rootfiles/oldcore/145/update.sh

diff --git a/lfs/linux b/lfs/linux
index 847abcbae1c29f628a2ee4931d977955a9e0da57..b71f0ead3879955e7382598ac0b5e0d7e55698d4 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.173
-ARM_PATCHES = 4.14.173-ipfire0
+VER         = 4.14.183
+ARM_PATCHES = 4.14.183-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,9 +34,6 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 94
-DEPS      =
-
 HEADERS_ARCH  = $(BUILD_PLATFORM)
 KERNEL_ARCH   = $(BUILD_ARCH)
 KERNEL_TARGET = bzImage
@@ -82,8 +79,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 450adc5d8dc77bd2d89a4d7098f0abac
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 3072dd813363b20361f80ecc748a1084
+$(DL_FILE)_MD5                                 = bd6db02bdbe35609756842b8c4c72cad
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 55f6b8d709919adb8791e507836ceedc
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index b9490588068741c96d1fdfb473ff72215a37b255..5ed15a0f5ad83fcef2f84b182ed3ddf489407360 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
-CORE="145"                                                     # Core Level (Filename)
+CORE="146"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level