浏览代码

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 <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>
Signed-off-by: Alexander Couzens <[email protected]>
Alexander Couzens 6 年之前
父节点
当前提交
ac3bae907f
共有 2 个文件被更改,包括 22 次插入1 次删除
  1. 1 1
      tools/Makefile
  2. 21 0
      tools/squashfskit4/patches/0001-fix-version.sh.patch

+ 1 - 1
tools/Makefile

@@ -44,7 +44,7 @@ $(curdir)/bison/compile := $(curdir)/flex/compile
 $(curdir)/flex/compile := $(curdir)/libtool/compile
 $(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile
 $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
-$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
+$(curdir)/squashfskit4/compile := $(curdir)/coreutils/compile $(curdir)/xz/compile $(curdir)/zlib/compile
 $(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile
 $(curdir)/autoconf/compile := $(curdir)/m4/compile
 $(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/pkg-config/compile $(curdir)/xz/compile

+ 21 - 0
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() {