[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 60b5c6c2bd13e9ed0423da66682bfd95b5d0ee32

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 60b5c6c2bd13e9ed0423da66682bfd95b5d0ee32

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4749 bytes --]

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  60b5c6c2bd13e9ed0423da66682bfd95b5d0ee32 (commit)
       via  522632655c3e06d02414c0905b5117aae769aa3e (commit)
      from  b71fe1a1e7bea7d95777ceb6a0bc0c8a87ea14f6 (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 60b5c6c2bd13e9ed0423da66682bfd95b5d0ee32
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 14 09:02:37 2024 +0000

    make.sh: Avoid finding non-existant rootfiles
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 522632655c3e06d02414c0905b5117aae769aa3e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 14 09:00:21 2024 +0000

    kernel: Enable IO uring
    
    This is a feature more and more tools start using now and will help to
    keep performance of the OS up.
    
    This was enabled on riscv64 already.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.aarch64-ipfire | 3 ++-
 config/kernel/kernel.config.x86_64-ipfire  | 3 ++-
 config/rootfiles/common/aarch64/linux      | 2 ++
 config/rootfiles/common/x86_64/linux       | 2 ++
 make.sh                                    | 2 ++
 5 files changed, 10 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index e3ea04138..f7835c69f 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -234,7 +234,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
@@ -8045,6 +8045,7 @@ CONFIG_NLS_UTF8=m
 CONFIG_NLS_UCS2_UTILS=m
 # CONFIG_DLM is not set
 # CONFIG_UNICODE is not set
+CONFIG_IO_WQ=y
 # end of File systems
 
 #
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index f98042d1e..1bc62acf5 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -253,7 +253,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
@@ -7226,6 +7226,7 @@ CONFIG_NLS_UCS2_UTILS=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
 # CONFIG_UNICODE is not set
+CONFIG_IO_WQ=y
 # end of File systems
 
 #
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index b07543290..a65a2d7a1 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -8934,6 +8934,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER/build/include/config/IONIC
 #lib/modules/KVER/build/include/config/IOSCHED_BFQ
 #lib/modules/KVER/build/include/config/IO_STRICT_DEVMEM
+#lib/modules/KVER/build/include/config/IO_URING
+#lib/modules/KVER/build/include/config/IO_WQ
 #lib/modules/KVER/build/include/config/IP6_NF_FILTER
 #lib/modules/KVER/build/include/config/IP6_NF_IPTABLES
 #lib/modules/KVER/build/include/config/IP6_NF_MANGLE
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 49e1dfe71..90bc8a818 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -8711,6 +8711,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER/build/include/config/IOSF_MBI
 #lib/modules/KVER/build/include/config/IO_DELAY_0X80
 #lib/modules/KVER/build/include/config/IO_STRICT_DEVMEM
+#lib/modules/KVER/build/include/config/IO_URING
+#lib/modules/KVER/build/include/config/IO_WQ
 #lib/modules/KVER/build/include/config/IP5XXX_POWER
 #lib/modules/KVER/build/include/config/IP6_NF_FILTER
 #lib/modules/KVER/build/include/config/IP6_NF_IPTABLES
diff --git a/make.sh b/make.sh
index 7129c36e7..f68a61c1c 100755
--- a/make.sh
+++ b/make.sh
@@ -2155,6 +2155,8 @@ check_for_missing_rootfiles() {
 
 	local file
 	for file in ${LOG_DIR}/*_missing_rootfile; do
+		[ -e "${file}" ] || continue
+
 		file="${file##*/}"
 		file="${file/_missing_rootfile/}";
 


hooks/post-receive
--
IPFire 2.x development tree