From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.28.183.69 with SMTP id h66mr320649wmf.1.1501673527029; Wed, 02 Aug 2017 04:32:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.169.216 with SMTP id s207ls704690wme.19.canary-gmail; Wed, 02 Aug 2017 04:32:06 -0700 (PDT) X-Received: by 10.28.1.205 with SMTP id 196mr332979wmb.0.1501673526568; Wed, 02 Aug 2017 04:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501673526; cv=none; d=google.com; s=arc-20160816; b=nhZ8F3UsZBWaNZiH4oOrJ046w4zY2e0K49Z7HYb6qoimYS2+mbonyc4FLIgSmrSV6L /1mVkwXeOAxmO0D3cpEL+Vm9AeAqx6GIkG7+xLw/KwG7RMqnHMo2Wz1Js53uVqtYEr85 QK3BD57dXmBCrR0JdVCtSmaXNr4kAzcK/0Q9RJ0zY0RaMEZ4QADwwFJiAyC8q3VlUsVA w5VIRHZK02ZL1ydkJucYBO6JQ7s3rKsNh8B/jZm7ubYJwGLuuGdf54IHToaezzKt8w8i y/2lzUHpCz9x4Z3ownSBkc99Ta/pKPAZjgvrImASTVqQ1OUPSSM3DP06biD5aPoOUdDK bc6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=O6K+D4172WUXSuBWlWwmAIsURKuYDT+UqEzpJlstKxk=; b=VO6KgCSsQIXe41W4OMvT4SUZcMefcPSuO3LR1UqWlswDUA35kJd4hDWPxK0BmF7IRe So+i6mO8ZT5iMH8qMsl5fenjeKQhMxT69oXwhlwYMKTfB1PpF2h8UJ+bwygkVyrTJHPd CdsUKpl1LHGvCvsONTOpOX/4FCUL5n8ZIezg2Kuktv2Dqq04/g5NL7tbtBCwYAEpD53Z V1TNgaXgclAEwXos8KwHRZD4H51MffDfX+1dK9KYT3QILMhsSPHkpKuOIVKbA14wmnUr KioQHlIDdx9WdQE6hI2EKJbt12XWva3iOn794gfZRnp1bLO4/q4mL0oRE3aw0w2Cj4vw t0vg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f3si1254747wme.4.2017.08.02.04.32.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 04:32:06 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v72BW0BW018806 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 2 Aug 2017 13:32:00 +0200 Received: from md1em3qc ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v72BW0cl009253; Wed, 2 Aug 2017 13:32:00 +0200 Date: Wed, 2 Aug 2017 13:33:54 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH 08/16] classes: move fetch and unpack into isar-base Message-ID: <20170802133354.6a90f1bd@md1em3qc> In-Reply-To: References: X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: der9lLgAeEps Am Wed, 2 Aug 2017 12:47:09 +0300 schrieb Alexander Smirnov : > 2017-08-01 13:17 GMT+03:00 Henning Schild > : > > > create a new base-class for images > > > > Signed-off-by: Henning Schild > > --- > > meta/classes/dpkg.bbclass | 34 > > ------------------------------ ---- > > meta/classes/ext4-img.bbclass | 2 +- > > meta/classes/isar-base-image.bbclass | 1 + > > meta/classes/isar-base.bbclass | 33 > > ++++++++++++++++++++++++++++++ +++ > > 4 files changed, 35 insertions(+), 35 deletions(-) > > create mode 100644 meta/classes/isar-base-image.bbclass > > > > diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass > > index 1d0132b..58cee6e 100644 > > --- a/meta/classes/dpkg.bbclass > > +++ b/meta/classes/dpkg.bbclass > > @@ -11,42 +11,8 @@ do_unpack[deptask] = "do_build" > > # recipe name as identifier > > PP = "/home/builder/${PN}" > > WORKDIR = "${BUILDCHROOT_DIR}/${PP}" > > - > > -# Fetch package from the source link > > -python do_fetch() { > > - src_uri = (d.getVar('SRC_URI', True) or "").split() > > - if len(src_uri) == 0: > > - return > > - > > - try: > > - fetcher = bb.fetch2.Fetch(src_uri, d) > > - fetcher.download() > > - except bb.fetch2.BBFetchException as e: > > - raise bb.build.FuncFailed(e) > > -} > > - > > -addtask fetch before do_build > > -do_fetch[dirs] = "${DL_DIR}" > > - > > -do_unpack[stamp-extra-info] = "${DISTRO}" > > S ?= "${WORKDIR}" > > > > -# Unpack package and put it into working directory in buildchroot > > -python do_unpack() { > > - src_uri = (d.getVar('SRC_URI', True) or "").split() > > - if len(src_uri) == 0: > > - return > > - > > - try: > > - fetcher = bb.fetch2.Fetch(src_uri, d) > > - fetcher.unpack(d.getVar('WORKDIR', True)) > > - except bb.fetch2.BBFetchException as e: > > - raise bb.build.FuncFailed(e) > > -} > > - > > -addtask unpack after do_fetch before do_build > > -do_unpack[dirs] = "${WORKDIR}" > > - > > do_build[stamp-extra-info] = "${DISTRO}" > > > > # Build package from sources using build script > > diff --git a/meta/classes/ext4-img.bbclass > > b/meta/classes/ext4-img.bbclass index eb23d06..5125d8e 100644 > > --- a/meta/classes/ext4-img.bbclass > > +++ b/meta/classes/ext4-img.bbclass > > @@ -1,7 +1,7 @@ > > # This software is a part of ISAR. > > # Copyright (C) 2015-2016 ilbers GmbH > > > > -inherit isar-base > > +inherit isar-base-image > > > > # Extra space for rootfs in MB > > ROOTFS_EXTRA ?= "64" > > diff --git a/meta/classes/isar-base-image.bbclass > > b/meta/classes/isar-base-image.bbclass > > new file mode 100644 > > index 0000000..33b0369 > > --- /dev/null > > +++ b/meta/classes/isar-base-image.bbclass > > @@ -0,0 +1 @@ > > +do_build[nostamp] = "0" > > > > From patch description it's not clear, why we need separate empty > class here with *-image name. I do not know what this line acutally does. It is there to keep the semantics because this line always was part of images. As Claudio suggested i will introduce a class isar-base with the fetcher and unpacker, from that isar-package-base and isar-image-base could be derived. Still not clear about the names, any suggestions? Henning > > > diff --git a/meta/classes/isar-base.bbclass > > b/meta/classes/isar-base. bbclass > > index 33b0369..3df6572 100644 > > --- a/meta/classes/isar-base.bbclass > > +++ b/meta/classes/isar-base.bbclass > > @@ -1 +1,34 @@ > > do_build[nostamp] = "0" > > + > > +# Fetch package from the source link > > +python do_fetch() { > > + src_uri = (d.getVar('SRC_URI', True) or "").split() > > + if len(src_uri) == 0: > > + return > > + > > + try: > > + fetcher = bb.fetch2.Fetch(src_uri, d) > > + fetcher.download() > > + except bb.fetch2.BBFetchException as e: > > + raise bb.build.FuncFailed(e) > > +} > > + > > +addtask fetch before do_build > > +do_fetch[dirs] = "${DL_DIR}" > > + > > +# Unpack package and put it into working directory in buildchroot > > +python do_unpack() { > > + src_uri = (d.getVar('SRC_URI', True) or "").split() > > + if len(src_uri) == 0: > > + return > > + > > + try: > > + fetcher = bb.fetch2.Fetch(src_uri, d) > > + fetcher.unpack(d.getVar('WORKDIR', True)) > > + except bb.fetch2.BBFetchException as e: > > + raise bb.build.FuncFailed(e) > > +} > > + > > +addtask unpack after do_fetch before do_build > > +do_unpack[dirs] = "${WORKDIR}" > > +do_unpack[stamp-extra-info] = "${DISTRO}" > > -- > > 2.13.0 > > > > -- > > You received this message because you are subscribed to the Google > > Groups "isar-users" group. > > To unsubscribe from this group and stop receiving emails from it, > > send an email to isar-users+unsubscribe@googlegroups.com. > > To post to this group, send email to isar-users@googlegroups.com. > > To view this discussion on the web visit > > https://groups.google.com/d/ > > msgid/isar-users/ef97842f18e67eb7140790542c0d88a04490421f.1501582237.git. > > henning.schild%40siemens.com. For more options, visit > > https://groups.google.com/d/optout.