sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#11400 debian: fix binary only builds

Browse Source 
* remove module-assistant definitions
* use debhelper (>= 9~)
* wrap-and-sort -sat

Fix #322

Change-Id: I9eec49edb967f99c39241ab85eafed180e582c5a
changes/92/11392/7
Victor Seva 9 years ago
parent 458d359379
commit 89393e1dfd
8 changed files with 123 additions and 149 deletions
Show Stats Download Patch File Download Diff File

2
debian/compat vendored
Unescape View File

@ -1 +1 @@
5 9

160
debian/control vendored
Unescape View File

@ -2,72 +2,87 @@ Source: ngcp-rtpengine
Section: net Section: net
Priority: extra Priority: extra
Maintainer: Sipwise Development Team <support@sipwise.com> Maintainer: Sipwise Development Team <support@sipwise.com>
Build-Depends: debhelper (>= 5), Build-Depends:
iptables-dev (>= 1.4), debhelper (>= 9~),
libavcodec-dev (>= 6:10), iptables-dev (>= 1.4),
libavfilter-dev (>= 6:10), libavcodec-dev (>= 6:10),
libavformat-dev (>= 6:10), libavfilter-dev (>= 6:10),
libavresample-dev (>= 6:10), libavformat-dev (>= 6:10),
libavutil-dev (>= 6:10), libavresample-dev (>= 6:10),
libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl3-openssl-dev | libcurl3-gnutls-dev, libavutil-dev (>= 6:10),
libevent-dev (>= 2.0), libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl3-openssl-dev | libcurl3-gnutls-dev,
libglib2.0-dev (>= 2.30), libevent-dev (>= 2.0),
libhiredis-dev, libglib2.0-dev (>= 2.30),
libjson-glib-dev, libhiredis-dev,
libpcap0.8-dev | libpcap-dev, libjson-glib-dev,
libpcre3-dev, libpcap0.8-dev | libpcap-dev,
libssl-dev (>= 1.0.1), libpcre3-dev,
libxmlrpc-c3-dev (>= 1.16.07) | libxmlrpc-core-c3-dev (>= 1.16.07), libssl-dev (>= 1.0.1),
markdown, libxmlrpc-c3-dev (>= 1.16.07) | libxmlrpc-core-c3-dev (>= 1.16.07),
zlib1g-dev markdown,
zlib1g-dev,
Standards-Version: 3.9.7 Standards-Version: 3.9.7
Homepage: http://sipwise.com/ Homepage: http://sipwise.com/
Package: ngcp-rtpengine-daemon Package: ngcp-rtpengine-daemon
Architecture: any Architecture: any
Recommends: ngcp-rtpengine-recording-daemon, Recommends:
ngcp-rtpengine-utils ngcp-rtpengine-recording-daemon,
Suggests: ngcp-system-tools ngcp-rtpengine-utils,
Depends: lsb-base (>= 3.0-6), Suggests:
${misc:Depends}, ngcp-system-tools,
${shlibs:Depends} Depends:
Conflicts: ngcp-mediaproxy-ng-daemon, lsb-base (>= 3.0-6),
ngcp-rtpengine-redis1 ${misc:Depends},
Replaces: ngcp-mediaproxy-ng-daemon, ${shlibs:Depends},
ngcp-rtpengine-redis1 Conflicts:
ngcp-mediaproxy-ng-daemon,
ngcp-rtpengine-redis1,
Replaces:
ngcp-mediaproxy-ng-daemon,
ngcp-rtpengine-redis1,
Description: Proxy for RTP and media streams used in NGCP, userspace part. Description: Proxy for RTP and media streams used in NGCP, userspace part.
This daemon handles the first stages of proxying media streams and talks to This daemon handles the first stages of proxying media streams and talks to
the kernel part of the proxy for eventual high-performance packet forwarding. the kernel part of the proxy for eventual high-performance packet forwarding.
Package: ngcp-rtpengine-recording-daemon Package: ngcp-rtpengine-recording-daemon
Architecture: any Architecture: any
Recommends: ngcp-rtpengine-utils Recommends:
Suggests: ngcp-system-tools ngcp-rtpengine-utils,
Depends: lsb-base (>= 3.0-6), Suggests:
nfs-common, ngcp-system-tools,
${misc:Depends}, Depends:
${shlibs:Depends} lsb-base (>= 3.0-6),
nfs-common,
${misc:Depends},
${shlibs:Depends},
Description: Recording daemon for RTP and media streams Description: Recording daemon for RTP and media streams
This daemon handles the call recording (media intercept) component of rtpengine. This daemon handles the call recording (media intercept) component of rtpengine.
Package: ngcp-rtpengine-iptables Package: ngcp-rtpengine-iptables
Architecture: any Architecture: any
Depends: ${misc:Depends}, Depends:
${shlibs:Depends} ${misc:Depends},
Conflicts: ngcp-mediaproxy-ng-iptables ${shlibs:Depends},
Replaces: ngcp-mediaproxy-ng-iptables Conflicts:
ngcp-mediaproxy-ng-iptables,
Replaces:
ngcp-mediaproxy-ng-iptables,
Description: IPtables extension module for the kernel-space NGCP media proxy. Description: IPtables extension module for the kernel-space NGCP media proxy.
Provides the IPtables extension needed to configure the mediaproxy rule. Provides the IPtables extension needed to configure the mediaproxy rule.
Package: ngcp-rtpengine Package: ngcp-rtpengine
Architecture: all Architecture: all
Depends: ngcp-rtpengine-daemon (>= ${source:Version}), Depends:
ngcp-rtpengine-iptables (>= ${source:Version}), ngcp-rtpengine-daemon (>= ${source:Version}),
ngcp-rtpengine-kernel-dkms (>= ${source:Version}), ngcp-rtpengine-iptables (>= ${source:Version}),
ngcp-rtpengine-recording-daemon (>= ${source:Version}), ngcp-rtpengine-kernel-dkms (>= ${source:Version}),
ngcp-rtpengine-utils (>= ${source:Version}) ngcp-rtpengine-recording-daemon (>= ${source:Version}),
Conflicts: ngcp-mediaproxy-ng ngcp-rtpengine-utils (>= ${source:Version}),
Replaces: ngcp-mediaproxy-ng Conflicts:
ngcp-mediaproxy-ng,
Replaces:
ngcp-mediaproxy-ng,
Description: NGCP RTP/media proxy - meta package. Description: NGCP RTP/media proxy - meta package.
This is a meta package for easy installation of all four parts of the NGCP This is a meta package for easy installation of all four parts of the NGCP
media proxy. It will install the user-space daemon, the kernel-space IPtables media proxy. It will install the user-space daemon, the kernel-space IPtables
@ -75,11 +90,14 @@ Description: NGCP RTP/media proxy - meta package.
Package: ngcp-rtpengine-kernel-source Package: ngcp-rtpengine-kernel-source
Architecture: all Architecture: all
Depends: debhelper (>= 5), Depends:
module-assistant, debhelper (>= 5),
${misc:Depends} module-assistant,
Conflicts: ngcp-mediaproxy-ng-kernel-source ${misc:Depends},
Replaces: ngcp-mediaproxy-ng-kernel-source Conflicts:
ngcp-mediaproxy-ng-kernel-source,
Replaces:
ngcp-mediaproxy-ng-kernel-source,
Description: IPtables kernel module for the NGCP media proxy - source. Description: IPtables kernel module for the NGCP media proxy - source.
Provides the kernel-space part of the NGCP media proxy for high- Provides the kernel-space part of the NGCP media proxy for high-
performance packet forwarding. performance packet forwarding.
@ -88,11 +106,15 @@ Description: IPtables kernel module for the NGCP media proxy - source.
Package: ngcp-rtpengine-kernel-dkms Package: ngcp-rtpengine-kernel-dkms
Architecture: all Architecture: all
Suggests: ngcp-system-tools Suggests:
Depends: dkms (>= 1.95), ngcp-system-tools,
${misc:Depends} Depends:
Conflicts: ngcp-mediaproxy-ng-kernel-dkms dkms (>= 1.95),
Replaces: ngcp-mediaproxy-ng-kernel-dkms ${misc:Depends},
Conflicts:
ngcp-mediaproxy-ng-kernel-dkms,
Replaces:
ngcp-mediaproxy-ng-kernel-dkms,
Description: IPtables kernel module for the NGCP media proxy - DKMS. Description: IPtables kernel module for the NGCP media proxy - DKMS.
Provides the kernel-space part of the NGCP media proxy for high- Provides the kernel-space part of the NGCP media proxy for high-
performance packet forwarding. performance packet forwarding.
@ -101,11 +123,14 @@ Description: IPtables kernel module for the NGCP media proxy - DKMS.
Package: ngcp-rtpengine-dbg Package: ngcp-rtpengine-dbg
Architecture: any Architecture: any
Section: debug Section: debug
Depends: ngcp-rtpengine-daemon (= ${binary:Version}), Depends:
ngcp-rtpengine-iptables (= ${binary:Version}), ngcp-rtpengine-daemon (= ${binary:Version}),
${misc:Depends} ngcp-rtpengine-iptables (= ${binary:Version}),
Conflicts: ngcp-mediaproxy-ng-dbg ${misc:Depends},
Replaces: ngcp-mediaproxy-ng-dbg Conflicts:
ngcp-mediaproxy-ng-dbg,
Replaces:
ngcp-mediaproxy-ng-dbg,
Description: debugging symbols for ngcp-rtpengine Description: debugging symbols for ngcp-rtpengine
The ngcp-rtpengine daemon handles the first stages of proxying media streams and talks to The ngcp-rtpengine daemon handles the first stages of proxying media streams and talks to
the kernel part of the proxy for eventual high-performance packet forwarding. the kernel part of the proxy for eventual high-performance packet forwarding.
@ -118,12 +143,13 @@ Description: debugging symbols for ngcp-rtpengine
Package: ngcp-rtpengine-utils Package: ngcp-rtpengine-utils
Architecture: all Architecture: all
Depends: libbencode-perl, Depends:
libcrypt-rijndael-perl, libbencode-perl,
libdigest-hmac-perl, libcrypt-rijndael-perl,
libio-socket-inet6-perl, libdigest-hmac-perl,
libio-socket-ip-perl, libio-socket-inet6-perl,
libsocket6-perl, libio-socket-ip-perl,
netcat-openbsd | netcat libsocket6-perl,
netcat-openbsd | netcat,
Description: Scripts and Perl modules for NGCP rtpengine Description: Scripts and Perl modules for NGCP rtpengine
This package contains scripts and Perl modules for NGCP rtpengine This package contains scripts and Perl modules for NGCP rtpengine

