rtpengine: update to 13.5.1.3 #930
Conversation
| --- a/kernel-module/xt_RTPENGINE.c | ||
| +++ b/kernel-module/xt_RTPENGINE.c | ||
| @@ -38,7 +38,6 @@ | ||
| #include <linux/btree.h> | ||
| #define KERNEL_PLAYER | ||
| #else | ||
| -#warning "Kernel without CONFIG_BTREE - kernel media player unavailable" | ||
| #endif | ||
|
|
||
| #include "xt_RTPENGINE.h" |
There was a problem hiding this comment.
It is good that you do have mention why this patch is needed in the pull request, but it is missing in the patch itself.
There was a problem hiding this comment.
To be honest, this patch sounds to me like a hack and I dont like it so much.
There was a problem hiding this comment.
This was just my idea to solve the build error. Happy to go another direction.
There was a problem hiding this comment.
the module enforces -Werror, causing the build to fail on OpenWrt kernels where CONFIG_BTREE is disabled.
Do you have any log to see what is going on? I dont think that this should be merged as it is.
It is a question, why the issue is raised suddenly in 13.5.1.3. 🤔
There was a problem hiding this comment.
make[5]: Entering directory '/scratch/union/build_dir/target-x86_64_glibc/rtpengine-no-transcode/rtpengine-mr13.5.1.3/kernel-module'
CC [M] xt_RTPENGINE.o
xt_RTPENGINE.c:41:2: error: #warning "Kernel without CONFIG_BTREE - kernel media player unavailable" [-Werror=cpp]
41 | #warning "Kernel without CONFIG_BTREE - kernel media player unavailable"
| ^~~~~~~
cc1: all warnings being treated as errors
There was a problem hiding this comment.
This looks fine, but should probably be fixed (in a better way) upstream. We can carry this for the time being.
There was a problem hiding this comment.
Instead of removing the warning, would it make sense to extend target/Config.in with BTREE support and make rtpengine depend on BTREE_SUPPORT?
There was a problem hiding this comment.
I think that make sense. I updated the PR. I do not think it is quite right. When I try building this I am seeing:
make[3]: Entering directory '/scratch/union/build_dir/target-x86_64_glibc/rtpengine-no-transcode/rtpengine-mr13.5.1.3/recording-daemon'
../utils/gen-common-flags >../config.mk.new
Error: Required package 'json-glib-1.0' not found
../lib/deps.Makefile:15: ../config.mk: No such file or directory
make[3]: *** [../lib/deps.Makefile:6: ../config.mk] Error 1
make[3]: Leaving directory '/scratch/union/build_dir/target-x86_64_glibc/rtpengine-no-transcode/rtpengine-mr13.5.1.3/recording-daemon'
Further the kernel config is not getting the CONFIG_BTREE=y option.
% grep BTREE /scratch/union/build_dir/target-x86_64_glibc/linux-x86_64/linux-6.12.63/.config
CONFIG_IPV6_SUBTREES=y
# CONFIG_RBTREE_TEST is not set
Add a BTREE_SUPPORT capability to describe targets whose kernels provide BTREE support, allowing packages to express a hard dependency without making kernel config assumptions. This is needed to merge before openwrt/telephony#930 Signed-off-by: John Audia <[email protected]>
This release is needed to build against linux 6.18. Removed upstreamed patches: 101-use-spandsp3.patch 104-daemon-poller-fix-compilation-error-for-pthread-tid.patch Manually rebased: 100-prevent-systemd-detection.patch Declare a dependency on BTREE_SUPPORT for rtpengine userspace variants and ensure the kernel module enables CONFIG_BTREE when built. This PR depends on openwrt/openwrt#21416 Signed-off-by: John Audia <[email protected]>
4 participants
Maintainer: no one
Compile tested: x86/64
Run tested: not run tested
Description:
This release is needed to build against linux 6.18.
Removed upstreamed patches:
101-use-spandsp3.patch
104-daemon-poller-fix-compilation-error-for-pthread-tid.patch
Manually rebased:
100-prevent-systemd-detection.patch
Declare a dependency on BTREE_SUPPORT for rtpengine userspace variants and ensure the kernel module enables CONFIG_BTREE when built.
This PR depends on openwrt/openwrt#21416