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>master
parent
33201a3ad1
commit
ac3bae907f
@ -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() {
|
Loading…
Reference in new issue