NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

utils: update-mojo.sh: Properly remove old sources

Browse source 
The update-mojo.sh script starts by removing all sources before copying
the new files from chromium. A bug in the 'rm' command makes the removal
a no-op: the glob pattern is quoted, which attempts to remove a file
name '*' in the tools directory, not all files in the directory. Fix it
by removing the whole utils/ipc/mojo/ directory.

While at it, also remove the utils/ipc/tools/ directory that contains
imported sources.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2024-01-04 17:15:41 +02:00 • committed by Kieran Bingham
parent effb8f5d7c
commit cb69c6e843
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
utils/update-mojo.sh
View file

@ -30,14 +30,18 @@ if [ -n "$(git -C "${chromium_dir}" status --porcelain)" ] ; then
exit 1 exit 1
fi fi
# Remove the previously imported files.
rm -rf "${ipc_dir}/mojo/"
rm -rf "${ipc_dir}/tools/"
# Copy the diagnosis file # Copy the diagnosis file
mkdir -p "${ipc_dir}/tools/diagnosis"
cp "${chromium_dir}/tools/diagnosis/crbug_1001171.py" "${ipc_dir}/tools/diagnosis" cp "${chromium_dir}/tools/diagnosis/crbug_1001171.py" "${ipc_dir}/tools/diagnosis"
# Copy the rest of mojo # Copy the rest of mojo
mkdir -p "${ipc_dir}/mojo/public"
cp "${chromium_dir}/mojo/public/LICENSE" "${ipc_dir}/mojo/public" cp "${chromium_dir}/mojo/public/LICENSE" "${ipc_dir}/mojo/public"
rm -rf "${ipc_dir}/mojo/public/tools/*"
( (
cd "${chromium_dir}" || exit cd "${chromium_dir}" || exit
find ./mojo/public/tools -type f \ find ./mojo/public/tools -type f \