From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6543937367387930624 X-Received: by 10.80.242.133 with SMTP id f5mr2548593edm.9.1523875786360; Mon, 16 Apr 2018 03:49:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.204.68 with SMTP id n4ls7817406edi.5.gmail; Mon, 16 Apr 2018 03:49:45 -0700 (PDT) X-Google-Smtp-Source: AIpwx49wDalYKcU3yvuojLw9G6HRneYwEm+bBCRZkBX/lS4+/GTrFAjfeEXgfvJ6WO36MTE86Hvg X-Received: by 10.80.213.73 with SMTP id f9mr13799edj.3.1523875785900; Mon, 16 Apr 2018 03:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523875785; cv=none; d=google.com; s=arc-20160816; b=rlx7NScdNv/42klBP2VuN579LakMew3HxDKniDbqf/b3FHGXA56GIweVy3zuMZFz53 wnePGowr96TOl/8/AJZb5E0VnLCN7Seh0GyBIf70uRkT3k+lecp9vlXY73ITHAn5hoHQ TBlmilkDnMKuqyJQ/rFMKtaP4ZQiFCeF2ME8rRiDpuf/S2DVS24OkB2SZQ71BS07pi1s ISCW/sqPntCyOt3vkTJYoRkiQ1UfLFJH+777dXaZgoSvtSKuD5NQL5eVYHvss3TADBF0 fDdAbsZYYEY2O0F4Yd804rAxPVzfERKR59Sw9FYHJoCp5LjTKE1cQdpX3Lx3Dj00KiC/ VHVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:content-description :mime-version:references:message-id:subject:cc:to:from:date :arc-authentication-results; bh=jSMLNCklAM6jHYUbfTwRL/KW1lvJgOyChQlLPqIw8h4=; b=h74yWqSKGCfhAA0Pmtraz0U0/75gXuuh6Kll3ITvEQr/CCuk6vPw8xT+OJaJlrQeVT b1Xi9mCvvsTfg1T69nF5LXuBhLLt2Kt3ik/Og2JoBgmTUdvo5FIgM8nh3kIJM6aI6hi+ MABJZJtjrAFLMKB1Xcy0kkZSgf0sHkP8fmrw8p5pzh/8kS/4Gz4Sl5VkXGE/w1/hgss4 2T6HWUI4Im7t7tAk000r2nN+SdOVPNbSFhwFLBcadG/5DEi5aR5LfY4XBbxYcfYUxoOX 8bQXJL0YgFtuGqIE3ZsIClXcXLh87Gv1MkrcBDo5cBP66a2Q2M5kS/k7Y/6v86itEkiF /nRA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 40si131440edr.2.2018.04.16.03.49.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 03:49:45 -0700 (PDT) Received-SPF: pass (google.com: domain of andreas.reichel.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 andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w3GAnj2O014328 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Apr 2018 12:49:45 +0200 Received: from iiotirae (golem.ppmd.siemens.net [139.25.69.245]) by mail2.sbs.de (8.15.2/8.15.2) with SMTP id w3GAni1X003195; Mon, 16 Apr 2018 12:49:44 +0200 Date: Mon, 16 Apr 2018 12:45:53 +0200 From: Andreas Reichel To: Henning Schild Cc: isar-users@googlegroups.com, Cedric Hombourger Subject: Re: [PATCH v2 09/17] meta/image: Fix broken variables KERNEL_IMAGE and INITRD_IMAGE Message-ID: <20180416104553.GE8866@iiotirae> References: <3d535ada87050c38b26b73f4f85eac82c1f40559.1523628814.git.henning.schild@siemens.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Description: message Content-Disposition: inline In-Reply-To: <3d535ada87050c38b26b73f4f85eac82c1f40559.1523628814.git.henning.schild@siemens.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-TUID: tA/kmb/7MoJ/ On Fri, Apr 13, 2018 at 04:18:58PM +0200, Henning Schild wrote: > Commit 5d15bb11f30c6f581c6 renamed the kernel in initrd in the deploy kernel AND initrd > 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 > -- Andreas Reichel Dipl.-Phys. (Univ.) Software Consultant Andreas.Reichel@tngtech.com, +49-174-3180074 TNG Technology Consulting GmbH, Betastr. 13a, 85774 Unterfoehring Geschaeftsfuehrer: Henrik Klagges, Dr. Robert Dahlke, Gerhard Mueller Sitz: Unterfoehring * Amtsgericht Muenchen * HRB 135082