EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools/squashfskit: fix version detection on non-linux system

Browse Source 
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 <ldir@darbyshire-bryant.me.uk>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
This commit is contained in:
Alexander Couzens 2019-03-02 14:46:57 +01:00 committed by Felix Fietkau
parent 33201a3ad1
commit ac3bae907f
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/Makefile
View File

@ -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
tools/squashfskit4/patches/0001-fix-version.sh.patch Normal file
View File

@ -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() {