From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6467810279643152384 X-Received: by 10.25.212.195 with SMTP id l186mr544547lfg.31.1505992760959; Thu, 21 Sep 2017 04:19:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.149.3 with SMTP id x3ls414072lfd.0.gmail; Thu, 21 Sep 2017 04:19:20 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDDDqVvibuOgtyUgjG4evAQwxjaUD8ZyNwrdxNTLFyyOze7qxvfUw2EsnkKXLU8IUGndbV+ X-Received: by 10.25.19.201 with SMTP id 70mr528850lft.35.1505992760691; Thu, 21 Sep 2017 04:19:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992760; cv=none; d=google.com; s=arc-20160816; b=rpK7QZYMl546UxN7c7rwyvApdGlac2aNjRt22FxjxT6rp2tt6S4SL5q82WripaePsR 2xruT0Ps8XK15ROe80qFQACh9oHHTWgz+rfEFxsIIRfSm1QEpogsQ2iYBTz9ueS9otdY cpEOdWiqVlJ1/XfJUPGGxKPwzDSMfJvvcovJ6h2ZFNn030FlPZ8S7nY5vDOlv7gvpQ87 aUDp7slWufzbHo4QrB0q5cNi/9ofP/jrhMYcr8wAVoV5hA+W2Dh9XWXgSy8j51WLI0MD ZtIJtyI05Hl7c/umSUbsBNiCJvzV6jyL0USA4X9IheFNAQUvookgACfPHgvFXU8RyYvV CuBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=+32xXsJVizfOy2sCn9TyppIWT4iMsrW475NFwz0pPXw=; b=JokKJvAWijzPza//H6LEDnZU8t+T28ihhwFypmxN4a2EhakRw7WsPEz+R1qIPCdvzF /fEmGW6kanrQiIlRMgnWrQ9mSejX+M6m2BMoXbAEjjOe1/gznPAD/iMEH02SO+sPYDEa r6sZZsxDAYkG6TAmkKdktMgFy4I8GJjAErDL+LJYzQ7IGVeptGc8u8s8G/ckrHFT42oq g6v7PrexoUexFSAUOyxUTw9ELMxbBpUVLLEP1NrWm5uTgfA+B7XdV8L3IUiFf36WPm2E UJomo+bu8L6kAEmiVXeMzTpS/iHF9eUEHOkc1QRiFtwjihwhtPmMocuwX07QVsss27sI aI3g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 194.138.37.40 is neither permitted nor denied by domain of claudius.heine.ext@siemens.com) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id d82si97052wmd.1.2017.09.21.04.19.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:19:20 -0700 (PDT) Received-SPF: neutral (google.com: 194.138.37.40 is neither permitted nor denied by domain of claudius.heine.ext@siemens.com) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 194.138.37.40 is neither permitted nor denied by domain of claudius.heine.ext@siemens.com) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id v8LBJJH7019977 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Sep 2017 13:19:20 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.68.223]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id v8LBJIv3024918; Thu, 21 Sep 2017 13:19:19 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 2/2] meta-isar/isar-image-base and meta/buildchroot: Use fetcher for files Date: Thu, 21 Sep 2017 13:19:11 +0200 Message-Id: <20170921111911.8133-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170921111911.8133-1-claudius.heine.ext@siemens.com> References: <20170921111911.8133-1-claudius.heine.ext@siemens.com> X-TUID: 5Dmz2DBWbMvS From: Claudius Heine Issue: Copying from the recipe directory is currently done by copying from it using the "THISDIR" variable. This variable points to the wrong directory when recipes are 'required' by other recipes. Change: Use the bitbake fetchers for these files. Impact: No negative impact known. Signed-off-by: Claudius Heine --- meta-isar/recipes-core/images/isar-image-base.bb | 38 +++++++++++++----------- meta/recipes-devtools/buildchroot/buildchroot.bb | 31 ++++++++++--------- 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index ccbece0..f4b0125 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -8,6 +8,12 @@ DESCRIPTION = "Multistrap target filesystem" LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" +FILESPATH =. "${LAYERDIR_isar}/recipes-core/images/files:" +SRC_URI = "file://multistrap.conf.in \ + file://${DISTRO_CONFIG_SCRIPT} \ + file://setup.sh \ + file://download_dev-random" + PV = "1.0" inherit image @@ -23,34 +29,32 @@ do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" do_rootfs[dirs] = "${WORKDIR}/hooks_multistrap" do_rootfs() { - # 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/ + chmod +x "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" + chmod +x "${WORKDIR}/setup.sh" + install -m 755 "${WORKDIR}/download_dev-random" "${WORKDIR}/hooks_multistrap/" # Multistrap accepts only relative path in configuration files, so get it: cd ${TOPDIR} WORKDIR_REL=${@ os.path.relpath(d.getVar("WORKDIR", True))} # Adjust multistrap config - sed -i -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \ - -e 's|##DISTRO##|${DISTRO}|g' \ - -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \ - -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ - -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ - -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \ - -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ - -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ - ${WORKDIR}/multistrap.conf + sed -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \ + -e 's|##DISTRO##|${DISTRO}|g' \ + -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \ + -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ + -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ + -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/${DISTRO_CONFIG_SCRIPT}|g' \ + -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ + -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ + "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf" # Create root filesystem sudo multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f "${WORKDIR}/multistrap.conf" || true # Configure root filesystem - sudo chroot ${IMAGE_ROOTFS} /configscript.sh ${MACHINE_SERIAL} ${BAUDRATE_TTY} \ + sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} ${BAUDRATE_TTY} \ ${ROOTFS_DEV} - sudo rm ${IMAGE_ROOTFS}/configscript.sh + sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" } -addtask rootfs before do_populate +addtask rootfs before do_populate after do_unpack diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index af9f3a8..a5a1896 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -8,6 +8,11 @@ DESCRIPTION = "Multistrap development filesystem" LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" +FILESPATH =. "${LAYERDIR_core}/recipes-devtools/buildchroot/files:" +SRC_URI = "file://multistrap.conf.in \ + file://configscript.sh \ + file://setup.sh \ + file://download_dev-random" PV = "1.0" BUILDCHROOT_PREINSTALL ?= "gcc \ @@ -27,26 +32,24 @@ do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_build[dirs] = "${WORKDIR}/hooks_multistrap" do_build() { - # 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/ + chmod +x "${WORKDIR}/setup.sh" + chmod +x "${WORKDIR}/configscript.sh" + install -m 755 "${WORKDIR}/download_dev-random" "${WORKDIR}/hooks_multistrap/" # Multistrap accepts only relative path in configuration files, so get it: cd ${TOPDIR} WORKDIR_REL=${@ os.path.relpath(d.getVar("WORKDIR", True))} # Adjust multistrap config - sed -i -e 's|##BUILDCHROOT_PREINSTALL##|${BUILDCHROOT_PREINSTALL}|g' \ - -e 's|##DISTRO##|${DISTRO}|g' \ - -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \ - -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ - -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ - -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \ - -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ - -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ - ${WORKDIR}/multistrap.conf + sed -e 's|##BUILDCHROOT_PREINSTALL##|${BUILDCHROOT_PREINSTALL}|g' \ + -e 's|##DISTRO##|${DISTRO}|g' \ + -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \ + -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ + -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ + -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \ + -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ + -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ + "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf" # Create root filesystem sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f "${WORKDIR}/multistrap.conf" || true -- 2.14.1