From: Henning Schild <henning.schild@siemens.com>
To: <isar-users@googlegroups.com>
Cc: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>,
Christian Storm <christian.storm@siemens.com>,
Claudius Heine <ch@denx.de>
Subject: Re: [PATCH 4/6] meta/dpkg-debian: Make 'do_install' more generic, prepare for pulling out
Date: Wed, 30 Aug 2017 21:09:17 +0200 [thread overview]
Message-ID: <20170830210917.7583cd2f@md1em3qc> (raw)
In-Reply-To: <dc2113d45afa77464052024a11d4b8bfe7811063.1504119538.git.henning.schild@siemens.com>
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 <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}"
next prev parent reply other threads:[~2017-08-30 19:09 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 19:03 [PATCH 0/6] v3 of getting the custom debian package in Henning Schild
2017-08-30 19:03 ` [PATCH 1/6] meta/dpkg: Make 'do_unpack' more generic, prepare for pulling out Henning Schild
2017-09-04 15:11 ` Alexander Smirnov
2017-09-04 16:47 ` Jan Kiszka
2017-09-05 7:05 ` Claudius Heine
2017-09-05 7:25 ` Alexander Smirnov
2017-09-05 7:37 ` Alexander Smirnov
2017-09-05 7:56 ` Claudius Heine
2017-09-08 8:30 ` Henning Schild
2017-09-08 8:44 ` Claudius Heine
2017-09-08 9:03 ` Henning Schild
2017-08-30 19:03 ` [PATCH 2/6] meta: Move 'do_fetch' and 'do_unpack' to base-class Henning Schild
2017-09-04 15:14 ` Alexander Smirnov
2017-09-04 16:03 ` Jan Kiszka
2017-09-04 16:10 ` Alexander Smirnov
2017-09-04 16:11 ` Jan Kiszka
2017-09-04 16:39 ` Alexander Smirnov
2017-09-04 16:45 ` Jan Kiszka
2017-08-30 19:03 ` [PATCH 3/6] meta/dpkg: rename to dpkg-debian and add comment Henning Schild
2017-08-31 8:23 ` Claudius Heine
2017-09-04 15:17 ` Alexander Smirnov
2017-09-04 16:05 ` Jan Kiszka
2017-08-30 19:03 ` [PATCH 4/6] meta/dpkg-debian: Make 'do_install' more generic, prepare for pulling out Henning Schild
2017-08-30 19:09 ` Henning Schild [this message]
2017-09-08 8:35 ` Henning Schild
2017-08-30 19:03 ` [PATCH 5/6] meta/dpkg: add dpkg-custom class Henning Schild
2017-08-31 8:38 ` Claudius Heine
2017-08-31 8:42 ` Jan Kiszka
2017-08-31 9:10 ` Claudius Heine
2017-08-31 9:32 ` Henning Schild
2017-08-31 12:14 ` Claudius Heine
2017-08-31 13:39 ` Henning Schild
2017-09-11 8:39 ` Alexander Smirnov
2017-08-31 8:53 ` Claudius Heine
2017-08-31 10:21 ` Henning Schild
2017-09-04 15:36 ` Alexander Smirnov
2017-09-04 16:08 ` Jan Kiszka
2017-09-04 16:30 ` Alexander Smirnov
2017-09-04 16:53 ` Jan Kiszka
2017-09-08 8:20 ` Henning Schild
2017-09-08 8:15 ` Henning Schild
2017-09-08 8:31 ` Alexander Smirnov
2017-09-08 8:42 ` Henning Schild
2017-09-08 8:50 ` Alexander Smirnov
2017-09-11 8:13 ` Claudius Heine
2017-09-11 8:19 ` Henning Schild
2017-09-11 9:12 ` Claudius Heine
2017-09-11 8:42 ` Claudius Heine
2017-08-30 19:03 ` [PATCH 6/6] recipes-app/example-custom: add example on how to use dpkg-custom Henning Schild
2017-09-04 15:40 ` Alexander Smirnov
2017-09-06 7:36 ` Henning Schild
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=20170830210917.7583cd2f@md1em3qc \
--to=henning.schild@siemens.com \
--cc=alex.bluesman.smirnov@gmail.com \
--cc=ch@denx.de \
--cc=christian.storm@siemens.com \
--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