From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6460145516460113920 X-Received: by 10.25.201.131 with SMTP id z125mr247236lff.37.1504119838413; Wed, 30 Aug 2017 12:03:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.7.2 with SMTP id 2ls467325ljh.15.gmail; Wed, 30 Aug 2017 12:03:58 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7AK1u1YC7hgHXZvnSY46oG4WfHC+Gvc2ot3JP3r2oF5dnCW1ATssPwVDN2J1G480RXmWKW X-Received: by 10.46.25.157 with SMTP id 29mr270226ljz.11.1504119838160; Wed, 30 Aug 2017 12:03:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504119838; cv=none; d=google.com; s=arc-20160816; b=0abrKGn1ps/4PJIIdV9n2MWdsyeVesmmjlGos01Qg0kXnr0LiFXR80OP8p1rVOsUgj 2WfJmPVGVZecUmYW3Q5rajdd7AZKIL4zRX6JX/flCQfZI5PObIjRpm5iO826QYN8G4xU n2S3keCZKRZ7d9ZF3mh0SR3xv7ojkxR6eB36p4wys5/rTkKw4PdST8m7wViJARNu6I+c 1KLCHXDYQbJ7KgWDZVlOVMyF5RncT6Qzs69sU856rLpn2qt3k9nOL7l1zPrJT0kNvC+K Mz2tP0F46PWK58sVoQdgWfkL6irX5Xyo8TAZOWW4GE+K9AxEuj5U0ZsAhnDsv0AqA9iT Sxzw== 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=sOK/W5o0dDaC0r5giH1u+KSJIgGhy4m4qIdDstmVGeQ=; b=H3caKYsJvuibdUTgBz0FDMbh63XRZFHseVwjOCAGCTBJ2U3VGyaQ7qBNw5789GKI3m dcfP11OZPAq6er5GDpRH0Zhjtkxt4IJHg8KzuTtH52weVXv+n7irlbvIk+GIqEROTi5C zZj+J7uZUxpyQhXHXMTAidg9Vg5eyRNRpb/e+35kENJizRR1/coVOcRYfZAFQ7No3Q8t Ky85ga+TIJPQi6lDYq0kjUT0FESlJU/X+h+Jrv3edAwq43VUeGY1J4gre8R8PP4C0LYT EBuyqxIFJ6EsmQCyt4b8+L+YJXFn5D6wBZMJ/a+OgQZL5smyAgVJZ3EaT9pN8zk69Sd/ bNJw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id e84si216708wmc.4.2017.08.30.12.03.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 12:03:58 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v7UJ3uxR015304 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Aug 2017 21:03:56 +0200 Received: from md1em3qc.ad001.siemens.net ([139.25.68.40]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id v7UJ3t5h027281; Wed, 30 Aug 2017 21:03:56 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Christian Storm , Claudius Heine , Henning Schild Subject: [PATCH 2/6] meta: Move 'do_fetch' and 'do_unpack' to base-class Date: Wed, 30 Aug 2017 21:03:53 +0200 Message-Id: <1d3a315a8ac98ba02800168b6f8bc50d95a96bb4.1504119538.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: X-TUID: UeKuk4TlNEKI Issues: unpack and fetch can only be used if you inherit dpkg, they should be available to others i.e. classes and images Change: Pull the code out of the dpdk-class and stick it into the base-class. It is the same code, no changes to it. Impact: This patch does not change the behaviour of Isar. It addresses the issue, preparing for future patches. Signed-off-by: Henning Schild --- meta/classes/base.bbclass | 36 ++++++++++++++++++++++++++++++++++++ meta/classes/dpkg.bbclass | 35 ----------------------------------- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 2179ba9..3cace37 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -58,6 +58,42 @@ python do_listtasks() { sys.__stdout__.write("%s\n" % e) } +do_fetch[dirs] = "${DL_DIR}" + +# 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_unpack[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" + +# Unpack package and put it into working directory +python do_unpack() { + src_uri = (d.getVar('SRC_URI', True) or "").split() + if len(src_uri) == 0: + return + + rootdir = d.getVar('WORKDIR', True) + + try: + fetcher = bb.fetch2.Fetch(src_uri, d) + fetcher.unpack(rootdir) + except bb.fetch2.BBFetchException as e: + raise bb.build.FuncFailed(e) +} + +addtask unpack after do_fetch before do_build + addtask build do_build[dirs] = "${TOPDIR}" python base_do_build () { diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 81e21ce..0b8c7c4 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -10,46 +10,11 @@ do_unpack[deptask] = "do_build" PP = "/home/builder/${PN}" BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" -do_fetch[dirs] = "${DL_DIR}" - -# 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_unpack[dirs] = "${BUILDROOT}" -do_unpack[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" S ?= "${BUILDROOT}" WORKDIR_task-unpack = "${BUILDROOT}" -# Unpack package and put it into working directory -python do_unpack() { - src_uri = (d.getVar('SRC_URI', True) or "").split() - if len(src_uri) == 0: - return - - rootdir = d.getVar('WORKDIR', True) - - try: - fetcher = bb.fetch2.Fetch(src_uri, d) - fetcher.unpack(rootdir) - except bb.fetch2.BBFetchException as e: - raise bb.build.FuncFailed(e) -} - -addtask unpack after do_fetch before do_build - do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" # Build package from sources using build script -- 2.13.5