From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Alexander Smirnov <asmirnov@ilbers.de>,
Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 2/2] meta: dpkg-raw: rename 'populate_package' to 'install'
Date: Fri, 15 Sep 2017 13:31:18 +0200 [thread overview]
Message-ID: <85fee89cc579e52f72ac49f55860eaf697963bdb.1505474867.git.henning.schild@siemens.com> (raw)
In-Reply-To: <c19b463dc33a5cade9cef8cae3ccd89c7541c038.1505474867.git.henning.schild@siemens.com>
In-Reply-To: <c19b463dc33a5cade9cef8cae3ccd89c7541c038.1505474867.git.henning.schild@siemens.com>
Issue:
dpkg-raw uses an unfamiliar name for the step where files make it into
${D}, people coming from OE or gentoo could be confused
Change:
Rename the task from to 'install' which in this case fits the
expectations of people coming from other/similar build systems.
Impact:
Everyone that already based recipes on dpdk-raw.bbclass will have to
change the name in these recipes as well.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
doc/technical_overview.md | 2 +-
meta-isar/recipes-app/example-raw/example-raw_0.1.bb | 2 +-
meta/classes/dpkg-raw.bbclass | 11 +++++------
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/doc/technical_overview.md b/doc/technical_overview.md
index c73cf08..3b150b1 100644
--- a/doc/technical_overview.md
+++ b/doc/technical_overview.md
@@ -170,7 +170,7 @@ Both consist of the following steps:
2. Task `do_unpack`: unpack those files to `${WORKDIR}`
-3. Task `do_populate_package` _only_ for `dpkg-raw`: copy all you want in your
+3. Task `do_install` _only_ for `dpkg-raw`: copy all you want in your
debian package to `${D}`, install hooks in `${D}/DEBIAN`
4. Task `do_build`: mount folder with unpacked files to buildchroot, execute
diff --git a/meta-isar/recipes-app/example-raw/example-raw_0.1.bb b/meta-isar/recipes-app/example-raw/example-raw_0.1.bb
index 8cd2626..08c7277 100644
--- a/meta-isar/recipes-app/example-raw/example-raw_0.1.bb
+++ b/meta-isar/recipes-app/example-raw/example-raw_0.1.bb
@@ -12,7 +12,7 @@ SRC_URI = "file://README \
inherit dpkg-raw
-do_populate_package() {
+do_install() {
bbnote "Creating ${PN} binary"
echo "#!/bin/sh" > ${WORKDIR}/${PN}
echo "echo Hello ISAR! ${PN}_${PV}" >> ${WORKDIR}/${PN}
diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
index 6c6a89c..af62be4 100644
--- a/meta/classes/dpkg-raw.bbclass
+++ b/meta/classes/dpkg-raw.bbclass
@@ -9,16 +9,15 @@ MAINTAINER ?= "FIXME Unknown maintainer"
D = "${WORKDIR}/image/"
# Populate folder that will be picked up as package
-# TODO this should be called 'do_install'
-do_populate_package() {
+do_install() {
bbnote "Put your files for this package in ${D}"
}
-do_populate_package[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
-addtask populate_package after do_unpack before do_deb_package_prepare
+do_install[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
+addtask install after do_unpack before do_deb_package_prepare
# so we can put hooks etc. in there already
-do_populate_package[dirs] = "${D}/DEBIAN"
+do_install[dirs] = "${D}/DEBIAN"
do_deb_package_prepare() {
cat<<-__EOF__ > ${D}/DEBIAN/control
@@ -41,7 +40,7 @@ do_deb_package_prepare() {
}
do_deb_package_prepare[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
-addtask deb_package_prepare after do_populate_package before do_deb_package_conffiles
+addtask deb_package_prepare after do_install before do_deb_package_conffiles
do_deb_package_conffiles() {
CONFFILES=${D}/DEBIAN/conffiles
--
2.13.5
next prev parent reply other threads:[~2017-09-15 11:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-15 11:31 [PATCH 1/2] meta: dpkg-base: rename 'install' to 'deploy_deb' Henning Schild
2017-09-15 11:31 ` Henning Schild [this message]
2017-09-19 15:15 ` Alexander Smirnov
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=85fee89cc579e52f72ac49f55860eaf697963bdb.1505474867.git.henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=asmirnov@ilbers.de \
--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