From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Greylist: delayed 364 seconds by postgrey-1.34 at layers.openembedded.org; Wed, 11 May 2016 04:41:14 UTC Received: from bin-vsp-out-03.atm.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by mail.openembedded.org (Postfix) with ESMTP id B5EDB70034 for ; Wed, 11 May 2016 04:41:14 +0000 (UTC) X-Halon-ID: bb3df1ac-1731-11e6-81fe-0050569116f7 Authorized-sender: petter@technux.se Received: from webmail.binero.se (unknown [195.74.38.9]) by bin-vsp-out-03.atm.binero.net (Halon Mail Gateway) with ESMTPA for ; Wed, 11 May 2016 06:35:04 +0200 (CEST) MIME-Version: 1.0 Date: Wed, 11 May 2016 06:34:59 +0200 From: =?UTF-8?Q?Petter_Mab=C3=A4cker?= To: Organization: Technux Reply-To: Mail-Reply-To: In-Reply-To: References: <1458665220-26223-1-git-send-email-markus.lehtonen@linux.intel.com> Message-ID: <524a1de66f35c2ecce1a709da93bfa65@technux.se> X-Sender: petter@technux.se User-Agent: Binero Webmail/0.8.4 Subject: Re: [PATCH v3] base.bbclass wipe ${S} before unpacking source X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2016 04:41:16 -0000 Content-Type: multipart/alternative; boundary="=_99146e3fd5c745228911db9d3c065c87" --=_99146e3fd5c745228911db9d3c065c87 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Hi Markus, >From my point of view it looks good, and all feedback from v2 of the patch seems to have been handled as well. BR Petter Petter Mabäcker Technux www.technux.se 2016-05-10 09:56 skrev Markus Lehtonen: > Ping, > > Any comments on this one? > > Discussion on v2 of the patch: > http://lists.openembedded.org/pipermail/openembedded-core/2016-March/119295.html [2] > > Cheers, > Markus > > On 22/03/16 18:47, "Markus Lehtonen" wrote: > >> Make sure that we have a pristine source tree after do_unpack. [YOCTO #9064] Signed-off-by: Markus Lehtonen --- meta/classes/base.bbclass | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index e066dc9..2acb2b6 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -133,23 +133,15 @@ python base_do_fetch() { addtask unpack after do_fetch do_unpack[dirs] = "${WORKDIR}" +do_unpack[cleandirs] = "${@d.getVar('S', True) if d.getVar('S', True) != d.getVar('WORKDIR', True) else os.path.join(d.getVar('S', True), 'patches')}" python base_do_unpack() { src_uri = (d.getVar('SRC_URI', True) or "").split() if len(src_uri) == 0: return - rootdir = d.getVar('WORKDIR', True) - - # Ensure that we cleanup ${S}/patches - # TODO: Investigate if we can remove - # the entire ${S} in this case. - s_dir = d.getVar('S', True) - p_dir = os.path.join(s_dir, 'patches') - bb.utils.remove(p_dir, True) - try: fetcher = bb.fetch2.Fetch(src_uri, d) - fetcher.unpack(rootdir) + fetcher.unpack(d.getVar('WORKDIR', True)) except bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) } -- 2.6.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core [1] Links: ------ [1] http://lists.openembedded.org/mailman/listinfo/openembedded-core [2] http://lists.openembedded.org/pipermail/openembedded-core/2016-March/119295.html --=_99146e3fd5c745228911db9d3c065c87 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=UTF-8 
Hi Markus,=20

>From my point of view it looks good, and all feedback from v2 of the patch =
seems to have been handled as well.=20

BR Petter

Petter Mabäcker

Technux <petter@technux.se>
www.technux.se

2016-05-10 09:56 skrev Markus Lehtonen:

Ping,

Any comments on this one?

Discussion on v2 of the patch:
http://lists.openembedded.org/pipermail/openembedded-core=
/2016-March/119295.html

Cheers,
  Markus



On 22/03/16 18:47, "Markus Lehtonen" <openembedded-core-bounces@lists.openembed=
ded.org on behalf of markus.lehtonen@linux.intel.com> wrote:
Make sure that we have a pristine sou= rce tree after do_unpack. [YOCTO #9064] Signed-off-by: Markus Lehtonen <= markus.lehtonen@linux.in= tel.com> --- meta/classes/base.bbclass | 12 ++---------- 1 file chan= ged, 2 insertions(+), 10 deletions(-) diff --git a/meta/classes/base.bbclas= s b/meta/classes/base.bbclass index e066dc9..2acb2b6 100644 --- a/meta/clas= ses/base.bbclass +++ b/meta/classes/base.bbclass @@ -133,23 +133,15 @@ pyth= on base_do_fetch() { addtask unpack after do_fetch do_unpack[dirs] =3D "${W= ORKDIR}" +do_unpack[cleandirs] =3D "${@d.get= Var('S', True) if d.getVar('S', True) !=3D d.getVar('WORKDIR', True) el= se os.path.join(d.getVar('S', True), 'patches')}" python base_do_unpack() {= src_uri =3D (d.getVar('SRC_URI', True) or "").split() if len(src_uri) =3D= =3D 0: return - rootdir =3D d.getVar('WORKDIR', True) - - # Ensure that we = cleanup ${S}/patches - # TODO: Investigate if we can remove - # the entire = ${S} in this case. - s_dir =3D d.getVar('S', True) - p_dir =3D os.path.join= (s_dir, 'patches') - bb.utils.remove(p_dir, True) - try: fetcher =3D bb.fet= ch2.Fetch(src_uri, d) - fetcher.unpack(rootdir) + fetcher.unpack(d.getVar('= WORKDIR', True)) except bb.fetch2.BBFetchException as e: raise bb.build.Fun= cFailed(e) } -- 2.6.2 -- ______________________________= _________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org<= /a> http://lists.openembedded.org/mailman/listinfo/openembedded-core =
--=_99146e3fd5c745228911db9d3c065c87--