From f4b85906ee251352989d03ca32160fd9c3c47f4f Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Fri, 3 Jun 2016 11:12:50 +0200 Subject: [PATCH] pkg/kamailio/deb: fix build rule for modules (cherry picked from commit 2115943fb5beb11a4b461c14f16dc42df8f32ab3) --- pkg/kamailio/deb/debian/rules | 11 +++++++++-- pkg/kamailio/deb/jessie/rules | 11 +++++++++-- pkg/kamailio/deb/precise/rules | 11 +++++++++-- pkg/kamailio/deb/squeeze/rules | 11 +++++++++-- pkg/kamailio/deb/trusty/rules | 11 +++++++++-- pkg/kamailio/deb/wheezy/rules | 11 +++++++++-- 6 files changed, 54 insertions(+), 12 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index b1c2b0fe2b4..5258bc79bf5 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -59,12 +59,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1)))) define PACKAGE_GRP_BUILD_template # package all the modules in PACKAGE_GROUPS in separate packages - $(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\ + $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) every-module group_include="k$(grp)" ) endef - define PACKAGE_GRP_INSTALL_template $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -83,6 +82,13 @@ define PACKAGE_GRP_INSTALL_template ) endef +define PACKAGE_EXTRA_BUILD_template + # package all the modules in EXTRA_GROUPS in separate packages + $(foreach grp,$(EXTRA_GROUPS),\ + $(MAKE) every-module group_include="k$(grp)" + ) +endef + define PACKAGE_EXTRA_INSTALL_template $(foreach grp,$(EXTRA_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -135,6 +141,7 @@ build-stamp: configure-stamp $(MAKE) all # make groups $(call PACKAGE_GRP_BUILD_template) + $(call PACKAGE_EXTRA_BUILD_template) touch build-stamp clean: diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index 6fc2ce691d0..63973da75ae 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -59,12 +59,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1)))) define PACKAGE_GRP_BUILD_template # package all the modules in PACKAGE_GROUPS in separate packages - $(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\ + $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) every-module group_include="k$(grp)" ) endef - define PACKAGE_GRP_INSTALL_template $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -83,6 +82,13 @@ define PACKAGE_GRP_INSTALL_template ) endef +define PACKAGE_EXTRA_BUILD_template + # package all the modules in EXTRA_GROUPS in separate packages + $(foreach grp,$(EXTRA_GROUPS),\ + $(MAKE) every-module group_include="k$(grp)" + ) +endef + define PACKAGE_EXTRA_INSTALL_template $(foreach grp,$(EXTRA_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -135,6 +141,7 @@ build-stamp: configure-stamp $(MAKE) all # make groups $(call PACKAGE_GRP_BUILD_template) + $(call PACKAGE_EXTRA_BUILD_template) touch build-stamp clean: diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index 579c1b55432..5ff91097888 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -58,12 +58,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1)))) define PACKAGE_GRP_BUILD_template # package all the modules in PACKAGE_GROUPS in separate packages - $(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\ + $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) every-module group_include="k$(grp)" ) endef - define PACKAGE_GRP_INSTALL_template $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -82,6 +81,13 @@ define PACKAGE_GRP_INSTALL_template ) endef +define PACKAGE_EXTRA_BUILD_template + # package all the modules in EXTRA_GROUPS in separate packages + $(foreach grp,$(EXTRA_GROUPS),\ + $(MAKE) every-module group_include="k$(grp)" + ) +endef + define PACKAGE_EXTRA_INSTALL_template $(foreach grp,$(EXTRA_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -134,6 +140,7 @@ build-stamp: configure-stamp $(MAKE) all # make groups $(call PACKAGE_GRP_BUILD_template) + $(call PACKAGE_EXTRA_BUILD_template) touch build-stamp clean: diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index bb5ec8e4d3e..dd643f2de4c 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -56,12 +56,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1)))) define PACKAGE_GRP_BUILD_template # package all the modules in PACKAGE_GROUPS in separate packages - $(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\ + $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) every-module group_include="k$(grp)" ) endef - define PACKAGE_GRP_INSTALL_template $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -80,6 +79,13 @@ define PACKAGE_GRP_INSTALL_template ) endef +define PACKAGE_EXTRA_BUILD_template + # package all the modules in EXTRA_GROUPS in separate packages + $(foreach grp,$(EXTRA_GROUPS),\ + $(MAKE) every-module group_include="k$(grp)" + ) +endef + define PACKAGE_EXTRA_INSTALL_template $(foreach grp,$(EXTRA_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -132,6 +138,7 @@ build-stamp: configure-stamp $(MAKE) all # make groups $(call PACKAGE_GRP_BUILD_template) + $(call PACKAGE_EXTRA_BUILD_template) touch build-stamp clean: diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules index 6fc2ce691d0..63973da75ae 100755 --- a/pkg/kamailio/deb/trusty/rules +++ b/pkg/kamailio/deb/trusty/rules @@ -59,12 +59,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1)))) define PACKAGE_GRP_BUILD_template # package all the modules in PACKAGE_GROUPS in separate packages - $(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\ + $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) every-module group_include="k$(grp)" ) endef - define PACKAGE_GRP_INSTALL_template $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -83,6 +82,13 @@ define PACKAGE_GRP_INSTALL_template ) endef +define PACKAGE_EXTRA_BUILD_template + # package all the modules in EXTRA_GROUPS in separate packages + $(foreach grp,$(EXTRA_GROUPS),\ + $(MAKE) every-module group_include="k$(grp)" + ) +endef + define PACKAGE_EXTRA_INSTALL_template $(foreach grp,$(EXTRA_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -135,6 +141,7 @@ build-stamp: configure-stamp $(MAKE) all # make groups $(call PACKAGE_GRP_BUILD_template) + $(call PACKAGE_EXTRA_BUILD_template) touch build-stamp clean: diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 0f38bebe6aa..f91ee99227a 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -58,12 +58,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1)))) define PACKAGE_GRP_BUILD_template # package all the modules in PACKAGE_GROUPS in separate packages - $(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\ + $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) every-module group_include="k$(grp)" ) endef - define PACKAGE_GRP_INSTALL_template $(foreach grp,$(PACKAGE_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -82,6 +81,13 @@ define PACKAGE_GRP_INSTALL_template ) endef +define PACKAGE_EXTRA_BUILD_template + # package all the modules in EXTRA_GROUPS in separate packages + $(foreach grp,$(EXTRA_GROUPS),\ + $(MAKE) every-module group_include="k$(grp)" + ) +endef + define PACKAGE_EXTRA_INSTALL_template $(foreach grp,$(EXTRA_GROUPS),\ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \ @@ -134,6 +140,7 @@ build-stamp: configure-stamp $(MAKE) all # make groups $(call PACKAGE_GRP_BUILD_template) + $(call PACKAGE_EXTRA_BUILD_template) touch build-stamp clean: