From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6667603680306397184 X-Received: by 2002:a50:addd:: with SMTP id b29mr1757742edd.11.1552548071275; Thu, 14 Mar 2019 00:21:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:6a98:: with SMTP id p24ls891933ejr.7.gmail; Thu, 14 Mar 2019 00:21:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVPh3AYA0JbRQOMvzTGjs9CuacyJ3ZaHQvsSRNna9LZFv/pEVagHhEcsfOx7VVxMRyv94i X-Received: by 2002:a17:906:4312:: with SMTP id j18mr2834685ejm.12.1552548070869; Thu, 14 Mar 2019 00:21:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552548070; cv=none; d=google.com; s=arc-20160816; b=NbhVuShFy2kvO8r177sQF6ULK+bpBJTX7l11IMMrIexm7kFcJiQotcA85NqzHJB26E Gs8xCmA5+g8ABWNAdon8WBJG1P3sZ0hqBn3JEM33yoUZPwQ0YVEwWUb18MHjqeYZ5i1z F681cTV8RlA5pwgh5GS0zQdzH2nuhoP1eDYKTOL5+VJLi7PhfmfFTGBshM9+7VDW6x7x MtNFPLBjY8BQRX+rdgbvo408bQT7Q0MVs4pHJx0P5fHB9+m5BPbU6ViMLj82pfGRRvhH 5VzxBlrEsDZkMWNjaA/i5Y75o/OVslYlBGawbCSax/MQ9kZzWR1uibzBbjaV7H+G/og0 3TZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=CNkdHgvh2gg3c7jGP2GXTMqxVregk20XJjKQp5z2h44=; b=q/S2Fi0lHRdkUFz7pMZjcoetXsF5QfyZvnS3k0HxdmEvGNSzts8lpzynNQpzBYHaXO 7RMpdD07j8gnTzIz34bZXya2zuh9b2ArdHWDEpV/7G/tJ838jyZyI5Nfq5tz41tJgG7t vxvimI5Skt59EBzueQMh3k3asYzb5b5wvcHJ4Od5u38d1VD1jY0uo/JtjK188v3cwn1m F/KMqGxBvxm+HRBf7h0IoqQ4VvjzbzsyXQ57dfzYPqK7AkT+F7sxuLKTFetOxKs47KwZ TfGGuyRP+a8RXtRvwIrlotdK+jEb3oz402db7c/IjmQb/AqBcChzRwj8oc/Td6GL2BCp csvQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id i16si169913ede.0.2019.03.14.00.21.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 00:21:10 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x2E7LAmX021962 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2019 08:21:10 +0100 Received: from [139.25.69.232] (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x2E7LA8N013465; Thu, 14 Mar 2019 08:21:10 +0100 Subject: Re: [PATCH 1/2] meta-isar: Separate images per MACHINE To: "Maxim Yu. Osipov" , isar-users@googlegroups.com References: <20190312202713.18792-1-mosipov@ilbers.de> From: Claudius Heine Message-ID: <7984d051-8bf0-dff1-804d-104ad2a17af7@siemens.com> Date: Thu, 14 Mar 2019 08:21:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: hC7AWmqYtwfb Hi Maxim, On 13/03/2019 17.42, Maxim Yu. Osipov wrote: > Hi everybody, > > Any feedback on this patch? > This is a "fast track" patch as it fixes problem which delayed the release. > > Thanks, > Maxim. > > On 3/12/19 9:27 PM, Maxim Yu. Osipov wrote: >> Image directory gets overwritten when running for two targets >> with the same pair DISTRO and DISTRO_ARCH, resulting >> start_vm script failure. >> >> Note: >> This patch affects the bitbake multiconfig target calling syntax: >> PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base" >> NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE" >> >> Suggested-by: Jan Kiszka >> Signed-off-by: Maxim Yu. Osipov >> --- >>   meta-isar/conf/conf-notes.txt                    |  6 ++-- >>   meta-isar/recipes-core/images/isar-image-base.bb |  2 ++ >>   meta-isar/recipes-core/images/isar-image-ubi.bb  |  2 ++ >>   scripts/ci_build.sh                              | 40 >> ++++++++++++------------ >>   scripts/start_vm                                 | 16 +++++----- >>   5 files changed, 35 insertions(+), 31 deletions(-) >> >> diff --git a/meta-isar/conf/conf-notes.txt >> b/meta-isar/conf/conf-notes.txt >> index 87bd2dc..84049e1 100644 >> --- a/meta-isar/conf/conf-notes.txt >> +++ b/meta-isar/conf/conf-notes.txt >> @@ -1,4 +1,4 @@ >>   Common targets are: >> -    multiconfig:qemuarm-stretch:isar-image-base >> -    multiconfig:qemuamd64-stretch:isar-image-base >> -    multiconfig:rpi-jessie:isar-image-base >> +    multiconfig:qemuarm-stretch:isar-image-base-qemuarm >> +    multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 >> +    multiconfig:rpi-jessie:isar-image-base-rpi I am not a big fan of having to specify the machine when building a image. Would it be possible to have virtual recipes? IMO all isar-image-base-* would provide a isar-image-base. >> diff --git a/meta-isar/recipes-core/images/isar-image-base.bb >> b/meta-isar/recipes-core/images/isar-image-base.bb >> index c86e63b..0ac0c44 100644 >> --- a/meta-isar/recipes-core/images/isar-image-base.bb >> +++ b/meta-isar/recipes-core/images/isar-image-base.bb >> @@ -11,3 +11,5 @@ LIC_FILES_CHKSUM = >> "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 >>   PV = "1.0" >>   inherit isar-image >> + >> +PN .= "-${MACHINE}" >> diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb >> b/meta-isar/recipes-core/images/isar-image-ubi.bb >> index 4b7e109..8059105 100644 >> --- a/meta-isar/recipes-core/images/isar-image-ubi.bb >> +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb >> @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = >> "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 >>   inherit isar-image >> +PN .= "-${MACHINE}" >> + >>   SRC_URI += "file://ubinize.cfg.tmpl \ >>               file://fitimage.its.tmpl" >> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh >> index bcc7545..b4df70e 100755 >> --- a/scripts/ci_build.sh >> +++ b/scripts/ci_build.sh >> @@ -1,7 +1,7 @@ >>   # Script for CI system build >>   # >>   # Alexander Smirnov >> -# Copyright (c) 2016-2018 ilbers GmbH >> +# Copyright (c) 2016-2019 ilbers GmbH >>   #!/bin/sh >> @@ -21,21 +21,21 @@ BUILD_DIR=./build >>   BB_ARGS="-v" >>   TARGETS_SET="\ >> -            multiconfig:qemuarm-jessie:isar-image-base \ >> -            multiconfig:qemuarm-stretch:isar-image-base \ >> -            multiconfig:qemuarm-buster:isar-image-base \ >> -            multiconfig:qemuarm64-stretch:isar-image-base \ >> -            multiconfig:qemui386-jessie:isar-image-base \ >> -            multiconfig:qemui386-stretch:isar-image-base \ >> -            multiconfig:qemui386-buster:isar-image-base \ >> -            multiconfig:qemuamd64-jessie:isar-image-base \ >> -            multiconfig:qemuamd64-stretch:isar-image-base \ >> -            multiconfig:qemuamd64-buster:isar-image-base \ >> -            multiconfig:qemuamd64-buster-tgz:isar-image-base \ >> -            multiconfig:nand-ubi-demo-buster:isar-image-ubi \ >> -            multiconfig:rpi-jessie:isar-image-base" >> +            multiconfig:qemuarm-jessie:isar-image-base-qemuarm \ >> +            multiconfig:qemuarm-stretch:isar-image-base-qemuarm \ >> +            multiconfig:qemuarm-buster:isar-image-base-qemuarm \ >> +            multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \ >> +            multiconfig:qemui386-jessie:isar-image-base-qemui386 \ >> +            multiconfig:qemui386-stretch:isar-image-base-qemui386 \ >> +            multiconfig:qemui386-buster:isar-image-base-qemui386 \ >> +            multiconfig:qemuamd64-jessie:isar-image-base-qemuamd64 \ >> +            multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 \ >> +            multiconfig:qemuamd64-buster:isar-image-base-qemuamd64 \ >> +            multiconfig:qemuamd64-buster-tgz:isar-image-base-qemuamd64 \ >> + >> multiconfig:nand-ubi-demo-buster:isar-image-ubi-nand-ubi-demo \ >> +            multiconfig:rpi-jessie:isar-image-base-rpi" >>             # qemu-user-static of <= buster too old to build that >> -          # multiconfig:qemuarm64-buster:isar-image-base >> +          # multiconfig:qemuarm64-buster:isar-image-base-qemuarm64 >>   show_help() { >> @@ -85,9 +85,9 @@ do >>           FAST_BUILD="1" >>           CROSS_BUILD="1" >>           TARGETS_SET="\ >> -                     multiconfig:qemuarm-stretch:isar-image-base \ >> -                     multiconfig:qemuarm64-stretch:isar-image-base \ >> -                     multiconfig:qemuamd64-stretch:isar-image-base" >> + >> multiconfig:qemuarm-stretch:isar-image-base-qemuarm \ >> + >> multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \ >> + >> multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 " >>           ;; >>       -q|--quiet) >>           BB_ARGS="" >> @@ -129,12 +129,12 @@ bitbake $BB_ARGS $TARGETS_SET >>   # parallel build with the same target arch (armhf) fails. >>   # The problem is being investigated >>   if [ -n "$FAST_BUILD" ]; then >> -    bitbake $BB_ARGS multiconfig:de0-nano-soc-stretch:isar-image-base >> +    bitbake $BB_ARGS >> multiconfig:de0-nano-soc-stretch:isar-image-base-de0-nano-soc >>   fi >>   cp -a "${ISARROOT}/meta/classes/dpkg-base.bbclass" >> "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup" >>   echo -e "do_fetch_append() {\n\n}" >> >> "${ISARROOT}/meta/classes/dpkg-base.bbclass" >> -bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base >> +bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 >>   mv "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup" >> "${ISARROOT}/meta/classes/dpkg-base.bbclass" >> diff --git a/scripts/start_vm b/scripts/start_vm >> index 1da0742..0c007bf 100755 >> --- a/scripts/start_vm >> +++ b/scripts/start_vm >> @@ -1,7 +1,7 @@ >>   #!/bin/sh >>   # >>   # This software is a part of ISAR. >> -# Copyright (C) 2015-2017 ilbers GmbH >> +# Copyright (C) 2015-2019 ilbers GmbH >>   set -e >> @@ -46,7 +46,7 @@ show_help() { >>       echo "                          Supported: arm, i386, amd64, >> arm64." >>       echo "    -b, --build BUILD     set path to build directory." >>       echo "    -d, --distro DISTRO   set isar Debian distribution." >> -    echo "                          Supported: jessie, stretch." >> +    echo "                          Supported: jessie, stretch, buster" Well that change together with the copyright update should be moved in a different patch. It has nothing to do with 'Separate images per MACHINE' IMO. regards, Claudius >>       echo "    -o, --out FILE        Route QEMU console output to" >>       echo "                          specified file." >>       echo "    -p, --pid FILE        Store QEMU pid to file." >> @@ -101,7 +101,7 @@ do >>       shift >>   done >> -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | >> grep "^DEPLOY_DIR_IMAGE=") >> +eval $(bitbake -e >> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep >> "^DEPLOY_DIR_IMAGE=") >>   readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE >>   readonly ISARROOT="$(dirname "$0")"/.. >> @@ -112,13 +112,13 @@ eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF >> |bb2sh)" >>   readonly >> CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf >>   eval "$(egrep 'QEMU_' $CONFIG_CONF |bb2sh)" >> -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | >> grep "^IMAGE_TYPE=") >> +eval $(bitbake -e >> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep >> "^IMAGE_TYPE=") >>   case "$IMAGE_TYPE" in >>       ext4-img) >> -    readonly >> ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img >> +    readonly >> ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.ext4.img >> -    eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | >> grep "^KERNEL_IMAGE=") >> -    eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | >> grep "^INITRD_IMAGE=") >> +    eval $(bitbake -e >> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep >> "^KERNEL_IMAGE=") >> +    eval $(bitbake -e >> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep >> "^INITRD_IMAGE=") >>       QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE} >>       QINITRD=/dev/null >>       [ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE} >> @@ -128,7 +128,7 @@ case "$IMAGE_TYPE" in >>       KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw" >>       ;; >>       wic-img) >> -    readonly >> ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.wic.img >> +    readonly >> ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.wic.img >>       EXTRA_ARGS="$EXTRA_ARGS -snapshot" >>       ;; >>       *) >> > > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de