sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

[kamailio/kamailio] cmake: do not packaged (Issue #4255)
by sergey-safarov 23 May '25

23 May '25

sergey-safarov created an issue (kamailio/kamailio#4255) ### Description I now make testing `cmake` packaging and see this error ``` RPM build errors: Directory not found: /root/rpmbuild/BUILDROOT/kamailio-6.1.0-dev1.0.el10.centos.x86_64/usr/share/kamailio/postgres File not found: /root/rpmbuild/BUILDROOT/kamailio-6.1.0-dev1.0.el10.centos.x86_64/usr/share/kamailio/postgres/* ``` ### Troubleshooting #### Reproduction I use this module list for build https://github.com/sergey-safarov/kamailio/blob/master/pkg/kamailio/obs/kam… @xkaraman could you look? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4255 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4255(a)github.com>

2 6

git:master:9a1b9d08: pkg/kamailio: switched RPM packaging to use cmake
by Sergey Safarov 23 May '25

23 May '25

Module: kamailio Branch: master Commit: 9a1b9d08a112745663f37f0dfcbe86a741486da3 URL: https://github.com/kamailio/kamailio/commit/9a1b9d08a112745663f37f0dfcbe86a… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-05-23T18:47:42+03:00 pkg/kamailio: switched RPM packaging to use cmake --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9a1b9d08a112745663f37f0dfcbe86a… Patch: https://github.com/kamailio/kamailio/commit/9a1b9d08a112745663f37f0dfcbe86a…

1 0

git:master:57bd37c5: cmake: dbschema Coorect install folder of pi_framework
by Xenofon Karamanos 23 May '25

23 May '25

Module: kamailio Branch: master Commit: 57bd37c54390fdb70520834b0c2eb29fbb79510e URL: https://github.com/kamailio/kamailio/commit/57bd37c54390fdb70520834b0c2eb29… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-23T13:34:50Z cmake: dbschema Coorect install folder of pi_framework --- Modified: cmake/dbschema.cmake --- Diff: https://github.com/kamailio/kamailio/commit/57bd37c54390fdb70520834b0c2eb29… Patch: https://github.com/kamailio/kamailio/commit/57bd37c54390fdb70520834b0c2eb29… --- diff --git a/cmake/dbschema.cmake b/cmake/dbschema.cmake index dcd7bb0645b..a45e7e85470 100644 --- a/cmake/dbschema.cmake +++ b/cmake/dbschema.cmake @@ -59,6 +59,8 @@ function(add_db_target db_name xsl_file) set(install_folder "postgres") elseif(db_name STREQUAL "db_text") set(install_folder "dbtext") + elseif(db_name STREQUAL "pi_framework_table" OR db_name STREQUAL "pi_framework_mod") + set(install_folder "xhttp_pi") else() set(install_folder "${db_name}") endif() @@ -101,7 +103,6 @@ function(add_db_target db_name xsl_file) TARGET dbschema_${db_name} POST_BUILD COMMAND ${POSTPROCESS_SCRIPT} 1 1 - # ${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}/${folder_suffix} COMMENT "Creating version table for ${db_name}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}/${folder_suffix} ) @@ -110,7 +111,6 @@ function(add_db_target db_name xsl_file) TARGET dbschema_${db_name} POST_BUILD COMMAND ${POSTPROCESS_SCRIPT} 2 10 - # ${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}/${folder_suffix} COMMENT "Creating version table for ${db_name}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}/${folder_suffix} ) @@ -130,7 +130,8 @@ function(add_db_target db_name xsl_file) # message(WARNING "group name is ${group_name}") # Before installing, ensure the target is built `dbschema_${db_name}` # install as previously done in makefile folder. see naming above - # TODO: when tools adopt to new folder structure, remove the install_folder variable + # TODO: when tools adopt to new folder structure, replace the install_folder variable + # with ${db_name_folder} install( DIRECTORY ${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}/

1 0

git:master:c7fcdfdb: cmake: Add some check for finding group name if using non K-variants of group names
by Xenofon Karamanos 23 May '25

23 May '25

Module: kamailio Branch: master Commit: c7fcdfdb13aeec9aeae726a9cc1ccaeda557e7bb URL: https://github.com/kamailio/kamailio/commit/c7fcdfdb13aeec9aeae726a9cc1ccae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-23T11:10:13Z cmake: Add some check for finding group name if using non K-variants of group names --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/c7fcdfdb13aeec9aeae726a9cc1ccae… Patch: https://github.com/kamailio/kamailio/commit/c7fcdfdb13aeec9aeae726a9cc1ccae… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index a41560f17fc..c629ee49f93 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -764,6 +764,20 @@ function(find_group_name module) "" PARENT_SCOPE ) + # This was need due to the dbschema.cmake + # If one select one of these option as group + # we want the group name to match instead of the actual group it belongs to + if(MODULE_GROUP_NAME STREQUAL "ALL" + OR MODULE_GROUP_NAME STREQUAL "DEFAULT" + OR MODULE_GROUP_NAME STREQUAL "STANDARD" + OR MODULE_GROUP_NAME STREQUAL "COMMON" + ) + set(group_name + "${MODULE_GROUP_NAME}" + PARENT_SCOPE + ) + return() + endif() # message(WARNING "groups to search in" ${MODULE_GROUP_PACKAGE_GROUPS}) # Get all variable names in the current CMake context foreach(group IN LISTS MODULE_GROUP_PACKAGE_GROUPS) @@ -776,6 +790,8 @@ function(find_group_name module) "${group}" PARENT_SCOPE ) + return() endif() endforeach() + message((STATUS "module ${module} not found in any group")) endfunction()

1 0

git:master:0fb18272: cmake: Add missing package KSTANDARD
by Xenofon Karamanos 23 May '25

23 May '25

Module: kamailio Branch: master Commit: 0fb182720428b276793899debb210279a0b5ec97 URL: https://github.com/kamailio/kamailio/commit/0fb182720428b276793899debb21027… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-23T11:10:13Z cmake: Add missing package KSTANDARD - When `ALL_PACKAGED` is used, KSTANDARD should be built as well, but not KMINI which is a subset of it. - Fix RTP_MEDIA group name --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/0fb182720428b276793899debb21027… Patch: https://github.com/kamailio/kamailio/commit/0fb182720428b276793899debb21027… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 90c47413d22..a41560f17fc 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -688,6 +688,7 @@ set(MODULE_GROUP_KRTP_MEDIA_SERVER ${MOD_LIST_RTP_MEDIA_SERVER}) set(STATIC_MODULES "") set(MODULE_GROUP_PACKAGE_GROUPS + KSTANDARD KPCRE KMYSQL KPOSTGRES @@ -748,7 +749,7 @@ set(MODULE_GROUP_PACKAGE_GROUPS KNGHTTP2 KGCRYPT KSECSIPID - KRT_MEDIA_SERVER + KRTP_MEDIA_SERVER ) # Add group names to available group and provide "ALL_PACKAGED" as well

1 0

5.7.7 release, tag and docker build
by Henning Westerholt 23 May '25

23 May '25

Hello, I have noticed that the git tag for release 5.7.7 was missing, I've just set it. The 5.7.7-bullseye docker image is also missing from https://github.com/kamailio/kamailio-docker/pkgs/container/kamailio Not sure if this is done automatically, if not - please can somebody please trigger the workflow to create it? Thank you, Henning

2 3

git:master:2ec8ddba: cmake: Move prefix/suffix calculation back.
by Xenofon Karamanos 23 May '25

23 May '25

Module: kamailio Branch: master Commit: 2ec8ddba5eeaeea1c7292d1aa56ed90dc834341e URL: https://github.com/kamailio/kamailio/commit/2ec8ddba5eeaeea1c7292d1aa56ed90… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-23T10:56:50Z cmake: Move prefix/suffix calculation back. - Prefix depends on each table name.. - Fix postgress with correct install folder..... --- Modified: cmake/dbschema.cmake --- Diff: https://github.com/kamailio/kamailio/commit/2ec8ddba5eeaeea1c7292d1aa56ed90… Patch: https://github.com/kamailio/kamailio/commit/2ec8ddba5eeaeea1c7292d1aa56ed90… --- diff --git a/cmake/dbschema.cmake b/cmake/dbschema.cmake index 17528d83ed0..dcd7bb0645b 100644 --- a/cmake/dbschema.cmake +++ b/cmake/dbschema.cmake @@ -50,26 +50,13 @@ function(add_db_target db_name xsl_file) # For consistency, we are now using the new names. # For compatibility with tools, we are still using the old names for install folder - # Determine the prefix/suffix - if(db_name STREQUAL "db_berkeley" - OR db_name STREQUAL "db_redis" - OR db_name STREQUAL "db_text" - OR db_name STREQUAL "db_mongodb" - ) - set(prefix '') - set(folder_suffix "${MAIN_NAME}") - else() - set(prefix "${table}-") - set(folder_suffix '') - endif() - # install folder based on db_name if(db_name STREQUAL "db_mongodb") set(install_folder "mongodb") elseif(db_name STREQUAL "db_mysql") set(install_folder "mysql") elseif(db_name STREQUAL "db_postgres") - set(install_folder "mysql") + set(install_folder "postgres") elseif(db_name STREQUAL "db_text") set(install_folder "dbtext") else() @@ -79,6 +66,19 @@ function(add_db_target db_name xsl_file) # Loop through each table and add a command for xsltproc foreach(table ${EXTRACTED_TABLES}) + # Determine the prefix/suffix + if(db_name STREQUAL "db_berkeley" + OR db_name STREQUAL "db_redis" + OR db_name STREQUAL "db_text" + OR db_name STREQUAL "db_mongodb" + ) + set(prefix '') + set(folder_suffix "${MAIN_NAME}") + else() + set(prefix "${table}-") + set(folder_suffix '') + endif() + # Stringparam db is the db_* module name add_custom_command( TARGET dbschema_${db_name}

1 0

git:master:c2fc8090: pkg/kamailio: use radcli on RHEL based dist [skip ci]
by Sergey Safarov 23 May '25

23 May '25

Module: kamailio Branch: master Commit: c2fc809059e0c70aa4324f5727666989ee8aff05 URL: https://github.com/kamailio/kamailio/commit/c2fc809059e0c70aa4324f572766698… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-05-23T11:04:14+03:00 pkg/kamailio: use radcli on RHEL based dist [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c2fc809059e0c70aa4324f572766698… Patch: https://github.com/kamailio/kamailio/commit/c2fc809059e0c70aa4324f572766698… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d31f8c84d9b..094171caaeb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -746,8 +746,8 @@ Summary: RADIUS modules for Kamailio Group: %{PKGGROUP} Requires: kamailio = %ver %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -Requires: freeradius-client -BuildRequires: freeradius-client-devel +Requires: radcli +BuildRequires: radcli-devel %else Requires: radiusclient-ng BuildRequires: radiusclient-ng-devel @@ -1072,7 +1072,7 @@ rm -f misc/examples/pkg/sipcapture.cfg %build %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 -export FREERADIUS=1 +export RADCLI=1 %endif make cfg prefix=/usr \ basedir=%{buildroot} \ @@ -1084,7 +1084,7 @@ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 - FREERADIUS=1 \ + RADCLI=1 \ %endif %if 0%{?rhel} >= 8 PYTHON3=python3.12 \ @@ -1192,7 +1192,7 @@ make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 - FREERADIUS=1 \ + RADCLI=1 \ %endif %if 0%{?rhel} >= 8 PYTHON3=python3.12 \

1 0

git:master:701d07df: pkg/kamailio: removed RHEL 6 and 7 if macros from RPM spec file
by Sergey Safarov 23 May '25

23 May '25

Module: kamailio Branch: master Commit: 701d07df14d0d66125ff0ff3adec3ce424929472 URL: https://github.com/kamailio/kamailio/commit/701d07df14d0d66125ff0ff3adec3ce… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-05-23T10:46:18+03:00 pkg/kamailio: removed RHEL 6 and 7 if macros from RPM spec file --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/701d07df14d0d66125ff0ff3adec3ce… Patch: https://github.com/kamailio/kamailio/commit/701d07df14d0d66125ff0ff3adec3ce…

1 0

git:master:a7c4d400: pkg/kamailio: sipcapture remove
by Sergey Safarov 23 May '25

23 May '25

Module: kamailio Branch: master Commit: a7c4d4003dced50b3f6cbc7c9c6235e6bf894334 URL: https://github.com/kamailio/kamailio/commit/a7c4d4003dced50b3f6cbc7c9c6235e… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-05-23T10:18:56+03:00 pkg/kamailio: sipcapture remove --- Modified: pkg/kamailio/obs/kamailio.spec Removed: pkg/kamailio/obs/sipcapture.service Removed: pkg/kamailio/obs/sipcapture.sysconfig Removed: pkg/kamailio/obs/sipcapture.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/a7c4d4003dced50b3f6cbc7c9c6235e… Patch: https://github.com/kamailio/kamailio/commit/a7c4d4003dced50b3f6cbc7c9c6235e…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev