From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7e70a93aaaf6e4492ea4a570bd7d2bc79c096bf0 Date: Sun, 18 Aug 2024 13:53:23 +0000 Message-ID: <4WmxyW3JcGz2xQF@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6917757418357578469==" List-Id: --===============6917757418357578469== 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 7e70a93aaaf6e4492ea4a570bd7d2bc79c096bf0 (commit) from 0eb5b5f9e1289df1421b9af380b0ef91127c6aa5 (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 7e70a93aaaf6e4492ea4a570bd7d2bc79c096bf0 Author: Arne Fitzenreiter Date: Sun Aug 18 15:40:33 2024 +0200 kernel: update to 6.6.46 =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 13 +++-- config/kernel/kernel.config.riscv64-ipfire | 13 +++-- config/kernel/kernel.config.x86_64-ipfire | 12 ++-- .../124 =3D> core/188}/filelists/aarch64/linux | 0 .../181 =3D> core/188}/filelists/riscv64/linux | 0 .../100 =3D> core/188}/filelists/x86_64/linux | 0 config/rootfiles/core/188/update.sh | 64 ++++++++++++++++++++= +- lfs/linux | 7 +-- 8 files changed, 88 insertions(+), 21 deletions(-) copy config/rootfiles/{oldcore/124 =3D> core/188}/filelists/aarch64/linux (1= 00%) copy config/rootfiles/{oldcore/181 =3D> core/188}/filelists/riscv64/linux (1= 00%) copy config/rootfiles/{oldcore/100 =3D> core/188}/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 af3601ec04..74085de004 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.31-ipfire Kernel Configuration +# Linux/arm64 6.6.45-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT=3D"gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT=3D"gcc (GCC) 13.3.0" CONFIG_CC_IS_GCC=3Dy -CONFIG_GCC_VERSION=3D130200 +CONFIG_GCC_VERSION=3D130300 CONFIG_CLANG_VERSION=3D0 CONFIG_AS_IS_GNU=3Dy CONFIG_AS_VERSION=3D24200 @@ -15,7 +15,6 @@ CONFIG_CC_CAN_LINK=3Dy CONFIG_CC_CAN_LINK_STATIC=3Dy CONFIG_CC_HAS_ASM_GOTO_OUTPUT=3Dy CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=3Dy -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=3Dy CONFIG_CC_HAS_ASM_INLINE=3Dy CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=3Dy CONFIG_PAHOLE_VERSION=3D0 @@ -961,6 +960,7 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=3D1 CONFIG_PAGE_REPORTING=3Dy CONFIG_MIGRATION=3Dy CONFIG_CONTIG_ALLOC=3Dy +CONFIG_PCP_BATCH_SCALE_MAX=3D5 CONFIG_PHYS_ADDR_T_64BIT=3Dy CONFIG_MMU_NOTIFIER=3Dy CONFIG_KSM=3Dy @@ -5545,6 +5545,7 @@ CONFIG_DVB_SP2=3Dm # Graphics support # CONFIG_APERTURE_HELPERS=3Dy +CONFIG_SCREEN_INFO=3Dy CONFIG_VIDEO_CMDLINE=3Dy CONFIG_VIDEO_NOMODESET=3Dy # CONFIG_AUXDISPLAY is not set @@ -5832,6 +5833,7 @@ CONFIG_FB_SYS_IMAGEBLIT=3Dy CONFIG_FB_SYS_FOPS=3Dy CONFIG_FB_DEFERRED_IO=3Dy CONFIG_FB_DMAMEM_HELPERS=3Dy +CONFIG_FB_IOMEM_FOPS=3Dy CONFIG_FB_IOMEM_HELPERS=3Dy CONFIG_FB_SYSMEM_HELPERS=3Dy CONFIG_FB_SYSMEM_HELPERS_DEFERRED=3Dy @@ -7535,6 +7537,7 @@ CONFIG_EXTCON=3Dy # CONFIG_EXTCON_USB_GPIO is not set CONFIG_MEMORY=3Dy # CONFIG_ARM_PL172_MPMC is not set +CONFIG_FSL_IFC=3Dy # CONFIG_IIO is not set # CONFIG_NTB is not set CONFIG_PWM=3Dy @@ -8127,6 +8130,7 @@ CONFIG_CRYPTO_ALGAPI=3Dy CONFIG_CRYPTO_ALGAPI2=3Dy CONFIG_CRYPTO_AEAD=3Dy CONFIG_CRYPTO_AEAD2=3Dy +CONFIG_CRYPTO_SIG=3Dy CONFIG_CRYPTO_SIG2=3Dy CONFIG_CRYPTO_SKCIPHER=3Dy CONFIG_CRYPTO_SKCIPHER2=3Dy @@ -8550,7 +8554,6 @@ CONFIG_CMA_SIZE_SEL_MBYTES=3Dy CONFIG_CMA_ALIGNMENT=3D8 # CONFIG_DMA_API_DEBUG is not set CONFIG_SGL_ALLOC=3Dy -# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=3Dy CONFIG_DQL=3Dy CONFIG_GLOB=3Dy diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kerne= l.config.riscv64-ipfire index 70c2014d04..451607c170 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.6.25-ipfire Kernel Configuration +# Linux/riscv 6.6.46-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT=3D"gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT=3D"gcc (GCC) 13.3.0" CONFIG_CC_IS_GCC=3Dy -CONFIG_GCC_VERSION=3D130200 +CONFIG_GCC_VERSION=3D130300 CONFIG_CLANG_VERSION=3D0 CONFIG_AS_IS_GNU=3Dy CONFIG_AS_VERSION=3D24200 @@ -15,7 +15,6 @@ CONFIG_CC_CAN_LINK=3Dy CONFIG_CC_CAN_LINK_STATIC=3Dy CONFIG_CC_HAS_ASM_GOTO_OUTPUT=3Dy CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=3Dy -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=3Dy CONFIG_CC_HAS_ASM_INLINE=3Dy CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=3Dy CONFIG_PAHOLE_VERSION=3D0 @@ -497,6 +496,7 @@ CONFIG_ACPI_WATCHDOG=3Dy # CONFIG_ACPI_PFRUT is not set # CONFIG_ACPI_FFH is not set # CONFIG_PMIC_OPREGION is not set +CONFIG_CPU_MITIGATIONS=3Dy =20 # # General architecture-dependent options @@ -761,6 +761,7 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=3D1 CONFIG_PAGE_REPORTING=3Dy CONFIG_MIGRATION=3Dy CONFIG_ARCH_ENABLE_THP_MIGRATION=3Dy +CONFIG_PCP_BATCH_SCALE_MAX=3D5 CONFIG_PHYS_ADDR_T_64BIT=3Dy CONFIG_MMU_NOTIFIER=3Dy CONFIG_KSM=3Dy @@ -4930,6 +4931,7 @@ CONFIG_DVB_SP2=3Dm # Graphics support # CONFIG_APERTURE_HELPERS=3Dy +CONFIG_SCREEN_INFO=3Dy CONFIG_VIDEO_CMDLINE=3Dy CONFIG_VIDEO_NOMODESET=3Dy # CONFIG_AUXDISPLAY is not set @@ -5157,6 +5159,7 @@ CONFIG_FB_SYS_IMAGEBLIT=3Dy # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=3Dy CONFIG_FB_DEFERRED_IO=3Dy +CONFIG_FB_IOMEM_FOPS=3Dy CONFIG_FB_IOMEM_HELPERS=3Dy CONFIG_FB_SYSMEM_HELPERS=3Dy CONFIG_FB_SYSMEM_HELPERS_DEFERRED=3Dy @@ -6805,6 +6808,7 @@ CONFIG_CRYPTO_ALGAPI=3Dy CONFIG_CRYPTO_ALGAPI2=3Dy CONFIG_CRYPTO_AEAD=3Dy CONFIG_CRYPTO_AEAD2=3Dy +CONFIG_CRYPTO_SIG=3Dy CONFIG_CRYPTO_SIG2=3Dy CONFIG_CRYPTO_SKCIPHER=3Dy CONFIG_CRYPTO_SKCIPHER2=3Dy @@ -7131,7 +7135,6 @@ CONFIG_DMA_DIRECT_REMAP=3Dy # CONFIG_DMA_API_DEBUG is not set CONFIG_SGL_ALLOC=3Dy CONFIG_CHECK_SIGNATURE=3Dy -# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=3Dy CONFIG_DQL=3Dy CONFIG_GLOB=3Dy diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel= .config.x86_64-ipfire index 10502dc3c5..579eea265f 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.32-ipfire Kernel Configuration +# Linux/x86 6.6.46-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT=3D"gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT=3D"gcc (GCC) 13.3.0" CONFIG_CC_IS_GCC=3Dy -CONFIG_GCC_VERSION=3D130200 +CONFIG_GCC_VERSION=3D130300 CONFIG_CLANG_VERSION=3D0 CONFIG_AS_IS_GNU=3Dy CONFIG_AS_VERSION=3D24200 @@ -15,7 +15,6 @@ CONFIG_CC_CAN_LINK=3Dy CONFIG_CC_CAN_LINK_STATIC=3Dy CONFIG_CC_HAS_ASM_GOTO_OUTPUT=3Dy CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=3Dy -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=3Dy CONFIG_TOOLS_SUPPORT_RELR=3Dy CONFIG_CC_HAS_ASM_INLINE=3Dy CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=3Dy @@ -1018,6 +1017,7 @@ CONFIG_PAGE_REPORTING=3Dy CONFIG_MIGRATION=3Dy CONFIG_ARCH_ENABLE_THP_MIGRATION=3Dy CONFIG_CONTIG_ALLOC=3Dy +CONFIG_PCP_BATCH_SCALE_MAX=3D5 CONFIG_PHYS_ADDR_T_64BIT=3Dy CONFIG_MMU_NOTIFIER=3Dy CONFIG_KSM=3Dy @@ -5244,6 +5244,7 @@ CONFIG_DVB_SP2=3Dm # Graphics support # CONFIG_APERTURE_HELPERS=3Dy +CONFIG_SCREEN_INFO=3Dy CONFIG_VIDEO_CMDLINE=3Dy CONFIG_VIDEO_NOMODESET=3Dy # CONFIG_AUXDISPLAY is not set @@ -5491,6 +5492,7 @@ CONFIG_FB_SYS_IMAGEBLIT=3Dy # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=3Dy CONFIG_FB_DEFERRED_IO=3Dy +CONFIG_FB_IOMEM_FOPS=3Dy CONFIG_FB_IOMEM_HELPERS=3Dy CONFIG_FB_SYSMEM_HELPERS=3Dy CONFIG_FB_SYSMEM_HELPERS_DEFERRED=3Dy @@ -7313,6 +7315,7 @@ CONFIG_CRYPTO_ALGAPI=3Dy CONFIG_CRYPTO_ALGAPI2=3Dy CONFIG_CRYPTO_AEAD=3Dy CONFIG_CRYPTO_AEAD2=3Dy +CONFIG_CRYPTO_SIG=3Dy CONFIG_CRYPTO_SIG2=3Dy CONFIG_CRYPTO_SKCIPHER=3Dy CONFIG_CRYPTO_SKCIPHER2=3Dy @@ -7689,7 +7692,6 @@ CONFIG_SWIOTLB=3Dy # CONFIG_DMA_API_DEBUG is not set CONFIG_SGL_ALLOC=3Dy CONFIG_CHECK_SIGNATURE=3Dy -# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=3Dy CONFIG_DQL=3Dy CONFIG_GLOB=3Dy diff --git a/config/rootfiles/core/188/filelists/aarch64/linux b/config/rootf= iles/core/188/filelists/aarch64/linux new file mode 120000 index 0000000000..3a2532bc7d --- /dev/null +++ b/config/rootfiles/core/188/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/188/filelists/riscv64/linux b/config/rootf= iles/core/188/filelists/riscv64/linux new file mode 120000 index 0000000000..c8e8350ca6 --- /dev/null +++ b/config/rootfiles/core/188/filelists/riscv64/linux @@ -0,0 +1 @@ +../../../../common/riscv64/linux \ No newline at end of file diff --git a/config/rootfiles/core/188/filelists/x86_64/linux b/config/rootfi= les/core/188/filelists/x86_64/linux new file mode 120000 index 0000000000..0615b5b9ad --- /dev/null +++ b/config/rootfiles/core/188/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/= update.sh index 185ca16cff..2762230522 100644 --- a/config/rootfiles/core/188/update.sh +++ b/config/rootfiles/core/188/update.sh @@ -26,6 +26,18 @@ =20 core=3D188 =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 @@ -33,6 +45,46 @@ done =20 # Stop services =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 and size of boot +ROOTSPACE=3D$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 ) +if [ $ROOTSPACE -lt 200000 ]; then + exit_with_error "ERROR cannot update because not enough free space on ro= ot." 2 +fi +BOOTSIZE=3D$( df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1 ) +if [ $BOOTSIZE -lt 100000 ]; then + exit_with_error "ERROR cannot update. BOOT partition is to small." 3 +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 + # Extract files extract_files =20 @@ -69,7 +121,7 @@ ldconfig /etc/init.d/apache restart /etc/init.d/unbound restart =20 -# Build initial ramdisks (for intel-microcode) +# Build initial ramdisks dracut --regenerate-all --force KVER=3D"xxxKVERxxx" case "$(uname -m)" in @@ -79,6 +131,16 @@ case "$(uname -m)" in ;; esac =20 +# 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 + # This update needs a reboot... touch /var/run/need_reboot =20 diff --git a/lfs/linux b/lfs/linux index 3f5e608385..8b4d58bded 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 6.6.32 +VER =3D 6.6.46 =20 THISAPP =3D linux-$(VER) DL_FILE =3D linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects =3D \ =20 $(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) =20 -$(DL_FILE)_BLAKE2 =3D 6456fcafe10eae6c0cf962b651aa567ba9ad522c4df0c87301ab00= 60313b8179a818a1d305e0af21599bc5b7bf42e2f61121a2ee0658a065524d098eb2947f0e +$(DL_FILE)_BLAKE2 =3D 583fd214fdf23b8ac90d3efd6311db06b254f57813a4193270d8f5= ca5f7dcf7be80c228f47ca52ac60d43a20b6d2c6e55768e5cf3ff74d67f0dc56ca4719fe2b =20 install : $(TARGET) =20 @@ -133,9 +133,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # https://bugzilla.ipfire.org/show_bug.cgi?id=3D12760 cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15-NFQUE= UE-Hold-RCU-read-lock-while-calling-nf_reinject.patch =20 - # reset ax88179 twice like in older kernels - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.6.32-asi= x88179_reset.patch - # Fix external module compile cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.0-fix_ex= ternal_module_build.patch =20 hooks/post-receive -- IPFire 2.x development tree --===============6917757418357578469==--