From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6460145512724037632 X-Received: by 10.25.158.132 with SMTP id h126mr260212lfe.6.1504119837958; Wed, 30 Aug 2017 12:03:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.8.90 with SMTP id g26ls486077ljd.18.gmail; Wed, 30 Aug 2017 12:03:57 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6g8KFpETtHxGuV3aCPfroJtgweuvlXxZQILZLkN/P9EoSXA52hFlNCG/vJhmQK/ZVUEw0S X-Received: by 10.46.21.2 with SMTP id s2mr267579ljd.41.1504119837505; Wed, 30 Aug 2017 12:03:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504119837; cv=none; d=google.com; s=arc-20160816; b=sb/9bPxtlMt6JyYDGMvOwD20WWN9Up5NCcsTqi2CJ71iIC1jYndqjvF1+YRmMw2xpg zcEgdj6KZy5uYW86RKf5okVxrNsBs9xmrQ20d1BKduIi6XIX+bIaJ5R5Mh/vf3Umf2AU 0MLT0adFSz1gDxCMFjOhqxo/ZzUg/tCykq/fAH8z3CvBt0+w25UeeKXdu8qz7gaDdfk1 dSB/cY9NLAJuC65Y+oXtpRiNS5PGl8TbNKzPwxP3q4dywg08pp8WgIgPqUETgdaLJ97S jC//YocB2780daIQTjLkb1j+r0XNyUUGaDISF6wHMcRCdp5txKbokAo+ghDiqbAX7sFI uo9g== 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=ITp1np7Q1ZDN8RQ5dy5XD9Jh+Uecq0y8evxIb09joYg=; b=ZDL2UapLUWPVlGboHSrcRlr9IvN5jOBgMmBL/k1WiZ01qF3xcWa5rPns8ln/JA9y30 QKgC8I0F1oibGKhQlD2W+H6FxIqKK2uKgsuC3tWppl1Gbcrx9oKVe9b9/eJUIHKVaqnj 8GtF88U6Nmhb8C5ZC9xtc8RtcDQx+XEN+y/3P+rBGLtBAqP6kFMcGVRI91xIJa3mtvz1 odSX/1PlgAi6KchXioz35YKpyjbRouobiqrGn3FiYPCjds/qqBUh+Yi0QGb3X/4O8EzC MH+oOv+dEVAOAlBooKZOU1/1UM/WgzbEJU8dQOHNHY6zPBzuHrP3LAyO9ztBSMYUU4vf C/Og== 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 h11si54904wmd.0.2017.08.30.12.03.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 12:03:57 -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 mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v7UJ3uvG018159 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Aug 2017 21:03:56 +0200 Received: from md1em3qc.ad001.siemens.net ([139.25.68.40]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id v7UJ3t5j027281; Wed, 30 Aug 2017 21:03:56 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Christian Storm , Claudius Heine , Henning Schild Subject: [PATCH 4/6] meta/dpkg-debian: Make 'do_install' more generic, prepare for pulling out Date: Wed, 30 Aug 2017 21:03:55 +0200 Message-Id: X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: X-TUID: xmWhkLyKpgoy 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 --- 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