From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6688556414723424256 X-Received: by 2002:a5d:638c:: with SMTP id p12mr25980330wru.61.1557300895873; Wed, 08 May 2019 00:34:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8184:: with SMTP id 4ls210440wra.5.gmail; Wed, 08 May 2019 00:34:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqy7DoBncgM+CeahQ2GzXczqIejEBJupiyk7NdF4rbNPrefxVKHhUhsw6IS3BpWErGX1CzCw X-Received: by 2002:a5d:4711:: with SMTP id y17mr27376271wrq.122.1557300895521; Wed, 08 May 2019 00:34:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557300895; cv=none; d=google.com; s=arc-20160816; b=Cg9CiVTdXgPH7Qg/uvuQGyhrXuUbCmXTPsLVmFEvOYUu622ouOPWPgJeIm3oBSZyJC zbOVrPp4yvzY1+ekxWJr99kkye8rlVrFCb3rh7AIlzD/VQdlxiA/j2ljitb7Q+692dUX JX8uMBVerzVy9dpXaGpM7tnrKaxf1r6hsNDt/pc2vLziUNE6NbTVdyFU2Rb0gLJE3MGV aeIvWIF6mEF4X5x7KjmdSsgwU0oeQab2SmLIchn4sAfITE47z+tqSA1a2g+EFamu9KHq G37uhHGx7kfywDsRE3U41qBt0xlpzc5GR/ry2G6Z0BMXSxW0OhLsZrgAdl6z85e492Bg PPVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=yyfhlcB7hTMMLnjF5Cjvebzpl48f+DJwQ6fSrxfnShM=; b=LKYUinqevwAxOoFPzYxKYaSicrXEsOj8EVmDUBDB1Qv9R1czvcsJJrN83q7Uyzqs46 vOsw9wjIrZosAZmzfVFGwQ8Rm5LOshRjynNWy3RWe9+2KqRh1B9x00g15z4LJqWUTIzD LSgFiIQtbCKM3bqsayaRlVyTJ7dvqoYk56n4RLwOZ1GucfTOV55oys2DTLhxvQrlxirH V+wmO4Ax3cwO/UDG8D4BzrFEOO2IFM+nkgwwMAto8zGPHrsDKm6O4k4CAau/QBTcKdOe fmtsokVeC4swecmiBoRQKR/hhp51yzwkTuF38mHo2l0QVDEO5mswCK/CVjPF6QsSeKmC l8Hg== 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 d14si819424wrj.3.2019.05.08.00.34.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 May 2019 00:34:55 -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 x487YQeW002730 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 May 2019 09:34:54 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 1/2] Revert "image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed" Date: Wed, 8 May 2019 09:34:24 +0200 Message-Id: <20190508073425.22380-2-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190508073425.22380-1-mosipov@ilbers.de> References: <20190508073425.22380-1-mosipov@ilbers.de> 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: ncdkkNWUR7Id 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 f9a3052..f265099 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