From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6688556415067357184 X-Received: by 2002:a2e:9a94:: with SMTP id p20mr2683230lji.2.1557733180747; Mon, 13 May 2019 00:39:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:96ce:: with SMTP id d14ls1219219ljj.5.gmail; Mon, 13 May 2019 00:39:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqx2d+DXIfOAXB+bVOV7OGIzL2B9rDYxFZGE7P29S5oR8kVAEBqsBq1iMg7Qvv4v4gOAwYSY X-Received: by 2002:a2e:568d:: with SMTP id k13mr12492454lje.194.1557733180071; Mon, 13 May 2019 00:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557733180; cv=none; d=google.com; s=arc-20160816; b=V4SHZ04JUnfFuHeHbM7omLdpxdzIN2+KbIYo+8aZGyZlj9f0Q/NVCboRTiO1hjBkZz 5YIqw/GXagCAOmomSH6wywmI98Gg2TJ0uxTM8kFkehQUaik2zlsfKFNa+xAI7VXaCLjt 7lfZrNGX33Fc99lCj+NY6BFaWGfHA+ITK2OZCX+71nkPiKw88e5LV1EwQ+v3cXXblaZe PIWEB2cxzwu7ltxkaLE/cf3Z1AP+v97PInmUBI8csCnF5/GO8RqvXtCC73EN+qu4SSxw slB4KXn0zH3uQcRAJVbiKTgbHVwNmHQyv2HKTHLeb0wiUVjazWQU9guHY660mYfGnBOo GoQg== 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:organization:from:references:to:subject; bh=SNTS+8NClU5SFASNEXsyrSwGAe4iUFmk5MtZEeaLwck=; b=c06knRAQhyYW6P7iNIbFZZP1D/AOD8B8EiIu4b02qJqGH5l51238EJnwIs+HbwjT2S SaU1fE2yslJsyTis4wo3vns/oAMp3ZJmM7P9ZOWqIp0/Jj6xKH9E7DdUCgn9TWFHqWk5 Dyy6o0XG8r7qZJE6e4P9wS62yQwlCDbCwpX7oHyRgNSpuF0c3wNOi0US1kAnVLw6qdyj EtE9RuhIRT0wV/j5LHmhHQJD//u6lLmpx7ocowp9arf0jW6C68hfKl2Gc6IfSCkjRbDl xHUO6Vj/gfLjq8MNdI0/aK/V58SReh1LYGGoxggWcWzlQRVpMA87dTKBOHB9OuOg0gAB RC/w== 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 x14si2490828ljh.1.2019.05.13.00.39.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 May 2019 00:39:39 -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 [192.168.1.29] ([109.131.165.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x4D7dbSd026072 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 May 2019 09:39:38 +0200 Subject: Re: [PATCH v2 2/3] Revert "image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed" To: Claudius Heine , isar-users@googlegroups.com References: <20190512193100.23709-1-mosipov@ilbers.de> <20190512193100.23709-3-mosipov@ilbers.de> <13a1e1d6-4abb-cccb-95f2-f745be200c11@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: Date: Mon, 13 May 2019 09:39:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <13a1e1d6-4abb-cccb-95f2-f745be200c11@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit 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: mSX2pxTF8SnJ On 5/13/19 9:31 AM, Claudius Heine wrote: > Hi Maxim, > > On 12/05/2019 21.30, Maxim Yu. Osipov wrote: >> This reverts commit b92589c574596ac98f97cf14369cbf62872e6481. >> >> vmlinuz and initrd are getting overwritten for the same machine >> by other distros under deploy/images/${MACHINE} > > NACK. I don't see a patch that addresses the issue described in the > commit message of that reverted patch in this patchset in a different > way, so this is a regression. Do you confirm that issue #53 appeared after applying your series into the 'next'? just look in http://isar-build.org:8080/job/isar_next/ws/build/tmp/deploy/images/qemuarm/ vmlinuz/initrd for stretch was overwritten by subsequent build for buster. Regards, Maxim. > regards, > Claudius > >> >> Closes: #56 >> Signed-off-by: Maxim Yu. Osipov >> --- >>   meta/classes/image.bbclass | 6 ++++-- >>   1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass >> index fb35a4c..8e6f2c9 100644 >> --- a/meta/classes/image.bbclass >> +++ b/meta/classes/image.bbclass >> @@ -13,8 +13,8 @@ IMAGE_INSTALL += "${@ ("linux-image-" + >> d.getVar("KERNEL_NAME", True)) if d.getV >>   IMAGE_FULLNAME = "${PF}" >>   # These variables are used by wic and start_vm >> -KERNEL_IMAGE ?= "vmlinuz" >> -INITRD_IMAGE ?= "initrd.img" >> +KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}" >> +INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}" >>   # Useful variables for imager implementations: >>   PP = "/home/builder/${PN}" >> @@ -149,10 +149,12 @@ addtask rootfs_install before do_build after >> do_unpack >>   do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" >>   do_copy_boot_files() { >> +    KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')[1]} >>       if [ -n "${KERNEL_IMAGE}" ]; then >>           cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, >> 'vmlinuz')[0]} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE} >>       fi >> +    INITRD_IMAGE=${@get_image_name(d, 'initrd.img')[1]} >>       if [ -n "${INITRD_IMAGE}" ]; then >>           sudo cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, >> 'initrd.img')[0]} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE} >>       fi >> > -- 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