From b4a66530d3c5ffe59feda36427422e6110a4279c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 23 Feb 2016 16:35:17 +0100 Subject: [PATCH] MT#17699 Fix m-a build error + Bump Standards-Version for ngcp-rtpengine-kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Noticed during lintian reviews + test builds of ngcp-rtpengine-kernel, STR: * Install ngcp-rtpengine-kernel-source + module-assistant * m-a build ngcp-rtpengine-kernel fails with: | tail: cannot open ‘/usr/src/modules/ngcp-rtpengine/../debian/changelog’ for reading: No such file or directory | dpkg-parsechangelog: error: tail of /usr/src/modules/ngcp-rtpengine/../debian/changelog gave error exit status 1 | Building modules, stage 2. | MODPOST 1 modules | tail: cannot open ‘/usr/src/modules/ngcp-rtpengine/../debian/changelog’ for reading: No such file or directory Fix conflicts: | dh_gencontrol -- -v4.3.0.0+0~mr4.3.0.0+0~20160223155548.661+jessie~1.gbp6d1932+3.16.7-ckt20-1+deb8u3 | dpkg-gencontrol: error: source package has two conflicting values - ngcp-rtpengine-kernel and ngcp-rtpengine | dh_gencontrol: dpkg-gencontrol -pngcp-rtpengine-kernel-modules-3.16.0-4-amd64 -ldebian/changelog -Tdebian/ngcp-rtpengine-kernel-modules-3.16.0-4-amd64.substvars -Pdebian/ngcp-rtpengine-kernel-modules-3.16.0-4-amd64 -v4.3.0.0+0~mr4.3.0.0+0~20160223155548.661+jessie~1.gbp6d1932+3.16.7-ckt20-1+deb8u3 returned exit code 255 | debian/rules:58: recipe for target 'binary-modules' failed While at it Bump Standards-Version for ngcp-rtpengine-kernel to 3.9.7 (no further changes) and fix package description. Change-Id: Iaf7326f55cd3919afdb140d8e7acb5d3ff87b7d9 --- debian/control.modules.in | 6 +++--- kernel-module/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control.modules.in b/debian/control.modules.in index d7264a207..a69488ef5 100644 --- a/debian/control.modules.in +++ b/debian/control.modules.in @@ -1,15 +1,15 @@ -Source: ngcp-rtpengine-kernel +Source: ngcp-rtpengine Section: kernel Priority: optional Maintainer: Sipwise Development Team Build-Depends: debhelper (>= 5) -Standards-Version: 3.9.3 +Standards-Version: 3.9.7 Homepage: http://sipwise.com/ Package: ngcp-rtpengine-kernel-modules-_KVERS_ Architecture: any Depends: linux-modules-_KVERS_ | linux-image-_KVERS_ Provides: ngcp-rtpengine-kernel -Description: TODO +Description: IPtables kernel module for the NGCP media proxy This package provides the ngcp-rtpengine module for the Linux kernel version _KVERS_. diff --git a/kernel-module/Makefile b/kernel-module/Makefile index 0df3f0f6d..1c4ccc365 100644 --- a/kernel-module/Makefile +++ b/kernel-module/Makefile @@ -7,7 +7,7 @@ ifneq ($(RTPENGINE_VERSION),) else DPKG_PRSCHNGLG= $(shell which dpkg-parsechangelog 2>/dev/null) ifneq ($(DPKG_PRSCHNGLG),) - EXTRA_CFLAGS += -DRTPENGINE_VERSION="\"$(shell dpkg-parsechangelog -l$(M)/../debian/changelog | awk '/^Version: / {print $$2}')\"" + EXTRA_CFLAGS += -DRTPENGINE_VERSION="\"$(shell dpkg-parsechangelog -l$(M)/debian/changelog | awk '/^Version: / {print $$2}')\"" else EXTRA_CFLAGS += -DRTPENGINE_VERSION="\"undefined\"" endif