Skip to content

Commit 271e34f

Browse files
Cameron Craddockmeta-codesync[bot]
authored andcommitted
add digilent.waveforms and libusbx rpms to brioche container
Summary: Adding digilent waveforms device driver and libusbx RPMs to the brioche container, these are needed to install libraries required by the digilent_cli to control an attached Digilent Analog Discovery 3 power measurement devices. This device is necessary to support making high resolution power and GPIO measurements in Ceres and Malibu power tests. Initially constructed chef recipes to do this (D88451532) but was educated that this is no longer the preferred method, so switched to this container method. Test Plan: Test instructions suggested by pecheriere ``` $ fbpkg build fbcode//brioche/containers/host:brioche.centos9.oci --acl-free-uuid-only ... fbpkg:version ``` brioche.centos9.oci:fe4a4fb ``` $ ek re lease -j '{"platform":"riot","device_type":"ceres-phone", "host_os":"linux"}' --setup-preference-kv container_fbpkg=FBPKG:VERSION ``` ``` $ ek shell ``` ``` [root@rlacentos0223 work]# ldconfig -v | grep dwf ldconfig: Can't stat /usr/lib/digilent/adept: No such file or directory ldconfig: Can't stat /libx32: No such file or directory ldconfig: Path `/usr/lib' given more than once (from <builtin>:0 and <builtin>:0) ldconfig: Path `/usr/lib64' given more than once (from <builtin>:0 and <builtin>:0) ldconfig: Can't stat /usr/libx32: No such file or directory libdwf.so -> libdwf.so.3.24.4 [root@rlacentos0223 work]# ldconfig -v | grep usb ldconfig: Can't stat /usr/lib/digilent/adept: No such file or directory ldconfig: Can't stat /libx32: No such file or directory ldconfig: Path `/usr/lib' given more than once (from <builtin>:0 and <builtin>:0) ldconfig: Path `/usr/lib64' given more than once (from <builtin>:0 and <builtin>:0) ldconfig: Can't stat /usr/libx32: No such file or directory libusb-1.0.so.0 -> libusb-1.0.so.0.3.0 [root@rlacentos0223 work]# ldconfig -v | grep libdmgr.so ldconfig: Can't stat /usr/lib/digilent/adept: No such file or directory ldconfig: Can't stat /libx32: No such file or directory ldconfig: Path `/usr/lib' given more than once (from <builtin>:0 and <builtin>:0) ldconfig: Path `/usr/lib64' given more than once (from <builtin>:0 and <builtin>:0) ldconfig: Can't stat /usr/libx32: No such file or directory libdmgr.so.2 -> libdmgr.so.2.11.9 ``` ``` ek release ``` There are also unit tests that build the brioche container: - fbcode//brioche/containers/host:host_centos9 - https://www.internalfb.com/intern/sandcastle/job/36028799406049596/ - fbcode//brioche/containers/host:host_centos9_image - https://www.internalfb.com/intern/sandcastle/job/36028799406049596/ Reviewed By: mge-fbe-com Differential Revision: D88851773 fbshipit-source-id: 97493b80d8f0629588e73f67f71a6cd5b29e8ae8
1 parent 610cf73 commit 271e34f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

antlir/antlir2/features/rpm/driver.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@
6767
"nsight-compute-2019.4.0": "TODO(T166170831)",
6868
"coreutils-common": "TODO(T182347179)",
6969
"mono-core": "TODO(T206575712)",
70+
"digilent.waveforms": "TODO(T248331993)",
71+
"digilent.adept.runtime": "TODO(T248331993)",
7072
}
7173

7274

0 commit comments

Comments
 (0)