public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH 1/3] isar-image: Allow paths in DISTRO_CONFIG_SCRIPT
Date: Fri, 18 Jan 2019 17:24:38 +0100	[thread overview]
Message-ID: <58bbf6d0d0a0456f11bd71355ac34cab94ab67f4.1547828680.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1547828680.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1547828680.git.jan.kiszka@siemens.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

This allows to specify DISTRO_CONFIG_SCRIPT by relative or absolute
paths, required in order to pull it from layers != meta.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/isar-image.bbclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
index 7efde7d..237e2cb 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -52,9 +52,10 @@ isar_image_conf_rootfs() {
     # Configure root filesystem
     if [ -n "${DISTRO_CONFIG_SCRIPT}" ]; then
         sudo install -m 755 "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" "${IMAGE_ROOTFS}"
-        sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} "${MACHINE_SERIAL}" \
-                                                             "${BAUDRATE_TTY}"
-        sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}"
+        TARGET_DISTRO_CONFIG_SCRIPT="$(basename ${DISTRO_CONFIG_SCRIPT})"
+        sudo chroot ${IMAGE_ROOTFS} "/$TARGET_DISTRO_CONFIG_SCRIPT" \
+                                    "${MACHINE_SERIAL}" "${BAUDRATE_TTY}"
+        sudo rm "${IMAGE_ROOTFS}/$TARGET_DISTRO_CONFIG_SCRIPT"
    fi
 }
 
-- 
2.16.4


  reply	other threads:[~2019-01-18 16:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-18 16:24 [PATCH 0/3] Follow-up fixes to meta/meta-isar reorganisation Jan Kiszka
2019-01-18 16:24 ` Jan Kiszka [this message]
2019-01-18 16:24 ` [PATCH 2/3] Remove last reference from meta to meta-isar Jan Kiszka
2019-01-18 16:24 ` [PATCH 3/3] doc: Fix licenses path in user manual Jan Kiszka
2019-01-23 13:41 ` [PATCH 0/3] Follow-up fixes to meta/meta-isar reorganisation Maxim Yu. Osipov

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=58bbf6d0d0a0456f11bd71355ac34cab94ab67f4.1547828680.git.jan.kiszka@siemens.com \
    --to=jan.kiszka@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