From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6688556415067357184 X-Received: by 2002:a2e:9b46:: with SMTP id o6mr11960131ljj.76.1557745537388; Mon, 13 May 2019 04:05:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:43c9:: with SMTP id u9ls1105378lfl.14.gmail; Mon, 13 May 2019 04:05:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDyHYvIqvz+R1hwq8oA0X2ym7pUjXycUHRd10j2zmx2lA6VaUuRs9iDgT8pppP4efmksRU X-Received: by 2002:a19:f705:: with SMTP id z5mr13031588lfe.164.1557745536909; Mon, 13 May 2019 04:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557745536; cv=none; d=google.com; s=arc-20160816; b=MNrzTbzft/qBz9K69iRKcimQAmvxYQ4XtL9AYmUJuapDSdRB9gz8kB3V89ptSCU7Yh SX8imh6zYl/8+3p7Ez0OP9vqFGENQisXo3caFJCGfgrEWKLxcLSQ0PLiTysmLDb0qCu8 b7X8HYeGhZR95tIgfDNkIOztqsRalXayx9Jg73W27SxkEaxJJy83HEr8FnHXUhVaYwnz hY42geJmN0nIW2U/vZFFVzCNzlWAVWRra8Hh8RKyZKazPOeqxLrZ8+KHWPJYQkuwTiMg KCMyMZ9lNeewEQFYWXVBbY6UxiNPJ5IB3ckjOPsw1WQ9uLJKCEW8j2ZaPyF7JZsb7kuy 9+bg== 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=dhYRggMu7E0ydPRNwLj6VFQan/AvKG4bQ4hFnFlUtgQ=; b=wxoCcqJ71lQXPDV4J1V/PDLsRcPIPzG/R2DhIEKFPsSymORCOEJR3zFbC9shTn/uH+ C+VTGfbih+JgEHObJ3NY4C2YlP/4Kn+3xCyzMhVTNGLFP7ryHOK7h6za+nogtn+A0fMY 5qm7ol/R/bj9VieY2iPOfmJo8aBcP8UHdDef/mhTujoKWE7Foxob2madCPw16To0eiMf MogaqBJOp4LfhF2hdorB3iTZPVMUskOu5vIGCx0vVOvn5nOm6pWERNdX8Avg+37UEEbb trfEY060VCOV8a7fc6/9iAvTb+wQSuN8jTF/kmtIgU+NYHq54ehgdMzzUW3q5jd4fCmf U/MA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id w26si2784963lji.4.2019.05.13.04.05.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 04:05:36 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x4DB5ZWC019159 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 May 2019 13:05:35 +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 x4DB5YQd014865; Mon, 13 May 2019 13:05:34 +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> <5eb17910-8690-4cff-20ff-0472a4146c52@siemens.com> From: Claudius Heine Message-ID: Date: Mon, 13 May 2019 13:05:34 +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: Hc6/qR3qq0jY Hi Maxim, On 13/05/2019 11.01, Maxim Yu. Osipov wrote: > On 5/13/19 10:11 AM, Claudius Heine wrote: >> 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? > > I agree with the intention of your patch b92589c5 "image.bbclass: make > KERNEL_IMAGE & INITRD_IMAGE variable fixed"  - I also had headaches with > variables KERNEL_IMAGE/INITRD_IMAGE when trying to use them. > Unfortunately, this patch leads to the mentioned problem with > overwriting vmlinuz/initrd images for the same MACHINE. > > In my opinion the MACHINE deploy images w/o the patch use good naming > scheme (see below). > > 1) The version of kernel is worth to see, I disagree, since the version of the kernel/initrd makes the file names in the deploy directory unpredictable, which is difficult to write documentation and scripts for. Have you tried something like this? KERNEL_IMAGE ?= "${PF}.vmlinuz" INITRD_IMAGE ?= "${PF}.initrd.img" regards, Claudius > not sure that one should add > another directory DISTRO and distro name is included into vmlinuz/initrd. > > > http://isar-build.org:8080/job/isar_master/ws/build/tmp/deploy/images/qemuarm/ > > > isar-image-base-debian-buster-qemuarm.ext4.img > isar-image-base-debian-buster-qemuarm.initrd.img-4.19.0-4-armmp > isar-image-base-debian-buster-qemuarm.vmlinuz-4.19.0-4-armmp > isar-image-base-debian-stretch-qemuarm.ext4.img > isar-image-base-debian-stretch-qemuarm.initrd.img-4.9.0-9-armmp > isar-image-base-debian-stretch-qemuarm.vmlinuz-4.9.0-9-armmp > > > 2) Another point is the image name itself - just compare isar-image-base > and isar-image-debug - it's also worth to add image name into > vmlinuz/initrd, f.e.: > > isar/build/tmp/deploy/images/qemuamd64: > isar-image-base-debian-stretch-qemuamd64.initrd.img-4.9.0-9-amd64 > isar-image-base-debian-stretch-qemuamd64.wic.img > isar-image-base-debian-stretch-qemuamd64.vmlinuz-4.9.0-9-amd64 > isar-image-debug-debian-stretch-qemuamd64.vmlinuz-4.9.0-9-amd64 > isar-image-debug-debian-stretch-qemuamd64.initrd.img-4.9.0-9-amd64 > isar-image-debug-debian-stretch-qemuamd64.wic.img Your concerns are valid. We need to figure out a good system for the file names and paths. > > Reagrds, > Maxim. > > > >> 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