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 cbbed5bc1487ca0e3343b0aaf777abea258ef49c (commit) via 9df49966d6c511227debbfca57dbe1ad38664f87 (commit) via b7ed5dc81796dbc49b48306259bd72fbd35c107f (commit) via 9012cffdb6588448de51a592dd1bdfeb6cd3ec05 (commit) via 340f155649ee22afa19f1b6677e35a3d155a7898 (commit) via 15f53912a1a474a2f0cce9a1cd1478276395f3ff (commit) via c913c9862cef699125149dc0ba40adc86eff05c6 (commit) via fef9a33846217b0257eda627a3aa6528b70adc86 (commit) via 828d3d2525a449c45b719a31fba800558a0c3b18 (commit) via 034a2402fc24083ec99e5caa70c45a1d810c9d33 (commit) via f58a8cb16f487441a86ea48ae6aaf06eb9f6e7e5 (commit) via c0932f8fbece2beb13644605d85b599fe33505e4 (commit) via 0e83b0d03c0907d99f7f709482476267c903c2dd (commit) via f06578af15465ab9eedca2e4840d070b8497a81c (commit) from 8c855a589271b52f9d2231fd520dc73fd66509fa (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 cbbed5bc1487ca0e3343b0aaf777abea258ef49c Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:29 2021 +0000
kernel: Enable all cgroups on all architectures
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9df49966d6c511227debbfca57dbe1ad38664f87 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:28 2021 +0000
kernel: Zero-init all stack variables by default
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b7ed5dc81796dbc49b48306259bd72fbd35c107f Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:27 2021 +0000
kernel: Enable support for TPM hardware
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9012cffdb6588448de51a592dd1bdfeb6cd3ec05 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:26 2021 +0000
kernel: Enable ExFAT on all architectures
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 340f155649ee22afa19f1b6677e35a3d155a7898 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:25 2021 +0000
kernel: Enable frontswap
"Frontswap provides a “transcendent memory” interface for swap pages. In some environments, dramatic performance savings may be obtained because swapped pages are saved in RAM (or a RAM-like device) instead of a swap disk."
https://www.kernel.org/doc/html/latest/vm/frontswap.html
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 15f53912a1a474a2f0cce9a1cd1478276395f3ff Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:24 2021 +0000
kernel: Disable network security hooks
This is a feature we do not use and it should therefore be disabled
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c913c9862cef699125149dc0ba40adc86eff05c6 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:23 2021 +0000
kernel: Disable OpenvSwitch
We do not use this and so we should not build it to save space.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fef9a33846217b0257eda627a3aa6528b70adc86 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:22 2021 +0000
kernel: Disable any runtime testing
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 828d3d2525a449c45b719a31fba800558a0c3b18 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:21 2021 +0000
kernel: Disable SLUB debugging
This is not necessary on our systems and according to the documentation will reduce code size of the allocator which will result in better performance.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 034a2402fc24083ec99e5caa70c45a1d810c9d33 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:20 2021 +0000
kernel: Enable Pressure Stall Information
This is a new type of metric to find out what resource is currently a bottleneck for the whole system. We might use this for graphs.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f58a8cb16f487441a86ea48ae6aaf06eb9f6e7e5 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:19 2021 +0000
kernel: Disable IRQ time accounting
This feature is now disabled (was disabled on ARM before) as we do not need it:
"Select this option to enable fine granularity task irq time accounting. This is done by reading a timestamp on each transitions between softirq and hardirq state, so there can be a small performance impact."
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c0932f8fbece2beb13644605d85b599fe33505e4 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:18 2021 +0000
kernel: Disable suspending systems to RAM
We do not make any use of this functionality
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0e83b0d03c0907d99f7f709482476267c903c2dd Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 11:42:17 2021 +0000
kernel: Change timer tick to 1000Hz
This change is required to make the system respond faster to any realtime events (sending or receiving data packets).
It will wake up at least one core 1000 times a second which will result in finer timer granularity and make scheduling smoother. HTB for example sends large packet bursts on each timer even to keep up data rates which is not helpful for most applications.
The change might increase resource consumption and overhead slightly on some systems, but since we are running in an idle-dyntick configuration, we should not keep awake any cores that have not been awake before.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f06578af15465ab9eedca2e4840d070b8497a81c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 20 13:57:26 2021 +0000
core161: start updater
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 92 ++++++------------ config/kernel/kernel.config.armv6l-ipfire | 89 ++++++----------- config/kernel/kernel.config.i586-ipfire | 99 +++++++------------ config/kernel/kernel.config.x86_64-ipfire | 105 ++++++++------------- config/rootfiles/{oldcore/159 => core/161}/exclude | 0 .../124 => core/161}/filelists/aarch64/linux | 0 .../161}/filelists/aarch64/linux-initrd | 0 .../159 => core/161}/filelists/armv6l/linux | 0 .../159 => core/161}/filelists/armv6l/linux-initrd | 0 .../{oldcore/159 => core/161}/filelists/core-files | 0 config/rootfiles/core/161/filelists/files | 1 + .../{oldcore/100 => core/161}/filelists/i586/linux | 0 .../100 => core/161}/filelists/i586/linux-initrd | 0 .../100 => core/161}/filelists/x86_64/linux | 0 .../100 => core/161}/filelists/x86_64/linux-initrd | 0 .../rootfiles/{oldcore/150 => core/161}/update.sh | 30 +++--- config/rootfiles/{core => oldcore}/160/exclude | 0 .../{core => oldcore}/160/filelists/Text-Tabs+Wrap | 0 .../{core => oldcore}/160/filelists/aarch64/glibc | 0 .../{core => oldcore}/160/filelists/armv6l/glibc | 0 .../rootfiles/{core => oldcore}/160/filelists/curl | 0 .../rootfiles/{core => oldcore}/160/filelists/ddns | 0 .../{core => oldcore}/160/filelists/e2fsprogs | 0 .../{core => oldcore}/160/filelists/ethtool | 0 .../{core => oldcore}/160/filelists/files | 0 .../{core => oldcore}/160/filelists/i586/glibc | 0 .../{core => oldcore}/160/filelists/iproute2 | 0 .../rootfiles/{core => oldcore}/160/filelists/less | 0 .../{core => oldcore}/160/filelists/libhtp | 0 .../{core => oldcore}/160/filelists/libidn | 0 .../{core => oldcore}/160/filelists/libloc | 0 .../{core => oldcore}/160/filelists/libssh | 0 .../{core => oldcore}/160/filelists/libtasn1 | 0 .../{core => oldcore}/160/filelists/openssh | 0 .../{core => oldcore}/160/filelists/openssl | 0 .../{core => oldcore}/160/filelists/p11-kit | 0 .../rootfiles/{core => oldcore}/160/filelists/pcre | 0 .../{core => oldcore}/160/filelists/perl-MIME-Lite | 0 .../{core => oldcore}/160/filelists/poppler | 0 .../{core => oldcore}/160/filelists/release-files | 0 .../{core => oldcore}/160/filelists/sqlite | 0 .../{core => oldcore}/160/filelists/strongswan | 0 .../rootfiles/{core => oldcore}/160/filelists/sudo | 0 .../{core => oldcore}/160/filelists/suricata | 0 .../{core => oldcore}/160/filelists/sysfsutils | 0 .../{core => oldcore}/160/filelists/sysstat | 0 .../rootfiles/{core => oldcore}/160/filelists/udev | 0 .../{core => oldcore}/160/filelists/wireless-regdb | 0 .../{core => oldcore}/160/filelists/x86_64/glibc | 0 config/rootfiles/{core => oldcore}/160/update.sh | 0 make.sh | 4 +- 51 files changed, 152 insertions(+), 268 deletions(-) copy config/rootfiles/{oldcore/159 => core/161}/exclude (100%) copy config/rootfiles/{oldcore/124 => core/161}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/124 => core/161}/filelists/aarch64/linux-initrd (100%) copy config/rootfiles/{oldcore/159 => core/161}/filelists/armv6l/linux (100%) copy config/rootfiles/{oldcore/159 => core/161}/filelists/armv6l/linux-initrd (100%) copy config/rootfiles/{oldcore/159 => core/161}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/161/filelists/files copy config/rootfiles/{oldcore/100 => core/161}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/100 => core/161}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/100 => core/161}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/100 => core/161}/filelists/x86_64/linux-initrd (100%) copy config/rootfiles/{oldcore/150 => core/161}/update.sh (91%) rename config/rootfiles/{core => oldcore}/160/exclude (100%) rename config/rootfiles/{core => oldcore}/160/filelists/Text-Tabs+Wrap (100%) rename config/rootfiles/{core => oldcore}/160/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/160/filelists/armv6l/glibc (100%) rename config/rootfiles/{core => oldcore}/160/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/160/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/160/filelists/e2fsprogs (100%) rename config/rootfiles/{core => oldcore}/160/filelists/ethtool (100%) rename config/rootfiles/{core => oldcore}/160/filelists/files (100%) rename config/rootfiles/{core => oldcore}/160/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/160/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/160/filelists/less (100%) rename config/rootfiles/{core => oldcore}/160/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/160/filelists/libidn (100%) rename config/rootfiles/{core => oldcore}/160/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/160/filelists/libssh (100%) rename config/rootfiles/{core => oldcore}/160/filelists/libtasn1 (100%) rename config/rootfiles/{core => oldcore}/160/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/160/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/160/filelists/p11-kit (100%) rename config/rootfiles/{core => oldcore}/160/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/160/filelists/perl-MIME-Lite (100%) rename config/rootfiles/{core => oldcore}/160/filelists/poppler (100%) rename config/rootfiles/{core => oldcore}/160/filelists/release-files (100%) rename config/rootfiles/{core => oldcore}/160/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/160/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/160/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/160/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/160/filelists/sysfsutils (100%) rename config/rootfiles/{core => oldcore}/160/filelists/sysstat (100%) rename config/rootfiles/{core => oldcore}/160/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/160/filelists/wireless-regdb (100%) rename config/rootfiles/{core => oldcore}/160/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/160/update.sh (100%)
Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 450835d8b..4449227e9 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -95,7 +95,8 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_PSI is not set +CONFIG_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set # end of CPU/Task time and stats accounting
CONFIG_CPU_ISOLATION=y @@ -141,7 +142,7 @@ CONFIG_FAIR_GROUP_SCHED=y # CONFIG_CFS_BANDWIDTH is not set CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y -# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_RDMA=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y @@ -225,7 +226,7 @@ CONFIG_PERF_EVENTS=y # end of Kernel Performance Events And Counters
CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG is not set # CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -370,11 +371,11 @@ CONFIG_NR_CPUS=8 CONFIG_HOTPLUG_CPU=y # CONFIG_NUMA is not set CONFIG_HOLES_IN_ZONE=y -CONFIG_HZ_100=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=100 +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -480,9 +481,7 @@ CONFIG_SYSVIPC_COMPAT=y # # Power management options # -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set +# CONFIG_SUSPEND is not set # CONFIG_HIBERNATION is not set CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -957,11 +956,12 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y # CONFIG_MEMORY_FAILURE is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_CLEANCACHE=y -# CONFIG_FRONTSWAP is not set +CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set CONFIG_CMA_AREAS=7 +# CONFIG_ZSWAP is not set # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set # CONFIG_ZSMALLOC is not set @@ -1596,10 +1596,7 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=m -CONFIG_OPENVSWITCH_VXLAN=m -CONFIG_OPENVSWITCH_GENEVE=m +# CONFIG_OPENVSWITCH is not set CONFIG_VSOCKETS=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m @@ -3425,7 +3422,19 @@ CONFIG_DEVMEM=y CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=8192 CONFIG_DEVPORT=y -# CONFIG_TCG_TPM is not set +CONFIG_TCG_TPM=m +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TIS_CORE=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_CRB=m +CONFIG_TCG_VTPM_PROXY=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m # CONFIG_XILLYBUS is not set # end of Character devices
@@ -7092,7 +7101,8 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" # CONFIG_FAT_DEFAULT_UTF8 is not set -# CONFIG_EXFAT_FS is not set +CONFIG_EXFAT_FS=m +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_NTFS_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems
@@ -7273,13 +7283,13 @@ CONFIG_IO_WQ=y CONFIG_KEYS=y # CONFIG_KEYS_REQUEST_CACHE is not set # CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_TRUSTED_KEYS is not set # CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEY_DH_OPERATIONS is not set CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -CONFIG_SECURITY_NETWORK_XFRM=y +# CONFIG_SECURITY_NETWORK is not set # CONFIG_SECURITY_PATH is not set CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y @@ -7315,7 +7325,7 @@ CONFIG_GCC_PLUGIN_STRUCTLEAK=y CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set # CONFIG_GCC_PLUGIN_STACKLEAK is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization # end of Kernel hardening options @@ -7752,7 +7762,6 @@ CONFIG_GENERIC_PTDUMP=y CONFIG_PTDUMP_CORE=y # CONFIG_PTDUMP_DEBUGFS is not set # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set @@ -7917,48 +7926,7 @@ CONFIG_IO_STRICT_DEVMEM=y CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_KCOV is not set -CONFIG_RUNTIME_TESTING_MENU=y -# CONFIG_LKDTM is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_MIN_HEAP is not set -# CONFIG_TEST_SORT is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -CONFIG_RBTREE_TEST=m -# CONFIG_REED_SOLOMON_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -# CONFIG_TEST_HEXDUMP is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_STRSCPY is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_TEST_PRINTF is not set -# CONFIG_TEST_BITMAP is not set -# CONFIG_TEST_UUID is not set -# CONFIG_TEST_XARRAY is not set -# CONFIG_TEST_OVERFLOW is not set -# CONFIG_TEST_RHASHTABLE is not set -# CONFIG_TEST_HASH is not set -# CONFIG_TEST_IDA is not set -# CONFIG_TEST_PARMAN is not set -# CONFIG_TEST_LKM is not set -# CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_VMALLOC is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_TEST_BPF is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set -# CONFIG_FIND_BIT_BENCHMARK is not set -# CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_SYSCTL is not set -# CONFIG_TEST_UDELAY is not set -# CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_TEST_KMOD is not set -# CONFIG_TEST_MEMCAT_P is not set -# CONFIG_TEST_OBJAGG is not set -# CONFIG_TEST_STACKINIT is not set -# CONFIG_TEST_MEMINIT is not set -# CONFIG_TEST_FREE_PAGES is not set +# CONFIG_RUNTIME_TESTING_MENU is not set # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage # end of Kernel hacking diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire index b1af6555c..77a4b8661 100644 --- a/config/kernel/kernel.config.armv6l-ipfire +++ b/config/kernel/kernel.config.armv6l-ipfire @@ -103,7 +103,8 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_PSI is not set +CONFIG_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set # end of CPU/Task time and stats accounting
CONFIG_CPU_ISOLATION=y @@ -146,7 +147,7 @@ CONFIG_FAIR_GROUP_SCHED=y # CONFIG_CFS_BANDWIDTH is not set CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y -# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_RDMA=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y @@ -226,7 +227,7 @@ CONFIG_PERF_EVENTS=y # end of Kernel Performance Events And Counters
CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG is not set # CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -588,13 +589,13 @@ CONFIG_HOTPLUG_CPU=y CONFIG_ARM_PSCI=y CONFIG_ARCH_NR_GPIO=512 CONFIG_HZ_FIXED=0 -CONFIG_HZ_100=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set # CONFIG_HZ_500 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=100 +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_ARM_PATCH_IDIV=y CONFIG_AEABI=y @@ -702,9 +703,7 @@ CONFIG_NEON=y # # Power management options # -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set +# CONFIG_SUSPEND is not set # CONFIG_HIBERNATION is not set CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -965,11 +964,12 @@ CONFIG_BOUNCE=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_CLEANCACHE=y -# CONFIG_FRONTSWAP is not set +CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set CONFIG_CMA_AREAS=7 +# CONFIG_ZSWAP is not set # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set # CONFIG_ZSMALLOC is not set @@ -1608,10 +1608,7 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=m -CONFIG_OPENVSWITCH_VXLAN=m -CONFIG_OPENVSWITCH_GENEVE=m +# CONFIG_OPENVSWITCH is not set CONFIG_VSOCKETS=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m @@ -3466,7 +3463,16 @@ CONFIG_DEVMEM=y CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=8192 CONFIG_DEVPORT=y -# CONFIG_TCG_TPM is not set +CONFIG_TCG_TPM=m +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TIS_CORE=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_VTPM_PROXY=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m # CONFIG_XILLYBUS is not set # end of Character devices
@@ -7192,7 +7198,8 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" # CONFIG_FAT_DEFAULT_UTF8 is not set -# CONFIG_EXFAT_FS is not set +CONFIG_EXFAT_FS=m +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_NTFS_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems
@@ -7368,13 +7375,13 @@ CONFIG_IO_WQ=y CONFIG_KEYS=y # CONFIG_KEYS_REQUEST_CACHE is not set # CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_TRUSTED_KEYS is not set # CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEY_DH_OPERATIONS is not set CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -CONFIG_SECURITY_NETWORK_XFRM=y +# CONFIG_SECURITY_NETWORK is not set # CONFIG_SECURITY_PATH is not set CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y @@ -7409,7 +7416,7 @@ CONFIG_GCC_PLUGIN_STRUCTLEAK=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization # end of Kernel hardening options @@ -7827,7 +7834,6 @@ CONFIG_DEBUG_MISC=y # CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_WX is not set # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set @@ -7990,48 +7996,7 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_KCOV is not set -CONFIG_RUNTIME_TESTING_MENU=y -# CONFIG_LKDTM is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_MIN_HEAP is not set -# CONFIG_TEST_SORT is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -CONFIG_RBTREE_TEST=m -# CONFIG_REED_SOLOMON_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -# CONFIG_TEST_HEXDUMP is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_STRSCPY is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_TEST_PRINTF is not set -# CONFIG_TEST_BITMAP is not set -# CONFIG_TEST_UUID is not set -# CONFIG_TEST_XARRAY is not set -# CONFIG_TEST_OVERFLOW is not set -# CONFIG_TEST_RHASHTABLE is not set -# CONFIG_TEST_HASH is not set -# CONFIG_TEST_IDA is not set -# CONFIG_TEST_PARMAN is not set -# CONFIG_TEST_LKM is not set -# CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_VMALLOC is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_TEST_BPF is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set -# CONFIG_FIND_BIT_BENCHMARK is not set -# CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_SYSCTL is not set -# CONFIG_TEST_UDELAY is not set -# CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_TEST_KMOD is not set -# CONFIG_TEST_MEMCAT_P is not set -# CONFIG_TEST_OBJAGG is not set -# CONFIG_TEST_STACKINIT is not set -# CONFIG_TEST_MEMINIT is not set -# CONFIG_TEST_FREE_PAGES is not set +# CONFIG_RUNTIME_TESTING_MENU is not set # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage # end of Kernel hacking diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 5f5a496a8..f426bf0b0 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -103,7 +103,7 @@ CONFIG_PREEMPT_VOLUNTARY=y # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_IRQ_TIME_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_HAVE_SCHED_AVG_IRQ=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set @@ -111,7 +111,8 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_PSI is not set +CONFIG_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set # end of CPU/Task time and stats accounting
CONFIG_CPU_ISOLATION=y @@ -144,14 +145,18 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CGROUPS=y -# CONFIG_MEMCG is not set +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_KMEM=y CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y # CONFIG_CFS_BANDWIDTH is not set CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y -# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_RDMA=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y @@ -234,7 +239,8 @@ CONFIG_PERF_EVENTS=y # end of Kernel Performance Events And Counters
CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -438,11 +444,11 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y -CONFIG_HZ_100=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=100 +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y # CONFIG_KEXEC is not set CONFIG_CRASH_DUMP=y @@ -464,9 +470,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options # -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set +# CONFIG_SUSPEND is not set # CONFIG_HIBERNATION is not set CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -484,7 +488,6 @@ CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SPCR_TABLE=y -CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=y @@ -952,8 +955,9 @@ CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_CLEANCACHE=y -# CONFIG_FRONTSWAP is not set +CONFIG_FRONTSWAP=y # CONFIG_CMA is not set +# CONFIG_ZSWAP is not set # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set # CONFIG_ZSMALLOC is not set @@ -1587,10 +1591,7 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=m -CONFIG_OPENVSWITCH_VXLAN=m -CONFIG_OPENVSWITCH_GENEVE=m +# CONFIG_OPENVSWITCH is not set CONFIG_VSOCKETS=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m @@ -3453,7 +3454,21 @@ CONFIG_DEVPORT=y CONFIG_HPET=y # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m -# CONFIG_TCG_TPM is not set +CONFIG_TCG_TPM=m +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TIS_CORE=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_XEN=m +CONFIG_TCG_CRB=m +CONFIG_TCG_VTPM_PROXY=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m # CONFIG_TELCLOCK is not set # CONFIG_XILLYBUS is not set # end of Character devices @@ -6917,8 +6932,7 @@ CONFIG_ENCRYPTED_KEYS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y # CONFIG_SECURITYFS is not set -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_NETWORK is not set # CONFIG_SECURITY_PATH is not set # CONFIG_INTEL_TXT is not set CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y @@ -7385,7 +7399,6 @@ CONFIG_GENERIC_PTDUMP=y CONFIG_PTDUMP_CORE=y # CONFIG_PTDUMP_DEBUGFS is not set # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set @@ -7578,49 +7591,7 @@ CONFIG_UNWINDER_FRAME_POINTER=y # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set CONFIG_CC_HAS_SANCOV_TRACE_PC=y -CONFIG_RUNTIME_TESTING_MENU=y -# CONFIG_LKDTM is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_MIN_HEAP is not set -# CONFIG_TEST_SORT is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_REED_SOLOMON_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -# CONFIG_ASYNC_RAID6_TEST is not set -# CONFIG_TEST_HEXDUMP is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_STRSCPY is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_TEST_PRINTF is not set -# CONFIG_TEST_BITMAP is not set -# CONFIG_TEST_UUID is not set -# CONFIG_TEST_XARRAY is not set -# CONFIG_TEST_OVERFLOW is not set -# CONFIG_TEST_RHASHTABLE is not set -# CONFIG_TEST_HASH is not set -# CONFIG_TEST_IDA is not set -# CONFIG_TEST_PARMAN is not set -# CONFIG_TEST_LKM is not set -# CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_VMALLOC is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_TEST_BPF is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set -# CONFIG_FIND_BIT_BENCHMARK is not set -# CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_SYSCTL is not set -# CONFIG_TEST_UDELAY is not set -# CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_TEST_KMOD is not set -# CONFIG_TEST_MEMCAT_P is not set -# CONFIG_TEST_OBJAGG is not set -# CONFIG_TEST_STACKINIT is not set -# CONFIG_TEST_MEMINIT is not set -# CONFIG_TEST_FREE_PAGES is not set -# CONFIG_TEST_FPU is not set +# CONFIG_RUNTIME_TESTING_MENU is not set # CONFIG_MEMTEST is not set # CONFIG_HYPERV_TESTING is not set # end of Kernel Testing and Coverage diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index f8289aeb8..9cd6756cd 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -107,7 +107,7 @@ CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -CONFIG_IRQ_TIME_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_HAVE_SCHED_AVG_IRQ=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set @@ -115,7 +115,8 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_PSI is not set +CONFIG_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set # end of CPU/Task time and stats accounting
CONFIG_CPU_ISOLATION=y @@ -151,14 +152,18 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y -# CONFIG_MEMCG is not set +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_KMEM=y CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y # CONFIG_CFS_BANDWIDTH is not set CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y -# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_RDMA=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y @@ -244,7 +249,8 @@ CONFIG_PERF_EVENTS=y # end of Kernel Performance Events And Counters
CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -430,11 +436,11 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_MIXED=y -CONFIG_HZ_100=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=100 +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y # CONFIG_KEXEC is not set # CONFIG_KEXEC_FILE is not set @@ -468,9 +474,7 @@ CONFIG_ARCH_ENABLE_THP_MIGRATION=y # # Power management and ACPI options # -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set +# CONFIG_SUSPEND is not set CONFIG_HIBERNATE_CALLBACKS=y # CONFIG_HIBERNATION is not set CONFIG_PM_SLEEP=y @@ -490,7 +494,6 @@ CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_LPIT=y -CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=y @@ -952,8 +955,9 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_THP_SWAP=y CONFIG_CLEANCACHE=y -# CONFIG_FRONTSWAP is not set +CONFIG_FRONTSWAP=y # CONFIG_CMA is not set +# CONFIG_ZSWAP is not set # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set # CONFIG_ZSMALLOC is not set @@ -1593,10 +1597,7 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=m -CONFIG_OPENVSWITCH_VXLAN=m -CONFIG_OPENVSWITCH_GENEVE=m +# CONFIG_OPENVSWITCH is not set CONFIG_VSOCKETS=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m @@ -3417,7 +3418,21 @@ CONFIG_DEVPORT=y CONFIG_HPET=y # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m -# CONFIG_TCG_TPM is not set +CONFIG_TCG_TPM=m +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TIS_CORE=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_XEN=m +CONFIG_TCG_CRB=m +CONFIG_TCG_VTPM_PROXY=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m # CONFIG_TELCLOCK is not set # CONFIG_XILLYBUS is not set # end of Character devices @@ -6570,7 +6585,8 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" # CONFIG_FAT_DEFAULT_UTF8 is not set -# CONFIG_EXFAT_FS is not set +CONFIG_EXFAT_FS=m +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_NTFS_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems
@@ -6749,14 +6765,14 @@ CONFIG_IO_WQ=y CONFIG_KEYS=y # CONFIG_KEYS_REQUEST_CACHE is not set # CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_TRUSTED_KEYS is not set # CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEY_DH_OPERATIONS is not set CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK is not set CONFIG_PAGE_TABLE_ISOLATION=y -# CONFIG_SECURITY_NETWORK_XFRM is not set # CONFIG_SECURITY_PATH is not set # CONFIG_INTEL_TXT is not set CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y @@ -6794,7 +6810,7 @@ CONFIG_GCC_PLUGIN_STRUCTLEAK=y CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set # CONFIG_GCC_PLUGIN_STACKLEAK is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization # end of Kernel hardening options @@ -7251,7 +7267,6 @@ CONFIG_GENERIC_PTDUMP=y CONFIG_PTDUMP_CORE=y # CONFIG_PTDUMP_DEBUGFS is not set # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set @@ -7448,49 +7463,7 @@ CONFIG_UNWINDER_ORC=y CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_KCOV is not set -CONFIG_RUNTIME_TESTING_MENU=y -# CONFIG_LKDTM is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_MIN_HEAP is not set -# CONFIG_TEST_SORT is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -CONFIG_RBTREE_TEST=m -# CONFIG_REED_SOLOMON_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -# CONFIG_TEST_HEXDUMP is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_STRSCPY is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_TEST_PRINTF is not set -# CONFIG_TEST_BITMAP is not set -# CONFIG_TEST_UUID is not set -# CONFIG_TEST_XARRAY is not set -# CONFIG_TEST_OVERFLOW is not set -# CONFIG_TEST_RHASHTABLE is not set -# CONFIG_TEST_HASH is not set -# CONFIG_TEST_IDA is not set -# CONFIG_TEST_PARMAN is not set -# CONFIG_TEST_LKM is not set -# CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_VMALLOC is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_TEST_BPF is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set -# CONFIG_FIND_BIT_BENCHMARK is not set -# CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_SYSCTL is not set -# CONFIG_TEST_UDELAY is not set -# CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_TEST_KMOD is not set -# CONFIG_TEST_MEMCAT_P is not set -# CONFIG_TEST_OBJAGG is not set -# CONFIG_TEST_STACKINIT is not set -# CONFIG_TEST_MEMINIT is not set -# CONFIG_TEST_FREE_PAGES is not set -# CONFIG_TEST_FPU is not set +# CONFIG_RUNTIME_TESTING_MENU is not set # CONFIG_MEMTEST is not set # CONFIG_HYPERV_TESTING is not set # end of Kernel Testing and Coverage diff --git a/config/rootfiles/core/161/exclude b/config/rootfiles/core/161/exclude new file mode 100644 index 000000000..b41e1070d --- /dev/null +++ b/config/rootfiles/core/161/exclude @@ -0,0 +1,35 @@ +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +boot/uboot.env +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 +usr/share/xt_geoip +var/ipfire/dma +var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/location/database.db +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/161/filelists/aarch64/linux b/config/rootfiles/core/161/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/161/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/aarch64/linux-initrd b/config/rootfiles/core/161/filelists/aarch64/linux-initrd new file mode 120000 index 000000000..8acdb0f31 --- /dev/null +++ b/config/rootfiles/core/161/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/armv6l/linux b/config/rootfiles/core/161/filelists/armv6l/linux new file mode 120000 index 000000000..aee1f4d73 --- /dev/null +++ b/config/rootfiles/core/161/filelists/armv6l/linux @@ -0,0 +1 @@ +../../../../common/armv6l/linux \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/armv6l/linux-initrd b/config/rootfiles/core/161/filelists/armv6l/linux-initrd new file mode 120000 index 000000000..4af11bfa1 --- /dev/null +++ b/config/rootfiles/core/161/filelists/armv6l/linux-initrd @@ -0,0 +1 @@ +../../../../common/armv6l/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/core-files b/config/rootfiles/core/161/filelists/core-files new file mode 100644 index 000000000..f196f54d8 --- /dev/null +++ b/config/rootfiles/core/161/filelists/core-files @@ -0,0 +1,5 @@ +etc/issue +etc/os-release +etc/system-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/161/filelists/files b/config/rootfiles/core/161/filelists/files new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/config/rootfiles/core/161/filelists/files @@ -0,0 +1 @@ + diff --git a/config/rootfiles/core/161/filelists/i586/linux b/config/rootfiles/core/161/filelists/i586/linux new file mode 120000 index 000000000..693ec4bbf --- /dev/null +++ b/config/rootfiles/core/161/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/i586/linux-initrd b/config/rootfiles/core/161/filelists/i586/linux-initrd new file mode 120000 index 000000000..32a03e6a9 --- /dev/null +++ b/config/rootfiles/core/161/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/x86_64/linux b/config/rootfiles/core/161/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/161/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/x86_64/linux-initrd b/config/rootfiles/core/161/filelists/x86_64/linux-initrd new file mode 120000 index 000000000..1b9fff70f --- /dev/null +++ b/config/rootfiles/core/161/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/161/update.sh b/config/rootfiles/core/161/update.sh new file mode 100644 index 000000000..d882397f5 --- /dev/null +++ b/config/rootfiles/core/161/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) 2021 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=161 + +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*) + # 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 old/renamed u-boot files +rm -rf /boot/kernel* +rm -rf /usr/share/u-boot/rpi* + +# Remove files + +# Stop services + +# Extract files +extract_files + +# Fix permissions just in case they broke again +chmod -v 755 \ + /usr \ + /usr/bin \ + /usr/lib \ + /usr/sbin \ + /var \ + /var/ipfire + +# update linker config +ldconfig + +# 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 + +# Install updated grub +/usr/bin/install-bootloader + +# 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/core/160/exclude b/config/rootfiles/oldcore/160/exclude similarity index 100% rename from config/rootfiles/core/160/exclude rename to config/rootfiles/oldcore/160/exclude diff --git a/config/rootfiles/core/160/filelists/Text-Tabs+Wrap b/config/rootfiles/oldcore/160/filelists/Text-Tabs+Wrap similarity index 100% rename from config/rootfiles/core/160/filelists/Text-Tabs+Wrap rename to config/rootfiles/oldcore/160/filelists/Text-Tabs+Wrap diff --git a/config/rootfiles/core/160/filelists/aarch64/glibc b/config/rootfiles/oldcore/160/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/160/filelists/aarch64/glibc rename to config/rootfiles/oldcore/160/filelists/aarch64/glibc diff --git a/config/rootfiles/core/160/filelists/armv6l/glibc b/config/rootfiles/oldcore/160/filelists/armv6l/glibc similarity index 100% rename from config/rootfiles/core/160/filelists/armv6l/glibc rename to config/rootfiles/oldcore/160/filelists/armv6l/glibc diff --git a/config/rootfiles/core/160/filelists/curl b/config/rootfiles/oldcore/160/filelists/curl similarity index 100% rename from config/rootfiles/core/160/filelists/curl rename to config/rootfiles/oldcore/160/filelists/curl diff --git a/config/rootfiles/core/160/filelists/ddns b/config/rootfiles/oldcore/160/filelists/ddns similarity index 100% rename from config/rootfiles/core/160/filelists/ddns rename to config/rootfiles/oldcore/160/filelists/ddns diff --git a/config/rootfiles/core/160/filelists/e2fsprogs b/config/rootfiles/oldcore/160/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/160/filelists/e2fsprogs rename to config/rootfiles/oldcore/160/filelists/e2fsprogs diff --git a/config/rootfiles/core/160/filelists/ethtool b/config/rootfiles/oldcore/160/filelists/ethtool similarity index 100% rename from config/rootfiles/core/160/filelists/ethtool rename to config/rootfiles/oldcore/160/filelists/ethtool diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/oldcore/160/filelists/files similarity index 100% rename from config/rootfiles/core/160/filelists/files rename to config/rootfiles/oldcore/160/filelists/files diff --git a/config/rootfiles/core/160/filelists/i586/glibc b/config/rootfiles/oldcore/160/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/160/filelists/i586/glibc rename to config/rootfiles/oldcore/160/filelists/i586/glibc diff --git a/config/rootfiles/core/160/filelists/iproute2 b/config/rootfiles/oldcore/160/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/160/filelists/iproute2 rename to config/rootfiles/oldcore/160/filelists/iproute2 diff --git a/config/rootfiles/core/160/filelists/less b/config/rootfiles/oldcore/160/filelists/less similarity index 100% rename from config/rootfiles/core/160/filelists/less rename to config/rootfiles/oldcore/160/filelists/less diff --git a/config/rootfiles/core/160/filelists/libhtp b/config/rootfiles/oldcore/160/filelists/libhtp similarity index 100% rename from config/rootfiles/core/160/filelists/libhtp rename to config/rootfiles/oldcore/160/filelists/libhtp diff --git a/config/rootfiles/core/160/filelists/libidn b/config/rootfiles/oldcore/160/filelists/libidn similarity index 100% rename from config/rootfiles/core/160/filelists/libidn rename to config/rootfiles/oldcore/160/filelists/libidn diff --git a/config/rootfiles/core/160/filelists/libloc b/config/rootfiles/oldcore/160/filelists/libloc similarity index 100% rename from config/rootfiles/core/160/filelists/libloc rename to config/rootfiles/oldcore/160/filelists/libloc diff --git a/config/rootfiles/core/160/filelists/libssh b/config/rootfiles/oldcore/160/filelists/libssh similarity index 100% rename from config/rootfiles/core/160/filelists/libssh rename to config/rootfiles/oldcore/160/filelists/libssh diff --git a/config/rootfiles/core/160/filelists/libtasn1 b/config/rootfiles/oldcore/160/filelists/libtasn1 similarity index 100% rename from config/rootfiles/core/160/filelists/libtasn1 rename to config/rootfiles/oldcore/160/filelists/libtasn1 diff --git a/config/rootfiles/core/160/filelists/openssh b/config/rootfiles/oldcore/160/filelists/openssh similarity index 100% rename from config/rootfiles/core/160/filelists/openssh rename to config/rootfiles/oldcore/160/filelists/openssh diff --git a/config/rootfiles/core/160/filelists/openssl b/config/rootfiles/oldcore/160/filelists/openssl similarity index 100% rename from config/rootfiles/core/160/filelists/openssl rename to config/rootfiles/oldcore/160/filelists/openssl diff --git a/config/rootfiles/core/160/filelists/p11-kit b/config/rootfiles/oldcore/160/filelists/p11-kit similarity index 100% rename from config/rootfiles/core/160/filelists/p11-kit rename to config/rootfiles/oldcore/160/filelists/p11-kit diff --git a/config/rootfiles/core/160/filelists/pcre b/config/rootfiles/oldcore/160/filelists/pcre similarity index 100% rename from config/rootfiles/core/160/filelists/pcre rename to config/rootfiles/oldcore/160/filelists/pcre diff --git a/config/rootfiles/core/160/filelists/perl-MIME-Lite b/config/rootfiles/oldcore/160/filelists/perl-MIME-Lite similarity index 100% rename from config/rootfiles/core/160/filelists/perl-MIME-Lite rename to config/rootfiles/oldcore/160/filelists/perl-MIME-Lite diff --git a/config/rootfiles/core/160/filelists/poppler b/config/rootfiles/oldcore/160/filelists/poppler similarity index 100% rename from config/rootfiles/core/160/filelists/poppler rename to config/rootfiles/oldcore/160/filelists/poppler diff --git a/config/rootfiles/core/160/filelists/release-files b/config/rootfiles/oldcore/160/filelists/release-files similarity index 100% rename from config/rootfiles/core/160/filelists/release-files rename to config/rootfiles/oldcore/160/filelists/release-files diff --git a/config/rootfiles/core/160/filelists/sqlite b/config/rootfiles/oldcore/160/filelists/sqlite similarity index 100% rename from config/rootfiles/core/160/filelists/sqlite rename to config/rootfiles/oldcore/160/filelists/sqlite diff --git a/config/rootfiles/core/160/filelists/strongswan b/config/rootfiles/oldcore/160/filelists/strongswan similarity index 100% rename from config/rootfiles/core/160/filelists/strongswan rename to config/rootfiles/oldcore/160/filelists/strongswan diff --git a/config/rootfiles/core/160/filelists/sudo b/config/rootfiles/oldcore/160/filelists/sudo similarity index 100% rename from config/rootfiles/core/160/filelists/sudo rename to config/rootfiles/oldcore/160/filelists/sudo diff --git a/config/rootfiles/core/160/filelists/suricata b/config/rootfiles/oldcore/160/filelists/suricata similarity index 100% rename from config/rootfiles/core/160/filelists/suricata rename to config/rootfiles/oldcore/160/filelists/suricata diff --git a/config/rootfiles/core/160/filelists/sysfsutils b/config/rootfiles/oldcore/160/filelists/sysfsutils similarity index 100% rename from config/rootfiles/core/160/filelists/sysfsutils rename to config/rootfiles/oldcore/160/filelists/sysfsutils diff --git a/config/rootfiles/core/160/filelists/sysstat b/config/rootfiles/oldcore/160/filelists/sysstat similarity index 100% rename from config/rootfiles/core/160/filelists/sysstat rename to config/rootfiles/oldcore/160/filelists/sysstat diff --git a/config/rootfiles/core/160/filelists/udev b/config/rootfiles/oldcore/160/filelists/udev similarity index 100% rename from config/rootfiles/core/160/filelists/udev rename to config/rootfiles/oldcore/160/filelists/udev diff --git a/config/rootfiles/core/160/filelists/wireless-regdb b/config/rootfiles/oldcore/160/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/160/filelists/wireless-regdb rename to config/rootfiles/oldcore/160/filelists/wireless-regdb diff --git a/config/rootfiles/core/160/filelists/x86_64/glibc b/config/rootfiles/oldcore/160/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/160/filelists/x86_64/glibc rename to config/rootfiles/oldcore/160/filelists/x86_64/glibc diff --git a/config/rootfiles/core/160/update.sh b/config/rootfiles/oldcore/160/update.sh similarity index 100% rename from config/rootfiles/core/160/update.sh rename to config/rootfiles/oldcore/160/update.sh diff --git a/make.sh b/make.sh index 8b97b24df..5c60f029b 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2020 IPFire Team info@ipfire.org. # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org. # # # ############################################################################ # @@ -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.27" # Version number -CORE="160" # Core Level (Filename) +CORE="161" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop
hooks/post-receive -- IPFire 2.x development tree