From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6594705813070151680 X-Received: by 2002:adf:f40e:: with SMTP id g14-v6mr3301971wro.1.1536135423193; Wed, 05 Sep 2018 01:17:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:103:: with SMTP id 3-v6ls53396wmb.7.canary-gmail; Wed, 05 Sep 2018 01:17:02 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb5bTJO4SSCnHdNrhJQwGrjWeYXdW5gKYZugyTIURL27QqZj4lHeoiD3MNhIuQKGmKf61Sv X-Received: by 2002:a1c:187:: with SMTP id 129-v6mr1962465wmb.2.1536135422791; Wed, 05 Sep 2018 01:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536135422; cv=none; d=google.com; s=arc-20160816; b=ymf65m3rALHo2QKoJ2EuHmkW4aLIT+cSJGXpanUA4l1LwnLdTtyKpPOrdcglUrYszR DasNt7tmp9oPYjK0oOPah4XThvIyTSshnAlJ6kQKYlAj/4CB2BHAUEviEYZsyhNiUg+M irDvyX5dLTDRrVRlvJD2A3D3itbvVKh0yjJVA7CsG1Hky3P1LR3qN5Rh0zC47yhu8Hql tvNYVvr4XcDXG3B9TWfPAbr9pl+JL16hwHEx4Yp+vwyKv5g3glx3Lb53qnUEmQ4lT+2i XpvHKWYgmTjX35Sga0I/srRoC6Kvqc0F4PA9bab0SPxLL3QKjVS90fa6I5A44wyhc/zA isoA== 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:to:from; bh=LXPe1kv/uPQU0ASps+qhGNsWGew9d9U3loePi++F6GY=; b=KwkJtzG908QIbFgVx76HfBD4bBENFtte1KPTJA0CkYUQc/tiMwmBC8jOK0ZJ5y3tPV EGJvxkRziTI9ORcH1v5WFEEB8weXr9WTq5tBKwl9+kbgO14Ye5eYsDzkYRg/c/GvC3mN ZPtox9WeGXFV5pDEGyjELX5tSj662hPzmBNuM4bnwG7b7vz3qexeOhDDENMd0PbCnY3H KAMWzsCS40x6SS229mg+BCPc8A/PJY4tciyyfaqtWQY17RypRJHbbG4idWxNx72DcMha 1nch5wb4UUKY5RxcubJpiW4nTg7lenb/uFSTLy80FJtiX3NWAnAMSOYCV6HxhbDgSsEZ +DKg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id z14-v6si25464wrh.4.2018.09.05.01.17.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 01:17:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w858Ge3Y011875 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Wed, 5 Sep 2018 10:17:01 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v2 1/2] sdk: Move deployment to populate_sdk Date: Wed, 5 Sep 2018 10:16:38 +0200 Message-Id: <20180905081639.23667-2-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180905081639.23667-1-mosipov@ilbers.de> References: <20180905081639.23667-1-mosipov@ilbers.de> X-TUID: +bYfo/uNAfjp Deploy SDK after Isar packages get deployed to local Isar apt repo which is copied afterwards to sdkchroot. Signed-off-by: Maxim Yu. Osipov --- meta/classes/image.bbclass | 12 ++++++++++++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 8 -------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6a5f0e9..f3efdd7 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -97,7 +97,19 @@ addtask copy_boot_files before do_build after do_rootfs do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files[stamp-extra-info] = "${DISTRO}-${MACHINE}" +SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}" + do_populate_sdk() { + # Copy isar-apt with deployed Isar packages + sudo cp -Trpfx ${DEPLOY_DIR_APT}/${DISTRO} ${SDKCHROOT_DIR}/rootfs/isar-apt + + # Create SDK archive + sudo umount ${SDKCHROOT_DIR}/rootfs/dev ${SDKCHROOT_DIR}/rootfs/proc + sudo tar -C ${SDKCHROOT_DIR} --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} } do_populate_sdk[stamp-extra-info] = "${MACHINE}-${DISTRO}" diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index e143ae7..46af3df 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -53,12 +53,4 @@ do_build() { # Configure root filesystem sudo install -m 755 ${WORKDIR}/configscript.sh ${S} sudo chroot ${S} /configscript.sh ${DISTRO_ARCH} - - # Create SDK archive - sudo umount ${S}/dev ${S}/proc - sudo tar -C ${WORKDIR} --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 ${S} ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH} } -- 2.11.0