diff options
| -rw-r--r-- | host/cmake/debian/README.Debian | 18 | ||||
| -rw-r--r-- | host/cmake/debian/control | 98 | ||||
| -rw-r--r-- | host/cmake/debian/copyright | 12 | ||||
| -rw-r--r-- | host/cmake/debian/libuhd-dev.install | 5 | ||||
| -rw-r--r-- | host/cmake/debian/python3-uhd.install | 1 | ||||
| -rwxr-xr-x | host/cmake/debian/rules | 46 | ||||
| -rw-r--r-- | host/cmake/debian/uhd-doc.doc-base | 8 | ||||
| -rw-r--r-- | host/cmake/debian/uhd-doc.install | 4 | ||||
| -rw-r--r-- | host/cmake/debian/uhd-host.dirs | 1 | ||||
| -rw-r--r-- | host/cmake/debian/uhd-host.install | 17 | ||||
| -rw-r--r-- | host/cmake/debian/uhd-images.dirs | 1 | ||||
| -rw-r--r-- | host/cmake/debian/watch | 2 | ||||
| -rw-r--r-- | mpm/python/CMakeLists.txt | 17 |
13 files changed, 157 insertions, 73 deletions
diff --git a/host/cmake/debian/README.Debian b/host/cmake/debian/README.Debian index c88087f3e..83cc779d2 100644 --- a/host/cmake/debian/README.Debian +++ b/host/cmake/debian/README.Debian @@ -25,21 +25,23 @@ Settings will not take effect until the user has logged in and out. Multiple packages ----------------- +libuhd4.1.0: + Small package just for the library itself. + +libuhd-dev: + Small package just for developing applications + using the library itself. + uhd-host: - The uhd-host package contains the uhd_find_devices and - uhd_usrp_probe commands for locating and examining USRP devices - available to the host system. + The uhd-host package contains utilities such as the uhd_find_devices and + uhd_usrp_probe commands for locating and examining USRP devices, as well + as other utilities. Also, under /usr/lib/uhd/ are examples, tests and utils directories. The utils include tools for managing the flash memory or EEPROM configuration of various USRPs. -libuhd4.1.0: - Small package just for the library itself. -libuhd-dev: - Small package just for developing applications - using the library itself. UHD Firmware / FPGA images -------------------------- diff --git a/host/cmake/debian/control b/host/cmake/debian/control index 2e1996a66..1549b453c 100644 --- a/host/cmake/debian/control +++ b/host/cmake/debian/control @@ -3,42 +3,40 @@ Section: science Priority: optional Maintainer: Ettus Research <packages@ettus.com> Uploaders: Aaron Rossetto <aaron.rossetto@ni.com> -Build-Depends: cmake, - debhelper (>= 9), - doxygen, - libboost-date-time-dev, - libboost-dev, - libboost-filesystem-dev, - libboost-program-options-dev, - libboost-serialization-dev, - libboost-system-dev, - libboost-test-dev, - libboost-thread-dev, - libncurses5-dev, - libusb-1.0-0-dev [linux-any], - libusb2-dev [kfreebsd-any], - pkg-config, - python3-dev, - python3-mako, - python3-numpy, - python3-requests, - python3-ruamel.yaml, - python3-setuptools -Standards-Version: 3.9.7 +Build-Depends: cmake, + debhelper (>= 9), + libboost-date-time-dev, + libboost-dev, + libboost-filesystem-dev, + libboost-program-options-dev, + libboost-serialization-dev, + libboost-system-dev, + libboost-test-dev, + libboost-thread-dev, + libncurses5-dev, + libusb-1.0-0-dev [linux-any hurd-i386], + libusb2-dev [kfreebsd-any], + pkg-config, + python3-dev, + python3-mako, + python3-numpy, + python3-requests, + python3-ruamel.yaml, + python3-setuptools +Build-Depends-Indep: doxygen, + doxygen-latex, + graphviz [!powerpcspe] +Standards-Version: 4.6.0 Homepage: https://www.ettus.com Vcs-Git: https://github.com/EttusResearch/uhd.git Package: uhd-host Architecture: any -Depends: adduser, - libuhd4.1.0 (= ${binary:Version}), - python3, - python3-mako, - python3-numpy, +Depends: libuhd4.1.0 (= ${binary:Version}), python3-requests, python3-ruamel.yaml, - python3-setuptools, ${misc:Depends}, + ${python3:Depends}, ${shlibs:Depends} Recommends: curl, procps Suggests: gnuradio @@ -72,22 +70,46 @@ Description: hardware driver for Ettus Research products Package: libuhd-dev Architecture: any Section: libdevel +Depends: libuhd4.1.0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Recommends: gnuradio-dev +Suggests: uhd-doc +Description: universal hardware driver for Ettus Research products + Host library for the USRP Hardware Driver for Ettus Research products. + . + The supported devices provide analog radio receiver and transmitter hardware + along with digital interfaces for getting signals to and from a software + defined radio running on the host computer. + . + This package contains the header files for developing with libuhd. + Doxygen generated documentation is in the uhd-host package. + +Package: python3-uhd +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 m68k mips64el ppc64 ppc64el riscv64 s390x sparc64 x32 +Section: libdevel Depends: libuhd4.1.0 (= ${binary:Version}), - python3, - python3-mako, - python3-numpy, - python3-requests, python3-ruamel.yaml, - python3-setuptools, + python3-numpy, ${misc:Depends}, + ${python3:Depends}, ${shlibs:Depends} -Suggests: gnuradio -Description: universal hardware driver for Ettus Research products - Host library for the USRP Hardware Driver for Ettus Research products. +Recommends: gnuradio +Suggests: uhd-doc +Conflicts: uhd-host (<= 4.2.0.4-6) +Description: universal hardware driver for Ettus Research products - Python3 + Host library for the Universal Hardware Driver for Ettus Research products. . The supported devices provide analog radio receiver and transmitter hardware along with digital interfaces for getting signals to and from a software defined radio running on the host computer. . - This package contains the header files and documentation for - developing with libuhd. + This package contains the Python API support for Python3. + +Package: uhd-doc +Architecture: all +Depends: ${misc:Depends}, libjs-mathjax +Breaks: uhd-host (<< 4.0.0.0-3) +Replaces: uhd-host (<< 4.0.0.0) +Description: universal hardware driver for Ettus Research products - doc + Detailed documentation for the Universal Hardware Driver. + . + This package includes the Doxygen generated documentation. diff --git a/host/cmake/debian/copyright b/host/cmake/debian/copyright index c8cac54ca..942d7bf2b 100644 --- a/host/cmake/debian/copyright +++ b/host/cmake/debian/copyright @@ -2,14 +2,16 @@ Format: http://dep.debian.net/deps/dep5/ Upstream-Name: UHD Upstream-Contact: http://www.ettus.com/contact Source: https://github.com/EttusResearch/uhd -X-Note: The upstream package source tarball was generated from the tag: - git archive --format=tar --prefix=uhd-3.7.3/ release_003_007_003 | xz > ../uhd_3.7.3.orig.tar.gz -Comment: Only the host directory of the distributed source is used to build the uhd-host package for Debian main. -Copyright: Copyright 2010-2021 Ettus Research, A National Instruments Company +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-2021 Ettus Research, A National Instruments Company +Copyright: Copyright 2010-2022 Ettus Research, A National Instruments Brand License: GPL-3+ Files: host/lib/deps/rpclib/* diff --git a/host/cmake/debian/libuhd-dev.install b/host/cmake/debian/libuhd-dev.install index 76008d09e..f9ec0ddab 100644 --- a/host/cmake/debian/libuhd-dev.install +++ b/host/cmake/debian/libuhd-dev.install @@ -1,5 +1,4 @@ usr/include -usr/lib/*/pkgconfig -usr/lib/*/libuhd.so usr/lib/*/cmake/uhd/*.cmake -usr/share/doc/uhd/doxygen /usr/share/doc/libuhd-dev/ +usr/lib/*/libuhd.so +usr/lib/*/pkgconfig diff --git a/host/cmake/debian/python3-uhd.install b/host/cmake/debian/python3-uhd.install new file mode 100644 index 000000000..2f63d6b64 --- /dev/null +++ b/host/cmake/debian/python3-uhd.install @@ -0,0 +1 @@ +usr/lib/python3/dist-packages/ diff --git a/host/cmake/debian/rules b/host/cmake/debian/rules index fffd8b22a..0a4b6e787 100755 --- a/host/cmake/debian/rules +++ b/host/cmake/debian/rules @@ -1,23 +1,59 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export DEB_HOST_MULTIARCH +DEB_NEON_SIMD_OPTION=$(shell if [ $(DEB_BUILD_ARCH) = armhf ]; then echo "-DNEON_SIMD_ENABLE=OFF" ; else echo "" ; fi) +DEB_MIPSEL_PYTHON_API_OPTION=$(shell if [ $(DEB_BUILD_ARCH) = mipsel ]; then echo "-DENABLE_PYTHON_API=OFF" ; else echo "" ; fi) +DEB_UHD_PACKAGE_CONFIGURATION=$(shell echo "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \ + -DENABLE_STATIC_LIBS=OFF \ + -DUHD_VERSION=$(DEB_VERSION) \ + -DENABLE_PYTHON_API=ON \ + -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \ + -DPKG_LIB_DIR="/usr/lib/uhd" \ + -DDOXYGEN_HAVE_DOT=True \ + -DUHD_PYTHON_DIR="lib/python3/dist-packages" \ + -DUSRP_MPM_PYTHON_DIR="lib/python3/dist-packages" \ + -DUHD_RELEASE_MODE="release" \ + -DMATHJAX_RELPATH="/usr/share/javascript/mathjax" \ + $(DEB_NEON_SIMD_OPTION) $(DEB_MIPSEL_PYTHON_API_OPTION)") %: dh $@ --parallel --sourcedirectory=host --builddirectory=build override_dh_auto_configure: - dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DPKG_LIB_DIR="/usr/lib/uhd" -DUHD_RELEASE_MODE="release" + dh_auto_configure -- $(DEB_UHD_PACKAGE_CONFIGURATION) # The test suite for this package is busted on powerpc. override_dh_auto_test: - if [ $(DEB_BUILD_ARCH) != powerpc ]; then dh_auto_test; fi -override_dh_auto_install: +override_dh_auto_install-indep: + dh_auto_install + rm -rf debian/tmp/usr/share/man + rm -rf debian/tmp/usr/share/doc/uhd/LICENSE + rm -rf debian/tmp/usr/share/doc/uhd/README.md +# Remove source files used to generate documentation + rm -rf debian/tmp/usr/share/doc/uhd/doxygen/latex + +override_dh_auto_install-arch: cp debian/uhd-host.limits debian/uhd-host/etc/security/limits.d/uhd.conf cp debian/uhd-host.sysctl debian/uhd-host/etc/sysctl.d/uhd-usrp2.conf dh_auto_install - - rm -f debian/tmp/usr/share/doc/uhd/doxygen/html/jquery.js - ln -s /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/doc/uhd/doxygen/html/jquery.js + chmod -x debian/tmp/usr/lib/uhd/tests/devtest/*.py + chmod -x debian/tmp/usr/lib/uhd/tests/streaming_performance/parse_benchmark_rate.py + chmod -x debian/tmp/usr/lib/uhd/tests/streaming_performance/run_benchmark_rate.py + rm -rf debian/tmp/usr/share/man + rm -rf debian/tmp/usr/share/doc/uhd/LICENSE + rm -rf debian/tmp/usr/share/doc/uhd/README.md +# Remove source files used to generate documentation + rm -rf debian/tmp/usr/share/doc/uhd/doxygen/latex + +override_dh_acc: + - dh_acc $@ + - cat logs/libuhd-dev/*/log.txt override_dh_shlibdeps: - dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info + dh_shlibdeps --package=uhd-host --libpackage=libuhd4.2.0 + dh_shlibdeps --package=libuhd4.2.0 --libpackage=libuhd4.2.0 + dh_shlibdeps --package=libuhd-dev --libpackage=libuhd4.2.0 + dh_shlibdeps --package=python3-uhd --libpackage=libuhd4.2.0 diff --git a/host/cmake/debian/uhd-doc.doc-base b/host/cmake/debian/uhd-doc.doc-base new file mode 100644 index 000000000..b21f3d2a8 --- /dev/null +++ b/host/cmake/debian/uhd-doc.doc-base @@ -0,0 +1,8 @@ +Document: uhd-host +Title: USRP Hardware Driver for Ettus Research products +Author: Ettus Research +Section: Programming + +Format: HTML +Index: /usr/share/doc/uhd-doc/html/index.html +Files: /usr/share/doc/uhd-doc/html/* diff --git a/host/cmake/debian/uhd-doc.install b/host/cmake/debian/uhd-doc.install new file mode 100644 index 000000000..14585193b --- /dev/null +++ b/host/cmake/debian/uhd-doc.install @@ -0,0 +1,4 @@ +usr/share/doc/uhd/doxygen /usr/share/doc/uhd-host/ + + + diff --git a/host/cmake/debian/uhd-host.dirs b/host/cmake/debian/uhd-host.dirs index bd43debd6..2fd4a54c0 100644 --- a/host/cmake/debian/uhd-host.dirs +++ b/host/cmake/debian/uhd-host.dirs @@ -1,7 +1,6 @@ etc/security/limits.d etc/sysctl.d usr/bin -usr/include/uhd usr/lib usr/lib/uhd/examples usr/lib/uhd/tests diff --git a/host/cmake/debian/uhd-host.install b/host/cmake/debian/uhd-host.install index 6efbf8fe6..a5688819f 100644 --- a/host/cmake/debian/uhd-host.install +++ b/host/cmake/debian/uhd-host.install @@ -1,4 +1,13 @@ -usr/bin -usr/lib/uhd -usr/share/doc/uhd/doxygen /usr/share/doc/uhd-host/ -debian/NetworkManager-USRP /etc/NetworkManager/system-connections/USRP +debian/NetworkManager-USRP /etc/NetworkManager/system-connections/ +usr/lib/uhd* /usr/lib/ +usr/bin/rfnoc_image_builder +usr/bin/uhd_adc_self_cal +usr/bin/uhd_cal_rx_iq_balance +usr/bin/uhd_cal_tx_dc_offset +usr/bin/uhd_cal_tx_iq_balance +usr/bin/uhd_config_info +usr/bin/uhd_find_devices +usr/bin/uhd_image_loader +usr/bin/uhd_images_downloader +usr/bin/uhd_usrp_probe +usr/bin/usrp2_card_burner diff --git a/host/cmake/debian/uhd-images.dirs b/host/cmake/debian/uhd-images.dirs deleted file mode 100644 index 73752c9ae..000000000 --- a/host/cmake/debian/uhd-images.dirs +++ /dev/null @@ -1 +0,0 @@ -usr diff --git a/host/cmake/debian/watch b/host/cmake/debian/watch index 4cabdbdb5..6347cc380 100644 --- a/host/cmake/debian/watch +++ b/host/cmake/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 opts=uversionmangle=s/([^0-9]|)0*(\d)/$1$2/g;s/_/./g \ https://github.com/EttusResearch/uhd/tags (?:.*?/)?(v[\d]+.[\d]+.[\d]+.[\d]+).tar.gz diff --git a/mpm/python/CMakeLists.txt b/mpm/python/CMakeLists.txt index e7ab542df..6b96c9376 100644 --- a/mpm/python/CMakeLists.txt +++ b/mpm/python/CMakeLists.txt @@ -100,13 +100,16 @@ add_custom_command(OUTPUT ${OUTPUT} DEPENDS ${USRP_MPM_FILES} pyusrp_periphs) add_custom_target(usrp_mpm ALL DEPENDS ${OUTPUT} pyusrp_periphs) -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c - "import os,sysconfig;\ - platlib = sysconfig.get_path(name='platlib');\ - prefix = sysconfig.get_config_var('prefix');\ - print(os.path.relpath(platlib, prefix));" - OUTPUT_VARIABLE USRP_MPM_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE -) +if(NOT DEFINED USRP_MPM_PYTHON_DIR) + execute_process(COMMAND ${PYTHON_EXECUTABLE} -c + "import os,sysconfig;\ + platlib = sysconfig.get_path(name='platlib');\ + prefix = sysconfig.get_config_var('prefix');\ + print(os.path.relpath(platlib, prefix));" + OUTPUT_VARIABLE USRP_MPM_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE + ) +endif(NOT DEFINED USRP_MPM_PYTHON_DIR) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build/lib/usrp_mpm DESTINATION ${USRP_MPM_PYTHON_DIR}) install(PROGRAMS usrp_hwd.py |