Skip to content

Commit fd2edd8

Browse files
committed
fix(debos/flash): Revert to simpler cp calls
In 539f97b, compatibility symlinks were added for Axiom support, requiring changes to "cp" calls to preserve these symlinks. The new style of cp calls also try to preserve ownership of files, and that fails under some debos fakemachine backends. Revert to the older style of simpler "cp" calls which work across a broader range of debos fakemachine backends. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
1 parent c45e2ae commit fd2edd8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

debos-recipes/qualcomm-linux-debian-flash.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ actions:
372372
rm -rf "${flash_dir}"
373373
mkdir -v "${flash_dir}"
374374
# copy platform partition files
375-
cp --preserve=all --no-dereference -v \
375+
cp --preserve=mode,timestamps -v \
376376
"build/ptool/${platform}"/* "${flash_dir}"
377377

378378
# remove BLANK_GPT, WIPE_PARTITIONS and wipe_rawprogram files as
@@ -402,18 +402,18 @@ actions:
402402
-or -name '*.fv' \
403403
-or -name '*.mbn' \
404404
\) \
405-
-exec cp --preserve=all --no-dereference -v '{}' "${flash_dir}" \;
405+
-exec cp --preserve=mode,timestamps -v '{}' "${flash_dir}" \;
406406

407407
if [ -n "${board_u_boot_file}" ]; then
408408
# copy U-Boot binary to boot.img; qcom-ptool partitions.conf
409409
# files use filename=boot.img for boot_a and boot_b partitions
410-
cp --preserve=all --no-dereference -v \
410+
cp --preserve=mode,timestamps -v \
411411
"${ARTIFACTDIR}/${board_u_boot_file}" "${flash_dir}/boot.img"
412412
fi
413413

414414
if [ -n "$board_cdt_filename" ]; then
415415
# copy just the CDT data; no partition or flashing files
416-
cp --preserve=all --no-dereference -v \
416+
cp --preserve=mode,timestamps -v \
417417
"build/${board_name}_cdt/${board_cdt_filename}" \
418418
"${flash_dir}"
419419
fi
@@ -452,7 +452,7 @@ actions:
452452
[ "${storage}" = "spinor" ] && continue
453453
target_dir="${ARTIFACTDIR}/flash_${board}_${storage}"
454454
[ -d "${target_dir}" ] || continue
455-
cp --preserve=all --no-dereference -av "${spinor_dir}/." "${target_dir}/spinor/"
455+
cp --preserve=mode,timestamps -av "${spinor_dir}/." "${target_dir}/spinor/"
456456
efi_img=$("${RECIPEDIR}/../scripts/get-rawprogram-filename.py" efi "${target_dir}/rawprogram0.xml")
457457
rootfs_img=$("${RECIPEDIR}/../scripts/get-rawprogram-filename.py" rootfs "${target_dir}/rawprogram0.xml")
458458
# fix file_path (../->../../) then rename efi.bin/rootfs.img

0 commit comments

Comments
 (0)