From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6443790524544450560 X-Received: by 10.25.193.148 with SMTP id r142mr372940lff.0.1500311895396; Mon, 17 Jul 2017 10:18:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.80.69 with SMTP id v5ls68816ljd.47.gmail; Mon, 17 Jul 2017 10:18:15 -0700 (PDT) X-Received: by 10.46.5.211 with SMTP id 202mr3117582ljf.28.1500311895180; Mon, 17 Jul 2017 10:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500311895; cv=none; d=google.com; s=arc-20160816; b=Ns5f9AdsU99jmw9Waa0s7fnNUw5rUr8HKH2YcDimPxXx2Pxm+Eej0SHrBup6UoeTOb v0r0gP3DhWnJgIxLTvYmuVoE8QozxYILPNCi0z/94OC3aH8WEFp3cYbIYJOlWDqTvOoX h106U4b+IjQxPoFMR/u20mp0Pj8HHSuu8X5OoelrXG6vI4fdykprQhPTN1gbwQlRYpn/ 2zc3WTOGB2PApUTYue67JQToojhF7mKCjVK2GaKeT1IMDS9DzwC2VXtzt7lx93b3aYFt exKJly2sHatSjGQkSkwKrUEgc1VB0qk2ScdqWsUrtjma//i14KkyQUE/7IqyNL22zulL ht4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=cQccE2KmrC46t/gHvyJHL1NVPdCBS8XplO0RWnrvlRk=; b=SGm/4HBF2f4jeB8RYChA1AcZkesXF+bw+GbKqW/Xi7Rt+QRw3R9t+oaiIL04urtlDK y/ZQ45t2pnp5PHl0CeQ4SBRxlgIJelw8hT7D8DwPK+VJGVmEMbHtw/RQ13JmYgRMkil4 HdE4q3UA0jmhKX+475VCax7QSfW5GWVa4OP5LDnTn5gbf4CYvHbZk+HpvfT7xyfR/VsJ bUwarpvmtlKKCeyiX/QexWv7Kxi69d0lRwutwyd8S82K4VEbjP57opY7jdwEMGtz1LoE RiuwxQRuWAFoQ6NNAf8p8ALdsG3A0fPitP2JdVx9VrtnHl/jHX0NT5fOfZzQGqbjZ6JW 51uA== 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 t129si3348940wmt.2.2017.07.17.10.18.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 10:18:15 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v6HHIE4q011739 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 17 Jul 2017 19:18:14 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v6HHIESn012511; Mon, 17 Jul 2017 19:18:14 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 1/2] meta: classes: use base.bbclass from bitbake Date: Mon, 17 Jul 2017 19:20:00 +0200 Message-Id: <20170717172001.6656-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.13.0 X-TUID: uPx9mjrMp7KL 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 | 17 +++++++++ 4 files changed, 22 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 f7ace54..3faa976 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 5652757..4c07b10 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..cbb15b1 --- /dev/null +++ b/meta/classes/isar-base.bbclass @@ -0,0 +1,17 @@ +inherit base + +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