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 1Rzmox-0008F8-G0 for garchives@archives.gentoo.org; Tue, 21 Feb 2012 10:19:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD6B8E0D25; Tue, 21 Feb 2012 10:19:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 53388E0A93 for ; Tue, 21 Feb 2012 10:19:00 +0000 (UTC) Received: from misibook.miska.isageek.net (nat.scz.novell.com [213.151.88.252]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: miska) by smtp.gentoo.org (Postfix) with ESMTPSA id 2C5096415A for ; Tue, 21 Feb 2012 10:18:58 +0000 (UTC) Date: Tue, 21 Feb 2012 11:18:44 +0100 From: Michal Hrusecky To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] RFC patch for obs-service.eclass Message-ID: <20120221101843.GA17026@misibook.miska.isageek.net> 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 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gBBFr7Ir9EOA20Yy" Content-Disposition: inline X-Operating-System: Linux User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: f387c42c-a6bc-451e-b644-f397ac86fcef X-Archives-Hash: 95b1be49431382e9741a2782a43104e6 --gBBFr7Ir9EOA20Yy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, any objections against following patch? I guess I'm the only one using this eclass anyway. So what the patch does. In gentoo we have build renamed to avoid clashes and moved to the different directory. More and more services are using parts of the build, so instead of patching all services, I think it would be better to do it in eclass. --- obs-service.eclass 16 Sep 2011 15:49:19 -0000 1.1 +++ obs-service.eclass 21 Feb 2012 10:03:43 -0000 @@ -74,6 +74,18 @@ debug-print-function ${FUNCNAME} "$@" } =20 +# @FUNCTION: obs-service_src_prepare +# @DESCRIPTION: +# Replaces all /usr/lib/build directories with /usr/share/suse-build to re= flect +# where suse-build is installed in Gentoo. +obs-service_src_prepare() { + debug-print-function ${FUNCNAME} "$@" + debug-print "Replacing all paths to find suse-build in Gentoo" + find . -exec grep -l /usr/lib/build \{\} \; | while read i; do + sed -i 's|/usr/lib/build|/usr/share/suse-build|g' "${i}" + done +} + # @FUNCTION: obs-service_src_install # @DESCRIPTION: # Does the installation of the downloaded files. @@ -94,4 +106,4 @@ fi } =20 -EXPORT_FUNCTIONS src_install src_unpack +EXPORT_FUNCTIONS src_install src_prepare src_unpack --=20 Michal Hrusecky --gBBFr7Ir9EOA20Yy Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iF4EAREIAAYFAk9Db4MACgkQpMQOFjUY7FVmvgD+LNf2EPM9Fz9GF0gzAg6FKpBx U9mJMERXkqRigveZ0b8A/RQuKomkf8ezJPRFE7cATvbJtWJL1zh7DFOPm+2uDheL =lLdP -----END PGP SIGNATURE----- --gBBFr7Ir9EOA20Yy--