git: c77607965ee8 - main - Mk/Uses/linux.mk: fix rpm extraction

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Wed, 23 Mar 2022 09:21:53 UTC

The branch main has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c77607965ee8ce947247355b2127aa1ac492dedf

commit c77607965ee8ce947247355b2127aa1ac492dedf
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-03-23 09:19:48 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-03-23 09:19:48 +0000

    Mk/Uses/linux.mk: fix rpm extraction
    
    with rpm 4.17, rpm2archive wants to have stdin input to be specified
    explicitely as "-" and will not assume stdin input automatically if
    no filename is given. This broke rpm extraction for many linux-c7-*
    ports.
---
 Mk/Uses/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index f1fbd6ca49fa..28ce77dc89b1 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -236,7 +236,7 @@ SRC_DISTFILES?=		${DISTNAME}${SRC_SUFX}:SOURCE
 .ifdef USE_LINUX_RPM_BAD_PERMS
 EXTRACT_DEPENDS+=	rpm2archive:archivers/rpm4
 EXTRACT_CMD=		rpm2archive
-EXTRACT_BEFORE_ARGS=	<
+EXTRACT_BEFORE_ARGS=	- <
 EXTRACT_AFTER_ARGS=	| ${TAR} xf - --no-same-owner --no-same-permissions
 .endif