From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6729358150130991104 X-Received: by 2002:ac2:43b6:: with SMTP id t22mr8860887lfl.150.1566800793654; Sun, 25 Aug 2019 23:26:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5605:: with SMTP id v5ls1399424lfd.6.gmail; Sun, 25 Aug 2019 23:26:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEfH/gi5yqRR9Riyl5Yr7WEeIctorpplM+Y17/s3Aq5x7eR9hl4/7Ag5nzHry0lH9RW+kj X-Received: by 2002:a19:5218:: with SMTP id m24mr10074933lfb.164.1566800793101; Sun, 25 Aug 2019 23:26:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566800793; cv=none; d=google.com; s=arc-20160816; b=AwgbgBEC8OUk5XxFaJY7xZhSOSzefV2KSMJjUjJzrnXgvxJ1JrWqcIc5tSEArHrWdS kxy2JrIIYq1tCSNaIjgeMx0pU60a+Du1/ihWkb4GQYaDbsNQ/KJx3DBRtWjZaA8a4848 XK7S/ILs4FHaOs/se97qwK/hTQJJkPi0wlq0ylYTD5qKiSXGFftBw0xq9YMpglqHNdo1 ha7e7DQyVxTZvM9SH77Ig6i6SjS/S6Rw5+GTbPCafX/tt/fGfHpethPesIq3+9MiJfHu Psjrtq/pFn8hgL2SosxMQRiqSZFwFVdEwqIDAIRwYuSHJb2KyoRJMD+eUiCXbd8u3wal fxjQ== 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=zl+QBjpqaR3M1ObO2A5XmWCRUei/id+GD/Bvh9AnIA0=; b=qzZB2NXvCbvkTPz5Hvu5fBaUFJinjfbHabdzZCDnF7DEx22rzsmlQVn0TiCZRN5wIK QfDvrkY1wD99c04JN/fNIrX2J519pD+RcSBh9GmtN8GDRsF9gAcCzp5Xa4Arr5whsBjq oFtTg4IX1xSBZZY4/w7B54dHUHYI2lq8dKoHUO9chdP+JUWeE/VY+IZDChJD0JSdQrpM ptsVUb2FTW1mTCKYxjse5CqL6tUnt8zMAPKRsWkD9N02S9BVMsFBy9jhUTgM68Cf+s5O m/vUF+jMRX0NATIhQjOzTfKM56iFeweoyhG5N1XETdjzBq5vw/m+HX45P2x9SYFiZqjc RfQw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q25si474896lfm.4.2019.08.25.23.26.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 23:26:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x7Q6QW0p025106 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Aug 2019 08:26:32 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.35.99]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x7Q6QRHA015165 for ; Mon, 26 Aug 2019 08:26:31 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 16/26] sdk: Deploy earlier Date: Mon, 26 Aug 2019 08:26:17 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: c5ZO2dA3xCV5 From: Jan Kiszka This avoids having to point from image-sdk-extension directly into the sdkchroot target workdir. It also aligns the sdk with isar-bootstrap and buildchroot in this regard. As we now have a deployment target of the sdk rootfs (SDKCHROOT_DIR), we can drop the previous link in DEPLOY_DIR_IMAGE. Signed-off-by: Jan Kiszka --- meta/classes/image-sdk-extension.bbclass | 20 ++++++++------------ meta/conf/bitbake.conf | 2 ++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 11 +++++++++++ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index a53d954..b9f2cf4 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -5,29 +5,25 @@ # # This class extends the image.bbclass to supply the creation of a sdk -SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}" - do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" do_populate_sdk() { # Copy isar-apt with deployed Isar packages - sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/rootfs/isar-apt + sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/isar-apt - sudo umount -R ${SDKCHROOT_DIR}/rootfs/dev || true - sudo umount ${SDKCHROOT_DIR}/rootfs/proc || true - sudo umount -R ${SDKCHROOT_DIR}/rootfs/sys || true + sudo umount -R ${SDKCHROOT_DIR}/dev || true + sudo umount ${SDKCHROOT_DIR}/proc || true + sudo umount -R ${SDKCHROOT_DIR}/sys || true # Remove setup scripts - sudo rm -f ${SDKCHROOT_DIR}/rootfs/chroot-setup.sh ${SDKCHROOT_DIR}/rootfs/configscript.sh + sudo rm -f ${SDKCHROOT_DIR}/chroot-setup.sh ${SDKCHROOT_DIR}/configscript.sh # Copy mount_chroot.sh for convenience - sudo cp ${ISARROOT}/scripts/mount_chroot.sh ${SDKCHROOT_DIR}/rootfs + sudo cp ${ISARROOT}/scripts/mount_chroot.sh ${SDKCHROOT_DIR} # Create SDK archive - sudo tar -C ${SDKCHROOT_DIR} --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \ + cd -P ${SDKCHROOT_DIR}/.. + sudo tar --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \ -c rootfs | xz -T0 > ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz - - # Install deployment link for local use - ln -Tfsr ${SDKCHROOT_DIR}/rootfs ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH} } addtask populate_sdk after do_rootfs diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f25b20f..e5681bf 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -48,11 +48,13 @@ GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" DEPLOY_DIR_BUILDCHROOT = "${DEPLOY_DIR}/buildchroot" +DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TMPDIR}/sstate-cache" BUILDCHROOT_HOST_DIR = "${DEPLOY_DIR_BUILDCHROOT}-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" BUILDCHROOT_TARGET_DIR = "${DEPLOY_DIR_BUILDCHROOT}-target/${DISTRO}-${DISTRO_ARCH}" +SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${DISTRO}-${DISTRO_ARCH}" CACHE = "${TMPDIR}/cache" OVERRIDES = "${DISTRO_ARCH}:${MACHINE}:${DISTRO}:forcevariable" diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index d2cc92e..84b8808 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -56,3 +56,14 @@ sdkchroot_install_files() { sudo install -m 755 ${WORKDIR}/configscript.sh ${S} sudo chroot ${S} /configscript.sh ${DISTRO_ARCH} } + +do_sdkchroot_deploy[dirs] = "${DEPLOY_DIR_SDKCHROOT}" +do_sdkchroot_deploy() { + ln -Tfsr "${ROOTFSDIR}" "${SDKCHROOT_DIR}" +} +addtask sdkchroot_deploy before do_build after do_rootfs + +CLEANFUNCS = "clean_deploy" +clean_deploy() { + rm -f "${SDKCHROOT_DIR}" +} -- 2.16.4