From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6667603680306397184 X-Received: by 2002:a7b:c0c8:: with SMTP id s8mr381684wmh.6.1552422456737; Tue, 12 Mar 2019 13:27:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:b755:: with SMTP id h82ls528728wmf.9.canary-gmail; Tue, 12 Mar 2019 13:27:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwhmlOS2/ajtQQfrCoY/7BDR+cYodTZdYSZeJspnblGX1webXyQb7cVXXUY30Oxs3QnCapP X-Received: by 2002:a05:600c:21d4:: with SMTP id x20mr394388wmj.25.1552422456290; Tue, 12 Mar 2019 13:27:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552422456; cv=none; d=google.com; s=arc-20160816; b=eLA1XIKGKK5UwgdJsBdLAjfYPDb1XDFGmq5nZk467NL/t0Mw1FGVPfIZvCTqSSvTb+ qEEDdoHSLrPFm2mBf5rORCGvS4+QiE/UmN08axWawbB2vHTK6m21JHIsnI+sl2jVmzXX fLOx4LfoUMW8QnLb5bgoKgQ8S3igopIqPQ8P/LzEu5k8v8uUbXdkpAyERBso61z3tnXQ g+BZ/K6ZTyU3GBPdjc8wur7afzNvdo990vCKzEhyrM6uFIhEdn+H9otzHKOB5e/TOUpL tfRi4zBI973JshlqRruUF4joJNsNOAjnEVwJPizHtiB+whDTHhj2RZQ6aoQK3s21moMM cHCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from; bh=c46Rrwu5F0wYZb+6Rzeg1LaZqcAc+lBovdyYkV3nhKo=; b=O5atMKy3hsj3NzySF8Lps8aP9nbz3j7dLGRMh6MJL3pIv9iBdUpHni9grDiJSVGCLo ihzjxhRkQVjnFShkuc0ZclAZA96AHKd+fKBrw4VCXP2IIc/Tp9iIPIfZZDZ80DxPFm0k QRhSNXtmpmhl/zfae/RnW8EiwaDgntdryPsh/KLCS7AF9p2isvmphYIr+D7gAJ81o7iL uXkCq7dGJ98gmKfiwIPuasMiRBGmn8G462tB3s84nlmjO6v/qS80fvS6YMLlx0W5J5M2 7feVXpP0hKv2nAhR4y6OX6oM1L+EmwThrvb5ouXuIBF4tGBJnsCjOwhbR5WnVaiJqI+2 niWg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id v189si108541wma.2.2019.03.12.13.27.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 13:27:36 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 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 shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x2CKRDM1018345 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Mar 2019 21:27:34 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 1/2] meta-isar: Separate images per MACHINE Date: Tue, 12 Mar 2019 21:27:12 +0100 Message-Id: <20190312202713.18792-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 8+EP+wAa6VrM 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 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" 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" ;; *) -- 2.11.0