From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 04/16] remove redundant variable THISDIR
Date: Tue, 1 Aug 2017 12:17:22 +0200 [thread overview]
Message-ID: <5ac96edda9115c2d1e7fd7b8c9aec563fbd07c05.1501582237.git.henning.schild@siemens.com> (raw)
In-Reply-To: <cover.1501582237.git.henning.schild@siemens.com>
In-Reply-To: <cover.1501582237.git.henning.schild@siemens.com>
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
.../doc/bitbake-user-manual/bitbake-user-manual-execution.xml | 2 +-
meta-isar/recipes-core/images/isar-image-base.bb | 8 ++++----
meta/classes/isar-base.bbclass | 2 --
meta/recipes-devtools/buildchroot/buildchroot.bb | 10 +++++-----
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
index ec75893..b9aafd1 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
@@ -765,7 +765,7 @@
the concept:
<literallayout class='monospaced'>
BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \
- SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \
+ SSTATE_DIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \
USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \
PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \
CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX"
diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index 337c329..0810de0 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -27,10 +27,10 @@ do_rootfs() {
install -d -m 755 ${WORKDIR}/hooks_multistrap
# Copy config file
- install -m 644 ${THISDIR}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf
- install -m 755 ${THISDIR}/files/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh
- install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR}
- install -m 755 ${THISDIR}/files/download_dev-random ${WORKDIR}/hooks_multistrap/
+ install -m 644 ${FILESDIR}/multistrap.conf.in ${WORKDIR}/multistrap.conf
+ install -m 755 ${FILESDIR}/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh
+ install -m 755 ${FILESDIR}/setup.sh ${WORKDIR}
+ install -m 755 ${FILESDIR}/download_dev-random ${WORKDIR}/hooks_multistrap/
# Adjust multistrap config
sed -i 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|' ${WORKDIR}/multistrap.conf
diff --git a/meta/classes/isar-base.bbclass b/meta/classes/isar-base.bbclass
index 25809fa..33b0369 100644
--- a/meta/classes/isar-base.bbclass
+++ b/meta/classes/isar-base.bbclass
@@ -1,3 +1 @@
-THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}"
-
do_build[nostamp] = "0"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index ba1bc66..f471f5e 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -29,10 +29,10 @@ do_build() {
install -d -m 755 ${WORKDIR}/hooks_multistrap
# Copy config files
- install -m 644 ${THISDIR}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf
- install -m 755 ${THISDIR}/files/configscript.sh ${WORKDIR}
- install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR}
- install -m 755 ${THISDIR}/files/download_dev-random ${WORKDIR}/hooks_multistrap/
+ install -m 644 ${FILESDIR}/multistrap.conf.in ${WORKDIR}/multistrap.conf
+ install -m 755 ${FILESDIR}/configscript.sh ${WORKDIR}
+ install -m 755 ${FILESDIR}/setup.sh ${WORKDIR}
+ install -m 755 ${FILESDIR}/download_dev-random ${WORKDIR}/hooks_multistrap/
# Adjust multistrap config
sed -i 's|##BUILDCHROOT_PREINSTALL##|${BUILDCHROOT_PREINSTALL}|' ${WORKDIR}/multistrap.conf
@@ -51,7 +51,7 @@ do_build() {
sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f "${WORKDIR}/multistrap.conf" || true
# Install package builder script
- sudo install -m 755 ${THISDIR}/files/build.sh ${BUILDCHROOT_DIR}
+ sudo install -m 755 ${FILESDIR}/build.sh ${BUILDCHROOT_DIR}
# Configure root filesystem
sudo chroot ${BUILDCHROOT_DIR} /configscript.sh
--
2.13.0
next prev parent reply other threads:[~2017-08-01 10:16 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-01 10:17 [PATCH 00/16] fixes and introducing dpdk-bin support Henning Schild
2017-08-01 10:17 ` [PATCH 01/16] meta: ext4-img: copy and keep attributes, always copy with sudo Henning Schild
2017-08-02 7:48 ` Alexander Smirnov
2017-08-02 11:18 ` Henning Schild
2017-10-19 18:04 ` Henning Schild
2017-10-19 19:41 ` Alexander Smirnov
2017-08-01 10:17 ` [PATCH 02/16] meta: classes: use base.bbclass from bitbake Henning Schild
[not found] ` <CAJmB2rBjBqHxPKTna-XUtgmW9i-ooQwbACyFgQTQahTqUAxHcg@mail.gmail.com>
2017-08-02 8:21 ` Alexander Smirnov
2017-08-01 10:17 ` [PATCH 03/16] meta: isar-base: remove unused function Henning Schild
[not found] ` <CAJmB2rBwssbfjgqL2wAsOFfGUK7DbBY31tF_QhR09Ot0rmRVjQ@mail.gmail.com>
2017-08-02 8:20 ` Alexander Smirnov
2017-08-01 10:17 ` Henning Schild [this message]
2017-08-02 8:25 ` [PATCH 04/16] remove redundant variable THISDIR Alexander Smirnov
2017-08-02 11:20 ` Henning Schild
2017-08-01 10:17 ` [PATCH 05/16] meta: conf: use bitbake.conf from bitbake and apply local changes Henning Schild
2017-08-02 8:34 ` Alexander Smirnov
2017-08-02 11:22 ` Henning Schild
2017-08-01 10:17 ` [PATCH 06/16] meta: conf: clean up local bitbake config Henning Schild
2017-08-02 8:35 ` Alexander Smirnov
2017-08-02 11:23 ` Henning Schild
2017-08-01 10:17 ` [PATCH 07/16] classes: use WORKDIR and get rid of BUILDROOT Henning Schild
2017-08-02 9:24 ` Alexander Smirnov
2017-08-02 11:30 ` Henning Schild
2017-08-03 11:24 ` Henning Schild
2017-08-01 10:17 ` [PATCH 08/16] classes: move fetch and unpack into isar-base Henning Schild
2017-08-02 9:47 ` Alexander Smirnov
2017-08-02 11:33 ` Henning Schild
2017-08-01 10:17 ` [PATCH 09/16] meta: dpdk use [dirs] directive instead of mkdir Henning Schild
2017-08-01 10:17 ` [PATCH 10/16] meta: dpkg: reorder and rename do_install to install in addtask Henning Schild
2017-08-01 10:17 ` [PATCH 11/16] meta: classes: make do_build always the end of the task-chain Henning Schild
2017-08-02 9:54 ` Alexander Smirnov
2017-08-02 12:05 ` Henning Schild
2017-08-01 10:17 ` [PATCH 12/16] meta: dpkg rename install to install_package Henning Schild
2017-08-02 9:59 ` Alexander Smirnov
2017-08-01 10:17 ` [PATCH 13/16] meta: classes: move install_package to isar-base Henning Schild
2017-08-01 11:48 ` Claudius Heine
2017-08-01 14:00 ` Claudius Heine
2017-08-01 15:01 ` Henning Schild
2017-08-01 10:17 ` [PATCH 14/16] meta: classes: rename dpkg to dpkg-src Henning Schild
2017-08-02 10:02 ` Alexander Smirnov
2017-08-03 15:37 ` Henning Schild
2017-08-03 15:45 ` Jan Kiszka
2017-08-01 10:17 ` [PATCH 15/16] meta: add dpkg-bin class Henning Schild
2017-08-01 14:25 ` Claudius Heine
2017-08-01 15:10 ` Claudius Heine
2017-08-02 10:11 ` Alexander Smirnov
2017-08-02 10:25 ` Henning Schild
2017-08-02 12:31 ` Henning Schild
2017-08-02 12:50 ` Jan Kiszka
2017-08-02 13:40 ` Henning Schild
2017-08-02 15:03 ` Claudius Heine
2017-08-03 7:57 ` Henning Schild
2017-08-03 10:39 ` Claudius Heine
2017-08-03 14:17 ` Henning Schild
2017-08-02 11:11 ` Claudius Heine
2017-08-02 11:17 ` Claudius Heine
2017-08-02 11:26 ` Claudius Heine
2017-08-01 10:17 ` [PATCH 16/16] recipes-app/hello-bin: add example on how to use dpkg-bin Henning Schild
2017-08-02 6:33 ` Jan Kiszka
2017-08-02 6:55 ` Claudius Heine
2017-08-03 18:48 ` Henning Schild
2017-08-01 10:23 ` [PATCH 00/16] fixes and introducing dpdk-bin support Henning Schild
2017-08-01 11:24 ` Claudius Heine
2017-08-11 9:15 ` Alexander Smirnov
2017-08-11 10:35 ` 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=5ac96edda9115c2d1e7fd7b8c9aec563fbd07c05.1501582237.git.henning.schild@siemens.com \
--to=henning.schild@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