From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6693487099162656768 X-Received: by 2002:adf:db87:: with SMTP id u7mr878623wri.245.1558448909302; Tue, 21 May 2019 07:28:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f102:: with SMTP id r2ls5087387wro.1.gmail; Tue, 21 May 2019 07:28:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqyrXa3TH8hHqOZby1k43S9CLbOU3hq5qPaSDh7RAM3NKKQFBbsvJ7dMpJpXkA7bp0MUHR4c X-Received: by 2002:a5d:5547:: with SMTP id g7mr23304900wrw.22.1558448908933; Tue, 21 May 2019 07:28:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558448908; cv=none; d=google.com; s=arc-20160816; b=ve3nbCnSN5psz0e9reS+VGt7+QTvvYr49+daGwX5dqhC+p6Tln+LEvkx+12KmjIzMQ wbO664cCyoaWsX6VN66tLGwmeMTCP3h82a5JAVPEXy2HraEIXhAd7XOt1NIfeEdWwq7n xJTAzV5Xz1+50nvQW8Zy1Z6SSGtcuJQjJKpDNvyJchVqzm8cA0ilqQe/lDPPmdJahaGt 7DlEkJuRXEpBxNzai4Mvd7NLetc+aAZFj1/N6CZ+Y54Q0tH/lhUAZ0MFYc+BeutxA6jr XnIDpTn2bTE6lAc55UVfPDFXbtKQWqs25eXXLfpUdjealIwmlGl1aToQFj1i7Bzt4X7i DGSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=4p3Ayt0Jd77DBx2hheHDjBvNKQrRmWOQlCFTLAaa0E4=; b=1H8sCp8pQYkqng1s1WucFa1T31JifqoaoaMEY2qdM7y0Ngy26yx8yp+S0clfy4G48B DpCJN+1xOJAmVvrqGlSKu2Z1YNx0/QLKtLf919fgP7pqHNYjKf186g4Df5o/jHMEUl9V GaZQyRl8bg7WNrhNTqyHlyWKG6I/FZktuNx2jN9DrXsB/0sIcoHjq5SmB9mcf4Twf5qe iyzTmSODEDzWPwjPlBXZvnt4LTXM1kIYTNXjoNBFT15XeYv0Eylr6Qcm8pvsPNtyjzjq aIbI2EinhvqaysuBtOg0uZVBxzG7sINe1jMRBJRU96Ss28e/2jkPfNZKj64IRiudHpDw X04Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id z127si95442wmc.1.2019.05.21.07.28.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 May 2019 07:28:28 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.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 claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x4LESSCO001658 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 May 2019 16:28:28 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x4LESS6g027449; Tue, 21 May 2019 16:28:28 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH] image.bbclass: remove 'get_image_name' function Date: Tue, 21 May 2019 16:28:18 +0200 Message-Id: <20190521142818.25505-1-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: iRz0YEO1mUlX From: Claudius Heine This function is only used in 'do_copy_boot_files' where a simple shell function fits better. Signed-off-by: Claudius Heine --- meta/classes/image.bbclass | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3eb261f..45ed8ba 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -64,29 +64,6 @@ inherit image-postproc-extension # Extra space for rootfs in MB ROOTFS_EXTRA ?= "64" -def get_image_name(d, name_link): - S = d.getVar("IMAGE_ROOTFS", True) - path_link = os.path.join(S, name_link) - - # If path_link does not exist, it might be a symlink - # in the target rootfs. This block attempts to resolve - # it relative to the rootfs location. - if not os.path.exists(path_link): - path_link = os.path.join( - S, - os.path.relpath( - os.path.realpath(path_link), - "/", - ), - ) - - if os.path.exists(path_link): - base = os.path.basename(os.path.realpath(path_link)) - full = d.getVar("IMAGE_FULLNAME", True) + "." + base - return [base, full] - - return ["", ""] - def get_rootfs_size(d): import subprocess rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True)) @@ -149,12 +126,14 @@ addtask rootfs_install before do_build after do_unpack do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files() { - if [ -n "${KERNEL_IMAGE}" ]; then - cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'vmlinuz')[0]} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE} + kernel="$(realpath -q '${IMAGE_ROOTFS}/vmlinuz')" + if [ -n "$kernel" ]; then + cp -f "$kernel" '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}' fi - if [ -n "${INITRD_IMAGE}" ]; then - sudo cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'initrd.img')[0]} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE} + initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" + if [ -n "$initrd" ]; then + cp -f "$initrd" '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}' fi # Check DTB_FILE via inline python to handle unset case: -- 2.20.1