From nobody Wed Mar 23 09:21:53 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 346EB1A29F14; Wed, 23 Mar 2022 09:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KNjXy12Nnz4lbB; Wed, 23 Mar 2022 09:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648027314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jvvpVpTcW8MEpM/7IvCj4tzEqBQyLy78C0QFRkvvScM=; b=BdiyXOl4fWB6H4Qx5/Pvd7CO6Laz9AlU7b9JTkbuE7eLU5z39UvMqbHn12GHwQlMapYOZP C3gk9k6DVUajdtTQrALcMgWZfVujnDTG2HvGny9+zDcIxmditxcI3yhONrcdrQb+FnxEq3 GpyPmq713ZeaFhO488oaH5L+QzedV9xLlDSTVW0kHoStJ2xFfed+Dm0oiH70JEydAGslew 2BnWUwF6NSkj/vVNKwA5L3V70nmJ/jMqJXg8Kp/41N71u6jbuzP1fJIMZZskejtHnSC45V W9FiVdHsSe2z1f6z92ToiXp23xApCCBW379tanTDgT1OGMNvEJ0PWwZcnIhIWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0415A20DCA; Wed, 23 Mar 2022 09:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22N9LrOt070168; Wed, 23 Mar 2022 09:21:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22N9Lrfa070167; Wed, 23 Mar 2022 09:21:53 GMT (envelope-from git) Date: Wed, 23 Mar 2022 09:21:53 GMT Message-Id: <202203230921.22N9Lrfa070167@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: c77607965ee8 - main - Mk/Uses/linux.mk: fix rpm extraction List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c77607965ee8ce947247355b2127aa1ac492dedf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648027314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jvvpVpTcW8MEpM/7IvCj4tzEqBQyLy78C0QFRkvvScM=; b=iSThdWhJiYafum7wThrS8tlwPikS+tvf17zxwqNTHleIETx7fP1UBvSiI4ySeamAAaq9dV BWbPAOsaEbRlGdaxjQyPHRMFROwiJP9qsgXBsRXc5JC7akW0MAVFRvyR+oEbnD6XcwPDO5 u/cS275EPEVR+Kbz1qsIjK29+wH24E3deNt8kd0kPj2LO2FvjHAPcLsq+DrdRKNpCYtJMy pLgl2I9SYVJ4PIIuv+xdB+4bhTjWdsVJPoEXvzkx8+OZH8UpqpYirrx5dl4BPCj9kh67rf fvSkS/Adx7rE9Ze0DUoi6oV66fK1PHlcFnpraOHwyAql0uA8YOlkbnPNT/0+bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648027314; a=rsa-sha256; cv=none; b=Yv43v44wYts7+vzsF4QevB5dR93+bX1pMaGN3OcJO1l8NH2lieGRGUOq3JLxk2C4PE+KLX xZo5Eo/IL+Uqp5zGATYbEp/APCwGsdDooxNnzzO2XRQJelM/Pe0/Nh3ZqxSeyzH6Z6GUkg ZjGVSMbDQqbCZ9/nQs3XXi4AokoI0PUFbvjKi2HBy4C1tgFa8uXYdc3Hh8OHFc1cVKupEF wORg/tSbhlGKYjStpXSpplOAZtfdetCNDwnCz3xq5M8LVgDP16X7nQyTL9/eay3fMfyrdD K3AiwH+1NSVGrSqDuTIMvgDw+U4rck4iuc+nfoWSxR0/Mtzqn3mKlO2LKPHKmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c77607965ee8ce947247355b2127aa1ac492dedf commit c77607965ee8ce947247355b2127aa1ac492dedf Author: Christoph Moench-Tegeder AuthorDate: 2022-03-23 09:19:48 +0000 Commit: Christoph Moench-Tegeder 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