From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6594705813070151680 X-Received: by 2002:a1c:e409:: with SMTP id b9-v6mr114546wmh.13.1535449599401; Tue, 28 Aug 2018 02:46:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f214:: with SMTP id s20-v6ls295978wmc.0.gmail; Tue, 28 Aug 2018 02:46:38 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbHfXouo/cAV7pfq4F0rpkpMZlAKeWfdfueeYvQJj2rwqffJoxFnh3ZIzrL14v3NGwaNL3x X-Received: by 2002:a1c:7319:: with SMTP id d25-v6mr116706wmb.10.1535449598972; Tue, 28 Aug 2018 02:46:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535449598; cv=none; d=google.com; s=arc-20160816; b=i4G9gq6gCyW+0/vKnvURDIWWGiFT120lca7c4xXLbH7pbYsbQIXjnZtQDDyTArDZx1 7+x0mZgTbsrFj1wh9W4RWVqYfiqY41ZKQLlsSi69M+7lXJpPsbtbR9HMrf1OxJ0c57vl DauidCTJMa+lpsxABVff2xDIXOJbAThaE0mEAgJhFmQTlgpZud7xsKcvQHbwUopcwU9X k+obsaQVigfMaE3Qcm/fOfTQF2oHWDdoSqG9lrqDsnkTQ9MxFmLdYSWTw81YF0yfsFYF ByQyYINfJOLg3UD6eaHkMQSWJGd18nWqXhoz8kjC51OimLUcAbQi0NNFJuO+aMv5CXGP ogEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:arc-authentication-results; bh=qhgnRUC+/JE7zvUAaWB1kdpCQZK55AMWcNsKOL5pQ34=; b=DlS+xMpGSGIrVs1iDi6fs/GDLbmw1It8Kazg40ehJP0azgTa1JGIxbRUpU3IspiE+u hi+MpdYekaKAS7ceCw8DFrUV7nTMtm7Rf7fRncRDW7sMDXRTnO+io3FZD7G/0qD1kfOi et13Q3F/DlslbpJjvgCvKVA5QGlSibERXGx5UX6hIS2ELbaMKj4CpxAMplm4UR2ZnZMJ XkWDOXEQUo+uDBr+G7qBZ8LNpbGuFqv4XsmTPc2ez3EMWsnyS/dHk1Xw09/hg8xReEkS Y+GKyD2eD8zUks0yaRRdwSwR/DM2F77teq14wmI1bubECBwfD1hm8ZiJPGg0zFyCqi99 W8iw== 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-v6si11421wrh.4.2018.08.28.02.46.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 02:46:38 -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 w7S9kRiI017841 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 28 Aug 2018 11:46:37 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH] sdk: Move deployment to populate_sdk Date: Tue, 28 Aug 2018 11:46:26 +0200 Message-Id: <20180828094626.24172-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: Th3MUKfbSw/I 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 | 11 +++++++++++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6a5f0e9..30f8eaa 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -97,7 +97,18 @@ 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}/${HOST_DISTRO} ${SDKCHROOT_DIR}/rootfs/isar-apt + + # Create SDK archive + 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