From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.107.2.215 with SMTP id 206mr16318223ioc.125.1501667230590; Wed, 02 Aug 2017 02:47:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.107.128.96 with SMTP id b93ls12764528iod.9.gmail; Wed, 02 Aug 2017 02:47:10 -0700 (PDT) X-Received: by 10.36.211.193 with SMTP id n184mr2874521itg.41.1501667230266; Wed, 02 Aug 2017 02:47:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501667230; cv=none; d=google.com; s=arc-20160816; b=wrolcjNvrX7hXBhYbEqg90MXIhD10xrJ5kABy6y6n1MjH3iXonpKYq0DxgiF8WNqQy 8VQ9+jXfWiddAtMVJjXpDgDk3STfbSCULnZmWUwmpb3cAXMkim1jUhn6Nn/GKJat4Eyg Ov0Fqp0fQlB/6lqQ8xeZiMQKtvwLDyPF8WwaolKjA4rLtvASFjW7W5MBQbQhpS6YItXY LQYXfk//2ubeF+4xEYN4HXIwJCTOHQ3nfDV//rMIIIVqWj9o11sW/TQioR9RAmFhaSHP oq4r6L8+NlTjpr8nQK1QSvSHfYEzWOR/mboJjFZ2W7mErGOzSajLGevm5vOJ5N/fWrfu ZHqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:dkim-signature:arc-authentication-results; bh=d1swDTOvoMc1TXCkoJJPCkTFKXtbkA681hLQCKqzbxU=; b=tGKLxxU5vXriI4p8RmjlKrDD4VdH+dyPQrb6Iae4KQ1+tKXGv7CanaxwtM2un3ZWkl vNvOwwNdU3FM8xuIn7JJIzlrFHkb835N/eLp8L3W285eku0ymL3P5sHLP0XBBuZqk42Z pxf19lQ8SIYhPPvo2mQ9kv7OCtZHf3DteW+nnXNRIY8LukYY7phhSelo4zTOOpUfqW7c IZBjvqFlO+GhKKAaZSP9XCXhKFzI2fjbF+hEv+p52nRDuZsjmrybhKHKTCBVHpFNqkv2 iVH5IihqHkwxZ5NeqmyY7W7ijSwVAJBAq8xhJasmT7pNqOUQP1F2Niq3IWXCPLEiDz68 eeiA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.b=r9vYTPHE; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::244 as permitted sender) smtp.mailfrom=alex.bluesman.smirnov@gmail.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-qt0-x244.google.com (mail-qt0-x244.google.com. [2607:f8b0:400d:c0d::244]) by gmr-mx.google.com with ESMTPS id q126si493960ywg.13.2017.08.02.02.47.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 02:47:10 -0700 (PDT) Received-SPF: pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::244 as permitted sender) client-ip=2607:f8b0:400d:c0d::244; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.b=r9vYTPHE; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::244 as permitted sender) smtp.mailfrom=alex.bluesman.smirnov@gmail.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: by mail-qt0-x244.google.com with SMTP id p3so4027328qtg.5 for ; Wed, 02 Aug 2017 02:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=d1swDTOvoMc1TXCkoJJPCkTFKXtbkA681hLQCKqzbxU=; b=r9vYTPHEh3Lf+qAadJ7rgxXjt8CxJQe8HW+CVEFkQ3h9PjRG7geeW+47Bt+8n1BuZy 600qwqi+PMuPDiiL1eA5ejRbqN6WuzODvIC5tm++5/FpuS0dQGWTC547ScFkFWo7yyNb iDiHSA6al38GvizuLyAEDo2KT51q3GHyoB+Y5xkAhtEeTVxuiGMcLCmDsAbDpzufKLir QK2ejfS8u18n4nSEPxcXopNU8IJTv1/72JgpCq2Nwzhl7Ny/rdS+nVDJ+afi7lJFY5xO UdQEZpqkRDAyz7/xZyOWjiJ3BlcvKKBNWXL1kJSASroBjOKbax+pupwWs+xXuNcDSPnS OxDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=d1swDTOvoMc1TXCkoJJPCkTFKXtbkA681hLQCKqzbxU=; b=imu5+YEO7SZRbBZuJdxVe4apIoEITWsMiYNlgaMubGBpjkNIZOwpb2BHyp/UezDytk vJXp/DqD23n8pQHLBYFbECyjugC28tdh/ygf5EmbI4X/4toq2CP2LszdEOadGNsf7yWo B4ODPapIXDuNnhlX8psxQaJiybgofCFxB/n2wV7Yn6zw1asal7AOHvbzfxVESmtVcIZO +32XZrPBGQP3oqctHb0TG2OGjkuBbeYeYSbKTHhy0DC9XJgnWbFSH722bJXZHTg776qI +mJ5JnQIMfbW0fJtaBC+Pit6a3U9EDSRR7TKYHDfMceVknxhI4PqZU0avi5bftgrD4vJ hS5g== X-Gm-Message-State: AIVw110XB8+VwR6CgWP95mHJd9bRivPluV07qmGUBFoCK+nkK9MFdQfb EOps2faloML3vpgTdQs1cqwW4hP6jQ== X-Received: by 10.200.46.118 with SMTP id s51mr29832242qta.48.1501667229925; Wed, 02 Aug 2017 02:47:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.12.148.188 with HTTP; Wed, 2 Aug 2017 02:47:09 -0700 (PDT) In-Reply-To: References: From: Alexander Smirnov Date: Wed, 2 Aug 2017 12:47:09 +0300 Message-ID: Subject: Re: [PATCH 08/16] classes: move fetch and unpack into isar-base To: Henning Schild Cc: isar-users@googlegroups.com Content-Type: multipart/alternative; boundary="001a113cf0e4cf83bf0555c2255f" X-TUID: s3D61D8aEFID --001a113cf0e4cf83bf0555c2255f Content-Type: text/plain; charset="UTF-8" 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. > 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. > --001a113cf0e4cf83bf0555c2255f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


