From 4beedbf35b780e55345f31cf9f49eafc70ee8fa8 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 16 May 2022 13:55:36 +0200 Subject: [PATCH] TT#124273 debian: Remove module-assistant support We have had DKMS support for a long time, which is easier to integrate to, and manage as a user. As we have not been testing module-assistant support and it's redundant with the DKMS support, let's just remove it. Change-Id: Iff546a4a333a2e4e48fbc1e49fecee9bab3a0138 --- debian/control | 13 ---- debian/control.modules.in | 16 ----- debian/ngcp-rtpengine-kernel-source.links | 1 - debian/rules | 11 --- debian/rules.modules | 82 ----------------------- 5 files changed, 123 deletions(-) delete mode 100644 debian/control.modules.in delete mode 100644 debian/ngcp-rtpengine-kernel-source.links delete mode 100644 debian/rules.modules diff --git a/debian/control b/debian/control index 000aba6ef..9c67fe4d4 100644 --- a/debian/control +++ b/debian/control @@ -99,19 +99,6 @@ Description: NGCP RTP/media proxy - meta package media proxy. It will install the user-space daemon, the kernel-space IPtables module, the IPtables extension module and utility scripts. -Package: ngcp-rtpengine-kernel-source -Architecture: all -Section: kernel -Depends: - debhelper-compat (= 12), - module-assistant, - ${misc:Depends}, -Description: IPtables kernel module for the NGCP media proxy - source - Provides the kernel-space part of the NGCP media proxy for high- - performance packet forwarding. - This package contains the source to be built with module-assistant or - kernel-package. - Package: ngcp-rtpengine-kernel-dkms Architecture: all Section: kernel diff --git a/debian/control.modules.in b/debian/control.modules.in deleted file mode 100644 index 2e726a2ec..000000000 --- a/debian/control.modules.in +++ /dev/null @@ -1,16 +0,0 @@ -Source: ngcp-rtpengine -Section: kernel -Priority: optional -Maintainer: Sipwise Development Team -Build-Depends: - debhelper-compat (= 12), -Standards-Version: 3.9.8 -Homepage: https://www.sipwise.com/ - -Package: ngcp-rtpengine-kernel-modules-_KVERS_ -Architecture: any -Depends: - linux-modules-_KVERS_ | linux-image-_KVERS_, -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/debian/ngcp-rtpengine-kernel-source.links b/debian/ngcp-rtpengine-kernel-source.links deleted file mode 100644 index e2fbc3dd6..000000000 --- a/debian/ngcp-rtpengine-kernel-source.links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/modass/packages/default.sh /usr/share/modass/overrides/ngcp-rtpengine-kernel-source diff --git a/debian/rules b/debian/rules index 1c03cab45..29b0914ee 100755 --- a/debian/rules +++ b/debian/rules @@ -7,8 +7,6 @@ include /usr/share/dpkg/pkg-info.mk ## kernel package specific stuff -# Name of the source package -psource:=ngcp-rtpengine-kernel-source # Name of the dkms package pdkms:=ngcp-rtpengine-kernel-dkms # short upstream name, used for module source directory @@ -34,20 +32,11 @@ endif override_dh_auto_install-indep: # Create the directories to install the source into - dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian dh_installdirs -p$(pdkms) usr/src/$(sname)-$(sversion) # Copy only the driver source to the proper locations - cd kernel-module && cp Makefile *.c *.h ../debian/$(psource)/usr/src/modules/$(sname) cd kernel-module && cp Makefile *.c *.h ../debian/$(pdkms)/usr/src/$(sname)-$(sversion) - # Copy the needed debian/ pieces to the proper location - cp debian/*.modules.in* debian/$(psource)/usr/src/modules/$(sname)/debian - cp debian/control debian/changelog debian/copyright \ - debian/$(psource)/usr/src/modules/$(sname)/debian/ - install -m 0755 debian/rules.modules debian/$(psource)/usr/src/modules/$(sname)/debian/rules - cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules - # Prepare dkms.conf from the dkms.conf.in template sed "s/__VERSION__/$(sversion)/g" debian/dkms.conf.in > debian/$(pdkms)/usr/src/$(sname)-$(sversion)/dkms.conf diff --git a/debian/rules.modules b/debian/rules.modules deleted file mode 100644 index 2566c8024..000000000 --- a/debian/rules.modules +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -CFLAGS ?= -g -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wstrict-prototypes - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# Name of the source package -psource:=ngcp-rtpengine-kernel-source - -# The short upstream name, used for the module source directory -sname:=ngcp-rtpengine - -### KERNEL SETUP -### Setup the stuff needed for making kernel module packages -### taken from /usr/share/kernel-package/sample.module.rules - -# prefix of the target package name -PACKAGE=ngcp-rtpengine-kernel-modules -# modifieable for experiments or debugging m-a -MA_DIR ?= /usr/share/modass -# load generic variable handling --include $(MA_DIR)/include/generic.make -# load default rules, including kdist, kdist_image, ... --include $(MA_DIR)/include/common-rules.make - -# module assistant calculates all needed things for us and sets -# following variables: -# KSRC (kernel source directory), KVERS (kernel version string), KDREV -# (revision of the Debian kernel-image package), CC (the correct -# compiler), VERSION (the final package version string), PKGNAME (full -# package name with KVERS included), DEB_DESTDIR (path to store DEBs) - -# The kdist_configure target is called by make-kpkg modules_config and -# by kdist* rules by dependency. It should configure the module so it is -# ready for compilation (mostly useful for calling configure). -# prep-deb-files from module-assistant creates the necessary debian/ files -kdist_configure: prep-deb-files - -# the kdist_clean target is called by make-kpkg modules_clean and from -# kdist* rules. It is responsible for cleaning up any changes that have -# been made by the other kdist_commands (except for the .deb files created) -kdist_clean: clean - $(MAKE) $(MFLAGS) -f debian/rules clean -# -### end KERNEL SETUP - -# the binary-modules rule is invoked by module-assistant while processing the -# kdist* targets. It is called by module-assistant or make-kpkg and *not* -# during a normal build -binary-modules: prep-deb-files - dh_testroot - dh_prep - - # Build the module - $(MAKE) modules KSRC=$(KSRC) KVER=$(KVERS) - - # Install the module - install -D -m 0644 xt_RTPENGINE.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/extra/xt_RTPENGINE.ko - - dh_installdocs - dh_installchangelogs - dh_compress - dh_fixperms - dh_installmodules - dh_installdeb - dh_gencontrol -- -v$(VERSION) - dh_md5sums - dh_builddeb --destdir=$(DEB_DESTDIR) - -clean: - dh_testdir - $(MAKE) clean - dh_clean - -.PHONY: clean binary-modules kdist kdist_configure kdist_image kdist_clean