From: Florin Diaconescu Date: Mon, 15 Jun 2026 15:39:44 +0000 (+0300) Subject: scripts/rpm2cpio.sh: Use 'xz -dc' instead of xzcat X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e78db7bfdfb7afb73e3bd089e002bb28ae719dba;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git scripts/rpm2cpio.sh: Use 'xz -dc' instead of xzcat rpm2cpio.sh calls xzcat to decompress,and xzcat is equivalent to: xz --decompress --stdout (-d and -c, in short) Since commit d1930f8, it is assumed that xz is provided, but 'xzcat' used in rpm2cpio.sh is not listed in HOSTTOOLS. With it being only a symlink, and with commit eb3ec74 replacing bzip2 with bunzip2 in a similar way, this fixes the bin_package class for rpm without adding xzcat to HOSTTOOLS. Signed-off-by: Florin Diaconescu Signed-off-by: Mathieu Dubois-Briand --- diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh index 8199b43784..9343f70ea3 100755 --- a/scripts/rpm2cpio.sh +++ b/scripts/rpm2cpio.sh @@ -58,7 +58,7 @@ hdrsize=$rsize case "$(_dd $offset bs=2 count=1 | tr -d '\0')" in "$(printf '\102\132')") _dd $offset | bunzip2 ;; # '\x42\x5a' "$(printf '\037\213')") _dd $offset | gunzip ;; # '\x1f\x8b' - "$(printf '\375\067')") _dd $offset | xzcat ;; # '\xfd\x37' + "$(printf '\375\067')") _dd $offset | xz -dc ;; # '\xfd\x37' "$(printf '\135')") _dd $offset | unlzma ;; # '\x5d\x00' "$(printf '\050\265')") _dd $offset | unzstd ;; # '\x28\xb5' *) fatal "Unrecognized payload compression format in rpm file: $pkg" ;;