[sr-dev] git:5.8:65873cd2: pkg/kamailio/deb: fix tls_wolfssl packaging

Module: kamailio Branch: 5.8 Commit: 65873cd2cdd390ce10ec99888fb35b0095a90c65 URL: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T18:21:27+02:00 pkg/kamailio/deb: fix tls_wolfssl packaging * packages can't have '_' in name * distinguish grp module and deb module name '_' => '-' so tls_wolfssl => tls-wolfssl (cherry picked from commit 1d82805ef084d90e5ea14e4894f3e5076e29e2f3) --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules --- Diff: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… Patch: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index b454421bff8..ee369ba7ccf 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -661,7 +661,7 @@ Description: TLS support for the Kamailio SIP server (authentication, transport) This package provides TLS support for encrypted and authenticated SIP connections as well as generic TLS support for many Kamailio modules. -Package: kamailio-wolftls-modules +Package: kamailio-tls-wolfssl-modules Architecture: any Multi-Arch: same Pre-Depends: diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index cbf680015ad..1cbace016b9 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -141,24 +141,27 @@ test_install_all-stamp: build $(MAKE) install quiet=verbose LIBDIR=$(LIBDIR) group_include="kstandard" touch test_install_all-stamp +# tls_wolfssl => tls-wolfssl +$(INSTALL_MODULES): module = $(subst _,-,$(subst install_,,$@)) +$(INSTALL_MODULES): grp = $(subst install_,,$@) $(INSTALL_MODULES): test_install_all-stamp $(MAKE) install-modules-all \ quiet=verbose \ LIBDIR=$(LIBDIR) \ - BASEDIR=$(D)-$(subst install_,,$@)-modules \ - cfg_prefix=$(D)-$(subst install_,,$@)-modules \ - doc-dir=share/doc/$(DEB_SOURCE)-$(subst install_,,$@)-modules \ - group_include="k$(subst install_,,$@)" + BASEDIR=$(D)-$(module)-modules \ + cfg_prefix=$(D)-$(module)-modules \ + doc-dir=share/doc/$(DEB_SOURCE)-$(module)-modules \ + group_include="k$(grp)" # Eliminate duplicate libs. for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(D)-$${module}-modules/usr/$(LIBDIR)/kamailio" && \ + test "$$d" != "$(D)-$(module)-modules/usr/$(LIBDIR)/kamailio" && \ for r in `find $$d -name 'lib*' | xargs`; do \ - echo "removing $(subst install_,,$@) lib `basename $$r` present also in $$d"; \ - rm -f $(D)-$(subst install_,,$@)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ + echo "removing $(module) lib `basename $$r` present also in $$d"; \ + rm -f $(D)-$(module)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ done ; \ done # clean empty dirs - find $(D)-$(subst install_,,$@)-modules -depth -empty -type d -exec rmdir {} \; + find $(D)-$(module)-modules -depth -empty -type d -exec rmdir {} \; $(INSTALL_EXTRA): test_install_all-stamp $(MAKE) install-modules-all \