From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247987863388160 X-Received: by 10.46.33.221 with SMTP id h90mr252148lji.31.1501761245308; Thu, 03 Aug 2017 04:54:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.81.9 with SMTP id f9ls81494ljb.23.gmail; Thu, 03 Aug 2017 04:54:04 -0700 (PDT) X-Received: by 10.25.141.81 with SMTP id p78mr222764lfd.19.1501761244821; Thu, 03 Aug 2017 04:54:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501761244; cv=none; d=google.com; s=arc-20160816; b=jZ0cYrTMjhygN5+rbDW46i5ecloEeARFT9Q22nOWPLgs34KGl06ikJtcyb8dr53dNa hTcCdV6jMHI+4Q5NC8L4qTBW+2xulw0oShjmkza0uZpAVGLMLL8ZhvqHh7YprERwFoGC 9Wl1QaZnxA0ztixGcO/gUcdTCvo3/WWcUX6wai/K26C9ajPXqVcEDzv4bvipLji1D5iT nQ+vfn1w7vh0Az/PDQVjzHplgtnEb0k6yDDtTyTUK5mNyIk62bkE//ydBgFQEjZ7/hfI HGsbikN+k+FTA6AvgWanG1+QmFoa/qI8LIEOvUgFjvKduLHY8FkiUc14BFQ0d/Rgj/2A JsTA== 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=PXOC6/AwaCtjIX+oDyQRGctyY7B4yEpSakr3lNZH0II=; b=lViaVHd6qCa9DVV3CGiF9zqiSb8VtP5xFN1sY+SSPGAYO19ZrbADcaSB1cDJVChGAQ 8xxviukt+JedWBO2uT+jdCLLiRMQRuaCBUNdTCyPESzfMQiZ8OlL1Z6COW3AWGxo864e asi4Hpp+0HFFekGWKOVd1GeuCQ/9sCwrnMoGzP5nHRgur3YjgBX85y3j8I2NlIwbxA05 a6BWMtLpL0UfW0bqyxp1rojYMK8Gixda649pS/TmgjK84rkn5pj9dTR3IITACM/FZV+W Pu62rQ3nun0rKbv+2LfLI6TkH1k2DX8X79NKWdjHOlSB3My+QhzWozmSHrXuPKBXMe5u pSHg== 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 h133si624833wmg.2.2017.08.03.04.54.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 04:54:04 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v73Bs3WB001250 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Aug 2017 13:54:04 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v73Bs3Ao032676; Thu, 3 Aug 2017 13:54:03 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Henning Schild Subject: [PATCH 0-10 of 16 v2 1/8] meta: classes: use base.bbclass from bitbake Date: Thu, 3 Aug 2017 13:55:50 +0200 Message-Id: <87549e3e12d5e4f2ee2464ba0e47cfe3b1d91284.1501760818.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: gQdW2LOgZl2p Do not use our own copy of that class and move local deviations into isar-base. That also fixes the default tasks "showdata" and "listtasks", which probably never worked. Signed-off-by: Henning Schild --- meta/classes/base.bbclass | 81 +----------------------------------------- meta/classes/dpkg.bbclass | 2 ++ meta/classes/ext4-img.bbclass | 2 ++ meta/classes/isar-base.bbclass | 36 +++++++++++++++++++ 4 files changed, 41 insertions(+), 80 deletions(-) mode change 100644 => 120000 meta/classes/base.bbclass create mode 100644 meta/classes/isar-base.bbclass diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass deleted file mode 100644 index 48b6bac..0000000 --- a/meta/classes/base.bbclass +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (C) 2003 Chris Larson -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. - -THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" - -die() { - bbfatal "$*" -} - -bbnote() { - echo "NOTE:" "$*" -} - -bbwarn() { - echo "WARNING:" "$*" -} - -bbfatal() { - echo "FATAL:" "$*" - exit 1 -} - -bbdebug() { - test $# -ge 2 || { - echo "Usage: bbdebug level \"message\"" - exit 1 - } - - test ${@bb.msg.debug_level['default']} -ge $1 && { - shift - echo "DEBUG:" $* - } -} - -addtask showdata -do_showdata[nostamp] = "1" -python do_showdata() { - import sys - # emit variables and shell functions - bb.data.emit_env(sys.__stdout__, d, True) - # emit the metadata which isnt valid shell - for e in bb.data.keys(d): - if bb.data.getVarFlag(e, 'python', d): - sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1))) -} - -addtask listtasks -do_listtasks[nostamp] = "1" -python do_listtasks() { - import sys - for e in bb.data.keys(d): - if bb.data.getVarFlag(e, 'task', d): - sys.__stdout__.write("%s\n" % e) -} - -addtask build -do_build[dirs] = "${TOPDIR}" -python base_do_build () { - bb.note("The included, default BB base.bbclass does not define a useful default task.") - bb.note("Try running the 'listtasks' task against a .bb to see what tasks are defined.") -} - -EXPORT_FUNCTIONS do_clean do_mrproper do_build diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass new file mode 120000 index 0000000..11fe0a4 --- /dev/null +++ b/meta/classes/base.bbclass @@ -0,0 +1 @@ +../../bitbake/classes/base.bbclass \ No newline at end of file diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index a0446d7..3d7aafb 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -1,6 +1,8 @@ # This software is a part of ISAR. # Copyright (C) 2015-2016 ilbers GmbH +inherit isar-base + # Add dependency from buildchroot creation DEPENDS += "buildchroot" do_unpack[deptask] = "do_build" diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 65d4c11..1486c3e 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -1,6 +1,8 @@ # This software is a part of ISAR. # Copyright (C) 2015-2016 ilbers GmbH +inherit isar-base + # Extra space for rootfs in MB ROOTFS_EXTRA ?= "64" diff --git a/meta/classes/isar-base.bbclass b/meta/classes/isar-base.bbclass new file mode 100644 index 0000000..67d38a1 --- /dev/null +++ b/meta/classes/isar-base.bbclass @@ -0,0 +1,36 @@ +# This software is a part of ISAR. +# Copyright (C) 2017 Siemens AG +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" + +bbdebug() { + test $# -ge 2 || { + echo "Usage: bbdebug level \"message\"" + exit 1 + } + + test ${@bb.msg.debug_level['default']} -ge $1 && { + shift + echo "DEBUG:" $* + } +} + +do_build[nostamp] = "0" -- 2.13.0