From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6543937367387930624 X-Received: by 10.223.220.82 with SMTP id m18mr495536wrj.1.1523629149983; Fri, 13 Apr 2018 07:19:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.157.133 with SMTP id p5ls1831205wre.0.gmail; Fri, 13 Apr 2018 07:19:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx48BqVXgWeirCTKghhaoYH1Zu26Q3ZFREwP5l1Z51yLmPuLa6iF2UTLRuwhPthNdho+ZJjrg X-Received: by 10.223.219.143 with SMTP id u15mr488465wri.23.1523629149561; Fri, 13 Apr 2018 07:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523629149; cv=none; d=google.com; s=arc-20160816; b=sSsrszUgcZpfXMD12EMBe3glGq3tHL4xJ3qeqP9myJAZ/4F7ZpVSjOxeGGWbwXA3wj pmCeLCF8D4NdMi/dyE1ozIprjBsTnrpUIeugM8hlEll/9ANjwCCP2kvWF0GujTyXMX4/ wcPC69x2clCGrRCQLmqB1p1BrPnp859LTQ1BT8sE24W9cBbSutAKVef56En1xknuh2n9 bVYeXkn74Wc/TjiQDIYD63CRpEJsw0bPeLR4REPSRTml/DFYX0ilDHD4LB2JNliZjh2b 9ZaI/HvS6KKPDJn5brtTxZUc3gGqTaSjTMLRy/qXQGu6KGTrhJ8bc05W+FA265wZuVs0 GSKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=S0sQgOlMYkTBPJJN8g1IQCzPem03Dja0ZjhDO3BbFCs=; b=OdlyBXuScyDVufoYUmZunbkwHzHkaOjAApCEowT6l1N8j5lJqoh3Rc/HV5fVejNQeb Bw+BggY2fiPqpAnEjyt00PG9TY383p2+wEt+IyyZJPyYUhfRO306kFXzZ6kEfrulxGU7 THlDS7Pg5mjVIWT849quGkw6S2i0sj8kcm+Y9lgB6pJTjIdOYjEqcOucq8XsxkpcWb74 1SGktCwU/xzdNwWo2YnRKrz/1lhEWs2BosVlg0JW+B8NX6NFuvzmzC5A6XVPgnjvxxi/ OhbK2zccCzuartU6mMw1jtDyr1gaKW3Y/JgIVXjcyFa8rRHkJCKNvE4pt70ksICVLB/p oftQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id k185si134944wma.3.2018.04.13.07.19.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:19:09 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w3DEJ94T022175 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Apr 2018 16:19:09 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3DEJ8W1011006; Fri, 13 Apr 2018 16:19:08 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Cedric Hombourger , Andreas Reichel , Henning Schild Subject: [PATCH v2 09/17] meta/image: Fix broken variables KERNEL_IMAGE and INITRD_IMAGE Date: Fri, 13 Apr 2018 16:18:58 +0200 Message-Id: <3d535ada87050c38b26b73f4f85eac82c1f40559.1523628814.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: X-TUID: P8CL8RheRlCf Commit 5d15bb11f30c6f581c6 renamed the kernel in initrd in the deploy folder. While that is correct only one user of those variables was updated. So wic will still look for a file called exactly what the variables say. This commit goes back to the original way, where the variables contain actual filenames while maintaining the file renaming pattern. Signed-off-by: Henning Schild --- meta/classes/image.bbclass | 20 ++++++++++++-------- scripts/start_vm | 4 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2243860..bb2c1e3 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -12,11 +12,15 @@ def get_image_name(d, name_link): S = d.getVar("IMAGE_ROOTFS", True) path_link = os.path.join(S, name_link) if os.path.exists(path_link): - return os.path.basename(os.path.realpath(path_link)) + base = os.path.basename(os.path.realpath(path_link)) + full = base + full += "_" + d.getVar("DISTRO", True) + full += "-" + d.getVar("MACHINE", True) + return [base, full] if os.path.islink(path_link): return get_image_name(d, os.path.relpath(os.path.realpath(path_link), '/')) - return "" + return ["", ""] def get_rootfs_size(d): import subprocess @@ -35,8 +39,8 @@ python set_image_size () { } # These variables are used by wic and start_vm -KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')}" -INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')}" +KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}" +INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}" inherit ${IMAGE_TYPE} @@ -51,14 +55,14 @@ addtask rootfs before do_build after do_unpack do_rootfs[deptask] = "do_deploy_deb" do_copy_boot_files() { - KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')} + KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')[1]} if [ -n "${KERNEL_IMAGE}" ]; then - cp -f ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}_${DISTRO}-${MACHINE} + 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')} + INITRD_IMAGE=${@get_image_name(d, 'initrd.img')[1]} if [ -n "${INITRD_IMAGE}" ]; then - sudo cp -f ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}_${DISTRO}-${MACHINE} + sudo cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'initrd.img')[0]} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE} fi } diff --git a/scripts/start_vm b/scripts/start_vm index 26274be..6c89ce9 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -108,9 +108,9 @@ readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") -QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE}_debian-$DISTRO-qemu$ARCH +QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE} QINITRD=/dev/null -[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE}_debian-$DISTRO-qemu$ARCH +[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE} readonly ISARROOT="$(dirname "$0")"/.. -- 2.16.1