From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6450128687666823168 X-Received: by 10.28.148.23 with SMTP id w23mr51742wmd.0.1501787613899; Thu, 03 Aug 2017 12:13:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.13.67 with SMTP id 64ls54513wmn.8.gmail; Thu, 03 Aug 2017 12:13:33 -0700 (PDT) X-Received: by 10.223.171.166 with SMTP id s35mr327101wrc.4.1501787613646; Thu, 03 Aug 2017 12:13:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501787613; cv=none; d=google.com; s=arc-20160816; b=J2ZgoZ/8Zf8ZAV0ViQMS0Ewpy6RL21TerofVV8UnK8Tw4bV+G3k2dn1PD4G1lCuI+3 eVa66BJFDyWWY6zz7QnpRCh/J7UpOdy67zBc3XIYYb0bFnAzxYB99qm3vSa/qDF+fCB7 iCb9wNcoA3uygq9HGPQmVHYSs4F2Ml15Oif4mnyK+dzOYWaXYRwfrZe/gmaFYfsTtfg9 CenZyWVCnQVMA8pSd8wlPGT5yiYo1Vss3vg61b21N3fmXAzc70lRuJwZYd5ufH/V9Oev /6MvLMWlPBSsLNixaawnZrDXm4X66Ld2+7T506MJpgCNlbptilvAL1SZ/o/V2hUR1lLz vLag== 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=5Kqb7X0DZGhuYjio3tFdmJWsB34YJ4O33exAsD+cHJ4=; b=yrxk5AiiKqc7lymla5sYCOkkFgOuWrZxT46bl1QIhmxc9p+uMUSE3mKzqF9q5dEtjN LBRKZL1Ei2jG7Dki5PuB2edJ+LjfCfpluN9pEptOIa/I50hV8nH88VpgNlBOaNrbIh9q pN38V7rDu+HdKRLFklhoFf5ycS71qN0e/Sb1qT9OHg5JQftJId9gaK+MLak0RMgW+AAk 8N4AnAVjoFqknKLYiD+0RLDvtNC5KDUBOvX4rFsbTyEFWvISrnZ8lfAmqkN2EoDSE5Sx ItvctuUCIqNvNC35za+7mTjXmjzQLsVmV4IAS8adCwWocdMc61jZHv4f1YcNZuXSG9q/ bkLw== 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 z192si1178208wmz.5.2017.08.03.12.13.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 12:13:33 -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 v73JDWiT015824 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Aug 2017 21:13:32 +0200 Received: from md1em3qc.erlm.siemens.de ([139.22.106.2]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v73JDVpi008615; Thu, 3 Aug 2017 21:13:32 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Henning Schild Subject: [PATCH 11-16 of 16 v2 3/6] meta: classes: move package_write_deb to new class isar-base-dpkg Date: Thu, 3 Aug 2017 21:15:21 +0200 Message-Id: X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: z7B42eVBwiWj This step is generic to later classes that generate .deb files. This is preparing for another class doing so. Signed-off-by: Henning Schild --- meta/classes/dpkg.bbclass | 20 +------------------ meta/classes/isar-base-dpkg.bbclass | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 meta/classes/isar-base-dpkg.bbclass diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index e86e0f4..ca687de 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -1,33 +1,15 @@ # This software is a part of ISAR. # Copyright (C) 2015-2016 ilbers GmbH -inherit isar-base +inherit isar-base-dpkg # Add dependency from buildchroot creation DEPENDS += "buildchroot" do_unpack[deptask] = "do_build" -# Each package should have its own unique build folder, so use -# recipe name as identifier -PP = "/home/builder/${PN}" -BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" -S ?= "${BUILDROOT}" - -# make the unpacker extract to BUILDROOT -WORKDIR_task-unpack = "${BUILDROOT}" - do_build[stamp-extra-info] = "${DISTRO}" # Build package from sources using build script do_build() { sudo chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${SRC_DIR} } - -# Install package to dedicated deploy directory -do_package_write_deb() { - install -m 644 ${BUILDROOT}/*.deb ${DEPLOY_DIR_DEB}/ -} - -addtask package_write_deb after do_build -do_package_write_deb[dirs] = "${DEPLOY_DIR_DEB}" -do_package_write_deb[stamp-extra-info] = "${MACHINE}" diff --git a/meta/classes/isar-base-dpkg.bbclass b/meta/classes/isar-base-dpkg.bbclass new file mode 100644 index 0000000..e2c151b --- /dev/null +++ b/meta/classes/isar-base-dpkg.bbclass @@ -0,0 +1,40 @@ +# 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. + +inherit isar-base + +# Each package should have its own unique build folder, so use +# recipe name as identifier +PP = "/home/builder/${PN}" +BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" +S ?= "${BUILDROOT}" + +# make the unpacker extract to BUILDROOT +WORKDIR_task-unpack = "${BUILDROOT}" + +# Install package to dedicated deploy directory +do_package_write_deb() { + install -m 644 ${BUILDROOT}/*.deb ${DEPLOY_DIR_DEB}/ +} + +addtask package_write_deb after do_build +do_package_write_deb[dirs] = "${DEPLOY_DIR_DEB}" +do_package_write_deb[stamp-extra-info] = "${MACHINE}" -- 2.13.0