From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6464921707679318016 X-Received: by 10.223.184.104 with SMTP id u37mr910403wrf.29.1505231882835; Tue, 12 Sep 2017 08:58:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.13.1 with SMTP id 1ls135129ljn.15.gmail; Tue, 12 Sep 2017 08:58:02 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6VKA1dOxUskB1YOr3ptt2tvhAQ5kxU0TY0TvLIPZCkc26Z4bHArumy08mRP0yeiNOvJKvF X-Received: by 10.46.33.202 with SMTP id h71mr1246593lji.3.1505231882546; Tue, 12 Sep 2017 08:58:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505231882; cv=none; d=google.com; s=arc-20160816; b=FBAVR1WIoxupTvrq5KJlsG9PdxEJw5gHSIMUWsb9x5/zUr4QdQRM/0uzGNfzJNSZBH SOE0vm/eBvoKp/M04E4bWOPfPkzHZOYgtkZwQFvH4dHCb5ii4wsm77EMWAz7Jb7QSVQW 5nv/LFXLI22fJE/wuhxJ9sazL1jamAaf7yZ5J2O9aQRVIl1EKYFwKBooF3TulyC0jyP5 TH+vV4GzhfalJ4+CmeEU0mnR6rlb9n5WS4XviPhUCAZEWgLve5JGTs9tHYpST0XXB+HN TVQ3WB9iX/LpNmV6S/dVb1HtcVWH1aAJXKd5AdenASjN77ZPT36F//kSw2rB786YhsSi xfdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=fy57EMsn5fYQggeN0+WNRyFfe9yZnNFe/b3i4jQzkSc=; b=ARwAJWOc7ROUheSBPERO1vLYGhg1r5AOrVEykheogtnz8+Z2WNPD7p/l0pT6D2cC7V ftviILAZxEYxap1kaVR7N69W+NnxACEW29yhGvuKgEdBmjSGhB5JDarIr4HdIGQDns8D mpoWXiA3/2RAHDxPJaNFqxFILil5HGQDTdUIjuK5soZlZXhpqM8NayHK4RU4d1a9YBKP Zmuf14NGFRPps5oUV7P2mUBQ51Oyu24jKEgmt6BbmOY0ZpvlLXN4Sbb934CcmaVTKSK2 JWtTE6KThStaYmdr75n7yi3lKHDGbC2755PebKa6RL3IE36shp//baK2C3kGc679PeI/ Ao4A== 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 m74si290411wma.0.2017.09.12.08.58.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 08:58:02 -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 v8CFw1ra011580 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Sep 2017 17:58:01 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id v8CFw19J001102; Tue, 12 Sep 2017 17:58:01 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Henning Schild , Claudius Heine Subject: [PATCH v2 2/6] meta/dpkg-debian: Move 'do_install' to new dpkg-base.bbclass Date: Tue, 12 Sep 2017 17:58:06 +0200 Message-Id: <20170912155810.9434-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170912155810.9434-1-henning.schild@siemens.com> References: <20170912155810.9434-1-henning.schild@siemens.com> X-TUID: b0CCKhN2g2kq Issue: The 'do_install' in dpkg can only be used in this class or one derived from it. But we are about to have another .deb-creating class, prepare for that and move common code out. Change: Move do_install to a generic class that can be inherited by more specific dpkg-classes. Impact: This patch does not change the behaviour of Isar. It addresses the issue and prepares for another patch. Signed-off-by: Henning Schild --- meta/classes/dpkg-base.bbclass | 11 +++++++++++ meta/classes/dpkg.bbclass | 12 ++---------- 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 meta/classes/dpkg-base.bbclass diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass new file mode 100644 index 0000000..64fd0e8 --- /dev/null +++ b/meta/classes/dpkg-base.bbclass @@ -0,0 +1,11 @@ +# This software is a part of ISAR. +# Copyright (C) 2017 Siemens AG + +# Install package to dedicated deploy directory +do_install() { + install -m 644 ${WORKDIR}/*.deb ${DEPLOY_DIR_DEB}/ +} + +addtask install after do_build +do_install[dirs] = "${DEPLOY_DIR_DEB}" +do_install[stamp-extra-info] = "${MACHINE}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 504fd1b..abd4cef 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 dpkg-base + # Add dependency from buildchroot creation DEPENDS += "buildchroot" do_build[deptask] = "do_build" @@ -20,13 +22,3 @@ do_build() { sudo umount ${BUILDROOT} rm -rf ${BUILDROOT} } - - -# Install package to dedicated deploy directory -do_install() { - install -m 644 ${WORKDIR}/*.deb ${DEPLOY_DIR_DEB}/ -} - -addtask install after do_build -do_install[dirs] = "${DEPLOY_DIR_DEB}" -do_install[stamp-extra-info] = "${MACHINE}" -- 2.13.5