From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6460145512724037632 X-Received: by 10.25.223.86 with SMTP id q22mr256226lfj.14.1504120167068; Wed, 30 Aug 2017 12:09:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.178.75 with SMTP id b72ls974879wmf.27.canary-gmail; Wed, 30 Aug 2017 12:09:26 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7zXt1pFwlXTG2xmJhYjFba11h1oAdu7ZB+v03B0TAowlx99erHgw/prPi1CRy71n6+pUHr X-Received: by 10.28.150.22 with SMTP id y22mr293291wmd.24.1504120166910; Wed, 30 Aug 2017 12:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504120166; cv=none; d=google.com; s=arc-20160816; b=SHLi06If6YttFOm6gOdvN8/pXFW+PpOYr42VL+arTZEvVUftnHRZo+sf58w+3yZXS3 3HoMUgCyb6CmnruZS+YwmHOvXng1SidPc6TgP+eyF5Np1YUyhcbgOjLdsBNxvcIb5iga ajF/a16oUHi+Lz2dqz0w8Ud7HfZYKVS6w4JhFxsAzq+WUVZva9Lj0piIyZiCwukAvG28 I8FV61/qTyAaMnO/LSgkUh5VIEgUILWsHwOwsqR7Ia2MFCObo0c9VtgefcxY64LReLxV w4BKQI/ITDzX3Ofis7V0fNAsO4CZHJEkaO7wU9V5UgZH0tXiKUw7xdIs/h7xtBg0AKCQ YEqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=1yHNy0JC/b7y3jn1587t5DAW1Fxb+RYRqdAUk+fNsHU=; b=UUN0wDy6zI8oLhSszCzwCnHVVwnIMSZLfI99+TBfRQA9hdVl1KxjM9oeKeesXpspZw VKibx13zsQDViem+meUOkKHNvJApRNwIKbM8ipTpSHIQ4MTyc4BlF7CtADi7xwsnaNtj Wpmz3K+FDWUoYzEIWuszrb2R94LNYapex6bD/YsKGdumpQIE08QP3arPwM0C+L3VEZhx i+w2grH1m+J3bY9gE451X0vZHuurVAs2j6ukBUsm6S4AW6lTMK4gaN7Xue6LugAjWoyY G6184VCjAsmsuMQ7O2kCDvaS3dHPg/aaJCE/s+CyUA3NouObxGfsqNlssCJV2RotEugF uwig== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id h11si55638wmd.0.2017.08.30.12.09.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 12:09:26 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v7UJ9Ebg029658 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Aug 2017 21:09:14 +0200 Received: from md1em3qc ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v7UJ9ERr026532; Wed, 30 Aug 2017 21:09:14 +0200 Date: Wed, 30 Aug 2017 21:09:17 +0200 From: Henning Schild To: Cc: Alexander Smirnov , Christian Storm , Claudius Heine Subject: Re: [PATCH 4/6] meta/dpkg-debian: Make 'do_install' more generic, prepare for pulling out Message-ID: <20170830210917.7583cd2f@md1em3qc> In-Reply-To: References: X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: HnujxG2zRJnT This was supposed to be a two step thing, first make it generic later pull it out. Some mistake in rebasing ... will fix. Henning Am Wed, 30 Aug 2017 21:03:55 +0200 schrieb Henning Schild : > 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}"