From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.46.69.68 with SMTP id s65mr2301081lja.6.1501582560693; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.63.147 with SMTP id m141ls206407wma.0.canary-gmail; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) X-Received: by 10.28.147.136 with SMTP id v130mr61945wmd.15.1501582560257; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501582560; cv=none; d=google.com; s=arc-20160816; b=g4uHelRSZ8QvWLiGeKXtdD6BkX++s9REj9X3KDXNh+vnebpcrzJvCjYMj5c8i/Z3ey hMLITSHLpIeaaBWwXBTq6QV0O8K3uZ9m+eEY2U3uSrOihSywlf0/0kb4JgJ5YiXPYoY4 TaXj3QGI+Qr6WMS5oDlK5fYqEcx4mMvjYPT1svIVIg+JTCamS3XM1Jid6s/H+YL9ZtNZ hfibM7MhKGsN6QfqA/smhNV6TbSbwrQYSUMLnTzDOhrxPtD4gKxhocxtmV8FHhNzHeE7 CsSmMv6axFalIZEpPd8ccq1FpHj2cTDC2UhLhEUNt1ttj24DFLQMZYKYkE43O3fdiUzb TZyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=JFEI6ZLEenlmlNOXnCFKwrVVDjZvZJQIqCFKK0RjiW0=; b=qXROA9s+s0+uJo4/wvBWOldWM1guODXzXxm8NOHfjTQF6NFbxgAuDFkMy02638MsHM ONTS7G5H4ezDDobqeAPAFmmsKuWqErXHqoHrWO+po3Dl87auntWYWY5MbqdIjNKz1kMi aZAfBXzRDtOPl5nmWlzBP9mHCye3E1+tLiSX+FCKRe0Yed9GrQoy/+nAefxjHKpFrYlW yhnCaYFyvfcnKyJQapHhRaoe2AhJ2wjHKEiduzaIhy+56ysUA2C2Zo8p6gKQHADI8+J8 54C9NbBuhUFnfp5UQ/sQA2I5tjl4+ZOkLMK+DUO51rHaS7WnMEWwJxiXdHPlzZfqZcKa sDQw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m6si73989wmh.7.2017.08.01.03.16.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 03:16:00 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v71AFxk0010893 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 1 Aug 2017 12:15:59 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v71AFx63016179; Tue, 1 Aug 2017 12:15:59 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 08/16] classes: move fetch and unpack into isar-base Date: Tue, 1 Aug 2017 12:17:26 +0200 Message-Id: X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: LyauM88zU8jr 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" 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