[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/embedded/, targets/support/

[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/embedded/, targets/support/

[Matt Turner]

commit:     5a47735a5a06955bf21b1462284eeff81c55aa22
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 21:41:22 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 21:41:22 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5a47735a

Add -k to gensquashfs calls to preserve timestamps

Without this flag, timestamps on all files in the squashfs image seem to
be at 0 epoch (Jan 1 1970).  This is messing with some apps at runtime
and I don't think we ever would intend to have bogus timestamps.

I've adjusted both places gensquashfs is called.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/embedded/fs-runscript.sh      | 2 +-
 targets/support/target_image_setup.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/embedded/fs-runscript.sh b/targets/embedded/fs-runscript.sh
index fb17d3ba..dd7c7531 100755
--- a/targets/embedded/fs-runscript.sh
+++ b/targets/embedded/fs-runscript.sh
@@ -21,7 +21,7 @@ case ${1} in
 
 	squashfs)
 		fs_check /usr/bin/gensquashfs squashfs sys-fs/squashfs-tools-ng
-		gensquashfs -D ${root_fs_path} -q ${clst_embedded_fs_ops} \
+		gensquashfs -k -D ${root_fs_path} -q ${clst_embedded_fs_ops} \
 			${clst_image_path}/root.img ||
 			die "Could not create a squashfs filesystem"
 	;;

diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index f9427eaf..b0e6546c 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -7,7 +7,7 @@ mkdir -p "${1}"
 echo "Creating ${clst_fstype} filesystem"
 case ${clst_fstype} in
 	squashfs)
-		gensquashfs -D "${clst_stage_path}" -q ${clst_fsops} "${1}/image.squashfs" \
+		gensquashfs -k -D "${clst_stage_path}" -q ${clst_fsops} "${1}/image.squashfs" \
 			|| die "Failed to create squashfs filesystem"
 	;;
 	jffs2)