9
debian/control.modules.in vendored
Unescape View File

@ -2,14 +2,17 @@ Source: ngcp-rtpengine
Section: kernel Section: kernel
Priority: optional Priority: optional
Maintainer: Sipwise Development Team <support@sipwise.com> Maintainer: Sipwise Development Team <support@sipwise.com>
Build-Depends: debhelper (>= 5) Build-Depends:
debhelper (>= 5),
Standards-Version: 3.9.7 Standards-Version: 3.9.7
Homepage: http://sipwise.com/ Homepage: http://sipwise.com/
Package: ngcp-rtpengine-kernel-modules-_KVERS_ Package: ngcp-rtpengine-kernel-modules-_KVERS_
Architecture: any Architecture: any
Depends: linux-modules-_KVERS_ | linux-image-_KVERS_ Depends:
Provides: ngcp-rtpengine-kernel linux-modules-_KVERS_ | linux-image-_KVERS_,
Provides:
ngcp-rtpengine-kernel,
Description: IPtables kernel module for the NGCP media proxy Description: IPtables kernel module for the NGCP media proxy
This package provides the ngcp-rtpengine module for This package provides the ngcp-rtpengine module for
the Linux kernel version _KVERS_. the Linux kernel version _KVERS_.

2
debian/dirs vendored
Unescape View File

