[OE-core] [PATCH] squashfs-tools: upgrade to commit f95864afe883

[Richard Purdie]

On Tue, 2019-07-16 at 15:54 +0200, Ulrich Ölmann wrote:  
> diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> index dc1568a77c9a..cca0524b7ea4 100644
> --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> @@ -6,12 +6,9 @@ LICENSE = "GPL-2"
>  LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>  
>  PV = "4.3+gitr${SRCPV}"
> -SRCREV = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"
> +SRCREV = "f95864afe8833fe3ad782d714b41378e860977b1"
>  SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
> -           file://0001-mksquashfs.c-get-inline-functions-work-with-C99.patch;striplevel=2 \
>             file://squashfs-tools-4.3-sysmacros.patch;striplevel=2 \
> -           file://fix-compat.patch \
> -           file://0001-squashfs-tools-patch-for-CVE-2015-4645-6.patch;striplevel=2 \
>  "
>  UPSTREAM_CHECK_COMMITS = "1"
>  SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759"
> @@ -24,13 +21,15 @@ COMPATIBLE_HOST_libc-musl = 'null'
>  
>  EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}"
>  
> -PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr"
> +PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr zstd reproducible"
>  PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib"
>  PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz"
>  PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo"
>  PACKAGECONFIG[lz4] = "LZ4_SUPPORT=1,LZ4_SUPPORT=0,lz4"
>  PACKAGECONFIG[lzma] = "LZMA_XZ_SUPPORT=1,LZMA_XZ_SUPPORT=0,xz"
>  PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
> +PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
> +PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"

This fails in OE-Core since zstd isn't present and you've enabled that
by default:

e.g.:
https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/827

(but many other similar failures).

Adding the PACKAGECONFIG[zstd] is good, we just can't enable it by
default.

Cheers,

Richard