dependencies.mk: reverse check-host-*.mk include to work around lzip -> tar dependency
PATCH 1/2 dependencies.mk: reverse check-host-*.mk include to work around lzip -> tar dependency
host-lzip needs host-tar to extract the source code tarball, so we need to ensure that host-tar gets added to DEPENDENCIES_HOST_PREREQ before host-lzip in case they are both available, otherwise host-lzip will fail to extract.
With the upcoming change to blacklist modern tar versions this situation is likely to trigger more often.
The real solution to this issue is the <foo>_EXTRACT_DEPENDENCIES rework, but that series is a bit too intrusive to add this close to 2018.02, so therefore this hack.
--- support/dependencies/dependencies.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
support/dependencies/dependencies.mk +3 -1
@@ -12,7 +12,9 @@ define suitable-host-package $(shell support/dependencies/check-host-$(1).sh $(2)) endef --include $(sort $(wildcard support/dependencies/check-host-*.mk)) +# host-lzip needs host-tar to extract the source code tarball, so +# ensure check-host-tar.mk is included before check-host-lzip.mk. +-include $(call reverse,$(sort $(wildcard support/dependencies/check-host-*.mk))) ifeq ($(BR2_CCACHE),y) DEPENDENCIES_HOST_PREREQ += host-ccache
Signature · 1 line
2.11.0
PATCH 2/2 check-host-tar.sh: blacklist tar 1.30+
Tar 1.30 changed the --numeric-owner output for filenames > 100 characters, leading to hash mismatches for the tar archives we create ourselves from git. This is really a fix for a bug in earlier tar versions regarding deterministic output, so it is unlikely to be reverted in later versions.
To work around this issue, blacklist tar 1.30+ similar to how we do it for pre-1.17 versions so Buildroot falls back to building host-tar.
--- support/dependencies/check-host-tar.sh | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-)
support/dependencies/check-host-tar.sh +24 -9
@@ -30,13 +30,28 @@ fi # containing hard-links if the --strip-components option is used). major_min=1 minor_min=17 -if [ $major -gt $major_min ]; then - echo $tar -else - if [ $major -eq $major_min -a $minor -ge $minor_min ]; then - echo $tar - else - # echo nothing: no suitable tar found - exit 1 - fi + +# Maximal version = 1.29 (1.30 changed --numeric-owner output for +# filenames > 100 characters). This is really a fix for a bug in +# earlier tar versions regarding deterministic output so it is +# unlikely to be reverted in later versions. +major_max=1 +minor_max=29 + +if [ $major -lt $major_min -o $major -gt $major_max ]; then + # echo nothing: no suitable tar found + exit 1 fi + +if [ $major -eq $major_min -a $minor -lt $minor_min ]; then + # echo nothing: no suitable tar found + exit 1 +fi + +if [ $major -eq $major_max -a $minor -gt $minor_max ]; then + # echo nothing: no suitable tar found + exit 1 +fi + +# valid +echo $tar
Signature · 1 line
2.11.0