From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6597651406325284864 X-Received: by 2002:a19:631c:: with SMTP id x28-v6mr75698lfb.3.1536239513784; Thu, 06 Sep 2018 06:11:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9e03:: with SMTP id e3-v6ls533144ljk.4.gmail; Thu, 06 Sep 2018 06:11:53 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb/pYnqeezjpQtDs+m3Yo+I/d9iy6KpZSHwljJbPZDPUwREGUbRbeE0C8ieKgWUwGx4qxZk X-Received: by 2002:a2e:8157:: with SMTP id t23-v6mr59431ljg.13.1536239513368; Thu, 06 Sep 2018 06:11:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536239513; cv=none; d=google.com; s=arc-20160816; b=XL/1ztzOE6P56MNTzr12ZfPx2MHee2JRkmrTB44pGkWRDPcj+18jcrCwRVeW20bwiF qkMJbGuBx2o+BbOEuP6x0/anmSxEEHjkArz81Kk80m6o4fMGGUanozND9tKbMbXbpMau tnugCVfRyhOFPMfMrU4PcvHd66QjnrVEmIABDepvgInRu2K0q+5ANJt2LvueN3nyBY0U XbtozAG+5MOAxH0Lpd/6Vptvl/NxuZAVRhrO9lB7tPL80BprqJUrSkyC/4cg5BF7ZeEr 01E5xL7BdBveofMjFAhgyL4z3NrCjHroqVfIyD0/aJa4bQTaTlvapcoQhzWpyPs0dQ2O RM5g== 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=Q+Uk7W/aqMYG4TNaSO7IKJH1po84tcOkm3E+ZLCIY+U=; b=PAPjHvYycv4xV0oCURDrF4DF1ptDuBcKHHsQCmOZrPx23CSd7clLD6NvuzeNcVf+L6 gB9ENBigd/j8GyPHJ+jvek5ndiJC3zuWlln2jIz8TtxmjCaX16B1hCn94UB85LEyOBBw ngYs5Rk0kYLKHKqEJgM/t/9u8zPSP5atsJ86i0p2T/u8ZXhTg49Rj1uoDwogO+FGDfyr o1lWU39lNJR2kUSZunsVNjqKr2lgDaXQ+wmdcbBWi41vnnoovCMWYA45e1rGMgxQ0/hW FDpnoPkM4Dv5Uk7TZJPf7GaeDSyuTPMQnJ+uZvIubPqhnqpHqC3z6ERbtTSoj3io0zJ8 LpfA== 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 x16-v6si152020ljj.4.2018.09.06.06.11.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Sep 2018 06:11:53 -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 w86DBRQW015706 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 6 Sep 2018 15:11:52 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v3 2/3] sdk: Move deployment to populate_sdk Date: Thu, 6 Sep 2018 15:11:26 +0200 Message-Id: <20180906131127.19039-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180906131127.19039-1-mosipov@ilbers.de> References: <20180906131127.19039-1-mosipov@ilbers.de> X-TUID: VYBMVTM82cw/ 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 d6c7bdd..ba84d53 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