From 99384a67b59a761c10ad5cd92281b0efddc63816 Mon Sep 17 00:00:00 2001 From: Nicolas Benech Date: Mon, 5 Nov 2018 17:15:07 -0500 Subject: [PATCH] gpu: nvgpu: unit: install-unit: Handle subfolders Now that some unit modules are in subfolders, this script needed an update as well. All module .so are now searched and all copied to the nvgpu_unit/units/ folder on target. JIRA NVGPU-1246 Change-Id: I1da639006a0012c8a2d1e19b8b2bddd0b6376b67 Signed-off-by: Nicolas Benech Reviewed-on: https://git-master.nvidia.com/r/1943578 Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Philip Elcan Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- userspace/install-unit.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/userspace/install-unit.sh b/userspace/install-unit.sh index a4b532a11..188f42683 100755 --- a/userspace/install-unit.sh +++ b/userspace/install-unit.sh @@ -97,9 +97,9 @@ jcp $nvgpu_bins/userspace-l4t_64/libnvgpu_unit-lib.so nvgpu_unit/libnvgpu-uni jcp $nvgpu_bins/drivers/gpu/nvgpu-l4t_64/libnvgpu-drv.so nvgpu_unit/libnvgpu-drv.so jcp $TOP/kernel/nvgpu/userspace/unit.sh nvgpu_unit/unit.sh -for unit_dir in `ls $nvgpu_bins/userspace/units`; do - unit=${unit_dir%-l4t_64} - jcp $nvgpu_bins/userspace/units/$unit_dir/lib$unit.so nvgpu_unit/units +find $nvgpu_bins/userspace/units -name "*.so" -not -path "*unit.so" \ + -not -path "*drv.so" \ -exec ls {} \; | while read unit_so ; do + jcp $unit_so nvgpu_unit/units/ done # Set up the necessary coverage files. Basically what we do is recreate just