From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SbU3v-0002Am-Rw for garchives@archives.gentoo.org; Mon, 04 Jun 2012 09:59:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD0CAE076B; Mon, 4 Jun 2012 09:58:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B4CEE0160 for ; Mon, 4 Jun 2012 09:58:03 +0000 (UTC) Received: from pomiocik.lan (p14.ppp.polbox.pl [213.241.7.14]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id E0FDC1B403A; Mon, 4 Jun 2012 09:58:01 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH vcs-snapshot] Use ${WORKDIR}/${P} rather than ${S} to support ${S} overrides. Date: Mon, 4 Jun 2012 11:59:14 +0200 Message-Id: <1338803954-3814-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.7.10.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 4dc944e4-c963-4113-ad23-9fe822b09bd5 X-Archives-Hash: 153e6aac271d7a6ea47cca58a226b5e8 One could set S to work on a subtree of the tarball rather than the whole tarball. Considering that, it's probably better to use ${WORKDIR}/${P} rather than ${S}. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=419479 --- gx86/eclass/vcs-snapshot.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gx86/eclass/vcs-snapshot.eclass b/gx86/eclass/vcs-snapshot.eclass index 6748360..23cd696 100644 --- a/gx86/eclass/vcs-snapshot.eclass +++ b/gx86/eclass/vcs-snapshot.eclass @@ -9,7 +9,8 @@ # @DESCRIPTION: # This eclass provides a convenience src_unpack() which does support # working with snapshots generated by various VCS-es. It unpacks those -# to ${S} rather than the original directory containing commit id. +# to ${WORKDIR}/${P} rather than the original directory containing +# commit id. # # Note that this eclass handles only unpacking. You need to specify # SRC_URI yourself, and call any autoreconfiguration as necessary. @@ -41,5 +42,5 @@ vcs-snapshot_src_unpack() { # github, bitbucket: username-projectname-hash # gitweb: projectname-tagname-hash - mv *-*-[0-9a-f]*[0-9a-f]/ "${S}" || die + mv *-*-[0-9a-f]*[0-9a-f]/ "${WORKDIR}"/${P} || die } -- 1.7.10.2