From cd5c2e15d8407d4b89297362bbfcbccc84a58486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 27 May 2020 11:51:03 +0200 Subject: [PATCH] kexec-tools: work around broken release tarball There are hard links from files to themselves in the tarball and bsdtar fails to extract them. Skip extraction and use GNU tar instead. --- srcpkgs/kexec-tools/template | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template index 140bd3039cf..81efebab90a 100644 --- a/srcpkgs/kexec-tools/template +++ b/srcpkgs/kexec-tools/template @@ -2,7 +2,9 @@ pkgname=kexec-tools version=2.0.20 revision=1 +create_wrksrc=yes build_style=gnu-configure +hostmakedepends="tar xz" makedepends="zlib-devel liblzma-devel" short_desc="Tools to support fast kexec reboots" maintainer="Orphaned " @@ -10,6 +12,7 @@ license="GPL-2.0-only" homepage="http://kernel.org/pub/linux/utils/kernel/kexec/" distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz" checksum=dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8 +skip_extraction="${pkgname}-${version}.tar.xz" case "$XBPS_TARGET_MACHINE" in i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/19200/steps/shell_3/logs/stdio" ;; @@ -19,6 +22,14 @@ case "$XBPS_TARGET_MACHINE" in ppc-musl) nopie=yes;; # textrels not supported esac +do_extract() { + # bsdtar fails to extract version 2.0.20 tarball which + # contains (buggy) hard links from files to themselves. + tar --strip-components 1 --no-same-owner --extract --file \ + ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.xz \ + --directory ${wrksrc} +} + pre_build() { rm ${XBPS_WRAPPERDIR}/strip case "$XBPS_TARGET_MACHINE" in