[PATCH] sdk: Move deployment to populate_sdk

[PATCH] sdk: Move deployment to populate_sdk

[Maxim Yu. Osipov]

Deploy SDK after Isar packages get deployed to
local Isar apt repo which is copied afterwards
to sdkchroot.

Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
 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

Re: [PATCH] sdk: Move deployment to populate_sdk

[Jan Kiszka]

On 2018-08-28 11:46, Maxim Yu. Osipov wrote:
> Deploy SDK after Isar packages get deployed to
> local Isar apt repo which is copied afterwards
> to sdkchroot.
> 
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
>   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

That also creates the general SDK question: What's the deal with 
${DEPLOY_DIR_APT}/${HOST_DISTRO} vs. ${DEPLOY_DIR_APT}/${DISTRO}. May 
both contain packages? Where do locally built packages go to, in native 
as well as cross mode? /me still confused.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] sdk: Move deployment to populate_sdk

[Maxim Yu. Osipov]

On 08/28/2018 01:09 PM, Jan Kiszka wrote:
> On 2018-08-28 11:46, Maxim Yu. Osipov wrote:
>> Deploy SDK after Isar packages get deployed to
>> local Isar apt repo which is copied afterwards
>> to sdkchroot.
>>
>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>> ---
>>   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
> 
> That also creates the general SDK question: What's the deal with 
> ${DEPLOY_DIR_APT}/${HOST_DISTRO} vs. ${DEPLOY_DIR_APT}/${DISTRO}. May 
> both contain packages? Where do locally built packages go to, in native 
> as well as cross mode? /me still confused.

This is a bug - we have to copy prebuilt packages for target-distro.
Fixed in V2.

Thanks,
Maxim.

-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov