Skip to content

Commit 006d7f7

Browse files
committed
debian: align install files to Debian/Ubuntu official (2)
- For Ubuntu/Debian, the package lib dir (PKD_LIB_DIR), is set to /usr/libexec/uhd. This is the path where examples, tests and utils get installed. - List usrp_hwd.py explicitly as not installed.
1 parent b30cd6c commit 006d7f7

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

host/cmake/debian/not-installed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/bin/usrp_hwd.py

host/cmake/debian/rules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DEB_UHD_PACKAGE_CONFIGURATION=$(shell echo "-DCMAKE_BUILD_TYPE=RelWithDebInfo -D
1010
-DENABLE_PYTHON_API=ON \
1111
-DENABLE_RFNOC_DEV=ON \
1212
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
13-
-DPKG_LIB_DIR="/usr/lib/uhd" \
13+
-DPKG_LIB_DIR="/usr/libexec/uhd" \
1414
-DDOXYGEN_HAVE_DOT=True \
1515
-DUHD_PYTHON_DIR="lib/python3/dist-packages" \
1616
-DUSRP_MPM_PYTHON_DIR="lib/python3/dist-packages" \
@@ -40,9 +40,9 @@ override_dh_auto_install-arch:
4040
cp debian/uhd-host.limits debian/uhd-host/etc/security/limits.d/uhd.conf
4141
cp debian/uhd-host.sysctl debian/uhd-host/etc/sysctl.d/uhd-usrp2.conf
4242
dh_auto_install
43-
chmod -x debian/tmp/usr/lib/uhd/tests/devtest/*.py
44-
chmod -x debian/tmp/usr/lib/uhd/tests/streaming_performance/parse_benchmark_rate.py
45-
chmod -x debian/tmp/usr/lib/uhd/tests/streaming_performance/run_benchmark_rate.py
43+
chmod -x debian/tmp/usr/libexec/uhd/tests/devtest/*.py
44+
chmod -x debian/tmp/usr/libexec/uhd/tests/streaming_performance/parse_benchmark_rate.py
45+
chmod -x debian/tmp/usr/libexec/uhd/tests/streaming_performance/run_benchmark_rate.py
4646
rm -rf debian/tmp/usr/share/man
4747
rm -rf debian/tmp/usr/share/doc/uhd/LICENSE
4848
rm -rf debian/tmp/usr/share/doc/uhd/README.md

host/cmake/debian/uhd-host.dirs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ etc/security/limits.d
22
etc/sysctl.d
33
usr/bin
44
usr/lib
5-
usr/lib/uhd/examples
6-
usr/lib/uhd/tests
7-
usr/lib/uhd/utils
5+
usr/libexec/uhd/examples
6+
usr/libexec/uhd/tests
7+
usr/libexec/uhd/utils

host/cmake/debian/uhd-host.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
debian/NetworkManager-USRP /etc/NetworkManager/system-connections/
2+
usr/libexec/uhd* /usr/libexec/
23
usr/bin/rfnoc_image_builder
34
usr/bin/rfnoc_modtool
45
usr/bin/uhd_adc_self_cal

0 commit comments

Comments
 (0)