@ -1,2 +0,0 @@
usr/sbin
etc/rtpengine

2
debian/ngcp-rtpengine.docs vendored
Unescape View File

@ -0,0 +1,2 @@
debian/README.md.gz
debian/README.html.gz

95
debian/rules vendored
Unescape View File

@ -1,16 +1,9 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# -*- makefile -*- # -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1 # export DH_VERBOSE=1
b=$(CURDIR)/debian
## kernel package specific stuff ## kernel package specific stuff
# Name of the source package # Name of the source package
psource:=ngcp-rtpengine-kernel-source psource:=ngcp-rtpengine-kernel-source
@ -22,44 +15,26 @@ sname:=ngcp-rtpengine
sversion:=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2) sversion:=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
PACKAGE=ngcp-rtpengine-kernel PACKAGE=ngcp-rtpengine-kernel
MA_DIR ?= /usr/share/modass
-include $(MA_DIR)/include/generic.make
-include $(MA_DIR)/include/common-rules.make
kdist_configure: prep-deb-files
kdist_clean: clean
$(MAKE) $(MFLAGS) -f debian/rules clean
## end of kernel package specific stuff ## end of kernel package specific stuff
build: build-stamp %:
dh $@ --parallel
build-stamp:
dh_testdir override_dh_auto_build-arch:
make -C iptables-extension $(MAKE) -C iptables-extension
make -C daemon -j`nproc` $(MAKE) -C daemon
make -C recording-daemon -j`nproc` $(MAKE) -C recording-daemon
touch $@
override_dh_auto_clean:
clean: (cd daemon && $(MAKE) clean)
dh_testdir (cd recording-daemon && $(MAKE) clean)
dh_testroot (cd iptables-extension && $(MAKE) clean)
cd daemon && $(MAKE) clean && cd .. rm -f daemon/build_time.h kernel-module/.xt_RTPENGINE.o.d
cd recording-daemon && $(MAKE) clean && cd ..
rm -f build-stamp
rm -f iptables-extension/libxt_RTPENGINE.so
rm -f daemon/rtpengine daemon/build_time.h daemon/.depend kernel-module/.xt_RTPENGINE.o.d
rm -rf kernel-module/.tmp_versions rm -rf kernel-module/.tmp_versions
rm -f debian/README.html.gz debian/README.md.gz rm -f debian/README.html.gz debian/README.md.gz
dh_clean dh_auto_clean
-rm -rf debian/build
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
override_dh_auto_install-indep:
# Create the directories to install the source into # Create the directories to install the source into
dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian
dh_installdirs -p$(pdkms) usr/src/$(sname)-$(sversion) dh_installdirs -p$(pdkms) usr/src/$(sname)-$(sversion)
@ -82,40 +57,8 @@ install: build
markdown README.md | gzip -9 > debian/README.html.gz markdown README.md | gzip -9 > debian/README.html.gz
gzip -9 < README.md > debian/README.md.gz gzip -9 < README.md > debian/README.md.gz
dh_install dh_auto_install
%:
@echo "--- Building: $@"
dh_installdirs -p$@ -P$(b)/$@
dh_link -p$@ -P$(b)/$@
dh_installdocs -p$@ -P$(b)/$@ debian/README.md.gz debian/README.html.gz
dh_installchangelogs -p$@ -P$(b)/$@
dh_installinit -p$@ -P$(b)/$@
dh_install -p$@ -P$(b)/$@
dh_strip --dbg-package=ngcp-rtpengine-dbg
dh_compress -p$@ -P$(b)/$@
dh_fixperms -p$@ -P$(b)/$@
dh_makeshlibs -p$@ -P$(b)/$@ -V
dh_installdeb -p$@ -P$(b)/$@
dh_shlibdeps -p$@ -P$(b)/$@
dh_installdebconf -p$@ -P$(b)/$@
dh_gencontrol -p$@ -P$(b)/$@
dh_md5sums -p$@ -P$(b)/$@
dh_builddeb -p$@ -P$(b)/$@
# Build architecture dependant packages
binary-arch: install \
ngcp-rtpengine-daemon \
ngcp-rtpengine-dbg \
ngcp-rtpengine-iptables \
ngcp-rtpengine-recording-daemon
# Build architecture independant packages
binary-indep: build install \
ngcp-rtpengine \
ngcp-rtpengine-kernel-dkms \
ngcp-rtpengine-kernel-source \
ngcp-rtpengine-utils
binary: binary-indep binary-arch .PHONY: override_dh_strip
.PHONY: build clean binary-indep binary-arch binary install kdist kdist_configure kdist_image kdist_clean override_dh_strip:
dh_strip --dbg-package=ngcp-rtpengine-dbg

1
debian/source/format vendored
Unescape View File

@ -0,0 +1 @@
3.0 (native)

1
debian/source/options vendored
Unescape View File

@ -0,0 +1 @@
extend-diff-ignore=.gitreview
Write Preview
Loading…
Cancel
Save