ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: consistent debhelper 10 support

Browse Source 
Type: fix

debian/compat contents were set to 10, but debhelper build dependency,
which is the same thing, was set to only 9. Both are not needed,
debian/compat being deprecated, so use only the latter.
At compat level 10, dh-systemd is integrated directly into debhelper, so
build dependency not needed (And in Debian Bullseye dh-systemd
transitional package is completely removed).
See: https://manpages.debian.org/testing/debhelper/debhelper.7.en.html#COMPATIBILITY_LEVELS

Signed-off-by: Nick Brown <nickbroon@gmail.com>
Change-Id: I5809b739334076d7fa8389b076a97f1648726e6e
This commit is contained in:
Nick Brown
2021-08-10 09:20:32 +01:00
committed by Andrew Yourtchenko
parent afbb33aaf2
commit b8e7a45d56
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -63,7 +63,7 @@ endif
# +libganglia1-dev if building the gmond plugin # +libganglia1-dev if building the gmond plugin
DEB_DEPENDS = curl build-essential autoconf automake ccache DEB_DEPENDS = curl build-essential autoconf automake ccache
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-python
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS += lcov chrpath autoconf libnuma-dev DEB_DEPENDS += lcov chrpath autoconf libnuma-dev
DEB_DEPENDS += python3-all python3-setuptools check DEB_DEPENDS += python3-all python3-setuptools check

2
src/pkg/CMakeLists.txt
View File

@ -53,8 +53,6 @@ foreach(f copyright vpp.preinst vpp.postrm vpp.postinst vpp.service)
) )
endforeach() endforeach()
file(WRITE ${VPP_BINARY_DIR}/debian/compat "10\n")
add_custom_target(pkg-deb add_custom_target(pkg-deb
COMMENT "Building .deb packages..." COMMENT "Building .deb packages..."
WORKING_DIRECTORY ${VPP_BINARY_DIR} WORKING_DIRECTORY ${VPP_BINARY_DIR}

2
src/pkg/debian/control.in
View File

@ -2,7 +2,7 @@ Source: vpp
Section: net Section: net
Priority: extra Priority: extra
Maintainer: fd.io VPP Packaging Team <vpp-dev@fd.io> Maintainer: fd.io VPP Packaging Team <vpp-dev@fd.io>
Build-Depends: debhelper (>= 9), Build-Depends: debhelper-compat (= 10),
dh-systemd, dh-systemd,
dh-python, dh-python,
@VPP_DEB_BUILD_DEPENDS@ @VPP_DEB_BUILD_DEPENDS@