From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6467810279643152384 X-Received: by 10.223.172.8 with SMTP id v8mr312612wrc.32.1505904433014; Wed, 20 Sep 2017 03:47:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.18.219 with SMTP id 88ls16172lfs.16.gmail; Wed, 20 Sep 2017 03:47:12 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDyhdobUZ6sFOyKKR7XjtKaRE5iG585T3HeIkzDX1cmD1SvVptmwSJNq+ZpKn+kgujpIoMb X-Received: by 10.46.82.9 with SMTP id g9mr449643ljb.42.1505904432697; Wed, 20 Sep 2017 03:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505904432; cv=none; d=google.com; s=arc-20160816; b=zF3j4m84XJWzU+S0o1qIFt2BizwdTftsEzBdi8y/A++Wpwq0gFhtPCX6voxL7Ldzb4 VAqZcDUu2jc4le9vYqO0nv6IOrRuh2Y91u6BySC+8x+xdNKxwc0kraW9Lf72ipg6ZYir 7JwfHHanqElNBLcNMTOV2X9aa/OiipPIYPi8PtFBUTRGlEweYxrqFAeEFRnuqmm1u361 mPGGYjmjjFiTdnJ9QUhIjRJsN1Tlvv5wyK7lYWTmx59A25kzX1EP135+FT1peJs7T0F1 x+hONWoNnuNSQzdIMqPnIzjbaE0FZ/i7Nx6nisVgjnq/4qB0uSlpq1UthTz1xyukZkrE cQXA== 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=NbdW4WI4NZsBy7J/bwwZx5CesdLEADG1HEDcX+nh0HU=; b=V0Tmstfrjl089VBPol7nzubYaauKm/hKA+/MVn9Aqb7wtgSsov7b/RaZuCNaouMQt0 DC20bxk9VJkUpHBRCxFzuUtY3f9Ddbu+TJMPd8r3He//s1WCXi+VFasrdAUpvSoLs/wu ckwTpmvAxl2kCQkLJn9/7YpI+V7Pal+iRzXKFU3SS5U1aCpZyCakoL+AfC2tkczgixsR tpx+WPR+07EG5T4yjZUFk29yIzUtJc7zyLjW71CO3F2yYNw74pEZbVO++9EAtel7XFA0 ryF+gmf8jvTLMmMqEwYnLm3FrcbU9JxJrvtqE5qi8+mwBNM1iP1Z6L0GazH9vMxv0/w8 VHJw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of claudius.heine.ext@siemens.com) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id m74si97436wma.0.2017.09.20.03.47.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 03:47:12 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of claudius.heine.ext@siemens.com) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of claudius.heine.ext@siemens.com) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v8KAlB5i020825 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Sep 2017 12:47:12 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.68.223]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id v8KAl80c009522; Wed, 20 Sep 2017 12:47:11 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 1/1] meta-isar/isar-image-base and meta/buildchroot: Use fetcher for files Date: Wed, 20 Sep 2017 12:46:45 +0200 Message-Id: <20170920104645.10475-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170920104645.10475-1-claudius.heine.ext@siemens.com> References: <20170920104645.10475-1-claudius.heine.ext@siemens.com> X-TUID: uSvtAw1dw+F+ 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 | 41 +++++++++++++----------- meta/recipes-devtools/buildchroot/buildchroot.bb | 34 +++++++++++--------- 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index 5cb8b1c..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 @@ -20,38 +26,35 @@ IMAGE_PREINSTALL += "apt \ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" +do_rootfs[dirs] = "${WORKDIR}/hooks_multistrap" 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/ + 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 30039f2..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 \ @@ -24,30 +29,27 @@ BUILDCHROOT_PREINSTALL ?= "gcc \ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" +do_build[dirs] = "${WORKDIR}/hooks_multistrap" 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/ + 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