From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6688556415067357184 X-Received: by 2002:a2e:86c5:: with SMTP id n5mr12956453ljj.184.1557732709152; Mon, 13 May 2019 00:31:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9c88:: with SMTP id x8ls1214445lji.11.gmail; Mon, 13 May 2019 00:31:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqyh2lz5CcxBesnET8ri5qVqC+xPkWY3d7rhBLaznLhCvsSaHyjE0/eTeri1yxvqTb0o+faZ X-Received: by 2002:a2e:91c3:: with SMTP id u3mr12599463ljg.130.1557732708722; Mon, 13 May 2019 00:31:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557732708; cv=none; d=google.com; s=arc-20160816; b=0ZIfNjKLFqZHnAH+XFTLghHf83X3DrL9WOWagj/y7SjtcTagfNkMnUUKHPj62DecVd YlR4do7k2EnB3gG2uTLmwBLdf37qmsNpuqNIBi3SU8GLAfHFBAxJC8npFU4q/Lv8reT7 QUlbP+f1/j/W0ziaKQU8Bq3Av8dh1oThK/M6mjcr/TnGXC8Gz06LfkTa4vH78ls9lnMF GhQ0y6gWDwD1J5wtWmed8DyoDBHIFb6+E+TWHkyHyV7CqG+NlQjw/Z/xkC5Ehgilqi/d sXAM4H4gjV/BxqHiR69uxhS0SjocQ3SEx+hpbpkoEtf8Bc02hKxB0HYWnQO6bdOq2Lz0 RHGA== 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=CvJ6Pe9lP3zUkNY78nHOszAb0t00IXJtX7qVNaBvaAY=; b=LwzAMgIcscdXe0x3CLPVadx2/D7XW2iEGyEH3Ci0e8L8FB4ZalyfhMuPzsaRiBK3Wh 0RThNF61DPFRUZk84FF/rzceimkyvwQvlU//esLRwYSaZdDQV9MqMxD6UC7VzV2h+mfc lQn9hPSMq8O4U8qsa4wT6yy1Mih88aOOPZqRY38SHBZNJsg9GwR6Q7GcWzRvlTT3w/LI JYd0XaCdPHcYcT0+Mhl4x5LC/zEUeAdz5KAA5iLiQOZTiDKNexSKJgW2VlaICvGYoCaV mTXDuU55flOrKqlH8BEYQKNfwPHEfsCNcim1PvlUrNNjzPSO184tBUlY50FhgNWWx+YC N09g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id c22si2204336lfh.5.2019.05.13.00.31.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 00:31:48 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x4D7Vl3x021010 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 May 2019 09:31:47 +0200 Received: from [139.25.69.232] (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x4D7VlOe014376; Mon, 13 May 2019 09:31:47 +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> From: Claudius Heine Message-ID: <13a1e1d6-4abb-cccb-95f2-f745be200c11@siemens.com> Date: Mon, 13 May 2019 09:31:47 +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: <20190512193100.23709-3-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: IhezKoZRDNth 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. 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