public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Alexander Smirnov <asmirnov@ilbers.de>,
	Henning Schild <henning.schild@siemens.com>,
	Claudius Heine <ch@denx.de>
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	[thread overview]
Message-ID: <20170912155810.9434-3-henning.schild@siemens.com> (raw)
In-Reply-To: <20170912155810.9434-1-henning.schild@siemens.com>

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 <henning.schild@siemens.com>
---
 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


  parent reply	other threads:[~2017-09-12 15:58 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-12 15:58 [PATCH v2 0/6] v4 of the custom debian package Henning Schild
2017-09-12 15:58 ` [PATCH v2 1/6] meta: Move 'do_fetch' and 'do_unpack' to base-class Henning Schild
2017-09-12 15:58 ` Henning Schild [this message]
2017-09-12 15:58 ` [PATCH v2 3/6] meta/dpkg: pull out actual build command from 'do_build' Henning Schild
2017-09-13 12:44   ` Alexander Smirnov
2017-09-13 13:41     ` Henning Schild
2017-09-13 14:40       ` Claudius Heine
2017-09-13 15:27         ` Henning Schild
2017-09-12 15:58 ` [PATCH v2 4/6] meta/dpkg: Move 'do_build' and buildchroot stuff to dpkg-base.bbclass Henning Schild
2017-09-12 15:58 ` [PATCH v2 5/6] meta/dpkg: add dpkg-raw class Henning Schild
2017-09-12 15:58 ` [PATCH v2 6/6] recipes-app/example-raw: add an example on how to use dpkg-raw Henning Schild
2017-09-13 11:39   ` Andreas Reichel
2017-09-14  7:28     ` Alexander Smirnov
2017-09-14  8:11       ` Henning Schild
2017-09-13 13:13   ` Alexander Smirnov
2017-09-13 14:15     ` Henning Schild
2017-09-13 15:06       ` Alexander Smirnov
2017-09-13 15:28         ` Henning Schild
2017-09-13 15:38           ` Alexander Smirnov
2017-09-14  8:33             ` Henning Schild
2017-09-12 17:07 ` [PATCH v2 0/6] v4 of the custom debian package Henning Schild
2017-09-13 15:00 ` [PATCH][FYI] dpkg-raw: Allow multiconfig build Alexander Smirnov
2017-09-13 15:09   ` Alexander Smirnov
2017-09-14  8:31     ` Henning Schild
2017-09-14 17:18 ` [PATCH v2 0/6] v4 of the custom debian package Alexander Smirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170912155810.9434-3-henning.schild@siemens.com \
    --to=henning.schild@siemens.com \
    --cc=asmirnov@ilbers.de \
    --cc=ch@denx.de \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox