From patchwork Tue Apr 11 09:03:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22520 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 C7C8DC7619A for ; Tue, 11 Apr 2023 09:04:20 +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.web10.9100.1681203851802732642 for ; Tue, 11 Apr 2023 02:04:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=gKIF1DTJ; 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 j17so8861160ejs.5 for ; Tue, 11 Apr 2023 02:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681203850; x=1683795850; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LL/o4qKVIRqFbGelbRXRg3NXXG7FRRJ4+MdbTu1yY+0=; b=gKIF1DTJBQmm4RT6Hev1A31/5aftrfSVlnCP0rRnuPlC51HAcRg3jqgoqDymZr7NLW Bxthu6PDpjRFreKfGrrZF4OpmfT+7lYSR9at8hqo8vHIBHIcXwXauXnFr8bkp3smvuPb jMQ3ItFOInAxXRnO/sQ9B5OJCGanVuVSI7sDHQLTq/6/3vfZ6jeBQbh5kVS2Gz1NcAGW BJ3fb3WzJXuRpicLG42jmlMqyXoGjjJcxObZSzemv327QKAwbHs1Wl/QC+B0B/LI+EN4 bNOSPQAw2HQBYD/d+r2Nh7DDw//Fwd1TYlyhYMJlvmKzHxHyluaHGOev2TElQv4s5X9v Celg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681203850; x=1683795850; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LL/o4qKVIRqFbGelbRXRg3NXXG7FRRJ4+MdbTu1yY+0=; b=SsKNQoayvw10TceZnvxMXbmGMNXg6UeT3bQZdOHkzAim1BwgHZgBNx3lO43RadQZx+ ApGS4lpjCkkCN+LSr9Wtrtr9VPfvR0NiX+pvhqDQelhYNYe+D35oBz9c5LLKF609zs/n CT33DgDZ6h2TMfTt9jQOkv6+1C4gnVaf8wpiSdVW0Az08X2cFDXnKhH19/1CFTqlWMkC 37DbkWlB2RupwnOh/IsYXeEBkSiBnsJhwtApBCzrwFFHLx3lt2ljWkbWGeMoEY+R6HK3 /9Yj6x84In2TqCdwFjz6PXZVG21TGIkEkyI1JEt/FFdLByClszYkZUfeopD2LL6w+zjE ZJXA== X-Gm-Message-State: AAQBX9eUtEAeD84p0z1IxobTVG4cC06+GbagadO8I9LBOHbGy2giDdzB 2Y618ZvGYRvnphtngTemV973yOrJaQs= X-Google-Smtp-Source: AKy350Z4yvhOT00LuS6/SD74rnlcFSfs8WUS8AUtEWMknyBXD8ngJvFkQlF/4G+azCQpekWnvx6Aug== X-Received: by 2002:a17:907:6d08:b0:94a:6071:d613 with SMTP id sa8-20020a1709076d0800b0094a6071d613mr8836265ejc.64.1681203850113; Tue, 11 Apr 2023 02:04:10 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id h22-20020a1709063b5600b0094cafa4fb8bsm1096040ejf.124.2023.04.11.02.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 02:04:09 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-core@lists.openembedded.org Cc: Martin Jansa Subject: [PATCH 1/3] populate_sdk_ext.bbclass: set METADATA_REVISION with an DISTRO override Date: Tue, 11 Apr 2023 11:03:46 +0200 Message-Id: <20230411090348.2434686-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 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, 11 Apr 2023 09:04:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179911 * otherwise it ends '' inside esdk, because of parsing order: # $METADATA_REVISION [3 operations] # set /OE/build/test-D/conf/local.conf:43 # "f2da54ef432eac89b0f18eaad68e602b6990b5de" # immediate /OE/build/test-D/layers/poky/meta/classes/metadata_scm.bbclass:9 # "${@oe.buildcfg.detect_revision(d)}" # set /OE/build/test-D/layers/poky/meta/classes/metadata_scm.bbclass:10 # [vardepvalue] "${METADATA_REVISION}" # pre-expansion value: # "" METADATA_REVISION="" * This causes base-files.do_install and following tasks to have different signatures between esdk and the build directory where this esdk was created: bitbake-diffsigs {test-D,poky/build-uninative-disabled}/tmp/stamps/qemux86_64-poky-linux/base-files/*do_install*sigdata* NOTE: Starting bitbake server... basehash changed from 5b6981cf58bfd57d416b0e31611b73a26baae635dd1ac31c08d46f95064c3ffc to dbdce042da4d7813d632b6d1cc87a16f728ad20e55fecbc392830e6acf72babd Variable METADATA_REVISION value changed from '' to 'f2da54ef432eac89b0f18eaad68e602b6990b5de' and an warning from "python3 /OE/build/test-D/ext-sdk-prepare.py" when eSDK is being prepared for use: WARNING: The base-files:do_install sig is computed to be 83b9c9a6ef1145baac5a1e0d08814b9156af239c58fc42df95c25a9cd8a7f201, but the sig is locked to 3dc22233059075978e5503691e98e79e7cc60db94259dfcd886bca2291c0add7 in SIGGEN_LOCKEDSIGS_t-qemux86-64 Signed-off-by: Martin Jansa --- meta/classes-recipe/populate_sdk_ext.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index f619fc9011..7f55c83ee2 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass @@ -376,7 +376,7 @@ python copy_buildsystem () { f.write('BUILDCFG_HEADER = ""\n\n') # Write METADATA_REVISION - f.write('METADATA_REVISION = "%s"\n\n' % d.getVar('METADATA_REVISION')) + f.write('METADATA_REVISION:%s = "%s"\n\n' % (d.getVar('DISTRO'), d.getVar('METADATA_REVISION'))) f.write('# Provide a flag to indicate we are in the EXT_SDK Context\n') f.write('WITHIN_EXT_SDK = "1"\n\n') From patchwork Tue Apr 11 09:03:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22521 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 D5200C76196 for ; Tue, 11 Apr 2023 09:04:20 +0000 (UTC) Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.groups.io with SMTP id smtpd.web10.9101.1681203852633794222 for ; Tue, 11 Apr 2023 02:04:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=X4Nu0rJ9; spf=pass (domain: gmail.com, ip: 209.85.218.53, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f53.google.com with SMTP id ga37so18859663ejc.0 for ; Tue, 11 Apr 2023 02:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681203851; x=1683795851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pMQAuiAx/kPFkN46M6wztIxvpGWA6fEojtd7KzAdSKU=; b=X4Nu0rJ9E9LBerO08GaRr+teKrOJm9hZZDKMLwv4E87Wz9LlxRAzzNJZwsnDHp7g1f WMuGG3uVktfFf+wVAc19BOmqFQLjtQXaE8NOXj+lk8kbiAyTIS1F6sxlPtg5crIIAfqv g+ub3ABcUqV93jnmI/VDlxRwI/ymMJlD+y5MLiXqFRvuxRnMdMhT8Tr406ZXSns2ga4L In1J/SErnGQgtcB+IyIykroOZrFN8al9Oryf7tnmfU4hEcDeD9mnI7ykQCyK4YZb8l1T /hBIZn2Emwvg7MN2Cw/09EKXg+HUcrSujdYbLE9C7GxzL0oN90+fYpYq7FHkQGgjXVOA DBHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681203851; x=1683795851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pMQAuiAx/kPFkN46M6wztIxvpGWA6fEojtd7KzAdSKU=; b=ciHoECrnf3yUpZMeK5DTndxNoVmRObaYzaLZyuOVlBtfmPT5c8cDuDCkfRaRDvhUyy qK/1mLK/rMrl4p4vo1qYHi9o3JL6axDgeULIfhyC98EDafZAbDRG4VaAi3SGeOeQRVaP tgxFYVzqS6S+hYqMpBbYACsYGEf1ACYvYGx+plGUdQc/JKBQnuxYA/JHd4f0L90krWS0 55rsfGeIeSj0ysMMTkmx3Qyms+G8TuGxuzTBICvSaUiGzNgGO6GRu1d34RHaioLuyO0R nY0IpHFO9yjkDZojPZCdgwlb2GjHINkQqbtwhe2ZICb9xD14MeBSEzrBw3Z8ww8HoDpj lYsw== X-Gm-Message-State: AAQBX9cyY3skaKEorf1Bp2VG+av10jrYyXNIZ1cbodu6L1P6PW5wI3Tw fX1IFYYud9jNUUhKGoPNGIfx8W7hpMQ= X-Google-Smtp-Source: AKy350bTx6760PNWQvaP8IbquoYmdAGJa1k80EOWu2Kf0aV7r2uy4ioMrZ+pq80mzex5ERJNnjv/pg== X-Received: by 2002:a17:906:f285:b0:932:4990:2563 with SMTP id gu5-20020a170906f28500b0093249902563mr9151698ejb.24.1681203850810; Tue, 11 Apr 2023 02:04:10 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id lo12-20020a170906fa0c00b00947792df079sm5925678ejb.115.2023.04.11.02.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 02:04:10 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-core@lists.openembedded.org Cc: Martin Jansa Subject: [PATCH 2/3] populate_sdk_ext.bbclass: redirect stderr to stdout so that both end in LOGFILE Date: Tue, 11 Apr 2023 11:03:47 +0200 Message-Id: <20230411090348.2434686-2-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230411090348.2434686-1-Martin.Jansa@gmail.com> References: <20230411090348.2434686-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, 11 Apr 2023 09:04:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179912 * this in the end doesn't help much, I was debugging warning (about base-files.do_install signature being different than expected) from: python3 $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}' this shows the warning on console, but it doesn't end in $LOGFILE, because it writes only contents of cooker log into the $LOGFILE with: with open(logfile, 'a') as logf: logf.write('Preparing SDK for %s...\n' % ', '.join(sdk_targets)) ret = run_command_interruptible('BB_SETSCENE_ENFORCE=1 bitbake --quiet %s' % ' '.join(sdk_targets)) if not ret: ret = run_command_interruptible('bitbake --quiet build-sysroots') lastlog = get_last_consolelog() if lastlog: with open(lastlog, 'r') as f: for line in f: logf.write(line) if ret: print('ERROR: SDK preparation failed: error log written to %s' % logfile) return ret maybe we could remove whole support for $LOGFILE parameter and just redirect the output like other commands on this line Signed-off-by: Martin Jansa --- meta/classes-recipe/populate_sdk_ext.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index 7f55c83ee2..8146036fa9 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass @@ -739,7 +739,7 @@ sdk_ext_postinst() { # current working directory when first ran, nor will it set $1 when # sourcing a script. That is why this has to look so ugly. LOGFILE="$target_sdk_dir/preparing_build_system.log" - sh -c ". buildtools/environment-setup* > $LOGFILE && cd $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE && python3 $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo "printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; } + sh -c ". buildtools/environment-setup* > $LOGFILE 2>&1 && cd $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE 2>&1 && python3 $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo "printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; } fi if [ -e $target_sdk_dir/ext-sdk-prepare.py ]; then rm $target_sdk_dir/ext-sdk-prepare.py From patchwork Tue Apr 11 09:03:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22519 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 C8E77C77B6F for ; Tue, 11 Apr 2023 09:04:20 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web10.9102.1681203853027930116 for ; Tue, 11 Apr 2023 02:04:13 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=iWnHKpX3; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id ga37so18859692ejc.0 for ; Tue, 11 Apr 2023 02:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681203851; x=1683795851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uiPFDJz/NTArYRs6NVo0RStPLEO83OjwnoRMm9iN5LE=; b=iWnHKpX3/IZoa+MHS3wiuIqRpqEgk99WAZHUcoZDiVjJoIe8Y4MH0utQV93zERdYQL r25DDKH2Cyzmnjfqa0HRsaKsQcS6JKh+R036JQvOLg18P5tChEog7ppHtAL9OTzGbhaD lrnGMSBf/rmMLJG2ZVCiMtn5d+WZpntwLlKtNxzteqqGAFZBqCAdhX0SZ6eFI+yUR/um ysuRRWFVtBfTnEFY2HteRhp/vC6yjvrUGvnrjqabL1y9tpG3esLhB8NCE5JHNEXkzU6n 1PBup1IU8YiwLXBHdfiVoyi9DGS9lUGHrPUacBf3967Npomi/sXWz0IsTYsXXkidEWLe S8YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681203851; x=1683795851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uiPFDJz/NTArYRs6NVo0RStPLEO83OjwnoRMm9iN5LE=; b=HXU0nkbqyq9TUSwcuPPrJZV8af7pnkxWNn5TvtVPyYHIKhTF+CELX4jJhYcnGR0H5M KCICmZeT5lquYvmgKzoKOQMTfVomMoKwsQpTe7EKGGJ75aGiJnibbZ1N6C2hy+LsJ5t2 CYnMkJclH1L95vHB1g7+bxMn1NHxd7yLBsYF08n5T5PaJbWLapAGYjiCPLN1hKR8xxXt Go8JtWC23c1Fpq3kKPdeWsO0Zqk2+IBwznUwTbDCn/8I4DaHUKT109VxTwxpWJD+iqIq socHxkJyTSe2GtxJ1sibHWCDqalvaQxM5ZNcvvxNx6rRfY33rlS9SpTT/h3SZHHgvIn+ E8OA== X-Gm-Message-State: AAQBX9dvcuJzTU94NEvWV2aK4pnnaXgj7eFwR1kttiS4kvwgDb9QXIBQ cIKFm92glSY3f6D6gpNUErhqOKpYpWI= X-Google-Smtp-Source: AKy350ZKIQiXwmyoa2cK7PQZ9BI535SuqQV1XmaZ9vOruXolTZDAdg9mP3Ti5DAevidncX0jRZYGXQ== X-Received: by 2002:a17:907:9693:b0:948:a1ae:b2c4 with SMTP id hd19-20020a170907969300b00948a1aeb2c4mr12088027ejc.6.1681203851503; Tue, 11 Apr 2023 02:04:11 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id s12-20020a17090699cc00b008ec4333fd65sm5889007ejn.188.2023.04.11.02.04.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 02:04:11 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-core@lists.openembedded.org Cc: Martin Jansa Subject: [PATCH 3/3] oeqa: print stderr in the AssertionError as well Date: Tue, 11 Apr 2023 11:03:48 +0200 Message-Id: <20230411090348.2434686-3-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230411090348.2434686-1-Martin.Jansa@gmail.com> References: <20230411090348.2434686-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, 11 Apr 2023 09:04:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179913 Signed-off-by: Martin Jansa --- meta/lib/oeqa/utils/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index c1f533802e..7b2f6ec124 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -209,7 +209,7 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, sync=T exc_output = "\n... (last %d lines of output)\n" % limit_exc_output + \ '\n'.join(split[-limit_exc_output:]) if assert_error: - raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output)) + raise AssertionError("Command '%s' returned non-zero exit status %d:\nstderr: %s\nstdout:\n%s" % (command, result.status, result.error, exc_output)) else: raise CommandError(result.status, command, exc_output)