From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6688556415067357184 X-Received: by 2002:a2e:9b96:: with SMTP id z22mr5262867lji.165.1557735118503; Mon, 13 May 2019 01:11:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:2f07:: with SMTP id v7ls1230034ljv.12.gmail; Mon, 13 May 2019 01:11:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqyit4aeBo/MSAADeMHl9wo0VnSiWVUuCqBiaUK1xhadRqZsJTMVMd/3flGJTKmyOLA/2bK9 X-Received: by 2002:a2e:74f:: with SMTP id i15mr12542776ljd.156.1557735118058; Mon, 13 May 2019 01:11:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557735118; cv=none; d=google.com; s=arc-20160816; b=ZYz0P1bg5Tf2m1eqFSzPeBKzA8usT/1iy/ilMjRRVNkTcJtNh3QrTuY80dgZz/+MCa L9Mp9mrWFM3DCWHikLlQxim+foMX3UnjvzluotpaxdyhY/iuB+HhY5pAqnk92NZRjhhx R11RCsGIsE9Ie8l9nILSKmqsAZFT3z0YzEioTfrKtvmWZIzP3PD4ZUrhASYhuZQ5uMW2 x9f+/zY7Fw4Z8fOn8eI41uF9drUO+xcsJUhFWjYX5B0hyHBiEe1NXQ93Rtjnt5ljiUCx YHl1SRZLa+SbYVYUrNEBQ4xxUP207hO1OnnZiBJN6CLU7PbKuRAwCoZzDLK5Sir5FMTG RWoQ== 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=6PmWZz0PqusbqDyHBpOEUBfIavdIWa/pGUzWRMdbABI=; b=esAZq0PSSxAFZDcKLnUHskUY618a6NI6xBgNtAL+yXLCt2npYRpJeIqEd90199UeRT j68BNXdVIoCCAYQz59HG9hElGMiJsE2oPLk2pQOCFX0qpjiyni8x3tlmkm3mLDl7eJrF umNoJpIJr1MyNrfhnq0sVZK0KTXyiOOaASqFxdzMVbzzprE6LkwmEbJIg0fGdFdAEJST K0rZJsYuSB1ZR7SU/0UbuhUqbQuoDZ+AtXj68IeDxGq86AWMr9G0aOztmUEk/2P/DkNf CZepORVFsMdi9gfHtHGBLoV/VJEed+YbzUzLhj+FR5u45sAoiWxQLZrplUh7JndBsPU7 JXaw== 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id b2si1985886lfj.2.2019.05.13.01.11.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 01:11:58 -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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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 x4D8BvtV003631 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 May 2019 10:11:57 +0200 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 x4D8BuMO014948; Mon, 13 May 2019 10:11:56 +0200 Subject: Re: [PATCH v2 2/3] Revert "image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed" To: "Maxim Yu. Osipov" , 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: Claudius Heine Message-ID: <5eb17910-8690-4cff-20ff-0472a4146c52@siemens.com> Date: Mon, 13 May 2019 10:11:56 +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: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: sWTOuUiD1SwO Hi Maxim, On 13/05/2019 09.39, Maxim Yu. Osipov wrote: > 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. So would not the fix for that be to add the DISTRO variable to the image deploy path or the the vmlinuz/initrd file name? regards, Claudius > > 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 >>> >> > > -- 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