From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by mail.openembedded.org (Postfix) with ESMTP id B443E6A428; Tue, 28 May 2013 13:56:24 +0000 (UTC) Received: by mail-pb0-f49.google.com with SMTP id rp8so7813641pbb.8 for ; Tue, 28 May 2013 06:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=5oceiSk7AvG4QLJH+FHEDa5nceUYjXzwD0nXXvvnuac=; b=h9LatWD/+h6KkJ39HFWar6a7FVkxmMsse8ufdfJVJkcN5ZnAUiVWwcjClTwgZ5Cars Dhq+6jIdO4lwV0dibD64HrorajRc+j/uBD2o4QDfSHpvmuT6zMGcBHAma0LsnABHHPOl nHoLxXWml3NvTbCNWtU5ubBSd39VoxIczBxKHP53WMHxK1jSnoMY853LO1OiAD3XA3Jz Ctaa5SmUspvWYQcy3dNCxhr1kVZoodrmx0plE01WN3hmyQ/URAG95AKW3YECJxmwXuAS YYabhOE+vXc7B3mOm7iI0amM709XaisYUnlOtbtuOVjo9kklTFVJ1qiy/RSPcNbusSSW RcFQ== X-Received: by 10.68.232.67 with SMTP id tm3mr26255264pbc.204.1369749385987; Tue, 28 May 2013 06:56:25 -0700 (PDT) Received: from localhost (ip-62-24-80-145.net.upcbroadband.cz. [62.24.80.145]) by mx.google.com with ESMTPSA id gc5sm33017088pbb.19.2013.05.28.06.56.23 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 28 May 2013 06:56:24 -0700 (PDT) Date: Tue, 28 May 2013 15:56:26 +0200 From: Martin Jansa To: openembedded-devel@lists.openembedded.org Message-ID: <20130528135626.GK3192@jama> References: <20130528132841.A450B5039B@opal> <20130528134606.GJ3192@jama> MIME-Version: 1.0 In-Reply-To: <20130528134606.GJ3192@jama> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: openembedded-core@lists.openembedded.org Subject: Re: [oe-commits] Mark Hatle : base.bbclass: Deprecate the PRINC logic X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 May 2013 13:56:24 -0000 X-Groupsio-MsgNum: 44902 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NqNl6FRZtoRUn5bW" Content-Disposition: inline --NqNl6FRZtoRUn5bW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, May 28, 2013 at 03:46:06PM +0200, Martin Jansa wrote: > On Tue, May 28, 2013 at 01:28:41PM +0000, git@git.openembedded.org wrote: > > Module: openembedded-core.git > > Branch: master-next > > Commit: e1cf564ebc8e7b4fa626a645356f6a4d7f5ba064 > > URL: http://git.openembedded.org/?p=3Dopenembedded-core.git&a=3Dcomm= it;h=3De1cf564ebc8e7b4fa626a645356f6a4d7f5ba064 > >=20 > > Author: Mark Hatle > > Date: Tue May 21 13:29:03 2013 -0500 > >=20 > > base.bbclass: Deprecate the PRINC logic > >=20 > > The PRINC logic is now deprecated, the PR server should be used to hand= le > > the automatic incrementing of the PR (package release) field. The defa= ult > > setting of '0' has been removed, and a warning message has been added. >=20 > How are people supposed to remove existing PRINC without causing version > going backwards? >=20 > Do I have to choose between seeing 100 warnings about deprecated PRINC > or 100 ERRORs from buildhistory about versions going backwards? Also subject: base.bbclass: BREAK and deprecate the PRINC logic would be more accurate ERROR: ExpansionError during parsing /OE/shr-core/meta-openembedded/meta-systemd/recipes-core/systemd/systemd-ma= chine-units_1.0.bb: Failure expanding variable PRINC[:=3D], expression was ${@int(PRINC) + 2} which triggered exception NameError: name 'PRINC' is not defined > > Signed-off-by: Mark Hatle > > Signed-off-by: Richard Purdie > >=20 > > --- > >=20 > > meta/classes/base.bbclass | 4 ++++ > > meta/conf/bitbake.conf | 1 - > > 2 files changed, 4 insertions(+), 1 deletions(-) > >=20 > > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass > > index b1642a2..29084a2 100644 > > --- a/meta/classes/base.bbclass > > +++ b/meta/classes/base.bbclass > > @@ -465,8 +465,12 @@ python () { > > appendVar('EXTRA_OECONF', extraconf) > > =20 > > # If PRINC is set, try and increase the PR value by the amount spe= cified > > + # The PR server is now the preferred way to handle PR changes base= d on > > + # the checksum of the recipe (including bbappend). The PRINC is n= ow > > + # obsolete. Return a warning to the user. > > princ =3D d.getVar('PRINC', True) > > if princ and princ !=3D "0": > > + bb.warn("Use of PRINC is deprecated. The PR server should be = used to automatically increment the PR. See: https://wiki.yoctoproject.org= /wiki/PR_Service" > > pr =3D d.getVar('PR', True) > > pr_prefix =3D re.search("\D+",pr) > > prval =3D re.search("\d+",pr) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > > index 174236d..115832c 100644 > > --- a/meta/conf/bitbake.conf > > +++ b/meta/conf/bitbake.conf > > @@ -186,7 +186,6 @@ ASSUME_PROVIDED =3D "\ > > PN =3D "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or= 'defaultpkgname'}" > > PV =3D "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or= '1.0'}" > > PR =3D "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or= 'r0'}" > > -PRINC ?=3D "0" > > PF =3D "${PN}-${EXTENDPE}${PV}-${PR}" > > EXTENDPE =3D "${@['','${PE\x7d_'][int(d.getVar('PE',1) or 0) > 0]}" > > P =3D "${PN}-${PV}" > >=20 > > _______________________________________________ > > Openembedded-commits mailing list > > Openembedded-commits@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-commits >=20 > --=20 > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --NqNl6FRZtoRUn5bW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iEYEARECAAYFAlGkt4oACgkQN1Ujt2V2gBwWrwCePUA9lf1yib+AW7s3kwU9pXM1 YkIAn1Sn+yQZ0UMTrAsbJmnKb9vtcyjC =dST+ -----END PGP SIGNATURE----- --NqNl6FRZtoRUn5bW--