From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6688556415067357184 X-Received: by 2002:a5d:53c8:: with SMTP id a8mr16842721wrw.152.1557733419571; Mon, 13 May 2019 00:43:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:c586:: with SMTP id v128ls383185wmf.1.gmail; Mon, 13 May 2019 00:43:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqwZyxyNkMuV5JdoqWhjJ2A6HfF5rHTvJ3hGX6KgumYjuZqE8wH60NyCQ10Wo6gXdokizGAM X-Received: by 2002:a1c:a550:: with SMTP id o77mr10256175wme.28.1557733419160; Mon, 13 May 2019 00:43:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557733419; cv=none; d=google.com; s=arc-20160816; b=CtFsiwT6qzSE4L7JTKl17nhcqnnvvKLO1LQCb1ZkDgizGzSwWrrMk+yLPYlNwCbbL2 L7fvkHUbc5L/e++oJtGLTkZaMNKx5FYB0HVCaDHND4+hO8SNKa4xddlZFyu7FPa9lHZi H3GEiyAwFbtkCd9fI6/NgGLQlADp8VsziNeQjQ+8eNx+SrxQynpzPv87F2bdKrsUBrjK Zj22YwUvs+qZHWu/kV/RDJqQHsjGa/RVr2r1kGlx7ifFQ+F5tUcgCL9jHHFqriLBdFao 0/mUbbqDOEnvZy8dLBUCJsiG+JuwqCNT35ZW2LG/Zi0zuXm4L/kZPqVIZroIuLrqEXVX Be/Q== 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:references:to:from:subject; bh=r9dwfL46ubQDpbwpXrr6crzn99w94ARxBhpx4gW+qMU=; b=RPe3nOj59aXG369okGbheS1bcccmeF53Od8BsTT9XOnqUkhtZFplpJkHn1vHyH8NVQ fRcc3k0hF/KKlyUegLBSDW+Zo/4U3vRFvQ3oToNCJ+uXl3GDZfsjbrWMKMunV/dEEiHC PvbSxSu1Kh8pnUOpu6LdxiB1iJpnjPgPikulfMHoBlk4JxZhzd1potkAY4pafF+nBWw4 IvptyekaulYeBRXz/8+4MCJViYwxve+ZhPt7fOV4hS77c6eETV/GEv5Z6dBJX8BWf2cB g7O4mmr7vkmtyLpgYiqkyGUrzR9bFtG2hjudGipHUOH+PYGvKu5wmF3TULoTuVHPfr4X RKlQ== 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 y139si261173wmd.0.2019.05.13.00.43.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 May 2019 00:43: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 x4D7hbPx026114 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 May 2019 09:43:38 +0200 Subject: Re: [PATCH v2 2/3] Revert "image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed" From: "Maxim Yu. Osipov" 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> Organization: ilbers GmbH Message-ID: <7eeae0a0-6887-50b9-1fb6-217f6a694453@ilbers.de> Date: Mon, 13 May 2019 09:43: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: 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: Ckqc/UhzcJP2 On 5/13/19 9:39 AM, 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'? Sorry for the misprint. Should be #56 https://github.com/ilbers/isar/issues/56 > 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