2017-08-01 13:17 GMT+03:00 Henning Schild <henning.schild@sie= mens.com>:
create a new bas= e-class for images

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
=C2=A0meta/classes/dpkg.bbclass=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | = 34 ----------------------------------
=C2=A0meta/classes/ext4-img.bbclass=C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-=
=C2=A0meta/classes/isar-base-image.bbclass |=C2=A0 1 +
=C2=A0meta/classes/isar-base.bbclass=C2=A0 =C2=A0 =C2=A0 =C2=A0| 33 +++++++= ++++++++++++++++++++++++++
=C2=A04 files changed, 35 insertions(+), 35 deletions(-)
=C2=A0create 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] =3D "do_build"
=C2=A0# recipe name as identifier
=C2=A0PP =3D "/home/builder/${PN}"
=C2=A0WORKDIR =3D "${BUILDCHROOT_DIR}/${PP}"
-
-# Fetch package from the source link
-python do_fetch() {
-=C2=A0 =C2=A0 src_uri =3D (d.getVar('SRC_URI', True) or "&quo= t;).split()
-=C2=A0 =C2=A0 if len(src_uri) =3D=3D 0:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 return
-
-=C2=A0 =C2=A0 try:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetcher =3D bb.fetch2.Fetch(src_uri, d)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetcher.download()
-=C2=A0 =C2=A0 except bb.fetch2.BBFetchException as e:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 raise bb.build.FuncFailed(e)
-}
-
-addtask fetch before do_build
-do_fetch[dirs] =3D "${DL_DIR}"
-
-do_unpack[stamp-extra-info] =3D "${DISTRO}"
=C2=A0S ?=3D "${WORKDIR}"

-# Unpack package and put it into working directory in buildchroot
-python do_unpack() {
-=C2=A0 =C2=A0 src_uri =3D (d.getVar('SRC_URI', True) or "&quo= t;).split()
-=C2=A0 =C2=A0 if len(src_uri) =3D=3D 0:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 return
-
-=C2=A0 =C2=A0 try:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetcher =3D bb.fetch2.Fetch(src_uri, d)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetcher.unpack(d.getVar('WORKDIR'= , True))
-=C2=A0 =C2=A0 except bb.fetch2.BBFetchException as e:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 raise bb.build.FuncFailed(e)
-}
-
-addtask unpack after do_fetch before do_build
-do_unpack[dirs] =3D "${WORKDIR}"
-
=C2=A0do_build[stamp-extra-info] =3D "${DISTRO}"

=C2=A0# 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 @@
=C2=A0# This software is a part of ISAR.
=C2=A0# Copyright (C) 2015-2016 ilbers GmbH

-inherit isar-base
+inherit isar-base-image

=C2=A0# Extra space for rootfs in MB
=C2=A0ROOTFS_EXTRA ?=3D "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] =3D "0"

Fr= om patch description it's not clear, why we need separate empty class h= ere with *-image name.
=C2=A0
diff --git a/meta/classes/isar-base.bbclass b/meta/classes/isar-base.<= wbr>bbclass
index 33b0369..3df6572 100644
--- a/meta/classes/isar-base.bbclass
+++ b/meta/classes/isar-base.bbclass
@@ -1 +1,34 @@
=C2=A0do_build[nostamp] =3D "0"
+
+# Fetch package from the source link
+python do_fetch() {
+=C2=A0 =C2=A0 src_uri =3D (d.getVar('SRC_URI', True) or "&quo= t;).split()
+=C2=A0 =C2=A0 if len(src_uri) =3D=3D 0:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return
+
+=C2=A0 =C2=A0 try:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetcher =3D bb.fetch2.Fetch(src_uri, d)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetcher.download()
+=C2=A0 =C2=A0 except bb.fetch2.BBFetchException as e:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 raise bb.build.FuncFailed(e)
+}
+
+addtask fetch before do_build
+do_fetch[dirs] =3D "${DL_DIR}"
+
+# Unpack package and put it into working directory in buildchroot
+python do_unpack() {
+=C2=A0 =C2=A0 src_uri =3D (d.getVar('SRC_URI', True) or "&quo= t;).split()
+=C2=A0 =C2=A0 if len(src_uri) =3D=3D 0:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return
+
+=C2=A0 =C2=A0 try:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetcher =3D bb.fetch2.Fetch(src_uri, d)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 fetcher.unpack(d.getVar('WORKDIR'= , True))
+=C2=A0 =C2=A0 except bb.fetch2.BBFetchException as e:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 raise bb.build.FuncFailed(e)
+}
+
+addtask unpack after do_fetch before do_build
+do_unpack[dirs] =3D "${WORKDIR}"
+do_unpack[stamp-extra-info] =3D "${DISTRO}"
--
2.13.0

--
You received this message because you are subscribed to the Google Groups &= quot;isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-u= sers+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/ef97842f18e67eb7140790542= c0d88a04490421f.1501582237.git.henning.schild%40siemens.com.<= br> For more options, visit https://groups.google.com/d/optout.

--001a113cf0e4cf83bf0555c2255f--