From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d33651d74f2479bb169dcda6934dceb40132b77b Date: Tue, 20 Sep 2022 14:33:09 +0000 Message-ID: <4MX3tY6rBYz2xpF@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2362175464490098640==" List-Id: --===============2362175464490098640== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via d33651d74f2479bb169dcda6934dceb40132b77b (commit) via 423685839a056f233b5289e2c47a55da47cebc47 (commit) via ae185d6f9d0578486f9a91c5e371f159a5a41a23 (commit) via 12d339e725cf093947c2d0243a724e014d5ef8d4 (commit) from ae49226866aef4b8ec700be2e739871c694d55c8 (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 d33651d74f2479bb169dcda6934dceb40132b77b Author: Peter M=C3=BCller Date: Tue Sep 20 14:30:28 2022 +0000 linux: Prepare CONFIG_DEBUG_FS disabling on non-x86_64 architectures =20 Signed-off-by: Peter M=C3=BCller commit 423685839a056f233b5289e2c47a55da47cebc47 Author: Peter M=C3=BCller Date: Tue Sep 20 10:39:08 2022 +0000 Core Update 171: Ship kernel and regenerate initial ramdisks locally =20 Signed-off-by: Peter M=C3=BCller commit ae185d6f9d0578486f9a91c5e371f159a5a41a23 Author: Peter M=C3=BCller Date: Mon Sep 19 12:28:14 2022 +0000 linux: Update to 5.15.68 =20 Please refer to https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.= 15.68 for the changelog of this release. Due to the lack of local build hardware, ARM rootfile and configuration changes have been omitted. =20 Signed-off-by: Peter M=C3=BCller commit 12d339e725cf093947c2d0243a724e014d5ef8d4 Author: Peter M=C3=BCller Date: Sat Sep 17 19:24:46 2022 +0000 kernel: Disable CONFIG_DEBUG_FS =20 According to the kernel's documentation, =20 > debugfs is a virtual file system that kernel developers use to put > debugging files into. Enable this option to be able to read and > write to these files. =20 There is no legitimate reason why one has to do so on an IPFire machine. Further, the vast debugging options (i.e. related to various drivers) have never been enabled, limiting the use of this virtual file system even further. =20 This patch therefore proposes to disable it entirely, since its potential security impact outweights its benefits. Due to operational constraints, changes to ARM kernel configurations will be made if this patch is approved for x86_64. =20 Signed-off-by: Peter M=C3=BCller Reviewed-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 5 +- config/kernel/kernel.config.armv6l-ipfire | 5 +- config/kernel/kernel.config.riscv64-ipfire | 5 +- config/kernel/kernel.config.x86_64-ipfire | 56 +++------------- config/rootfiles/common/x86_64/linux | 6 +- .../124 =3D> core/171}/filelists/aarch64/linux | 0 .../159 =3D> core/171}/filelists/armv6l/linux | 0 .../100 =3D> core/171}/filelists/x86_64/linux | 0 config/rootfiles/core/171/update.sh | 77 ++++++++++++++++++++= ++ lfs/linux | 4 +- 10 files changed, 96 insertions(+), 62 deletions(-) copy config/rootfiles/{oldcore/124 =3D> core/171}/filelists/aarch64/linux (1= 00%) copy config/rootfiles/{oldcore/159 =3D> core/171}/filelists/armv6l/linux (10= 0%) copy config/rootfiles/{oldcore/100 =3D> core/171}/filelists/x86_64/linux (10= 0%) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kerne= l.config.aarch64-ipfire index b557f4cf3..1e08153c4 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -8014,10 +8014,7 @@ CONFIG_FRAME_POINTER=3Dy # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_FS=3Dy -CONFIG_DEBUG_FS_ALLOW_ALL=3Dy -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -# CONFIG_DEBUG_FS_ALLOW_NONE is not set +# CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=3Dy # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=3Dy diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel= .config.armv6l-ipfire index b8e0ee70c..2247e66c5 100644 --- a/config/kernel/kernel.config.armv6l-ipfire +++ b/config/kernel/kernel.config.armv6l-ipfire @@ -8005,10 +8005,7 @@ CONFIG_FRAME_POINTER=3Dy # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_FS=3Dy -CONFIG_DEBUG_FS_ALLOW_ALL=3Dy -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -# CONFIG_DEBUG_FS_ALLOW_NONE is not set +# CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=3Dy # CONFIG_KGDB is not set # CONFIG_UBSAN is not set diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kerne= l.config.riscv64-ipfire index 37d5366af..51f6442be 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -6602,10 +6602,7 @@ CONFIG_FRAME_POINTER=3Dy # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_FS=3Dy -CONFIG_DEBUG_FS_ALLOW_ALL=3Dy -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -# CONFIG_DEBUG_FS_ALLOW_NONE is not set +# CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=3Dy CONFIG_HAVE_ARCH_KGDB_QXFER_PKT=3Dy # CONFIG_KGDB is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel= .config.x86_64-ipfire index aa1e847dd..d005f98d4 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.59-ipfire Kernel Configuration +# Linux/x86 5.15.68-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT=3D"gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=3Dy CONFIG_GCC_VERSION=3D110300 CONFIG_CLANG_VERSION=3D0 CONFIG_AS_IS_GNU=3Dy -CONFIG_AS_VERSION=3D23700 +CONFIG_AS_VERSION=3D23900 CONFIG_LD_IS_BFD=3Dy -CONFIG_LD_VERSION=3D23700 +CONFIG_LD_VERSION=3D23900 CONFIG_LLD_VERSION=3D0 CONFIG_CC_CAN_LINK=3Dy CONFIG_CC_CAN_LINK_STATIC=3Dy @@ -78,7 +78,6 @@ CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=3Dy CONFIG_GENERIC_IRQ_RESERVATION_MODE=3Dy CONFIG_IRQ_FORCED_THREADING=3Dy CONFIG_SPARSE_IRQ=3Dy -# CONFIG_GENERIC_IRQ_DEBUGFS is not set # end of IRQ subsystem =20 CONFIG_CLOCKSOURCE_WATCHDOG=3Dy @@ -158,7 +157,6 @@ CONFIG_RCU_NEED_SEGCBLIST=3Dy CONFIG_LOG_BUF_SHIFT=3D18 CONFIG_LOG_CPU_MAX_BUF_SHIFT=3D12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=3D13 -# CONFIG_PRINTK_INDEX is not set CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=3Dy =20 # @@ -330,7 +328,6 @@ CONFIG_X86_EXTENDED_PLATFORM=3Dy CONFIG_X86_INTEL_LPSS=3Dy CONFIG_X86_AMD_PLATFORM_DEVICE=3Dy CONFIG_IOSF_MBI=3Dy -# CONFIG_IOSF_MBI_DEBUG is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=3Dy CONFIG_SCHED_OMIT_FRAME_POINTER=3Dy CONFIG_HYPERVISOR_GUEST=3Dy @@ -348,7 +345,6 @@ CONFIG_XEN_PVHVM=3Dy CONFIG_XEN_PVHVM_SMP=3Dy CONFIG_XEN_PVHVM_GUEST=3Dy CONFIG_XEN_SAVE_RESTORE=3Dy -CONFIG_XEN_DEBUG_FS=3Dy CONFIG_XEN_PVH=3Dy CONFIG_XEN_DOM0=3Dy CONFIG_KVM_GUEST=3Dy @@ -398,7 +394,6 @@ CONFIG_X86_MCELOG_LEGACY=3Dy CONFIG_X86_MCE_INTEL=3Dy CONFIG_X86_MCE_AMD=3Dy CONFIG_X86_MCE_THRESHOLD=3Dy -# CONFIG_X86_MCE_INJECT is not set =20 # # Performance monitoring @@ -421,7 +416,6 @@ CONFIG_X86_MSR=3Dy CONFIG_X86_CPUID=3Dy # CONFIG_X86_5LEVEL is not set CONFIG_X86_DIRECT_GBPAGES=3Dy -# CONFIG_X86_CPA_STATISTICS is not set # CONFIG_AMD_MEM_ENCRYPT is not set # CONFIG_NUMA is not set CONFIG_ARCH_SPARSEMEM_ENABLE=3Dy @@ -543,7 +537,6 @@ CONFIG_ACPI_CONTAINER=3Dy CONFIG_ACPI_HOTPLUG_IOAPIC=3Dy CONFIG_ACPI_SBS=3Dm CONFIG_ACPI_HED=3Dy -# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NFIT=3Dm @@ -554,7 +547,6 @@ CONFIG_ACPI_APEI=3Dy CONFIG_ACPI_APEI_GHES=3Dy CONFIG_ACPI_APEI_PCIEAER=3Dy CONFIG_ACPI_APEI_MEMORY_FAILURE=3Dy -# CONFIG_ACPI_APEI_EINJ is not set # CONFIG_ACPI_APEI_ERST_DEBUG is not set # CONFIG_ACPI_DPTF is not set CONFIG_ACPI_WATCHDOG=3Dy @@ -691,6 +683,7 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=3Dy CONFIG_HAVE_FUNCTION_ERROR_INJECTION=3Dy CONFIG_HAVE_NMI=3Dy CONFIG_TRACE_IRQFLAGS_SUPPORT=3Dy +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=3Dy CONFIG_HAVE_ARCH_TRACEHOOK=3Dy CONFIG_HAVE_DMA_CONTIGUOUS=3Dy CONFIG_GENERIC_SMP_IDLE_THREAD=3Dy @@ -772,7 +765,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=3Dy CONFIG_STRICT_MODULE_RWX=3Dy CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=3Dy CONFIG_ARCH_USE_MEMREMAP_PROT=3Dy -CONFIG_LOCK_EVENT_COUNTS=3Dy CONFIG_ARCH_HAS_MEM_ENCRYPT=3Dy CONFIG_HAVE_STATIC_CALL=3Dy CONFIG_HAVE_STATIC_CALL_INLINE=3Dy @@ -785,7 +777,6 @@ CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=3Dy # # GCOV-based kernel profiling # -# CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=3Dy # end of GCOV-based kernel profiling =20 @@ -837,8 +828,6 @@ CONFIG_BLK_DEV_THROTTLING=3Dy # CONFIG_BLK_CGROUP_FC_APPID is not set # CONFIG_BLK_CGROUP_IOCOST is not set # CONFIG_BLK_CGROUP_IOPRIO is not set -CONFIG_BLK_DEBUG_FS=3Dy -CONFIG_BLK_DEBUG_FS_ZONED=3Dy # CONFIG_BLK_SED_OPAL is not set CONFIG_BLK_INLINE_ENCRYPTION=3Dy CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=3Dy @@ -971,7 +960,10 @@ CONFIG_VMAP_PFN=3Dy CONFIG_ARCH_USES_HIGH_VMA_FLAGS=3Dy CONFIG_ARCH_HAS_PKEYS=3Dy # CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_TEST is not set + +# +# GUP_TEST needs to have DEBUG_FS enabled +# # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_ARCH_HAS_PTE_SPECIAL=3Dy CONFIG_MAPPING_DIRTY_HELPERS=3Dy @@ -1464,7 +1456,6 @@ CONFIG_ATM_CLIP=3Dm CONFIG_ATM_BR2684=3Dm # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_L2TP=3Dm -# CONFIG_L2TP_DEBUGFS is not set CONFIG_L2TP_V3=3Dy CONFIG_L2TP_IP=3Dm CONFIG_L2TP_ETH=3Dm @@ -1677,7 +1668,6 @@ CONFIG_CFG80211_EXTRA_REGDB_KEYDIR=3D"" CONFIG_CFG80211_REG_CELLULAR_HINTS=3Dy CONFIG_CFG80211_REG_RELAX_NO_IR=3Dy CONFIG_CFG80211_DEFAULT_PS=3Dy -# CONFIG_CFG80211_DEBUGFS is not set CONFIG_CFG80211_CRDA_SUPPORT=3Dy CONFIG_CFG80211_WEXT=3Dy CONFIG_CFG80211_WEXT_EXPORT=3Dy @@ -1693,7 +1683,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=3Dy CONFIG_MAC80211_RC_DEFAULT=3D"minstrel_ht" CONFIG_MAC80211_MESH=3Dy CONFIG_MAC80211_LEDS=3Dy -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=3D0 @@ -1867,7 +1856,6 @@ CONFIG_DMA_SHARED_BUFFER=3Dy # Bus devices # CONFIG_MHI_BUS=3Dm -# CONFIG_MHI_BUS_DEBUG is not set # CONFIG_MHI_BUS_PCI_GENERIC is not set # end of Bus devices =20 @@ -2168,7 +2156,6 @@ CONFIG_LIBFCOE=3Dm CONFIG_FCOE=3Dm CONFIG_FCOE_FNIC=3Dm CONFIG_SCSI_SNIC=3Dm -CONFIG_SCSI_SNIC_DEBUG_FS=3Dy CONFIG_SCSI_DMX3191D=3Dm CONFIG_SCSI_FDOMAIN=3Dm CONFIG_SCSI_FDOMAIN_PCI=3Dm @@ -2195,7 +2182,6 @@ CONFIG_SCSI_QLA_ISCSI=3Dm CONFIG_QEDI=3Dm CONFIG_QEDF=3Dm CONFIG_SCSI_LPFC=3Dm -# CONFIG_SCSI_LPFC_DEBUG_FS is not set CONFIG_SCSI_DC395x=3Dm CONFIG_SCSI_AM53C974=3Dm CONFIG_SCSI_WD719X=3Dm @@ -2626,10 +2612,8 @@ CONFIG_NET_VENDOR_LITEX=3Dy CONFIG_NET_VENDOR_MARVELL=3Dy CONFIG_MVMDIO=3Dm CONFIG_SKGE=3Dm -# CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=3Dy CONFIG_SKY2=3Dm -# CONFIG_SKY2_DEBUG is not set CONFIG_PRESTERA=3Dm CONFIG_PRESTERA_PCI=3Dm CONFIG_NET_VENDOR_MELLANOX=3Dy @@ -2955,7 +2939,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=3Dy CONFIG_ATH9K=3Dm CONFIG_ATH9K_PCI=3Dy CONFIG_ATH9K_AHB=3Dy -# CONFIG_ATH9K_DEBUGFS is not set CONFIG_ATH9K_DFS_CERTIFIED=3Dy # CONFIG_ATH9K_DYNACK is not set # CONFIG_ATH9K_WOW is not set @@ -2964,7 +2947,6 @@ CONFIG_ATH9K_RFKILL=3Dy CONFIG_ATH9K_PCOEM=3Dy CONFIG_ATH9K_PCI_NO_EEPROM=3Dm CONFIG_ATH9K_HTC=3Dm -# CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_ATH9K_HWRNG=3Dy CONFIG_CARL9170=3Dm CONFIG_CARL9170_LEDS=3Dy @@ -2975,14 +2957,12 @@ CONFIG_AR5523=3Dm CONFIG_WIL6210=3Dm CONFIG_WIL6210_ISR_COR=3Dy CONFIG_WIL6210_TRACING=3Dy -# CONFIG_WIL6210_DEBUGFS is not set CONFIG_ATH10K=3Dm CONFIG_ATH10K_CE=3Dy CONFIG_ATH10K_PCI=3Dm CONFIG_ATH10K_SDIO=3Dm CONFIG_ATH10K_USB=3Dm CONFIG_ATH10K_DEBUG=3Dy -# CONFIG_ATH10K_DEBUGFS is not set # CONFIG_ATH10K_TRACING is not set CONFIG_ATH10K_DFS_CERTIFIED=3Dy CONFIG_WCN36XX=3Dm @@ -3241,7 +3221,6 @@ CONFIG_XEN_NETDEV_BACKEND=3Dm CONFIG_VMXNET3=3Dm CONFIG_FUJITSU_ES=3Dm CONFIG_HYPERV_NET=3Dm -# CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=3Dm # CONFIG_ISDN is not set =20 @@ -5116,7 +5095,6 @@ CONFIG_DRM_AMDGPU=3Dm CONFIG_DRM_AMD_DC=3Dy CONFIG_DRM_AMD_DC_DCN=3Dy # CONFIG_DRM_AMD_DC_HDCP is not set -# CONFIG_DRM_AMD_SECURE_DISPLAY is not set # end of Display Engine Configuration =20 # CONFIG_HSA_AMD is not set @@ -5371,7 +5349,6 @@ CONFIG_SND_DEBUG=3Dy # CONFIG_SND_DEBUG_VERBOSE is not set CONFIG_SND_PCM_XRUN_DEBUG=3Dy # CONFIG_SND_CTL_VALIDATION is not set -# CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_VMASTER=3Dy CONFIG_SND_DMA_SGBUF=3Dy CONFIG_SND_CTL_LED=3Dm @@ -6211,7 +6188,6 @@ CONFIG_DMA_ENGINE_RAID=3Dy # DMABUF options # CONFIG_SYNC_FILE=3Dy -CONFIG_SW_SYNC=3Dy # CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set @@ -6487,7 +6463,6 @@ CONFIG_IOMMU_SUPPORT=3Dy CONFIG_IOMMU_IO_PGTABLE=3Dy # end of Generic IOMMU Pagetable Support =20 -# CONFIG_IOMMU_DEBUGFS is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=3Dy # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set @@ -6633,7 +6608,6 @@ CONFIG_GENERIC_PHY=3Dy # end of Performance monitor support =20 CONFIG_RAS=3Dy -# CONFIG_RAS_CEC is not set # CONFIG_USB4 is not set =20 # @@ -6838,7 +6812,6 @@ CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=3Dy CONFIG_PSTORE_COMPRESS_DEFAULT=3D"deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set -# CONFIG_PSTORE_FTRACE is not set # CONFIG_PSTORE_RAM is not set # CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set @@ -7124,8 +7097,7 @@ CONFIG_CRYPTO_CRC32=3Dy CONFIG_CRYPTO_CRC32_PCLMUL=3Dm CONFIG_CRYPTO_XXHASH=3Dm CONFIG_CRYPTO_BLAKE2B=3Dm -# CONFIG_CRYPTO_BLAKE2S is not set -CONFIG_CRYPTO_BLAKE2S_X86=3Dm +CONFIG_CRYPTO_BLAKE2S_X86=3Dy CONFIG_CRYPTO_CRCT10DIF=3Dy CONFIG_CRYPTO_CRCT10DIF_PCLMUL=3Dm CONFIG_CRYPTO_GHASH=3Dm @@ -7369,7 +7341,6 @@ CONFIG_NEED_DMA_MAP_STATE=3Dy CONFIG_ARCH_DMA_ADDR_T_64BIT=3Dy CONFIG_SWIOTLB=3Dy # CONFIG_DMA_API_DEBUG is not set -# CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=3Dy CONFIG_CHECK_SIGNATURE=3Dy CONFIG_CPU_RMAP=3Dy @@ -7443,10 +7414,7 @@ CONFIG_STACK_VALIDATION=3Dy # Generic Kernel Debugging Instruments # # CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_FS=3Dy -CONFIG_DEBUG_FS_ALLOW_ALL=3Dy -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -# CONFIG_DEBUG_FS_ALLOW_NONE is not set +# CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=3Dy # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=3Dy @@ -7472,7 +7440,6 @@ CONFIG_ARCH_HAS_DEBUG_WX=3Dy CONFIG_DEBUG_WX=3Dy CONFIG_GENERIC_PTDUMP=3Dy CONFIG_PTDUMP_CORE=3Dy -# CONFIG_PTDUMP_DEBUGFS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=3Dy @@ -7652,7 +7619,6 @@ CONFIG_IO_STRICT_DEVMEM=3Dy # # x86 Debugging # -CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=3Dy # CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=3Dy # CONFIG_EARLY_PRINTK_DBGP is not set @@ -7665,7 +7631,6 @@ CONFIG_IO_DELAY_0X80=3Dy # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set -# CONFIG_DEBUG_BOOT_PARAMS is not set # CONFIG_CPA_DEBUG is not set # CONFIG_DEBUG_ENTRY is not set # CONFIG_DEBUG_NMI_SELFTEST is not set @@ -7688,6 +7653,5 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=3Dy # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ARCH_USE_MEMTEST=3Dy # CONFIG_MEMTEST is not set -# CONFIG_HYPERV_TESTING is not set # end of Kernel Testing and Coverage # end of Kernel hacking diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x= 86_64/linux index 99fa8ffdc..518230b39 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -10135,7 +10135,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SKY2 #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_HARDENED #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_RANDOM -#lib/modules/KVER-ipfire/build/include/config/SLAB_MERGE_DEFAULT #lib/modules/KVER-ipfire/build/include/config/SLHC #lib/modules/KVER-ipfire/build/include/config/SLICOSS #lib/modules/KVER-ipfire/build/include/config/SLS @@ -17543,6 +17542,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h #lib/modules/KVER-ipfire/build/scripts/dtc/yamltree.c #lib/modules/KVER-ipfire/build/scripts/dummy-tools +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include/= plugin-version.h #lib/modules/KVER-ipfire/build/scripts/dummy-tools/gcc #lib/modules/KVER-ipfire/build/scripts/dummy-tools/ld #lib/modules/KVER-ipfire/build/scripts/dummy-tools/nm @@ -17781,6 +17783,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/package/mkdebian #lib/modules/KVER-ipfire/build/scripts/package/mkspec #lib/modules/KVER-ipfire/build/scripts/package/snapcraft.template +#lib/modules/KVER-ipfire/build/scripts/pahole-flags.sh #lib/modules/KVER-ipfire/build/scripts/parse-maintainers.pl #lib/modules/KVER-ipfire/build/scripts/patch-kernel #lib/modules/KVER-ipfire/build/scripts/profile2linkerlist.pl @@ -18724,7 +18727,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/arch #lib/modules/KVER-ipfire/kernel/arch/x86 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto -#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/blake2s-x86_64.ko.xz #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/blowfish-x86_64.ko.xz #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko= .xz #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/camellia-aesni-avx2.ko.xz diff --git a/config/rootfiles/core/171/filelists/aarch64/linux b/config/rootf= iles/core/171/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/171/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/armv6l/linux b/config/rootfi= les/core/171/filelists/armv6l/linux new file mode 120000 index 000000000..aee1f4d73 --- /dev/null +++ b/config/rootfiles/core/171/filelists/armv6l/linux @@ -0,0 +1 @@ +../../../../common/armv6l/linux \ No newline at end of file diff --git a/config/rootfiles/core/171/filelists/x86_64/linux b/config/rootfi= les/core/171/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/171/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/= update.sh index 86efc8afc..1332f676d 100644 --- a/config/rootfiles/core/171/update.sh +++ b/config/rootfiles/core/171/update.sh @@ -26,6 +26,18 @@ =20 core=3D171 =20 +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=3D1; i<=3D$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -39,6 +51,44 @@ done /etc/rc.d/init.d/ipsec stop /etc/rc.d/init.d/collectd stop =20 +KVER=3D"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 prior to the kernel update +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=3D`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 ro= ot." 2 + exit 2 +fi + +# Remove the old kernel +rm -rvf \ + /boot/System.map-* \ + /boot/config-* \ + /boot/ipfirerd-* \ + /boot/initramfs-* \ + /boot/vmlinuz-* \ + /boot/uImage-* \ + /boot/zImage-* \ + /boot/uInit-* \ + /boot/dtb-* \ + /lib/modules + # Remove files rm -rvf \ /lib/firmware/3com/3C359.bin \ @@ -164,9 +214,36 @@ if [ -f /var/ipfire/proxy/enable ]; then /etc/init.d/squid start fi =20 +# Regenerate all initrds +dracut --regenerate-all --force +case "$(uname -m)" in + armv*) + mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /b= oot/uInit-${KVER}-ipfire + rm /boot/initramfs-${KVER}-ipfire.img + ;; + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img = /boot/uInit-${KVER}-ipfire + # dont remove initramfs because grub need this to boot. + ;; +esac + # This update needs a reboot... touch /var/run/need_reboot =20 +# 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 in uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=3D.*/KVER=3D${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 + # Finish /etc/init.d/fireinfo start sendprofile diff --git a/lfs/linux b/lfs/linux index e80f99601..a1b32cc25 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 5.15.59 +VER =3D 5.15.68 ARM_PATCHES =3D 5.15-ipfire5 =20 THISAPP =3D linux-$(VER) @@ -78,7 +78,7 @@ objects =3D$(DL_FILE) \ $(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz =3D $(URL_IPFIRE)/arm-multi-patche= s-$(ARM_PATCHES).patch.xz =20 -$(DL_FILE)_BLAKE2 =3D c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f0034= 1a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b +$(DL_FILE)_BLAKE2 =3D b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4f= cedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 =3D 58a70e757a9121a0aac8360= 4a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a= 86e0371a3e896f4c7cdd699c34a0 =20 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree --===============2362175464490098640==--