From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E6FF138350 for ; Wed, 4 Mar 2020 17:07:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A01A7E0D4D; Wed, 4 Mar 2020 17:07:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81508E0D4D for ; Wed, 4 Mar 2020 17:07:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2CC3E34F304 for ; Wed, 4 Mar 2020 17:07:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2BFD183 for ; Wed, 4 Mar 2020 17:07:37 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1583341645.cdb819a4babe6e64c7353ec58b669cba44f2cd26.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/runc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/runc/runc-1.0.0_rc10.ebuild X-VCS-Directories: app-emulation/runc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: cdb819a4babe6e64c7353ec58b669cba44f2cd26 X-VCS-Branch: master Date: Wed, 4 Mar 2020 17:07:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bba39e43-0c1f-4f40-9a82-f259d305aa0a X-Archives-Hash: af634c47a67979141e97a0cb134ed47c commit: cdb819a4babe6e64c7353ec58b669cba44f2cd26 Author: William Hubbs sony com> AuthorDate: Wed Mar 4 17:06:57 2020 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Mar 4 17:07:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb819a4 app-emulation/runc: remove src_prepare function Signed-off-by: William Hubbs gentoo.org> app-emulation/runc/runc-1.0.0_rc10.ebuild | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app-emulation/runc/runc-1.0.0_rc10.ebuild b/app-emulation/runc/runc-1.0.0_rc10.ebuild index 2338fa34630..00d4ecb746d 100644 --- a/app-emulation/runc/runc-1.0.0_rc10.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc10.ebuild @@ -31,17 +31,6 @@ RDEPEND=" !app-emulation/docker-runc " -src_prepare() { - pushd src/${EGO_PN} - default - sed -i -e "/^GIT_BRANCH/d"\ - -e "/^GIT_BRANCH_CLEAN/d"\ - -e "/^COMMIT_NO/d"\ - -e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\ - Makefile || die - popd || die -} - src_compile() { # Taken from app-emulation/docker-1.7.0-r1 export CGO_CFLAGS="-I${ROOT}/usr/include" @@ -56,7 +45,8 @@ src_compile() { $(usex kmem '' 'nokmem') ) - GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN} + COMMIT=${RUNC_COMMIT} GOPATH="${S}" emake BUILDTAGS="${options[*]}" \ + -C src/${EGO_PN} } src_install() {