From ac3bae907fc2bc648b4b40b0df1f325b72ae24c3 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sat, 2 Mar 2019 14:46:57 +0100 Subject: tools/squashfskit: fix version detection on non-linux system gnu date is present in our staging_dir which means squashfskit will fail to build. Prevent also a race condition if coreutils is build after squashfskit. To prevent a race condition, depend on coreutils. Acked-by: Kevin Darbyshire-Bryant Signed-off-by: Felix Fietkau Signed-off-by: Alexander Couzens --- .../squashfskit4/patches/0001-fix-version.sh.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tools/squashfskit4/patches/0001-fix-version.sh.patch (limited to 'tools/squashfskit4') diff --git a/tools/squashfskit4/patches/0001-fix-version.sh.patch b/tools/squashfskit4/patches/0001-fix-version.sh.patch new file mode 100644 index 0000000000..5f0894bc17 --- /dev/null +++ b/tools/squashfskit4/patches/0001-fix-version.sh.patch @@ -0,0 +1,21 @@ +--- a/squashfs-tools/version.sh ++++ b/squashfs-tools/version.sh +@@ -27,13 +27,11 @@ if [ -z "$OUTPUT" ] ; then + fi + + our_date() { +-case $(uname) in +-NetBSD|OpenBSD|DragonFly|FreeBSD|Darwin) +- date -r "$1" "$2" +- ;; +-*) +- date -d "@$1" "$2" +-esac ++ if date --version 2>&1 | grep -q "GNU coreutils"; then ++ date -d "@$1" "$2" ++ else ++ date -r "$1" "$2" ++ fi + } + + try_version() { -- cgit v1.2.3