diff options
author | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-04-20 16:01:36 -0500 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-04-26 09:11:48 -0500 |
commit | 80838503eb39a592a4b50a8e0f82e353a9820074 (patch) | |
tree | 9dd7c0773cfc63675327695b23f6d053a1f5db0a /host/cmake | |
parent | 46a70d853267c40205a8cfea472056bd1aa7c04e (diff) | |
download | uhd-80838503eb39a592a4b50a8e0f82e353a9820074.tar.gz uhd-80838503eb39a592a4b50a8e0f82e353a9820074.tar.bz2 uhd-80838503eb39a592a4b50a8e0f82e353a9820074.zip |
debian: Resolve lintian issues
This PR makes a couple of minor changes to Debian packaging files to
resolve errors reported by Lintian during CI and manual building of
.debs after having been updated in 38fb5e262:
- Remove instances of `${python3:Depends}` in the rules file, as this
substitution directive cannot be used without specifying `--with
python3` in the `dh` debhelper command invocation. However, the Docker
containers that are spun up to build .debs as part of UHD CI do not
include the Debian Python helper package necessary to use the
substitution even if `--with python3` is specified. Thus, the
substitution was removed and replaced with the actual names of the
dependent Python packages.
- Remove the `Files-Excluded` section from the copyright file. Lintian
flags an error whenever a file in that section is present in the source
tree (which the specified files are). The addition of this section was
supposed to bring UHD's built-in Debian packaging files more in line
with those used by the actual Debian package maintainer, but it is
likely that the actual Debian packing process runs additional steps that
reference this section and uses it to remove the specified files which
we currently don't run.
Diffstat (limited to 'host/cmake')
-rw-r--r-- | host/cmake/debian/control | 12 | ||||
-rw-r--r-- | host/cmake/debian/copyright | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/host/cmake/debian/control b/host/cmake/debian/control index 723212dd0..5a69d5715 100644 --- a/host/cmake/debian/control +++ b/host/cmake/debian/control @@ -33,10 +33,13 @@ Vcs-Git: https://github.com/EttusResearch/uhd.git Package: uhd-host Architecture: any Depends: libuhd4.2.0 (= ${binary:Version}), + python3, + python3-mako, + python3-numpy, python3-requests, python3-ruamel.yaml, + python3-setuptools, ${misc:Depends}, - ${python3:Depends}, ${shlibs:Depends} Recommends: curl, procps Suggests: gnuradio @@ -87,10 +90,13 @@ Package: python3-uhd Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 m68k mips64el ppc64 ppc64el riscv64 s390x sparc64 x32 Section: libdevel Depends: libuhd4.2.0 (= ${binary:Version}), - python3-ruamel.yaml, + python3, + python3-mako, python3-numpy, + python3-requests, + python3-ruamel.yaml, + python3-setuptools, ${misc:Depends}, - ${python3:Depends}, ${shlibs:Depends} Recommends: gnuradio Suggests: uhd-doc diff --git a/host/cmake/debian/copyright b/host/cmake/debian/copyright index 942d7bf2b..74bc0c4f6 100644 --- a/host/cmake/debian/copyright +++ b/host/cmake/debian/copyright @@ -6,9 +6,6 @@ Comment: Only the host directory of the distributed source is used to build the uhd-host package for Debian main. Copyright: Copyright 2010-2022 Ettus Research, a National Instruments Brand License: GPL-3+ -Files-Excluded: host/cmake/msvc - fpga/usrp3/top/b200/planahead/planahead.runs/impl_1/rundef.js - fpga/usrp3/top/x400/doc/X4XX_FPGA_right.htm Files: * Copyright: Copyright 2010-2022 Ettus Research, A National Instruments Brand |