From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6460145512724037632 X-Received: by 10.223.168.41 with SMTP id l38mr123259wrc.24.1504859739218; Fri, 08 Sep 2017 01:35:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.144.147 with SMTP id s141ls238315wmd.20.gmail; Fri, 08 Sep 2017 01:35:38 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBsVFRyhIxRc1HRhBJnB395TSUiQ9kkwAcBmozOz+hdYTs7u/aLT1ujJ/RxDTB355hF6bAg X-Received: by 10.28.87.132 with SMTP id l126mr132776wmb.23.1504859738866; Fri, 08 Sep 2017 01:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504859738; cv=none; d=google.com; s=arc-20160816; b=kt7Uyh0/Pdy24npDb8ehSsn1fC036lLQFKQ0yWMlt/iVghYpG4tLFBSoGANy+ipBcq swAXdcsA4GGjzF3a6QuK22AkeStJTsG2xnPfn5C9m93as8xIpUU6C6leIpw5j5dEMw95 bU9r2cTyhcp6bzYRbwiZRCuHl7le6tcXszcc54CC7puytatDJY19u7ZzdszgFz7T5Keo ts3GZOGEzkIsjfwaRdlNkV+zzZNOPjpp6mGp0oiizcgBN5iNsM792WSI6STDQraoEQEB V0kf4EzJqX/bjqq9H3FAbj5hMBflGsD8CBCgajid2g6S7H3WxvLDexiU1OSg9oqn3zhB dytw== 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=90nVPEXQvPmyDYNCMrbClICgkITptzl4EmLLa+hhKgE=; b=gvmJKdfRuWSlwUuJ4hBKUBlnlcrpgmjZ0m1j0OPHarWSdi0q125uDTsBOgul6SiVYr JzV4f+NpX83t8j/t+D9ET29UVHuR1nhDD85KWuF5wyRJiPyTt/3CBE8Px+I16XIb4sj4 p6kLf7Zahf/Po6UulbElmkyyvNXY+qscBMTjT+dQW4kF+8hx8lBMzUs6HuL87Z+jRIsx Tv4tn3RVR7MXkKyN8cguk3GZZrk8cowZ0zQ1hqrrYefdu0FcyLbb2VBdY+Zn9xeQp72G cvjnnPDC+QrXa6oM0G0pXTwwvIV5v9fSO2oJQhP5ia/N10X7BGC8uABamb8f0iKCI+78 k64w== 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 b196si72775wmd.2.2017.09.08.01.35.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 01:35:38 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v888ZWHi010759 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 8 Sep 2017 10:35:32 +0200 Received: from md1em3qc ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v888ZWtw007305; Fri, 8 Sep 2017 10:35:32 +0200 Date: Fri, 8 Sep 2017 10:35:41 +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: <20170908103541.23f88f78@md1em3qc> In-Reply-To: <20170830210917.7583cd2f@md1em3qc> References: <20170830210917.7583cd2f@md1em3qc> 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: y7jbhO7Lh2ic Am Wed, 30 Aug 2017 21:09:17 +0200 schrieb "[ext] Henning Schild" : > This was supposed to be a two step thing, first make it generic later > pull it out. Some mistake in rebasing ... will fix. Please still review this patch as required for this series. It is similar to 1 and 2 and the same disussions about WORKDIR vs BUILDROOT and splitting apply. Henning > 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}" >