[PATCH 4/6] meta/dpkg-debian: Make 'do_install' more generic, prepare for pulling out

[Henning Schild <henning.schild@siemens.com>]

Issue:
The 'do_install' in dpkg-debian is not generic since it wants to find the
debian package in BUILDROOT. And this variable is only meaningful in
this class.

Change:
Make do_install generic by making it look into WORKDIR and keep the
old semantic by overwriting this variable for the task do_install.

Impact:
This patch does not change the behaviour of Isar. It addresses the issue
and prepares for another patch pulling code to another class.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/dpkg-debian.bbclass | 13 +++----------
 meta/classes/dpkg.bbclass        | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 meta/classes/dpkg.bbclass

diff --git a/meta/classes/dpkg-debian.bbclass b/meta/classes/dpkg-debian.bbclass
index 7466254..5df3678 100644
--- a/meta/classes/dpkg-debian.bbclass
+++ b/meta/classes/dpkg-debian.bbclass
@@ -5,6 +5,8 @@
 # These sources need to be enabled for that, they need to have the
 # debian/ folder.
 
+inherit dpkg
+
 # Add dependency from buildchroot creation
 DEPENDS += "buildchroot"
 do_unpack[deptask] = "do_build"
@@ -18,6 +20,7 @@ do_unpack[dirs] = "${BUILDROOT}"
 S ?= "${BUILDROOT}"
 
 WORKDIR_task-unpack = "${BUILDROOT}"
+WORKDIR_task-install = "${BUILDROOT}"
 
 do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 
@@ -25,13 +28,3 @@ do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 do_build() {
     sudo chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${SRC_DIR}
 }
-
-
-# Install package to dedicated deploy directory
-do_install() {
-    install -m 644 ${BUILDROOT}/*.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
new file mode 100644
index 0000000..4fb2757
--- /dev/null
+++ b/meta/classes/dpkg.bbclass
@@ -0,0 +1,14 @@
+# This software is a part of ISAR.
+# Copyright (C) 2017 Siemens AG
+#
+# This class should contain common functionality of all classes or recipes
+# that create debian packages.
+
+# 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