From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6688556415067357184 X-Received: by 2002:a17:906:6152:: with SMTP id p18mr18825233ejl.245.1557689485674; Sun, 12 May 2019 12:31:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:892b:: with SMTP id e40ls2791654ede.2.gmail; Sun, 12 May 2019 12:31:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrPW57aRNYJQ/VJ7xlaQHheSMheIORr2MVzZB3fr+4OzFXQr51+eOVRdBvRWULhPg3z+uw X-Received: by 2002:a50:87f5:: with SMTP id 50mr24540172edz.58.1557689485190; Sun, 12 May 2019 12:31:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557689485; cv=none; d=google.com; s=arc-20160816; b=QDu9oJa6DPdnWYs3e2E9E2YsmCnR5TdIQ6tTR3NNnKgDpdsvRAN5zAvW4j15c1u60Q 4Ml85WvGHjb4ebhlxTC7imqt2+X3f5o6EIN/Vff7HNw1BhHXple2ap/n8Ouh9w+W8aWO QwAVl1KNMRloBdTgmoIIQKtm2M/ReH7fhhICR8c8uGigE2nowtMor569IfEGa1eTPnpN VZrhpKqav8CIFgv7iAKLVcid9W/vlKwBq85bAdNDDu55Vf1GxdYdQ+6PD/6x0ZS40cDV 2hqt5Kqxa2k0ujLRrL/TGqgF9tth+G6EHICyMq9mJtDF53jOZDAkJMYZrRSscoK1VlCr EgZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=Dyj7FIJyUlhw/dvAug127Ro6balEckj4JMxZkxJjPCM=; b=IGUDa6YKK9Mqao5IO9/3cYVreapZMaSLCzm2P445D8m4wxy5gr+BIkPFNKCngnL1LY TtMFX9hcG7gQp8rh1/IplKF3eqq6/ZxfcQBrT3+16X9O8srQFa8M/b/Sz1YQ4wLi9/UN S8a8bOkIa39fsg8nrlelqPoule5O0Kt2YytI/3Q1+ZDs2XjKEwl/Ji7O/YDSVUpDXnRQ gbaLFRF5v6MnlVIF7GfIF7i7SV4ISSIybgkowq0TuFojI9i9TP203JeZSsHWJyW/+mg/ 1JJn0qNvzJP3Sw1m5EHdKXlWHggW7qeQDX9P60NhbUKhsLpx5XOarTbx8fOUmycM2Eyz YX6Q== 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 w5si3070755edw.1.2019.05.12.12.31.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 May 2019 12:31:25 -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 azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x4CJV25u024019 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 12 May 2019 21:31:24 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v2 2/3] Revert "image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed" Date: Sun, 12 May 2019 21:30:59 +0200 Message-Id: <20190512193100.23709-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190512193100.23709-1-mosipov@ilbers.de> References: <20190512193100.23709-1-mosipov@ilbers.de> MIME-Version: 1.0 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: wE/37AQ9XEnO This reverts commit b92589c574596ac98f97cf14369cbf62872e6481. vmlinuz and initrd are getting overwritten for the same machine by other distros under deploy/images/${MACHINE} 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 -- 2.11.0