From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6647873572602642432 X-Received: by 2002:a17:906:5999:: with SMTP id j25-v6mr2488628ejq.11.1547828683229; Fri, 18 Jan 2019 08:24:43 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:ad59:: with SMTP id z25ls3211556edc.4.gmail; Fri, 18 Jan 2019 08:24:42 -0800 (PST) X-Google-Smtp-Source: ALg8bN7QgD1zPyvoDETaUYDVYrX6BxYi+cn4ak7EYpZbihWdQQXSYqq0prbcHkbIYtTxQC1Wx1OX X-Received: by 2002:a50:ac53:: with SMTP id w19mr2773303edc.3.1547828682741; Fri, 18 Jan 2019 08:24:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547828682; cv=none; d=google.com; s=arc-20160816; b=s4EdtDYg0cRA5mo6yONOW5EhUbVwtHBRW7jzd5ZkhGAR1aFiEbOovTsh0cDgkXNjpl FqMpfQ8fPAylfpNIXjNP7jmVygID1FtcMgMlWdIjJwdLrKbNji5pWcdfIqFZoLb4e/92 kj7sQnS9Yotc6VdUtjPOrkEtEDGclfJH/Nvrv+7kFXX1Okn6erFQvSX8yIeFIEoZCvz9 R6CtTWIB+vvZLsN4cCWIUKf2YHb6xaa+nn6DbT/LDKbJNI5AcvBcgEEyXMj6qOv6fv2G nKdVDixZQvUhtIJVsiiU9dSCfsWlrwtsyOM3VyCsFG4p2uaZumaJaX8SFJpeIS+51gcG HmyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=HH840f5dBtLxkYMx7DhOGrONXYxSE7cyStZs0+beNwM=; b=RkXvzI4ZWnOJ2yDnSDThXV54jU38w3GtMAbpSIeGAui94PmnvzbjLvn9Knq0obp1r/ KTmYfiPv32biYUmEnh3vIAQKNO6mJ35HTBTCiViTzWRR1ioN3xdR7mGiOsxK3vV21as3 0yk6u3+auW/lPn64CljztVTjg6yJZWJD5e8BkSzyFdg75/yLLc7J1Ty0lEIw1L1uRpJ/ mBzkI94eEfzGOqk2ECI2hQ2V9CqMjpHLYUV5iMw48Q7cnlNK9kbWwRHQpGMhQNVQjXN2 YK37jMkCuPyfnDc6CLSN8OG/xuymXWtQGbWhok4tIqQ3s2dvaqwz1qgqF2p6MsxvZk1Z qNFw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id h28si951699edh.4.2019.01.18.08.24.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 08:24:42 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x0IGOg3P001674 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 18 Jan 2019 17:24:42 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.22.35.32]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0IGOeHX006472 for ; Fri, 18 Jan 2019 17:24:41 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH 1/3] isar-image: Allow paths in DISTRO_CONFIG_SCRIPT Date: Fri, 18 Jan 2019 17:24:38 +0100 Message-Id: <58bbf6d0d0a0456f11bd71355ac34cab94ab67f4.1547828680.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: z4Qly8Qw7ZLL From: Jan Kiszka 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 --- 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