From patchwork Tue Jun 7 20:52:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 8990 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 696AACCA47C for ; Tue, 7 Jun 2022 20:53:06 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web08.2684.1654635168297555608 for ; Tue, 07 Jun 2022 13:52:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Pdf8rdrW; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id n10so37618500ejk.5 for ; Tue, 07 Jun 2022 13:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lJG1/Vl0zqcVEpwyoWhH2SN0yXogMcZ48lFyGE3/AEc=; b=Pdf8rdrW4dIxnNIFGrBZu11orht0ZoDFxHaXAW9SJ6OKZ8r9cEpPqecfnfVrNt0N8r Lc9XI7VwEBIWUycLYrZuwAP3qHO/QXSRtg4x/wnmxXZe6uo96j3+wuTh0THYFazdnBqK 41iaM9RA8tdCrGiqcAVaj2wHgXri0Bwn6XMPubAKPEiJZ6l4nxMoScJdC9kmIpZDtCi6 Bo5PdXrLDW9+XJ7xkY279IKE/jpxXvv09OGUfaPCVEk5Y9Vb5wXaE2AVVdU22K8BvoDY wlgLL8YCUwPPRgge4dj+Il7ok1plja4CHdalZkY0c2f1QjEJrTT1pJ75rRNVhIFHjkWH 7ndg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lJG1/Vl0zqcVEpwyoWhH2SN0yXogMcZ48lFyGE3/AEc=; b=ga50XjnuaOnwTUAFS7wkCfskSolmxjz2oDwPiQ+2qM/Hl5PPFcepw+1lpykLHro5fI axfCw26EYknX/5St/tadQT+IDDHBGzSpXlnSW3hHoCc7QqamRZwT5oafQHYbUPxdKC/O k57gA190RKBijP56TxrLC683s9/2WmBW7QFOCQmC0DUFzT46AezZXeeQ0WVa42ius6Um E38tU3VuwE8GQVuLDRVFDrtikMqT008aOumYX8hIx1dw/4axEHnRMiF5+GraqhVKCEWC ckl2Tk8UUCXl60f+Sy+Nae/KVpTPMJTx494H57AjiA4MJIBY+qRav6GVhN96ZtNVLC8N Kq3w== X-Gm-Message-State: AOAM531KktfgxYYGO38vaFet5CEu8qJrWGN+kSvnBjjozNZuzUopehpb 1ozbubfNiXRPTGDD9py3a2gVAM8rS1c= X-Google-Smtp-Source: ABdhPJyQiTyogfr/dBTY9p6/tXoDxvgX+fiYw4spP3a8XgXLiO/FVsA6uf/MSHuFI2AxiVDjv2g0sw== X-Received: by 2002:a17:906:1f07:b0:710:2911:378c with SMTP id w7-20020a1709061f0700b007102911378cmr20409346ejj.8.1654635166748; Tue, 07 Jun 2022 13:52:46 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id qu19-20020a170907111300b006fe960c5c5asm8206592ejb.126.2022.06.07.13.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 13:52:46 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-core@lists.openembedded.org Cc: Martin Jansa Subject: [PATCH 1/2] buildhistory.bbclass: fix shell syntax when using dash Date: Tue, 7 Jun 2022 22:52:41 +0200 Message-Id: <20220607205242.1773119-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Jun 2022 20:53:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166686 * fix: run.buildhistory_get_image_installed.791888: 198: [: unexpected operator introduced in: commit 82e6172c1df378dff4e503aa878501c08937b5bb Author: Andres Beltran Date: Tue Oct 5 00:34:15 2021 +0000 buildhistory: Fix package output files for SDKs Signed-off-by: Martin Jansa --- meta/classes/buildhistory.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index e0853f1abe..0cb81e80c4 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -508,7 +508,7 @@ buildhistory_get_installed() { # Set correct pkgdatadir pkgdatadir=${PKGDATA_DIR} - if [ "$2" == "sdk" ] && [ "$3" == "host" ]; then + if [ "$2" = "sdk" ] && [ "$3" = "host" ] ; then pkgdatadir="${PKGDATA_DIR_SDK}" fi From patchwork Tue Jun 7 20:52:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 8989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67D39CCA499 for ; Tue, 7 Jun 2022 20:52:56 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web12.2574.1654635170353228842 for ; Tue, 07 Jun 2022 13:52:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WbDRes+D; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id h23so26506861ejj.12 for ; Tue, 07 Jun 2022 13:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0dtRdeGqoeeXnLpMcQLJCUxF28ezti13rutNBJ/LwAU=; b=WbDRes+Dt8L7gpUOPvdLxFNF4lT8cZ522+MDjc46QqqQJ4SOf6k67p0fb04C3qAO7y /obIpJmhrWND/yCrnkmEdUGW2cFiIGr9jeSHGY4Z0YofKkK5mjKJqiI8szzRJzgtICX5 NeBfzRyGJE2WuLq8dIPUp4l6VqYLBYC4kpOSU7TjKL23hOiiZAGHDUsiWJe4Vq7f2zk+ 0RcUqdzNwM8cVbFZ5MxHwzZBggKjrbrkoFJXivbvBWf0pw8FuM+QMW40cUnS4If5aKqg IElcWh9W2WJqu7vqCaiozIgRDc33I9SAaYUkwfJNHk0D4yP/OyP10nKoldZ9ILMOP9aG VAyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0dtRdeGqoeeXnLpMcQLJCUxF28ezti13rutNBJ/LwAU=; b=y+Gc+6pcz4snzoMLSda1AGtPnCkgRIX7yDcBV4TEFyvvEsEgCjeB27csyg0xFwkoXY b+iUjeVozAL3Zm8yNRQ2rqriu5KOjSK6Vc+izcheFcI6ltYWQSaqr4ftIVVi9sGxBPGI 5qKZY4W6f/FtUeHmgr0+U6fxK34VLGaaKPYPOH1e2AuMBm9JOji8D76KifKZddXm/dqk i41YSm5Q24tpO2SmhB3ELtXVeCPFcKs7pVlxMajPjkTZncuqjP58frQFMAFSpTmWrsGm lgbBytqVdX1+HbyWbfRI/15TmsOT3/0oqizS2oI9/vDBv7SykovEmpCt0wk90EzMiPuE wsUA== X-Gm-Message-State: AOAM531SeGbqsXWblUQ6gjzAOta+1TikoYNpfgou20YNQNiNpl2FA//f qnFRGvwmTOo9wqfm72VjOhe0XdPQkxU= X-Google-Smtp-Source: ABdhPJw8wJiADF+YD/secTtozNbu5o1QnCr/Ub2ex/5xS8hxRuJZ5WiVddbBWYuITJzoD8bl89VqRQ== X-Received: by 2002:a17:906:9749:b0:6f5:6cd:5bd9 with SMTP id o9-20020a170906974900b006f506cd5bd9mr29687545ejy.523.1654635168636; Tue, 07 Jun 2022 13:52:48 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id g11-20020a17090669cb00b006fec1a73e48sm8188993ejs.64.2022.06.07.13.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 13:52:48 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-core@lists.openembedded.org Cc: Martin Jansa Subject: [PATCH 2/2] rootfs.py: close kernel_abi_ver_file Date: Tue, 7 Jun 2022 22:52:42 +0200 Message-Id: <20220607205242.1773119-2-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607205242.1773119-1-Martin.Jansa@gmail.com> References: <20220607205242.1773119-1-Martin.Jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Jun 2022 20:52:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166687 * fixes: oe-core/meta/lib/oe/rootfs.py:331: ResourceWarning: unclosed file <_io.TextIOWrapper name='pkgdata/mach/kernel-depmod/kernel-abiversion' mode='r' encoding='UTF-8'> kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') Signed-off-by: Martin Jansa --- meta/lib/oe/rootfs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 61ccf369f1..9e6b411fb6 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -328,7 +328,9 @@ class Rootfs(object, metaclass=ABCMeta): if not os.path.exists(kernel_abi_ver_file): bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) - kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') + with open(kernel_abi_ver_file) as f: + kernel_ver = f.read().strip(' \n') + versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver) bb.utils.mkdirhier(versioned_modules_dir)