Skip to content

Commit 60f76b8

Browse files
Fix: RxTxApp Meson configuration issue (#1065)
The image was not building correctly when the bare metal directory was built before due to the .dockerignore copying the build directory of RxTxApp from a new location. Fix by adding the necessary entries to .dockerignore to prevent the build directory from being copied to image. Add copy of the RxTxApp to the final stage and adjust the README to reflect the changes. Fixes: 1580c7f
1 parent 580c6c7 commit 60f76b8

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ assets/
3636
mtl_system_status_*
3737
*.pyc
3838
*.mp4
39+
tests/tools/RxTxApp/build

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,5 @@ docker-compose run imtl
124124
# Run below command to generate a fake yuv file or follow "#### 3.3 Prepare source files:" in [run guide](../doc/run.md)
125125
# dd if=/dev/urandom of=test.yuv count=2160 bs=4800
126126
# Edit and Run the loop JSON file.
127-
./app/RxTxApp --config_file tests/script/loop_json/1080p60_1v.json
127+
./RxTxApp --config_file scripts/loop_json/1080p60_1v.json
128128
```

docker/ubuntu.dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ RUN groupadd -g 2110 vfio && \
7272
# Copy libraries and binaries
7373
COPY --chown=imtl --from=builder /install /
7474
COPY --chown=imtl --from=builder /Media-Transport-Library/build /home/imtl
75+
COPY --chown=imtl --from=builder /Media-Transport-Library/tests/tools/RxTxApp/build/RxTxApp /home/imtl/RxTxApp
76+
COPY --chown=imtl --from=builder /Media-Transport-Library/tests/tools/RxTxApp/script /home/imtl/scripts
7577

7678
WORKDIR /home/imtl/
7779

0 commit comments

Comments
 (0)