From patchwork Thu Jan 30 02:51:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56265 X-Patchwork-Delegate: steve@sakoman.com 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 B7060C0218D for ; Thu, 30 Jan 2025 02:51:26 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.7673.1738205484485285916 for ; Wed, 29 Jan 2025 18:51:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=0aZri2ge; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-216281bc30fso7245615ad.0 for ; Wed, 29 Jan 2025 18:51:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205484; x=1738810284; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qrrudlDiYEYUOtm85uihCfVq5gWck6dASM/6cY5H66k=; b=0aZri2gedmifsFIffIbyti0SN3DALueIT2oWU04F3E3WMgieKUk0pD6Qy4S6FgxM7+ 2aTInlCPrvLIL9OdOcAY/CC/Lb0gfteAU9T8zSUWOV3A0vv4J1cUez/7kG4Gf4lfYS+T vhIONDhC4XQPceU/L3olN8zQpG4hr3/JSCZCuXbuq/sdCMaxHbbhFKnvizMkJHcq0vz0 F/FLi6qeDUTXaxuPKGLDa9YO3pJZ2bKn4+Iu6yDsyMZd+IYeU27mZSKI5QRR24DXLw0d YgY1cCYlz4zeW/9NOACEOiILK5sdjmXm5B8Oc0e/a64Ka7SDfrVxCJl7NZf7xcHVSbRW 7KUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205484; x=1738810284; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qrrudlDiYEYUOtm85uihCfVq5gWck6dASM/6cY5H66k=; b=IwHZj8gvi4a/aiTqn4qb0VYAmQ/Ed64bKByiEjK3E4pZox5Fw+Ff4As+/jfjOY0DR6 cIUt/AlR6gMINI673fBLdObJCmQJfVboo6h+tN4IQH9hgDaBqp/OQH4bOBQWhq0hbTgT Pacppye+vvcz2CsPzsszlPyZ3W5mDU5AfJ9p2iHY53WnQ40pjGzlEHlHOVXBGJnpzO2+ k2+HJ0+2kpY5+jj3b/AeMGYBKHolyEhAflmU9+WXq7Y6quud+xF36PNbE0GE3TwAplbK IFxHyR85mszR6tOL/uWsOCdILxyoLevN3vPhkpO/Lbxb4W3K0F7YENViYTIuyWqPn5UT fVjg== X-Gm-Message-State: AOJu0YxCU1LvVv3mQ+B5AjHUEsHu6GHIxS33W7zEGAXjt9pLTGGc2fdw ynUy0qaNqOhF/AsVBtX6cClw9PLxVi+Iu9Vgbai3Xq34tfNLJg0NTmneNxZSJJX6SWLcyfKHHfn toFY= X-Gm-Gg: ASbGnctDKNgRkyyDqiQtG/0Us61g+Z4TtAdFk6Iom8q7fWxe74G50DsNFO65pvsMUuw 3ley+PsthP9PI9uK1O7XCrRSYGygftddBhZ4uwa9H6yr+oY8TlBhnLFccVtHTHQMShGZfEaTdi7 dXiyd1nflp2b8ffmnOi6FghHVH4s/5NHZdmdlfVhbxHi/Nl9eIOHiSgQ2XeDN3Aq7UoB0Cnx9m8 BJ41MZ8+l4JriRarsj7RS/S13vjwqV5tyCgC3+Z71bPk17h/b7qxKY46KP6WVcUbjdf3cVqmX/D 9xuJ X-Google-Smtp-Source: AGHT+IHoA1MgVbPoARmPD2LU9Mh7cr8NiI8nc5ku4svAfEDpHNlgI2MR2Xv41J+THw8kTmWQ06APHA== X-Received: by 2002:a17:902:ecce:b0:211:3275:3fe with SMTP id d9443c01a7336-21dd7c65555mr83698465ad.17.1738205483351; Wed, 29 Jan 2025 18:51:23 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:23 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 01/12] openssl: patch CVE-2024-13176 Date: Wed, 29 Jan 2025 18:51:02 -0800 Message-ID: <7f9bb49394185fea268397db4fc7d96afae53f28.1738205405.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210422 From: Peter Marko Picked [1] per link in [2] [1] https://github.com/openssl/openssl/commit/4b1cb94a734a7d4ec363ac0a215a25c181e11f65 [2] https://nvd.nist.gov/vuln/detail/CVE-2024-13176 Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- .../openssl/openssl/CVE-2024-13176.patch | 126 ++++++++++++++++++ .../openssl/openssl_3.2.3.bb | 1 + 2 files changed, 127 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-13176.patch diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2024-13176.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2024-13176.patch new file mode 100644 index 0000000000..28d4dd706a --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/CVE-2024-13176.patch @@ -0,0 +1,126 @@ +From 4b1cb94a734a7d4ec363ac0a215a25c181e11f65 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Wed, 15 Jan 2025 18:27:02 +0100 +Subject: [PATCH] Fix timing side-channel in ECDSA signature computation + +There is a timing signal of around 300 nanoseconds when the top word of +the inverted ECDSA nonce value is zero. This can happen with significant +probability only for some of the supported elliptic curves. In particular +the NIST P-521 curve is affected. To be able to measure this leak, the +attacker process must either be located in the same physical computer or +must have a very fast network connection with low latency. + +Attacks on ECDSA nonce are also known as Minerva attack. + +Fixes CVE-2024-13176 + +Reviewed-by: Tim Hudson +Reviewed-by: Neil Horman +Reviewed-by: Paul Dale +(Merged from https://github.com/openssl/openssl/pull/26429) + +(cherry picked from commit 63c40a66c5dc287485705d06122d3a6e74a6a203) +(cherry picked from commit 392dcb336405a0c94486aa6655057f59fd3a0902) + +CVE: CVE-2024-13176 +Upstream-Status: Backport [https://github.com/openssl/openssl/commit/4b1cb94a734a7d4ec363ac0a215a25c181e11f65] +Signed-off-by: Peter Marko +--- + crypto/bn/bn_exp.c | 21 +++++++++++++++------ + crypto/ec/ec_lib.c | 7 ++++--- + include/crypto/bn.h | 3 +++ + 3 files changed, 22 insertions(+), 9 deletions(-) + +diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c +index b876edbfac36e..af52e2ced6914 100644 +--- a/crypto/bn/bn_exp.c ++++ b/crypto/bn/bn_exp.c +@@ -606,7 +606,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top, + * out by Colin Percival, + * http://www.daemonology.net/hyperthreading-considered-harmful/) + */ +-int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, ++int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, + BN_MONT_CTX *in_mont) + { +@@ -623,10 +623,6 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, + unsigned int t4 = 0; + #endif + +- bn_check_top(a); +- bn_check_top(p); +- bn_check_top(m); +- + if (!BN_is_odd(m)) { + ERR_raise(ERR_LIB_BN, BN_R_CALLED_WITH_EVEN_MODULUS); + return 0; +@@ -1146,7 +1142,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, + goto err; + } else + #endif +- if (!BN_from_montgomery(rr, &tmp, mont, ctx)) ++ if (!bn_from_mont_fixed_top(rr, &tmp, mont, ctx)) + goto err; + ret = 1; + err: +@@ -1160,6 +1156,19 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, + return ret; + } + ++int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, ++ const BIGNUM *m, BN_CTX *ctx, ++ BN_MONT_CTX *in_mont) ++{ ++ bn_check_top(a); ++ bn_check_top(p); ++ bn_check_top(m); ++ if (!bn_mod_exp_mont_fixed_top(rr, a, p, m, ctx, in_mont)) ++ return 0; ++ bn_correct_top(rr); ++ return 1; ++} ++ + int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, + const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont) + { +diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c +index c92b4dcb0ac45..a79fbb98cf6fa 100644 +--- a/crypto/ec/ec_lib.c ++++ b/crypto/ec/ec_lib.c +@@ -21,6 +21,7 @@ + #include + #include + #include "crypto/ec.h" ++#include "crypto/bn.h" + #include "internal/nelem.h" + #include "ec_local.h" + +@@ -1261,10 +1262,10 @@ static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r, + if (!BN_sub(e, group->order, e)) + goto err; + /*- +- * Exponent e is public. +- * No need for scatter-gather or BN_FLG_CONSTTIME. ++ * Although the exponent is public we want the result to be ++ * fixed top. + */ +- if (!BN_mod_exp_mont(r, x, e, group->order, ctx, group->mont_data)) ++ if (!bn_mod_exp_mont_fixed_top(r, x, e, group->order, ctx, group->mont_data)) + goto err; + + ret = 1; +diff --git a/include/crypto/bn.h b/include/crypto/bn.h +index 302f031c2ff1d..499e1d10efab0 100644 +--- a/include/crypto/bn.h ++++ b/include/crypto/bn.h +@@ -73,6 +73,9 @@ int bn_set_words(BIGNUM *a, const BN_ULONG *words, int num_words); + */ + int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, + BN_MONT_CTX *mont, BN_CTX *ctx); ++int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, ++ const BIGNUM *m, BN_CTX *ctx, ++ BN_MONT_CTX *in_mont); + int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, + BN_CTX *ctx); + int bn_from_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, diff --git a/meta/recipes-connectivity/openssl/openssl_3.2.3.bb b/meta/recipes-connectivity/openssl/openssl_3.2.3.bb index 2c30dbd47a..0b47bab550 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.2.3.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.2.3.bb @@ -13,6 +13,7 @@ SRC_URI = "https://github.com/openssl/openssl/releases/download/openssl-${PV}/op file://0001-Configure-do-not-tweak-mips-cflags.patch \ file://0001-Added-handshake-history-reporting-when-test-fails.patch \ file://CVE-2024-9143.patch \ + file://CVE-2024-13176.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Thu Jan 30 02:51:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56273 X-Patchwork-Delegate: steve@sakoman.com 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 95D16C02192 for ; Thu, 30 Jan 2025 02:51:36 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.7674.1738205487963831485 for ; Wed, 29 Jan 2025 18:51:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jAgxY6NO; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21654fdd5daso4499445ad.1 for ; Wed, 29 Jan 2025 18:51:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205487; x=1738810287; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PcKLyEwSP+XGe9PeCD70NykJiiFdnIdFVeBlXw3SKRc=; b=jAgxY6NOREoyCiRB0qpRf4BcHglSZApshUfplP03014M7UrqQWupsosGnJk0uJx+hy f5tTG5tn0pSdukueUJ/O+0Jn31oxWGItPqRv603JJTTEJpHU+kDcooz6Slzi8i6TXmCZ rEDe1R4HPcJTn3uYsQqccJTwTNrepnKSq5z4oDtdhyKJFIsVlv9oCGWPLeUluHgCPygH xQZvi3jBp6RslBb17NF0i+o7tFekDuddkZtVuhp5jQIkQvQAAHpsA9rkA5jXtKHIONCH CCEObCQpeVIKav8Ues4Skss4iupPyEdqmrOaW4VAC3PpUEyhSxCxNMTdswHcFRwNVPKr d5Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205487; x=1738810287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PcKLyEwSP+XGe9PeCD70NykJiiFdnIdFVeBlXw3SKRc=; b=KPuzPf9amscd7sqccP/HljYefS63C17chOSTRo2aI4cm/8F3msRnqqqQelalDwyTMx 8tv7STKUhLnM45ycoGx1Gs0bc3rty/YeaLy7jfnXJqDHHAVehuFZVhQkaQGpEzu00byl zWANMHghklv6Lo5D4Eey0QERn8eS3BmW5tBz4Eo2egXN4rpEHiIhY33zYuNmgmvX5b8D +16K6A5KHJYnEfgDGSXhD6NjCbyPzBVoCXNKajAjeTK1kaa4rLA4Em5RmfvvlH4d4un8 8bYnNIQFoK2rRdslpNUCL0tmdgJJv45BY6TUhloX7hFpSeQAwmB6Nt7Y1mtVixgelYz2 JHIg== X-Gm-Message-State: AOJu0YyP8pjRVAxK/tE/xU3ffMIR9qZd0TKrAs3RpDCVIsEanjM+RmvZ 1OK6iGHkV4/yQxIBpkd1RKqst2dDukHIFz23//Pn6lYF5EmL/2+hJmTKCCQkcQeBwEqGOcxns3V 7vhQ= X-Gm-Gg: ASbGnctHqY1u7Pw4KYlss3S0+xhDmSFK0Nofoh+ZjT07jLSSH9Bl9lWggRCozGhaIrW cz2ZX4wCTHDMv2K14L6BPYcMDV2PRai1q88X3jVyr/7eHoyN7QaBJO0rJmkvVy2zIW34KTvCusn Jx2q3sDa2K0Z9g9TxdSujD6PlkvoIq1B2WafVrrt6iH+Y3NglvhilHDomb3mbgt1SYD05Ga1kRp VzNpY74WZ0Pfm4C8t0k/OVpRj0k8p757x8WJE8A/qCs0PdgUgZlXjuyIJ7FWAmp8O/ptpf0i02G qrdt X-Google-Smtp-Source: AGHT+IFMJdUv3OdRxilLL9/MJ50ERSAZUmUxBlcq3b4A7P1O8D7HREIli6NQiZDJnYtDbW5/NHa0BA== X-Received: by 2002:a05:6a21:516:b0:1e1:9f57:eab4 with SMTP id adf61e73a8af0-1ed7a5f9036mr8967396637.16.1738205485463; Wed, 29 Jan 2025 18:51:25 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:25 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 02/12] systemd: upgrade 255.13 -> 255.17 Date: Wed, 29 Jan 2025 18:51:03 -0800 Message-ID: <57ca5a2c912fcc4836f263ff2b98c9de2130f324.1738205405.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210423 From: Guðni Már Gilbert The update includes 156 commits. Full list of changes can be found on Github [1] All patches were refreshed with devtool. One patch had to be manually rebased to resolve a merge conflict introduced with 255.14 [2]. [1] https://github.com/systemd/systemd-stable/compare/v255.13...v255.17 [2] 0003-src-basic-missing.h-check-for-missing-strndupa.patch Signed-off-by: Guðni Már Gilbert Signed-off-by: Steve Sakoman --- ...55.13.bb => systemd-boot-native_255.17.bb} | 0 ...-boot_255.13.bb => systemd-boot_255.17.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...1-missing_type.h-add-comparison_fn_t.patch | 2 +- ...k-parse_printf_format-implementation.patch | 6 ++-- ...tall-dependency-links-at-install-tim.patch | 2 +- ...missing.h-check-for-missing-strndupa.patch | 33 ++++++++++-------- ...OB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | 2 +- ...005-add-missing-FTW_-macros-for-musl.patch | 2 +- ...06-Use-uintmax_t-for-handling-rlim_t.patch | 6 ++-- ...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 2 +- ...patible-basename-for-non-glibc-syste.patch | 2 +- ...implment-systemd-sysv-install-for-OE.patch | 2 +- ...uffering-when-writing-to-oom_score_a.patch | 4 +-- ...compliant-strerror_r-from-GNU-specif.patch | 2 +- ...definition-of-prctl_mm_map-structure.patch | 2 +- ...-not-disable-buffer-in-writing-files.patch | 34 +++++++++---------- .../0013-Handle-__cpu_mask-usage.patch | 2 +- .../systemd/0014-Handle-missing-gshadow.patch | 2 +- ...l.h-Define-MIPS-ABI-defines-for-musl.patch | 2 +- ...ass-correct-parameters-to-getdents64.patch | 2 +- .../0017-Adjust-for-musl-headers.patch | 6 ++-- ...trerror-is-assumed-to-be-GNU-specifi.patch | 2 +- ...util-Make-STRERROR-portable-for-musl.patch | 2 +- ...ake-malloc_trim-conditional-on-glibc.patch | 4 +-- ...hared-Do-not-use-malloc_info-on-musl.patch | 2 +- ...22-avoid-missing-LOCK_EX-declaration.patch | 4 +-- .../{systemd_255.13.bb => systemd_255.17.bb} | 0 28 files changed, 68 insertions(+), 63 deletions(-) rename meta/recipes-core/systemd/{systemd-boot-native_255.13.bb => systemd-boot-native_255.17.bb} (100%) rename meta/recipes-core/systemd/{systemd-boot_255.13.bb => systemd-boot_255.17.bb} (100%) rename meta/recipes-core/systemd/{systemd_255.13.bb => systemd_255.17.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot-native_255.13.bb b/meta/recipes-core/systemd/systemd-boot-native_255.17.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot-native_255.13.bb rename to meta/recipes-core/systemd/systemd-boot-native_255.17.bb diff --git a/meta/recipes-core/systemd/systemd-boot_255.13.bb b/meta/recipes-core/systemd/systemd-boot_255.17.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_255.13.bb rename to meta/recipes-core/systemd/systemd-boot_255.17.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 88f24f99c2..c359d77e9d 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "565916c245b53b49f5917f5326d21246f46ae3db" +SRCREV = "fb92304041cd203d2ca84cc28721dea5e1355c4e" SRCBRANCH = "v255-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch index 78a4bf5868..9e9ccf51c8 100644 --- a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch +++ b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch @@ -1,4 +1,4 @@ -From af2784935b483bd0eb5705ef7072a5cea6fe9eef Mon Sep 17 00:00:00 2001 +From abbda6d89c0b850c0adeebc3e210d9b255072a40 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 Subject: [PATCH] missing_type.h: add comparison_fn_t diff --git a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch index e19f7dc688..c91f24b026 100644 --- a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch @@ -1,4 +1,4 @@ -From b9b4f9bbca46832ea152979d8c9459f29c2e83fa Mon Sep 17 00:00:00 2001 +From adaa70c17daedd8d81525d080fda8a1e22efe3a4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sat, 22 May 2021 20:26:24 +0200 Subject: [PATCH] add fallback parse_printf_format implementation @@ -22,10 +22,10 @@ Signed-off-by: Scott Murray create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 2418d6e8f7..b544a69aaa 100644 +index d5109b0d00..ccde927cf3 100644 --- a/meson.build +++ b/meson.build -@@ -731,6 +731,7 @@ endif +@@ -732,6 +732,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', diff --git a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch index aca30d5ffe..11e9be6059 100644 --- a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,4 +1,4 @@ -From 178b7b4adefdf1d80fa3a5eb54a49ef0fc12369f Mon Sep 17 00:00:00 2001 +From 95bf78fe7d7b7d41ff43e761bb78adfb4fdb9303 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at install time for diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch index 802002a1c3..0b75896b00 100644 --- a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,10 @@ -From eca6019bbd793c8d8a99142677a548766a775153 Mon Sep 17 00:00:00 2001 +From 76f4749e3a583ad3c924bdff4a6bde967c674ed7 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 Subject: [PATCH] src/basic/missing.h: check for missing strndupa +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit include missing.h for definition of strndupa @@ -20,6 +23,8 @@ Signed-off-by: Luca Boccassi [Rebased for v254] Signed-off-by: Chen Qi [Rebased for v255.1] +Signed-off-by: Guðni Már Gilbert +[Rebased for v255.14] --- meson.build | 1 + src/backlight/backlight.c | 1 + @@ -75,7 +80,7 @@ Signed-off-by: Chen Qi 51 files changed, 62 insertions(+) diff --git a/meson.build b/meson.build -index b544a69aaa..90b07aeb14 100644 +index 216a8cbc91..d5109b0d00 100644 --- a/meson.build +++ b/meson.build @@ -572,6 +572,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] @@ -99,7 +104,7 @@ index b2032adaa5..ee9201826d 100644 #define PCI_CLASS_GRAPHICS_CARD 0x30000 diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 50224648d3..2eaa6e3307 100644 +index e978bd3eff..d08c903c3b 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -38,6 +38,7 @@ @@ -239,7 +244,7 @@ index d7cfcd9105..6cb0ddf575 100644 int procfs_get_pid_max(uint64_t *ret) { _cleanup_free_ char *value = NULL; diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index f9014dc560..1d7840a5b5 100644 +index 0c2d739977..5c150806a0 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -27,6 +27,7 @@ @@ -263,7 +268,7 @@ index 12dfdf76fa..e66332519a 100644 static char **arg_path = NULL; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 88198010ee..74d61bfaaf 100644 +index b3baf03afc..7404784a01 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -25,6 +25,7 @@ @@ -299,7 +304,7 @@ index 7bb026af48..a86128e40c 100644 int bus_property_get_triggered_unit( sd_bus *bus, diff --git a/src/core/execute.c b/src/core/execute.c -index 4d597bf8a6..7d27f80834 100644 +index aa179fd57e..1ee9f4526b 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -72,6 +72,7 @@ @@ -323,7 +328,7 @@ index b8e3f7aadd..8ce8ca68d8 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index 5f4859e0d3..a920154f55 100644 +index d3ea8a9c3c..c3441f785c 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -45,6 +45,7 @@ @@ -371,7 +376,7 @@ index 2d380bc7a7..d3f5612728 100644 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 87e2f28841..58275f41f1 100644 +index f52ed03dd0..3fa708a906 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -77,6 +77,7 @@ @@ -443,7 +448,7 @@ index d988588de0..458df8df9a 100644 #define MAX_SIZE (2*1024*1024) diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c -index 7a1dd2569f..d187baad47 100644 +index acabec699f..8115d3784a 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -44,6 +44,7 @@ @@ -467,19 +472,19 @@ index bf45974ca5..2cb7e930c0 100644 #include "parse-util.h" #include "path-util.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index 48527a2c73..9777fe0561 100644 +index e5f78a3b99..4833de2009 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c -@@ -14,6 +14,7 @@ - #include "string-table.h" +@@ -15,6 +15,7 @@ #include "string-util.h" #include "strv.h" + #include "vlan-util.h" +#include "missing_stdlib.h" /* # .network diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index 161b1c1c70..ba1c459f78 100644 +index 2bb034eb22..c9837b8d79 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ @@ -503,7 +508,7 @@ index c64e79bdff..eda26b0b9a 100644 static void setup_logging_once(void) { static pthread_once_t once = PTHREAD_ONCE_INIT; diff --git a/src/portable/portable.c b/src/portable/portable.c -index faeb97bd06..30768f728e 100644 +index 4aced8c391..6f426e0e51 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -42,6 +42,7 @@ diff --git a/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index ccfe8e6aa9..96872ac150 100644 --- a/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +++ b/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch @@ -1,4 +1,4 @@ -From a15045a60893f29ce9720e62cafbc0b87908ad49 Mon Sep 17 00:00:00 2001 +From e9110b095a5728762b3bd3abdec2a99b4ce01b5e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:56:21 +0800 Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined diff --git a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch index a29aab8390..936183f238 100644 --- a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch @@ -1,4 +1,4 @@ -From b2c98ef636ac7dfdf86e7a42aebc3142a5b167d2 Mon Sep 17 00:00:00 2001 +From 1eeac3e8ce96ad5da381555e93a57330cb8a5d48 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:00:06 +0800 Subject: [PATCH] add missing FTW_ macros for musl diff --git a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch index 818b946886..34d62c9e32 100644 --- a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,4 +1,4 @@ -From 3ea46787827fb6db631b240589d2f447b977f7d9 Mon Sep 17 00:00:00 2001 +From fd2bb25921040fc5faed3a4aae0bd9e03f8f4742 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:12:41 +0800 Subject: [PATCH] Use uintmax_t for handling rlim_t @@ -86,10 +86,10 @@ index c1f0b2b974..61c5412582 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index 7d27f80834..bde0f8137c 100644 +index 1ee9f4526b..cb29799afb 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -1042,9 +1042,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -1043,9 +1043,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index ad7cf90f1d..7cc8002a90 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,4 +1,4 @@ -From 0e51be93aa8c647bf1761d684c722b92d3cfabc1 Mon Sep 17 00:00:00 2001 +From fde97394bf1a2faffa420afb098af61676033640 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 10 Oct 2017 14:33:30 -0700 Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() diff --git a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch index 4d6382810b..5579dc3dcc 100644 --- a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,4 +1,4 @@ -From 9f85e2db2b40313de555b3103aa485b9b84382fe Mon Sep 17 00:00:00 2001 +From e2e1fee9fd5635420408777524dd418ce10dddc8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 May 2018 08:36:44 -0700 Subject: [PATCH] Define glibc compatible basename() for non-glibc systems diff --git a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch index 0909185dcf..2151d51af2 100644 --- a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch +++ b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch @@ -1,4 +1,4 @@ -From c223945b20aadd1e3b1f3986e159cb3755aabf99 Mon Sep 17 00:00:00 2001 +From 2b40558d201b73962077d0cedef820dfe95395c7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 5 Sep 2015 06:31:47 +0000 Subject: [PATCH] implment systemd-sysv-install for OE diff --git a/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 55a033ecec..6586cbb72c 100644 --- a/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,4 +1,4 @@ -From 64b98f7ba1f5211bd19cd98c9d7e4d0f884cf65d Mon Sep 17 00:00:00 2001 +From b783adf25c5619931189b4474d389a808e7845d6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 4 Jul 2018 15:00:44 +0800 Subject: [PATCH] Do not disable buffering when writing to oom_score_adj @@ -24,7 +24,7 @@ Signed-off-by: Scott Murray 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 4492e7ded2..b61a2aba74 100644 +index 1447f65399..dcbc7ac973 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) { diff --git a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index f3f3698e5a..79db096b34 100644 --- a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,4 +1,4 @@ -From bc75e47baaddbd629d9757a2539102649d9501fd Mon Sep 17 00:00:00 2001 +From ac820a745c905e0045ce5cc41da7eaa802078b1b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 10 Jul 2018 15:40:17 +0800 Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi diff --git a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch index a73c67efb1..67fd4921ba 100644 --- a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,4 +1,4 @@ -From e8a03df3275aef82a1bfd5c1ce60058c5e39eb09 Mon Sep 17 00:00:00 2001 +From 4a2472cae75720b3129260c8789a87af26ca443a Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:44:54 +0800 Subject: [PATCH] avoid redefinition of prctl_mm_map structure diff --git a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch index c2defc7e1e..e735a00bb9 100644 --- a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch @@ -1,4 +1,4 @@ -From f3630404d25dd91e87e7aac09d5dee9b92655082 Mon Sep 17 00:00:00 2001 +From 8072fee9fcb0e9a8c73de56f38468e7287ac4961 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Mar 2019 15:22:15 +0800 Subject: [PATCH] do not disable buffer in writing files @@ -47,7 +47,7 @@ Signed-off-by: Chen Qi 22 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 2eaa6e3307..5c2876b5c9 100644 +index d08c903c3b..77ebe85dfd 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -443,7 +443,7 @@ int cg_kill_kernel_sigkill(const char *path) { @@ -59,7 +59,7 @@ index 2eaa6e3307..5c2876b5c9 100644 if (r < 0) return r; -@@ -869,7 +869,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -873,7 +873,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -68,7 +68,7 @@ index 2eaa6e3307..5c2876b5c9 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -887,7 +887,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -891,7 +891,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -77,7 +77,7 @@ index 2eaa6e3307..5c2876b5c9 100644 if (r < 0) return r; -@@ -914,7 +914,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -918,7 +918,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -86,7 +86,7 @@ index 2eaa6e3307..5c2876b5c9 100644 if (r < 0) return r; -@@ -924,7 +924,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -928,7 +928,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -95,7 +95,7 @@ index 2eaa6e3307..5c2876b5c9 100644 if (r < 0) return r; -@@ -1840,7 +1840,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -1844,7 +1844,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -201,10 +201,10 @@ index 61539afdbf..77e2b35daf 100644 return r; diff --git a/src/core/main.c b/src/core/main.c -index 1c0030a75f..7108a87d46 100644 +index 8373a156cb..33e866942c 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1683,7 +1683,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; @@ -253,7 +253,7 @@ index 500c310cfc..f9845ff9e7 100644 log_warning_errno(r, "Failed to drop caches, ignoring: %m"); else diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index 01e66b4658..f3ea82ca1b 100644 +index 5f7491e8e2..b4a0af4073 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, @@ -279,10 +279,10 @@ index a5002437c6..b12e6cd9c9 100644 log_error_errno(r, "Failed to move process: %m"); goto finish; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index a229c70875..4ceb73e915 100644 +index 005a3d2be1..526d3c4311 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) { +@@ -2707,7 +2707,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -291,7 +291,7 @@ index a229c70875..4ceb73e915 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -4143,7 +4143,7 @@ static int setup_uid_map( +@@ -4160,7 +4160,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); @@ -300,7 +300,7 @@ index a229c70875..4ceb73e915 100644 if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); -@@ -4153,7 +4153,7 @@ static int setup_uid_map( +@@ -4170,7 +4170,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); @@ -367,10 +367,10 @@ index 805503f366..01a7ccb291 100644 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c -index ea1b024ab6..bb82f37580 100644 +index 67862dcc61..9e9265c214 100644 --- a/src/shared/hibernate-util.c +++ b/src/shared/hibernate-util.c -@@ -501,7 +501,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -504,7 +504,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ @@ -379,7 +379,7 @@ index ea1b024ab6..bb82f37580 100644 if (r == -ENOENT) { if (offset != 0) return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), -@@ -517,7 +517,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -520,7 +520,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", offset_str, device); diff --git a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch index 4982d6c7af..e995da81ff 100644 --- a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch +++ b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch @@ -1,4 +1,4 @@ -From db390dc6bfa0a7b27010e0dcd25f45f17a6e3954 Mon Sep 17 00:00:00 2001 +From 4b46cf08f269b69d5336bf3d8f617a288bd65ea8 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 13 Sep 2019 19:26:27 -0400 Subject: [PATCH] Handle __cpu_mask usage diff --git a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch index ac74d1fab7..8cc9c1ba0c 100644 --- a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch +++ b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch @@ -1,4 +1,4 @@ -From 0019ddcc5c415df52504dd2b779b5acb19e4084d Mon Sep 17 00:00:00 2001 +From 76a0eea205c943a0e1fd0db7336cabb98d5c6c8c Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Tue, 10 Mar 2020 11:05:20 +0000 Subject: [PATCH] Handle missing gshadow diff --git a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch index 551d9f8037..915a7bb0be 100644 --- a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch @@ -1,4 +1,4 @@ -From eb4095a963a51a1b3de693f8cf0ac27304f30d24 Mon Sep 17 00:00:00 2001 +From bd309e23e3e5b7bff8cd4b6778396d921438295e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 12 Apr 2021 23:44:53 -0700 Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl diff --git a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch index 947833e92b..a9961b515d 100644 --- a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch +++ b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch @@ -1,4 +1,4 @@ -From c9c0cdbc37c2e0ac1917188b6f3a1ad54cbbd816 Mon Sep 17 00:00:00 2001 +From 81eb93545808124b3c1abbef2e5d71ad28a1a870 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Jan 2022 15:15:11 -0800 Subject: [PATCH] pass correct parameters to getdents64 diff --git a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch index 922a390cc3..d8557bd3f3 100644 --- a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch +++ b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch @@ -1,4 +1,4 @@ -From 038809fb270d11909d502d76b56bb83784ff478d Mon Sep 17 00:00:00 2001 +From d09615e61bc779228c996f024ec48c7e21eb64c9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Jan 2022 22:19:37 -0800 Subject: [PATCH] Adjust for musl headers @@ -242,7 +242,7 @@ index ff372092e6..eef66811f4 100644 #include "nlmon.h" diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c -index db84e7cf6e..93d5642962 100644 +index ab3b8fbb51..68f88b3ca3 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -2,7 +2,7 @@ @@ -332,7 +332,7 @@ index b11fdbbd0d..a971a917f0 100644 #include "conf-parser.h" #include "alloc-util.h" diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c -index 4c7d837c41..6df6dfb816 100644 +index 52fed20b57..e66bc34993 100644 --- a/src/network/netdev/wireguard.c +++ b/src/network/netdev/wireguard.c @@ -6,7 +6,7 @@ diff --git a/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch b/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch index 9e21222b99..0fd55eb0ea 100644 --- a/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch +++ b/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch @@ -1,4 +1,4 @@ -From b771a2ed8d6e07b006710767b79475dece4d789c Mon Sep 17 00:00:00 2001 +From c0c90f4e2381091830203e1286115b0a30e059d3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Nov 2022 13:31:34 -0800 Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific diff --git a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch index a6f2fe1d0f..e0228d6ad8 100644 --- a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch @@ -1,4 +1,4 @@ -From f70a8031ded3bcfe4c5f1cea4763ae257ca27be8 Mon Sep 17 00:00:00 2001 +From 6ad0fb9dcd6940a9a24e515b61d4b6245c3b1e98 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 23 Jan 2023 23:39:46 -0800 Subject: [PATCH] errno-util: Make STRERROR portable for musl diff --git a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch index cc123b4dee..45284e89e1 100644 --- a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch +++ b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch @@ -1,4 +1,4 @@ -From 9ae5377acfa895bfc1ea61aef4fbe754bc2f7f33 Mon Sep 17 00:00:00 2001 +From 70abcbd93b8854c4dd0ae88b82f394d325b2a365 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 2 Aug 2023 12:06:27 -0700 Subject: [PATCH] sd-event: Make malloc_trim() conditional on glibc @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c -index 25f3b1fc4f..9ea3c964b2 100644 +index b3541a1429..ba87265d9f 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -1874,7 +1874,7 @@ _public_ int sd_event_add_exit( diff --git a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch index 5e03284507..691bf89afd 100644 --- a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch +++ b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch @@ -1,4 +1,4 @@ -From d814a5cae2ecbee079816e3fc7b34a59da356a3b Mon Sep 17 00:00:00 2001 +From c85009340b3a58686390ee70671334593e348a10 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 2 Aug 2023 12:20:40 -0700 Subject: [PATCH] shared: Do not use malloc_info on musl diff --git a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch index e4ed2002c4..6b3aa607b4 100644 --- a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch +++ b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch @@ -1,4 +1,4 @@ -From e355e927950e8978a417067f25f30bf311896c96 Mon Sep 17 00:00:00 2001 +From 45478696b3a3eb1fbcd6c5cd4899bb426230c2e1 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 2 Jan 2024 11:03:27 +0800 Subject: [PATCH] avoid missing LOCK_EX declaration @@ -15,7 +15,7 @@ Signed-off-by: Chen Qi 2 files changed, 2 insertions(+) diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c -index 308d332c15..b1c43bbc6a 100644 +index 22bc8d10c1..9bced8f420 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -5,6 +5,7 @@ diff --git a/meta/recipes-core/systemd/systemd_255.13.bb b/meta/recipes-core/systemd/systemd_255.17.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_255.13.bb rename to meta/recipes-core/systemd/systemd_255.17.bb From patchwork Thu Jan 30 02:51:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56268 X-Patchwork-Delegate: steve@sakoman.com 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 8FC1FC0218D for ; Thu, 30 Jan 2025 02:51:36 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.7675.1738205488060005125 for ; Wed, 29 Jan 2025 18:51:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DGzPjaxy; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2164b662090so5392705ad.1 for ; Wed, 29 Jan 2025 18:51:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205487; x=1738810287; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+fOc+JNn/BxN1hUpxRNh0mTxm73MZUCUwBexXwOSDAM=; b=DGzPjaxy0U3JlFSUBEqQ3tTYVhXH4fqZpYnYYVFvs6SeGoakr0vBmkOgZUTEUL8Mpn k8n+LD8rH0xdXar+tunzafcPt7jRGnUBX6p+OlMi8NbHVTViOxMZuflZGdcEdkdkH7dG qqX8u/pm9YAkpYYKZv805rasCdFcBHaqwRYSX8kmQnoHTnavItKymVjJAK+Ux15Lumqt +N85E3ZN780zhqgf2tqWDfOSGHmVO2pOJmqFUs3ZYgSAbvtPm963YBlm3TBJGp1hbUM3 fjZGewxLpK18uS4zwV8sllT7ZOMgKo6vcAn86u6jS8zwrwExqwhNjgB3biH4m4h1zsCh Kxkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205487; x=1738810287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+fOc+JNn/BxN1hUpxRNh0mTxm73MZUCUwBexXwOSDAM=; b=QCzghrApHbe41twZ5rHQX8l7wM25vFBKoxhmchHzRYZTh8wh6cRzcYO0dexvp3gLcI 6z/c8rGaeipg5i7lHHyc6pl7FPRqzwA4IIbMXrVIyXbTCQI4n6FVyiqFEWLphY++IVau rnrig3IHwrAAZhVeezCEbbRqg0JmBsBJmS8f5kLvNcUlv7q3bSrsr/gh6s/16zk/foaO N6El6VB4PMGfqkXkr+P0ofEUY04QSDE1/dmre94Qc4+EfA4Sza02wIS/UiIHsQaYQV/k lhylRsigrgUUFqVksJjriDn7ucM/KgEtGlBDV3CrvkK1FacBEvGj/od+c1aRnZIKiS1b aXlQ== X-Gm-Message-State: AOJu0YwlQXP0NBpfsT3xLrA0VQSG8XVB+nyajnuEYoCw3Ww52X0PkCf/ sKXgzADaNltQp0/ASrVGvfk0WmhTHPABnKq/q082Z764XvkqBjkcOam37kcx64I293ZI/nw81qX Syms= X-Gm-Gg: ASbGncuWM1kGgZbbNaEMeqZevk9Ok9Phd0kR3oVA848J5miFIpUc+ZVHUfFkWJ0/2FV O9jRRJRL0kxwkcnjpUVKEmwalB661tfe1zCZFqVUfCqg6v3Yf5I/QEBMk/HpUHeiKeP/OHHbKZG YkIPUQVhTlCjCOGKyGTG+m/l3SrP2ITNQsACHhXjcLz8/x9MeZZDt8OUo5c5K6Vz5d8ryxLTqU8 L0TQVN1lyg7rfAANo+WTx4yQp8BqSFJJQmaTqDztgMYu1yJZhSWDtxJQITaGfC++jdIzBD7zTNm 3wL4 X-Google-Smtp-Source: AGHT+IG0WU1QUXJgx4c50lP0k61wegR3w4Is5HLNuseAOC7RErp+HGtD4zaBVQb/DSFNwAuzvd3E/Q== X-Received: by 2002:a17:903:24d:b0:215:4d90:4caf with SMTP id d9443c01a7336-21dd7c57af8mr89671535ad.14.1738205487313; Wed, 29 Jan 2025 18:51:27 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:27 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 03/12] go: upgrade 1.22.8 -> 1.22.9 Date: Wed, 29 Jan 2025 18:51:04 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210424 From: Peter Marko Upgrade to latest 1.22.x release [1]: $ git --no-pager log --oneline go1.22.8..go1.22.9 8af39d30a4 (tag: go1.22.9) [release-branch.go1.22] go1.22.9 c19e5887f4 [release-branch.go1.22] cmd/cgo/internal/testcarchive: remove 1-minute timeout e3fd4ba7f9 [release-branch.go1.22] cmd/link: generate Mach-O UUID when -B flag is specified 29252e4c5a [release-branch.go1.22] runtime: fix TestGdbAutotmpTypes on gdb version 15 [1] https://github.com/golang/go/compare/go1.22.8...go1.22.9 (From OE-Core rev: 4f2f202506bcefb4d6c46a11738e159e261a4a4b) Signed-off-by: Peter Marko Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/{go-1.22.8.inc => go-1.22.9.inc} | 2 +- ...o-binary-native_1.22.8.bb => go-binary-native_1.22.9.bb} | 6 +++--- ...cross-canadian_1.22.8.bb => go-cross-canadian_1.22.9.bb} | 0 .../go/{go-cross_1.22.8.bb => go-cross_1.22.9.bb} | 0 .../go/{go-crosssdk_1.22.8.bb => go-crosssdk_1.22.9.bb} | 0 .../go/{go-runtime_1.22.8.bb => go-runtime_1.22.9.bb} | 0 meta/recipes-devtools/go/{go_1.22.8.bb => go_1.22.9.bb} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/go/{go-1.22.8.inc => go-1.22.9.inc} (89%) rename meta/recipes-devtools/go/{go-binary-native_1.22.8.bb => go-binary-native_1.22.9.bb} (78%) rename meta/recipes-devtools/go/{go-cross-canadian_1.22.8.bb => go-cross-canadian_1.22.9.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.22.8.bb => go-cross_1.22.9.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.22.8.bb => go-crosssdk_1.22.9.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.22.8.bb => go-runtime_1.22.9.bb} (100%) rename meta/recipes-devtools/go/{go_1.22.8.bb => go_1.22.9.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.22.8.inc b/meta/recipes-devtools/go/go-1.22.9.inc similarity index 89% rename from meta/recipes-devtools/go/go-1.22.8.inc rename to meta/recipes-devtools/go/go-1.22.9.inc index 542519b930..8fe2a8e39c 100644 --- a/meta/recipes-devtools/go/go-1.22.8.inc +++ b/meta/recipes-devtools/go/go-1.22.9.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "df12c23ebf19dea0f4bf46a22cbeda4a3eca6f474f318390ce774974278440b8" +SRC_URI[main.sha256sum] = "e81a362f51aee2125722b018e46714e6a055a1954283414c0f937e737013db22" diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.8.bb b/meta/recipes-devtools/go/go-binary-native_1.22.9.bb similarity index 78% rename from meta/recipes-devtools/go/go-binary-native_1.22.8.bb rename to meta/recipes-devtools/go/go-binary-native_1.22.9.bb index 98799eb503..040091be79 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.8.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.9.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "5f467d29fc67c7ae6468cb6ad5b047a274bae8180cac5e0b7ddbfeba3e47e18f" -SRC_URI[go_linux_arm64.sha256sum] = "5c616b32dab04bb8c4c8700478381daea0174dc70083e4026321163879278a4a" -SRC_URI[go_linux_ppc64le.sha256sum] = "c546f27866510bf8e54e86fe6f58c705af0e894341e5572c91f197a734152c27" +SRC_URI[go_linux_amd64.sha256sum] = "84a8f05b7b969d8acfcaf194ce9298ad5d3ddbfc7034930c280006b5c85a574c" +SRC_URI[go_linux_arm64.sha256sum] = "5beec5ef9f019e1779727ef0d9643fa8bf2495e7222014d2fc4fbfce5999bf01" +SRC_URI[go_linux_ppc64le.sha256sum] = "dcee55b402eaf46e7ffb2018b9e30b27ae5e821367697d8f8ff1ed1cecfd7948" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.8.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.9.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.22.8.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.22.9.bb diff --git a/meta/recipes-devtools/go/go-cross_1.22.8.bb b/meta/recipes-devtools/go/go-cross_1.22.9.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.22.8.bb rename to meta/recipes-devtools/go/go-cross_1.22.9.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.8.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.9.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.22.8.bb rename to meta/recipes-devtools/go/go-crosssdk_1.22.9.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.22.8.bb b/meta/recipes-devtools/go/go-runtime_1.22.9.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.22.8.bb rename to meta/recipes-devtools/go/go-runtime_1.22.9.bb diff --git a/meta/recipes-devtools/go/go_1.22.8.bb b/meta/recipes-devtools/go/go_1.22.9.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.22.8.bb rename to meta/recipes-devtools/go/go_1.22.9.bb From patchwork Thu Jan 30 02:51:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56267 X-Patchwork-Delegate: steve@sakoman.com 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 A6052C02195 for ; Thu, 30 Jan 2025 02:51:36 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.7677.1738205489572623949 for ; Wed, 29 Jan 2025 18:51:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=BbqQS2d9; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2ee50ffcf14so2290533a91.0 for ; Wed, 29 Jan 2025 18:51:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205489; x=1738810289; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xy8mtGeejVADMOrxbcig/qW7Uzokw47RXb7URxtK2lA=; b=BbqQS2d9hjjiz86gQt1UHRu98DBKCmyyFQGT68jdLN4gogW9GkyYSkifYQc1WSIxOq Y7oGQ21RAsqFCWUR/DsypuYgI+ttjyt7N/6CXQuwvOq9+e6Ja8N6oDgs6e7GWFC+78Km NbCKu6Stuiyyt1U4a6NEHdKs/OUMFJcgEKWP7HDHAXYnspqqqtnXXoGmUIxJfoatIBFP odiekkboJBLNJ9BTYuTE5afRvjxVn/qoBEcJF6iISXaWyBzG5FhNIISxG13qYToTpxy+ GZ+83uPPb8+Qzn2kGmxv78TEbq+uIy4cHXMx0fxyMh05+7WRQZ6643YMxoIEltX9KAtG Sz9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205489; x=1738810289; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xy8mtGeejVADMOrxbcig/qW7Uzokw47RXb7URxtK2lA=; b=RufPXBNmQa/PrfwM8W0eNDOoEWI+u8JlV1Je6pF7M/CYuP7T8kUr0MBSh87OJ/zM+1 Z27wWWO1apJrk0sWKxYRnpokcf0ciC5g3vrbHDveMaC+pzqd6bIMLjcJM8AkYnSqrmgo pWOL+RKx7GtGX5WwXUTzo300jb9bvE1+vDfONvkOSspmgT7ynd1XeBLn+n6E/kpTy9qy 8QgvxxLo8TfX2OYdqpJCXKjI/fDe++qJAYG7+E3a67mAwGU/zXlPB4C513oEaF6aSrGJ zXTSBlTl8BYOlWkw3fFzzTkBO0fVpr7nBVUm15IRgDiNQ9N2Fs5RjVWRVthfsuZ78Ns9 O1OQ== X-Gm-Message-State: AOJu0Ywz3eRpWhohsrPK0JK2Dx253tMMHkGGodZoANx5uXuUv4qUYVdi aunsERxYIuPVHN9P97mZnZIH5g+QK7o1qFf4aE2t3lY60Df0eS56tl2/jSqhg38HUgflnKGvK4h rzPk= X-Gm-Gg: ASbGnctTEd7C1kg9rJ1k/S9X1vsbGGg3BFI3ILlczyu60TIO+o15gQzqGTxOE1xriQL Iee8XoLPVjMG4zW+Smrke2UJQl7biBAzpMq4Wkjlbz2hZ15PAXR+wX2Y7+Vwg51kVA2RCvO7Meu Z5G5oucc2T5adhspprN+h6UWcwEaYBLdTJVyxwv2ejfDqogNjIR/tZ1DcPNvqdnLvrZhWNlFSb2 Zdd1c3s2iyoHyYCfAxli01dt7QOOUOf9ami0lZZ5MDf5Uf0/H/K0Ma3CJvV+5yO0JdBwytyb2gJ xlDb X-Google-Smtp-Source: AGHT+IGKb+CYIDTEy0Y+nVkhupMhioAfuB/8Fb3MZcOreDHCbRSY1RBmmizEx6tvUkQHq34WmlASOA== X-Received: by 2002:a62:b605:0:b0:725:f1e9:5334 with SMTP id d2e1a72fcca58-72fe2d8c1fdmr2543688b3a.8.1738205488631; Wed, 29 Jan 2025 18:51:28 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:28 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 04/12] go: upgrade 1.22.9 -> 1.22.10 Date: Wed, 29 Jan 2025 18:51:05 -0800 Message-ID: <4d35279eed634f5e2b25c23dddbfb213c4943c30.1738205405.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210425 From: Peter Marko Upgrade to latest 1.22.x release [1]: $ git --no-pager log --oneline go1.22.9..go1.22.10 8f3f22eef8 (tag: go1.22.10) [release-branch.go1.22] go1.22.10 6d7a95abca [release-branch.go1.22] runtime: reserve 4kB for system stack on windows-386 6f05fa7a4f [release-branch.go1.22] syscall: mark SyscallN as noescape 3355db9690 [release-branch.go1.22] time: accept "+01" in TestLoadFixed on OpenBSD [1] https://github.com/golang/go/compare/go1.22.9...go1.22.10 (From OE-Core rev: e357c93b39df938dc36195dbd779a58b2951b8e6) Signed-off-by: Peter Marko Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/{go-1.22.9.inc => go-1.22.10.inc} | 2 +- ...-binary-native_1.22.9.bb => go-binary-native_1.22.10.bb} | 6 +++--- ...ross-canadian_1.22.9.bb => go-cross-canadian_1.22.10.bb} | 0 .../go/{go-cross_1.22.9.bb => go-cross_1.22.10.bb} | 0 .../go/{go-crosssdk_1.22.9.bb => go-crosssdk_1.22.10.bb} | 0 .../go/{go-runtime_1.22.9.bb => go-runtime_1.22.10.bb} | 0 meta/recipes-devtools/go/{go_1.22.9.bb => go_1.22.10.bb} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/go/{go-1.22.9.inc => go-1.22.10.inc} (89%) rename meta/recipes-devtools/go/{go-binary-native_1.22.9.bb => go-binary-native_1.22.10.bb} (78%) rename meta/recipes-devtools/go/{go-cross-canadian_1.22.9.bb => go-cross-canadian_1.22.10.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.22.9.bb => go-cross_1.22.10.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.22.9.bb => go-crosssdk_1.22.10.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.22.9.bb => go-runtime_1.22.10.bb} (100%) rename meta/recipes-devtools/go/{go_1.22.9.bb => go_1.22.10.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.22.9.inc b/meta/recipes-devtools/go/go-1.22.10.inc similarity index 89% rename from meta/recipes-devtools/go/go-1.22.9.inc rename to meta/recipes-devtools/go/go-1.22.10.inc index 8fe2a8e39c..2abe7d0f3e 100644 --- a/meta/recipes-devtools/go/go-1.22.9.inc +++ b/meta/recipes-devtools/go/go-1.22.10.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "e81a362f51aee2125722b018e46714e6a055a1954283414c0f937e737013db22" +SRC_URI[main.sha256sum] = "1e94fd48be750d1fafb4d9b3b6dd31a6e9d2735d339bf2462bc97b64ca4c1037" diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.9.bb b/meta/recipes-devtools/go/go-binary-native_1.22.10.bb similarity index 78% rename from meta/recipes-devtools/go/go-binary-native_1.22.9.bb rename to meta/recipes-devtools/go/go-binary-native_1.22.10.bb index 040091be79..8c8fe5bff9 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.9.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.10.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "84a8f05b7b969d8acfcaf194ce9298ad5d3ddbfc7034930c280006b5c85a574c" -SRC_URI[go_linux_arm64.sha256sum] = "5beec5ef9f019e1779727ef0d9643fa8bf2495e7222014d2fc4fbfce5999bf01" -SRC_URI[go_linux_ppc64le.sha256sum] = "dcee55b402eaf46e7ffb2018b9e30b27ae5e821367697d8f8ff1ed1cecfd7948" +SRC_URI[go_linux_amd64.sha256sum] = "736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092" +SRC_URI[go_linux_arm64.sha256sum] = "5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec" +SRC_URI[go_linux_ppc64le.sha256sum] = "db05b9838f69d741fb9a5301220b1a62014aee025b0baf341aba3d280087b981" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.9.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.10.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.22.9.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.22.10.bb diff --git a/meta/recipes-devtools/go/go-cross_1.22.9.bb b/meta/recipes-devtools/go/go-cross_1.22.10.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.22.9.bb rename to meta/recipes-devtools/go/go-cross_1.22.10.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.9.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.10.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.22.9.bb rename to meta/recipes-devtools/go/go-crosssdk_1.22.10.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.22.9.bb b/meta/recipes-devtools/go/go-runtime_1.22.10.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.22.9.bb rename to meta/recipes-devtools/go/go-runtime_1.22.10.bb diff --git a/meta/recipes-devtools/go/go_1.22.9.bb b/meta/recipes-devtools/go/go_1.22.10.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.22.9.bb rename to meta/recipes-devtools/go/go_1.22.10.bb From patchwork Thu Jan 30 02:51:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56271 X-Patchwork-Delegate: steve@sakoman.com 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 B046EC02194 for ; Thu, 30 Jan 2025 02:51:36 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.7727.1738205490767270676 for ; Wed, 29 Jan 2025 18:51:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=l3QjKrJ1; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-215770613dbso3418575ad.2 for ; Wed, 29 Jan 2025 18:51:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205490; x=1738810290; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RIUUXzA6Bs30r6F0wxrFz+H7jxSWchng2i8h7gBhsLk=; b=l3QjKrJ19G8hGuZsiW6MOhDs+pof8Hw1b0+d2hBVjmSMC7bW+NaCoR0qxxSSkMp/lk 74YEpDSneFGaUpFgr9ux5A3wgobeQSPNs4vZiFtw4hVdvJFCZ9Zc/vCZVrcTq9zb6gD3 s6jMhqN5tHRECejVHMmbPKMu7bhjtcVdhdnwKgdA810O//TD5OyvXSebJoQ+ln6xSEnz S8qZDuJqpkXhO35DR73/qmLY32/bOlYfrlWUCSQwCcsP+TU9KfY4lI+DB+KhI7bGvzzp 1mQbk83tgBB/+LkdjOiRU2frBUv2d30PwzQBGoDbn9dKcmrO0877iOk6LQcjUIK30n54 0YFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205490; x=1738810290; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RIUUXzA6Bs30r6F0wxrFz+H7jxSWchng2i8h7gBhsLk=; b=Q8AEbwdVTtSlA65gYijxQepBIHSxX4PxoolxTUaxO6mfFtpBGwU/ejXLrlcosf9zlK UQ/Hw6vHj3vHonCvmMiSqIbd3CEkttGxWqkUAv0Mc8ft3bs15oRNWEzzSdeY4cfbD/ij 9EfKb/jqA7QZgusnSozBIymkn5a1+n1K3ewQktpqjgw4bWLcRLIwBzcBiyCjM0zvb1zp 7hJ6Z/XrqsoGVakc48ml+Wisl+C0IFLMOXLg6YmLJd6mlRBxmG9Juw8m0MRWEXCIWKpm lxkXlbMlfdN7Iq/Do8TcPviguJdORvMMhRUc60Hip2rte5QXXlVKkppfYHThQbSf6BQD xEng== X-Gm-Message-State: AOJu0Yw7Yp5+X4jF+e1v/zFQSqJH0tfqU9wzPYlhK6Ydx2ZLiBwquJ3i swZNagT3k1A8rfbjtO+FRbgaHJEJD103JxVQgGuM0C+Y8CaNPEfZIfjWjB+L9A+rxkFQ/mVyaaP Ml6A= X-Gm-Gg: ASbGnctmGZ5Zux9I2YlHOd2hLoJLacsJNOqihSd/amYdIoazZ2lMzIALaZDsZFcKAZP PrTVjeFSoaGEQWjTKsmgmhAnezQpRxZjJb6kUO+OzTJ196YlY/bSWlDitS0+akNRgrHtT2Dru+U EXnyQ0KAd3tfTY5JtKmBuvV0vB7JZe/dIxhGi1UMYDHR9OLW9EsCz4UdCzV3qPlSwxgpu0nrmYA KAsqKJ29UJZrIWSlyQpr+LxBRDCVy40KlHyOnmkN+nuKkgBAKbe6qknFcrdh4Np1CjOH76V68LG xfWA X-Google-Smtp-Source: AGHT+IHGEsUiow6eV87DwpSfLQ26KPdgnb+m5lv9A7/7uQAB7mxXvyYqiOQ6OA+oaAt6EU6nI0pN9Q== X-Received: by 2002:a05:6a21:6da4:b0:1e1:b727:1801 with SMTP id adf61e73a8af0-1ed7a5ef9demr7867740637.27.1738205490030; Wed, 29 Jan 2025 18:51:30 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:29 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 05/12] go: upgrade 1.22.10 -> 1.22.11 Date: Wed, 29 Jan 2025 18:51:06 -0800 Message-ID: <35bf053cd41d53a764ef3a2de3e7cb1e6c81109f.1738205405.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210426 From: Peter Marko Upgrade to latest 1.22.x release [1]: $ git --no-pager log --oneline go1.22.10..go1.22.11 f072884354 (tag: go1.22.11) [release-branch.go1.22] go1.22.11 b72d56f98d [release-branch.go1.22] net/http: persist header stripping across repeated redirects 19d2103415 [release-branch.go1.22] crypto/x509: properly check for IPv6 hosts in URIs ae9996f965 [release-branch.go1.22] runtime: hold traceAcquire across casgstatus in injectglist 223260bc63 [release-branch.go1.22] crypto/tls: fix Config.Time in tests using expired certificates Fixes CVE-2024-45336 and CVE-2024-45341 [1] https://github.com/golang/go/compare/go1.22.10...go1.22.11 (From OE-Core rev: 4589986602319f9ed61e381b333bb53b731eb8d8) Signed-off-by: Peter Marko Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/{go-1.22.10.inc => go-1.22.11.inc} | 2 +- ...binary-native_1.22.10.bb => go-binary-native_1.22.11.bb} | 6 +++--- ...oss-canadian_1.22.10.bb => go-cross-canadian_1.22.11.bb} | 0 .../go/{go-cross_1.22.10.bb => go-cross_1.22.11.bb} | 0 .../go/{go-crosssdk_1.22.10.bb => go-crosssdk_1.22.11.bb} | 0 .../go/{go-runtime_1.22.10.bb => go-runtime_1.22.11.bb} | 0 meta/recipes-devtools/go/{go_1.22.10.bb => go_1.22.11.bb} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/go/{go-1.22.10.inc => go-1.22.11.inc} (89%) rename meta/recipes-devtools/go/{go-binary-native_1.22.10.bb => go-binary-native_1.22.11.bb} (78%) rename meta/recipes-devtools/go/{go-cross-canadian_1.22.10.bb => go-cross-canadian_1.22.11.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.22.10.bb => go-cross_1.22.11.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.22.10.bb => go-crosssdk_1.22.11.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.22.10.bb => go-runtime_1.22.11.bb} (100%) rename meta/recipes-devtools/go/{go_1.22.10.bb => go_1.22.11.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.22.10.inc b/meta/recipes-devtools/go/go-1.22.11.inc similarity index 89% rename from meta/recipes-devtools/go/go-1.22.10.inc rename to meta/recipes-devtools/go/go-1.22.11.inc index 2abe7d0f3e..21222bea4e 100644 --- a/meta/recipes-devtools/go/go-1.22.10.inc +++ b/meta/recipes-devtools/go/go-1.22.11.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "1e94fd48be750d1fafb4d9b3b6dd31a6e9d2735d339bf2462bc97b64ca4c1037" +SRC_URI[main.sha256sum] = "a60c23dec95d10a2576265ce580f57869d5ac2471c4f4aca805addc9ea0fc9fe" diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.10.bb b/meta/recipes-devtools/go/go-binary-native_1.22.11.bb similarity index 78% rename from meta/recipes-devtools/go/go-binary-native_1.22.10.bb rename to meta/recipes-devtools/go/go-binary-native_1.22.11.bb index 8c8fe5bff9..a526cc88bc 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.10.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.11.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092" -SRC_URI[go_linux_arm64.sha256sum] = "5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec" -SRC_URI[go_linux_ppc64le.sha256sum] = "db05b9838f69d741fb9a5301220b1a62014aee025b0baf341aba3d280087b981" +SRC_URI[go_linux_amd64.sha256sum] = "0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991" +SRC_URI[go_linux_arm64.sha256sum] = "9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031" +SRC_URI[go_linux_ppc64le.sha256sum] = "963a0ec973640b23ee8bb7a462cc415276fd8436111a03df8c34eb3b1ae29f12" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.10.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.11.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.22.10.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.22.11.bb diff --git a/meta/recipes-devtools/go/go-cross_1.22.10.bb b/meta/recipes-devtools/go/go-cross_1.22.11.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.22.10.bb rename to meta/recipes-devtools/go/go-cross_1.22.11.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.10.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.11.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.22.10.bb rename to meta/recipes-devtools/go/go-crosssdk_1.22.11.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.22.10.bb b/meta/recipes-devtools/go/go-runtime_1.22.11.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.22.10.bb rename to meta/recipes-devtools/go/go-runtime_1.22.11.bb diff --git a/meta/recipes-devtools/go/go_1.22.10.bb b/meta/recipes-devtools/go/go_1.22.11.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.22.10.bb rename to meta/recipes-devtools/go/go_1.22.11.bb From patchwork Thu Jan 30 02:51:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56272 X-Patchwork-Delegate: steve@sakoman.com 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 B4E72C02196 for ; Thu, 30 Jan 2025 02:51:36 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web11.7678.1738205492373117668 for ; Wed, 29 Jan 2025 18:51:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jKz9g4Xa; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2ee8e8e29f6so361017a91.0 for ; Wed, 29 Jan 2025 18:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205492; x=1738810292; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IYJMZfQoFd4jEzcjJ0xXhPrCudnb0RAfOHbVxYVnA+c=; b=jKz9g4XarJc3adqJjhw4tuKzOxtsspS9J3wQKlX9ESIkDvGusWtasCQKoWvrQv5afS Dxfk/5p4u0nGvHZ4zyPNgphoayq8h5WVcY236sNLEOlx0jZVWKQoMMP7/zZLEms1RYxd dvjNuMS8QVyQ1NGah2kIml3bUevh6WRpUWEOTQT+BIkApTN1DCQioPPBKT0EJ+VKg0mY vpG+StJ+0HDb5TEJ1Pa3RAXqnguayx5fYLtHnym8NFE2hbNgPru+JkikFozrJ3M8xE5l prpugQmFPiOrXktTt08Emtl9BZFEUDuIXYO05At6hlHMMSHUKGgbAGKs87nnEmqQeITW g3Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205492; x=1738810292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IYJMZfQoFd4jEzcjJ0xXhPrCudnb0RAfOHbVxYVnA+c=; b=TA7SPa+smdu2vbx0vJwECUrX9AmPqDdr8Y6Pak03RWjCcvKLNTq6BoKKx0jvoYfG/k IWKtSiTwFIykA7HAl6BCCdlP+v1hShx92e2IrNnsAiXRp5zDpS5H7xrA3WPDoXdHRuiJ hJSAgkSIo6vatLU2zzHRfjtLYKb8XvI2PavEHO1WiyHEM9RRHBRQML7kfhLl8sRIv4cI /rulWyZaMJ6fAq6u7qkExLIUWuPnvbmnMK4EchW+cclONoRtAowisPFC1wnslNG5LZFw caZTAp5F1kAhp8PNFwfWbcyibbmu8JU9JhcP3WFhPcAxZ/k+a735L6hxS2bOrniYvaFz DHaQ== X-Gm-Message-State: AOJu0Ywz5cy/iYNYa0J3JXaly/+JvjJTZ1n0puVeiT2HVlaZ5Q2cvDZN 28KSFyoNu0i3HCknRSwmJpuDA0K/XafRqI2QKanV6cJSYUaJAp9u+6VumYJZsOmtFs6AHK/Najy QEWQ= X-Gm-Gg: ASbGncs+gcjXK2Gm9uqIyC2wz8RpncF1q6kQc81aBF+/4tfjeXMT98sZhhsqbHoHbzA TIV/fC+mvZ+J8WnrxppCevriyojlJt6GdaQ7aqMQ8OJ4+nrM07OPZTf9Q+qWMblBvbLjhWS65it F3FhOd/X14/2FE/Rk7UzRPih2OgfQhBgoeZRxngBCOy3bACXD0KEDxdBD19hY2RLw3Kltxv0oY1 RO0kHf9aiwPHo52+PJjaEOKzhQhVs1RqAEPrADou1x85pfAa0n7tIifYI9rWJY5JrQaknje59XH KfyE X-Google-Smtp-Source: AGHT+IERd8HJREuj+trJY0cj8VTWP1sdUWvdQwamyDkK0Q0zadSnnkiKsr4TyM3mN86FAl4Z+9KPYQ== X-Received: by 2002:a05:6a00:8d6:b0:72a:8b90:92e9 with SMTP id d2e1a72fcca58-72fd0bbe0f9mr7250871b3a.5.1738205491403; Wed, 29 Jan 2025 18:51:31 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:31 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 06/12] u-boot: kernel-fitimage: Fix dependency loop if UBOOT_SIGN_ENABLE and UBOOT_ENV enabled Date: Wed, 29 Jan 2025 18:51:07 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210427 From: Marek Vasut In case both UBOOT_SIGN_ENABLE and UBOOT_ENV are enabled and kernel-fitimage.bbclass is in use to generate signed kernel fitImage, there is a circular dependency between uboot-sign and kernel-fitimage bbclasses . The loop looks like this: kernel-fitimage.bbclass: - do_populate_sysroot depends on do_assemble_fitimage - do_assemble_fitimage depends on virtual/bootloader:do_populate_sysroot - virtual/bootloader:do_populate_sysroot depends on virtual/bootloader:do_install => The virtual/bootloader:do_install installs and the virtual/bootloader:do_populate_sysroot places into sysroot an U-Boot environment script embedded into kernel fitImage during do_assemble_fitimage run . uboot-sign.bbclass: - DEPENDS on KERNEL_PN, which is really virtual/kernel. More accurately - do_deploy depends on do_uboot_assemble_fitimage - do_install depends on do_uboot_assemble_fitimage - do_uboot_assemble_fitimage depends on virtual/kernel:do_populate_sysroot => do_install depends on virtual/kernel:do_populate_sysroot => virtual/bootloader:do_install depends on virtual/kernel:do_populate_sysroot virtual/kernel:do_populate_sysroot depends on virtual/bootloader:do_install Attempt to resolve the loop. Pull fitimage configuration options into separate new configuration file image-fitimage.conf so these configuration options can be shared by both uboot-sign.bbclass and kernel-fitimage.bbclass, and make use of mkimage -f auto-conf / mkimage -f auto option to insert /signature node key-* subnode into U-Boot control DT without depending on the layout of kernel fitImage itself. This is perfectly valid to do, because the U-Boot /signature node key-* subnodes 'required' property can contain either of two values, 'conf' or 'image' to authenticate either selected configuration or all of images when booting the fitImage. For details of the U-Boot fitImage signing process, see: https://docs.u-boot.org/en/latest/usage/fit/signature.html For details of mkimage -f auto-conf and -f auto, see: https://manpages.debian.org/experimental/u-boot-tools/mkimage.1.en.html#EXAMPLES (From OE-Core rev: 259bfa86f384206f0d0a96a5b84887186c5f689e) Fixes: 5e12dc911d0c ("u-boot: Rework signing to remove interdependencies") Reviewed-by: Adrian Freihofer Signed-off-by: Marek Vasut Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-fitimage.bbclass | 53 +-------------------- meta/classes-recipe/uboot-sign.bbclass | 26 +++++----- meta/conf/image-fitimage.conf | 53 +++++++++++++++++++++ 3 files changed, 68 insertions(+), 64 deletions(-) create mode 100644 meta/conf/image-fitimage.conf diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 18ab17bd2c..3e20c3248b 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -5,6 +5,7 @@ # inherit kernel-uboot kernel-artifact-names uboot-config +require conf/image-fitimage.conf def get_fit_replacement_type(d): kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" @@ -52,58 +53,6 @@ python __anonymous () { d.setVar('EXTERNAL_KERNEL_DEVICETREE', "${RECIPE_SYSROOT}/boot/devicetree") } - -# Description string -FIT_DESC ?= "Kernel fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}" - -# Kernel fitImage Hash Algo -FIT_HASH_ALG ?= "sha256" - -# Kernel fitImage Signature Algo -FIT_SIGN_ALG ?= "rsa2048" - -# Kernel / U-Boot fitImage Padding Algo -FIT_PAD_ALG ?= "pkcs-1.5" - -# Generate keys for signing Kernel fitImage -FIT_GENERATE_KEYS ?= "0" - -# Size of private keys in number of bits -FIT_SIGN_NUMBITS ?= "2048" - -# args to openssl genrsa (Default is just the public exponent) -FIT_KEY_GENRSA_ARGS ?= "-F4" - -# args to openssl req (Default is -batch for non interactive mode and -# -new for new certificate) -FIT_KEY_REQ_ARGS ?= "-batch -new" - -# Standard format for public key certificate -FIT_KEY_SIGN_PKCS ?= "-x509" - -# Sign individual images as well -FIT_SIGN_INDIVIDUAL ?= "0" - -FIT_CONF_PREFIX ?= "conf-" -FIT_CONF_PREFIX[doc] = "Prefix to use for FIT configuration node name" - -FIT_SUPPORTED_INITRAMFS_FSTYPES ?= "cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio" - -# Allow user to select the default DTB for FIT image when multiple dtb's exists. -FIT_CONF_DEFAULT_DTB ?= "" - -# length of address in number of cells -# ex: 1 32bits address, 2 64bits address -FIT_ADDRESS_CELLS ?= "1" - -# Keys used to sign individually image nodes. -# The keys to sign image nodes must be different from those used to sign -# configuration nodes, otherwise the "required" property, from -# UBOOT_DTB_BINARY, will be set to "conf", because "conf" prevails on "image". -# Then the images signature checking will not be mandatory and no error will be -# raised in case of failure. -# UBOOT_SIGN_IMG_KEYNAME = "dev2" # keys name in keydir (eg. "dev2.crt", "dev2.key") - # # Emit the fitImage ITS header # diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass index a17be745ce..96c47ab016 100644 --- a/meta/classes-recipe/uboot-sign.bbclass +++ b/meta/classes-recipe/uboot-sign.bbclass @@ -26,6 +26,7 @@ # We need some variables from u-boot-config inherit uboot-config +require conf/image-fitimage.conf # Enable use of a U-Boot fitImage UBOOT_FITIMAGE_ENABLE ?= "0" @@ -85,9 +86,6 @@ UBOOT_FIT_KEY_SIGN_PKCS ?= "-x509" # ex: 1 32bits address, 2 64bits address UBOOT_FIT_ADDRESS_CELLS ?= "1" -# This is only necessary for determining the signing configuration -KERNEL_PN = "${PREFERRED_PROVIDER_virtual/kernel}" - UBOOT_FIT_UBOOT_LOADADDRESS ?= "${UBOOT_LOADADDRESS}" UBOOT_FIT_UBOOT_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}" @@ -96,8 +94,6 @@ python() { sign = d.getVar('UBOOT_SIGN_ENABLE') == '1' if d.getVar('UBOOT_FITIMAGE_ENABLE') == '1' or sign: d.appendVar('DEPENDS', " u-boot-tools-native dtc-native") - if sign: - d.appendVar('DEPENDS', " " + d.getVar('KERNEL_PN')) } concat_dtb() { @@ -106,16 +102,26 @@ concat_dtb() { if [ -e "${UBOOT_DTB_BINARY}" ]; then # Re-sign the kernel in order to add the keys to our dtb + UBOOT_MKIMAGE_MODE="auto-conf" + # Signing individual images is not recommended as that + # makes fitImage susceptible to mix-and-match attack. + if [ "${FIT_SIGN_INDIVIDUAL}" = "1" ] ; then + UBOOT_MKIMAGE_MODE="auto" + fi ${UBOOT_MKIMAGE_SIGN} \ ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ - -F -k "${UBOOT_SIGN_KEYDIR}" \ + -f $UBOOT_MKIMAGE_MODE \ + -k "${UBOOT_SIGN_KEYDIR}" \ + -o "${FIT_HASH_ALG},${FIT_SIGN_ALG}" \ + -g "${UBOOT_SIGN_IMG_KEYNAME}" \ -K "${UBOOT_DTB_BINARY}" \ - -r ${B}/fitImage-linux \ + -d /dev/null \ + -r ${B}/unused.itb \ ${UBOOT_MKIMAGE_SIGN_ARGS} # Verify the kernel image and u-boot dtb ${UBOOT_FIT_CHECK_SIGN} \ -k "${UBOOT_DTB_BINARY}" \ - -f ${B}/fitImage-linux + -f ${B}/unused.itb cp ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SIGNED} fi @@ -351,10 +357,6 @@ uboot_assemble_fitimage_helper() { } do_uboot_assemble_fitimage() { - if [ "${UBOOT_SIGN_ENABLE}" = "1" ] ; then - cp "${STAGING_DIR_HOST}/sysroot-only/fitImage" "${B}/fitImage-linux" - fi - if [ -n "${UBOOT_CONFIG}" ]; then unset i for config in ${UBOOT_MACHINE}; do diff --git a/meta/conf/image-fitimage.conf b/meta/conf/image-fitimage.conf new file mode 100644 index 0000000000..be9ae30134 --- /dev/null +++ b/meta/conf/image-fitimage.conf @@ -0,0 +1,53 @@ +# Possible options for fitImage generation, mainly +# related to signing of the fitImage content. + +# Description string +FIT_DESC ?= "Kernel fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}" + +# Kernel fitImage Hash Algo +FIT_HASH_ALG ?= "sha256" + +# Kernel fitImage Signature Algo +FIT_SIGN_ALG ?= "rsa2048" + +# Kernel / U-Boot fitImage Padding Algo +FIT_PAD_ALG ?= "pkcs-1.5" + +# Generate keys for signing Kernel fitImage +FIT_GENERATE_KEYS ?= "0" + +# Size of private keys in number of bits +FIT_SIGN_NUMBITS ?= "2048" + +# args to openssl genrsa (Default is just the public exponent) +FIT_KEY_GENRSA_ARGS ?= "-F4" + +# args to openssl req (Default is -batch for non interactive mode and +# -new for new certificate) +FIT_KEY_REQ_ARGS ?= "-batch -new" + +# Standard format for public key certificate +FIT_KEY_SIGN_PKCS ?= "-x509" + +# Sign individual images as well +FIT_SIGN_INDIVIDUAL ?= "0" + +FIT_CONF_PREFIX ?= "conf-" +FIT_CONF_PREFIX[doc] = "Prefix to use for FIT configuration node name" + +FIT_SUPPORTED_INITRAMFS_FSTYPES ?= "cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio" + +# Allow user to select the default DTB for FIT image when multiple dtb's exists. +FIT_CONF_DEFAULT_DTB ?= "" + +# length of address in number of cells +# ex: 1 32bits address, 2 64bits address +FIT_ADDRESS_CELLS ?= "1" + +# Keys used to sign individually image nodes. +# The keys to sign image nodes must be different from those used to sign +# configuration nodes, otherwise the "required" property, from +# UBOOT_DTB_BINARY, will be set to "conf", because "conf" prevails on "image". +# Then the images signature checking will not be mandatory and no error will be +# raised in case of failure. +# UBOOT_SIGN_IMG_KEYNAME = "dev2" # keys name in keydir (eg. "dev2.crt", "dev2.key") From patchwork Thu Jan 30 02:51:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56269 X-Patchwork-Delegate: steve@sakoman.com 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 965AAC3DA4A for ; Thu, 30 Jan 2025 02:51:36 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.7680.1738205494299515063 for ; Wed, 29 Jan 2025 18:51:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=qlG04N++; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2162c0f6a39so26416775ad.0 for ; Wed, 29 Jan 2025 18:51:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205493; x=1738810293; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XgzkULlRR5Yw1IHIAYdymSzudzisPdgSnyL+Q8A1fXI=; b=qlG04N++Fn39pZtraH82tW0t+37mHYfFLIpA/qlE0+By9iABKZfrb9oK5+9dmWzs2r cXPmZW5esngmNQx76O14LKH+Cf1rwWYFKqtE2dRij+focwacP84aIO1vO4V7W9eb0HDB NmF31Uhp5cOyfg5kDMKIWvQmxzPur9mSryPlGE7RrzcrgrqtQm2vZGI+k5wupQwURhOI dJ9Y2NIwYXv5yjBKz28DJeXWQjqxNgAx5E5ID6qFo0rs+QbUM81cxDkFk1pnTq6pbs9R rrNbSkrdhF+K78b1cLt/s40+lCQKViZ5nlreAeDHLmTiWMWbnxDDRjdiEj8T9TMotzWb Q7bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205493; x=1738810293; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XgzkULlRR5Yw1IHIAYdymSzudzisPdgSnyL+Q8A1fXI=; b=h82nAJ5UNgdieIlerDAW1VRFUqOYkkjhb6MXCC1iLcHOT0Z5CuqYjhE11IZu6x3AY7 d/HLAJKBlHRsqeh87qi3tTFhc90qmxpv0dVwpBDWRTyiamV029QH8YHs1e++CBNhzR2v idDiAqpidfhyQHzYj3qKFNaN1IEb1Z/rPZ8VV6Rp6YgitiQP5tr91uMe3+pSYKouVLvI H/01Tx9v/XCR1JzFbAT4JsuLSON8k/9eSuZGf1hd1Jh5laFMLl0uV2XBEKztj9kBx4OK /lVK8eKBRUNLE2PGQQv+rva/zlIWRlU+sXx++sqKUQcfEuPzSNgHconunjgAUt/nLa30 UlXQ== X-Gm-Message-State: AOJu0YyMrDIMuIn9odcO8wxQVUNO5DTzYlX6rGFD027uzNZJyWDErpPy Oet75C/WBlHtl4nqrJ/6x7LtYaN6pMv/hdgWI0llUIhZR4ascMcpQk3BjeHfysL0XtwD04kOcIP CM1k= X-Gm-Gg: ASbGnctTo5baVugFOIL5xU7c2TqIq3hWoMeVfpwBpCLDaqZ95F0fSUYSyn/4/jIBmyX LQX7XBNQ/y+vg6wlR6yOoK8P6jQigmLPOiZQCxX7sCbHpb7SsnaU4Xq7sexyMhrB83C0x91qyn+ fR2PMu3okO/HN1RnMkaq1F55byZr0Dd/tSmzr+jbG0R6jADWWmGc0zEOxxsOJyvh4Uwou8cM8gT stK7nY5MlTUp7X6icSrReOLj4bxeCChXbj61mzUYwXhN7qxDB94rbEQku3JTTZT9wmqZR3DkwWA DxM9 X-Google-Smtp-Source: AGHT+IEFwskujvesBhE0pPM39eIWi5g6DgMaDHy4ZOJho5oT+hQWdfvj3YPlvbF6Z2rtW1+0ZJqaMA== X-Received: by 2002:a05:6a20:7fa6:b0:1d8:c74d:1ca0 with SMTP id adf61e73a8af0-1ed8731b796mr2116988637.11.1738205493404; Wed, 29 Jan 2025 18:51:33 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 07/12] devtool: modify support debug-builds Date: Wed, 29 Jan 2025 18:51:08 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210428 From: Adrian Freihofer Add a new option --debug-builds to automatically add DEBUG_BUILD = “1” to the bbappend file of this recipe. This is especially useful when invoking devtool modify before invoking devtool ide-sdk to perform a remote debugging session. Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- scripts/lib/devtool/standard.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 05161942b7..908869cc4f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1031,6 +1031,8 @@ def modify(args, config, basepath, workspace): if branch == args.branch: continue f.write('# patches_%s: %s\n' % (branch, ','.join(branch_patches[branch]))) + if args.debug_build: + f.write('\nDEBUG_BUILD = "1"\n') update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn]) @@ -2396,6 +2398,7 @@ def register_commands(subparsers, context): parser_modify.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (when not using -n/--no-extract) (default "%(default)s")') parser_modify.add_argument('--no-overrides', '-O', action="store_true", help='Do not create branches for other override configurations') parser_modify.add_argument('--keep-temp', help='Keep temporary directory (for debugging)', action="store_true") + parser_modify.add_argument('--debug-build', action="store_true", help='Add DEBUG_BUILD = "1" to the modified recipe') parser_modify.set_defaults(func=modify, fixed_setup=context.fixed_setup) parser_extract = subparsers.add_parser('extract', help='Extract the source for an existing recipe', From patchwork Thu Jan 30 02:51:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56270 X-Patchwork-Delegate: steve@sakoman.com 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 A5F5DC02193 for ; Thu, 30 Jan 2025 02:51:36 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.7729.1738205495359698798 for ; Wed, 29 Jan 2025 18:51:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=aLOj5CA3; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21654fdd5daso4500395ad.1 for ; Wed, 29 Jan 2025 18:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205495; x=1738810295; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=suqRx0QmP0olUg42W/3rUoJz+0dDu63k1QA5/RiTXzs=; b=aLOj5CA3J4c4vma8bGy1ASY98M9PEeVSEIrOaUG3iyxzWsnHQdBqMvBzi0N+C5QyyZ kK3U/UWIGIVLjlLPRd3dciLeBijf2BAx7XxiKvBI1py/9L1L2bc134t90yHyxCcdPSVZ NZf4bIbutbobihal0i9Aq1mopTRsaEayB/bUhthE5uVbDGBr2ESs3l3Tmbu1sziz1uv2 oALAlWh2d/mPXIjo7AcCEzkgHPP3hVh7l6zqZafTD1v1DW0FZl8jP6PiyvHzl6U7RQod lJfeXo1/JwMqptOwd/6stLjb+u8rOXEl5uHaqo1OWdcvKBRKZ0oKnTOOKa26ciAYFhfD rXiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205495; x=1738810295; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=suqRx0QmP0olUg42W/3rUoJz+0dDu63k1QA5/RiTXzs=; b=JjuwIOw8JFK1hbE8VaLeZ5nUe2RHvIBtkuJO6L4PQUdPbZi/OpBSQIH36eqlSfxnTU k+qz250uoakakp4edevj4ihb4Xa7e6372YvXdjSdT0OWuKDLANT2ToXOSZ8JtCfJD/fs dqRVb3+y2eJ9I69AfKIkGMrNcJAKBxnleNzCv/pNJKOpGyZqCptH6ye29L9OLWEsFDiw Uke3AZNEC9zJrnJMmZCkYZyKberftHG2XI+9OvbmcC602XviXm4OjVB2UjtSr1LDTsZu V1bn6ySyWhPvJr6/ZFNz5Zm+xPFWzl2VRdUX0TL90SSVu9fpfCOZL5EUVZyYvs+bksL1 x5SQ== X-Gm-Message-State: AOJu0YwvoSRdNIbXLYu26r6uwRnH8IWnV9OmgxFmjmz77Vec+gHKuqVe tN9LrNkJOO3Ehn4Jh05X2Ow2wRcf0DPqUuBKr+5HK2hJE4QhWrrmwLhOn7IPHO9sikU+6cdZ9CV SZp4= X-Gm-Gg: ASbGncs23slRMHlPZei0qSPduQujttFl6wV0DoqOeMpp0iAKlXIDjf7tcX3y70wTe/E QhX4RjuqswutrE208Nf95A3zuTaAASJGnDmNgLxJnNrKDCij7jVdEvt2+nxiD7/vkFoqFKkJZAw 1GGKE2iaQLAPlMl/+PaUaCfg3clfbydXWPBO0apWJM7vWiZw7OmXYZtdQimlOtrYSS/QoSjMV0w qoseIBTcUXUHZqGEluhwsD/VC4PwJ5PgxDJNrpaAj4l+7rn7L0imsn0KoTrFcfOxLvVWHd1/RH+ wFfc X-Google-Smtp-Source: AGHT+IHVIo0tv4gQdx24cACPXLMRtfOLrU+ChuHCOYAVgHEbZPdfzLLSpblFVLDtmCsTyPJ40RKitQ== X-Received: by 2002:a05:6a21:516:b0:1e1:9f57:eab4 with SMTP id adf61e73a8af0-1ed7a5f9036mr8967928637.16.1738205494736; Wed, 29 Jan 2025 18:51:34 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:34 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 08/12] devtool: ide-sdk sort cmake preset Date: Wed, 29 Jan 2025 18:51:09 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210429 From: Adrian Freihofer Sort the keys of the generated CMakeUserPreset.json file to make it easier to search and compare. Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- scripts/lib/devtool/ide_sdk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 65873b088d..eee5425aa7 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -493,7 +493,7 @@ class RecipeModified: vars = (key for key in d.keys() if not key.startswith( "__") and not d.getVarFlag(key, "func", False)) - for var in vars: + for var in sorted(vars): func = d.getVarFlag(var, "func", False) if d.getVarFlag(var, 'python', False) and func: continue @@ -545,7 +545,7 @@ class RecipeModified: cache_vars = {} oecmake_args = d.getVar('OECMAKE_ARGS').split() extra_oecmake = d.getVar('EXTRA_OECMAKE').split() - for param in oecmake_args + extra_oecmake: + for param in sorted(oecmake_args + extra_oecmake): d_pref = "-D" if param.startswith(d_pref): param = param[len(d_pref):] From patchwork Thu Jan 30 02:51:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56274 X-Patchwork-Delegate: steve@sakoman.com 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 B37E2C0218D for ; Thu, 30 Jan 2025 02:51:46 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.7730.1738205496936060069 for ; Wed, 29 Jan 2025 18:51:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=aODJDBDH; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2166022c5caso3972245ad.2 for ; Wed, 29 Jan 2025 18:51:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205496; x=1738810296; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=X+F6BB0qRD0vhqAy8HOXNuvdBIlExc3dRkXfBllP5LE=; b=aODJDBDHSsiPoWaSjMmNdPpT1m3S9XiSXYIZ+Nz3upKzFfA9D8YF6NvF6caXwRYYsz BDR7zIICy56BdFoHlAXCvFk5m4lAmevRf6pkGVL8v9l5FELu6ezz4XtgxS1LwJsoOwCp 1NNzpSrOEDN+f1JZuao6m62oz6kpHJfTzHY1E2QlYsn7ax+PtBEV2Udp3i5HV52KFbvJ IdW+trels/69QaS7BD2LLyndPTsYt71YT2n78S6p4+EGjFOG182Jn0D6ogar+uxkh1TA HMkRHjVjYrHEMSdu/O87X+vz0KnKmLzKWDBn3hb433mr1lGLL/M/UW4J+15BL2/PtdaT uBtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205496; x=1738810296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X+F6BB0qRD0vhqAy8HOXNuvdBIlExc3dRkXfBllP5LE=; b=udaC2EDyKX2Xa4QBR3NtsZqTpCCjj0+/8Lt2EKxLiayqgvaWAimHiAtHTCPVtMfMr7 eosPNGyXP1DX5oE84srPuZqoLZp1PdcwVY9r9eW3dsY7mGzvf2bME1+rOW+V8KqwedXR T867HVL+OISL+XnUhi1IWc4+VE/xeVxdRC+7YKMa+FKN1Rco5772PJhi2r6bIZ9QqNGg PTLqpFo6pQ2OaConMDv9y/8ITi3DEyLrIui0BHsUFJ3sojTLK85GiQN+tE/A/T3jvw6P Y99eRiWPFqN9QPA0Yp1qn+5gsKlxdDz4e0+gDb3rgXryKLGgF3aW5twUz0RDCGJPMWEg ZJWA== X-Gm-Message-State: AOJu0YwcUb32KjizZwP2mLeOc4miyKYTsSNBl5C8lqk7+ZiN2AEXln6R g8MMnassTuTlvg+Sv+oPeC3xa/g5W0R9qJtF+bUfDj1qIDVvGbdMPdUScZdU8Z1mZpjpKQCWfMC Tg/Y= X-Gm-Gg: ASbGncv6MxlHbVkCq6ySHWOkD4/5EnPRSC3Oso52USrKmaKAbJPs1Mnofm7WXBKO60/ QU/SrmYeP4iAhNvo/ZpXgHMf9xS4auics2no+aG0oFxms7qfLQH/SeLWyigVrUhq8SinNmvuyTD 2ULHBlPbS6wC1yblxi4Nvtham4RNT8kIOLoOeudqRF/oPN8EugHdLoiaUaSp+6FGaFptDAHHcX7 XkXVw2qYJucswklG9CpOxSFlIvD8JHJgBEIT0cB9EvkJBON24VXa16oeb1XJeTWT5jR2HvR6n/p 6+qP X-Google-Smtp-Source: AGHT+IEt2vmnAOd3Tx54O0eVuKOsFPHmqGuH8GK5r+eyQYvY3rji7QtnF6StpSfRGDJktOJYuhcXwg== X-Received: by 2002:a17:902:e809:b0:21c:e34:c8c3 with SMTP id d9443c01a7336-21dd7c671a3mr89052735ad.24.1738205496197; Wed, 29 Jan 2025 18:51:36 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 09/12] devtool: ide-sdk recommend DEBUG_BUILD Date: Wed, 29 Jan 2025 18:51:10 -0800 Message-ID: <23795962683c792347a17854fb0521734497d4a8.1738205405.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210430 From: Adrian Freihofer The debug_build_config function was never called. Compiling with debug optimized compiler flags was not working. Even with the --debug-build-config flag set, the build configuration from the recipe was used. The devtool ide-sdk --debug-build-config approach didn't work very well anyway. The problem is that changing the bbappend file doesn't work while bitbake uses the bbappend file. As a workaround, it would be possible to parse the recipe, get DEBUG_BUILD and the path to the append file, exit tinfoil, change the bbappend file, reopen tinfoil and do what ide-sdk is supposed to do. Such an implementation would be complicated and slow. Therefore, the code that was originally supposed to implement this is removed from ide-sdk and the new --debug-build function of devtool modify is used instead. Additionally, a hint should be given on how to manually add DEBUG_BUILD = '1' to bbappend. This is compatible with the VSCode Bitbake plug-in, which does not support this parameter anyway. Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- scripts/lib/devtool/ide_sdk.py | 50 ++++++---------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index eee5425aa7..5e4c543275 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -288,6 +288,7 @@ class RecipeModified: self.bblayers = None self.bpn = None self.d = None + self.debug_build = None self.fakerootcmd = None self.fakerootenv = None self.libdir = None @@ -348,6 +349,7 @@ class RecipeModified: self.bpn = recipe_d.getVar('BPN') self.cxx = recipe_d.getVar('CXX') self.d = recipe_d.getVar('D') + self.debug_build = recipe_d.getVar('DEBUG_BUILD') self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD') self.fakerootenv = recipe_d.getVar('FAKEROOTENV') self.libdir = recipe_d.getVar('libdir') @@ -389,17 +391,6 @@ class RecipeModified: self.recipe_id = self.bpn + "-" + self.package_arch self.recipe_id_pretty = self.bpn + ": " + self.package_arch - def append_to_bbappend(self, append_text): - with open(self.bbappend, 'a') as bbap: - bbap.write(append_text) - - def remove_from_bbappend(self, append_text): - with open(self.bbappend, 'r') as bbap: - text = bbap.read() - new_text = text.replace(append_text, '') - with open(self.bbappend, 'w') as bbap: - bbap.write(new_text) - @staticmethod def is_valid_shell_variable(var): """Skip strange shell variables like systemd @@ -412,34 +403,6 @@ class RecipeModified: return True return False - def debug_build_config(self, args): - """Explicitely set for example CMAKE_BUILD_TYPE to Debug if not defined otherwise""" - if self.build_tool is BuildTool.CMAKE: - append_text = os.linesep + \ - 'OECMAKE_ARGS:append = " -DCMAKE_BUILD_TYPE:STRING=Debug"' + os.linesep - if args.debug_build_config and not 'CMAKE_BUILD_TYPE' in self.cmake_cache_vars: - self.cmake_cache_vars['CMAKE_BUILD_TYPE'] = { - "type": "STRING", - "value": "Debug", - } - self.append_to_bbappend(append_text) - elif 'CMAKE_BUILD_TYPE' in self.cmake_cache_vars: - del self.cmake_cache_vars['CMAKE_BUILD_TYPE'] - self.remove_from_bbappend(append_text) - elif self.build_tool is BuildTool.MESON: - append_text = os.linesep + 'MESON_BUILDTYPE = "debug"' + os.linesep - if args.debug_build_config and self.meson_buildtype != "debug": - self.mesonopts.replace( - '--buildtype ' + self.meson_buildtype, '--buildtype debug') - self.append_to_bbappend(append_text) - elif self.meson_buildtype == "debug": - self.mesonopts.replace( - '--buildtype debug', '--buildtype plain') - self.remove_from_bbappend(append_text) - elif args.debug_build_config: - logger.warn( - "--debug-build-config is not implemented for this build tool yet.") - def solib_search_path(self, image): """Search for debug symbols in the rootfs and rootfs-dbg @@ -988,6 +951,13 @@ def ide_setup(args, config, basepath, workspace): recipe_modified.gen_meson_wrapper() ide.setup_modified_recipe( args, recipe_image, recipe_modified) + + if recipe_modified.debug_build != '1': + logger.warn( + 'Recipe %s is compiled with release build configuration. ' + 'You might want to add DEBUG_BUILD = "1" to %s. ' + 'Note that devtool modify --debug-build can do this automatically.', + recipe_modified.name, recipe_modified.bbappend) else: raise DevtoolError("Must not end up here.") @@ -1065,6 +1035,4 @@ def register_commands(subparsers, context): '-p', '--no-preserve', help='Do not preserve existing files', action='store_true') parser_ide_sdk.add_argument( '--no-check-space', help='Do not check for available space before deploying', action='store_true') - parser_ide_sdk.add_argument( - '--debug-build-config', help='Use debug build flags, for example set CMAKE_BUILD_TYPE=Debug', action='store_true') parser_ide_sdk.set_defaults(func=ide_setup) From patchwork Thu Jan 30 02:51:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56277 X-Patchwork-Delegate: steve@sakoman.com 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 B4968C02192 for ; Thu, 30 Jan 2025 02:51:46 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.7731.1738205498418561836 for ; Wed, 29 Jan 2025 18:51:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jqdqHui4; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-216395e151bso3365935ad.0 for ; Wed, 29 Jan 2025 18:51:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205498; x=1738810298; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HGF+tJNBjPpIRn/6drc4kak+dzYmCzWv1pBlyFX2VrQ=; b=jqdqHui4VC5u8sw9Mm17ZUlPkRZKRPCUhoFv1KnPs0MwgEGorIbiCn97hGwCy0JBZM bC7Xbc16ut8r6rpb63GCKcJC4Xklm+jad1k87ITZIf0fQFbUFMzCJJaKk+EJpPA2QSIK A4ay29aDrC/xG51bNH7+NgTu5u115yIuMZGE7ge+CnacYlsFvG3ksSCudko0VYvbmLzN j33STgaisbnFH0rgQu0FVAndl5caL83FM6HNADnJT/vRL8fXBJUvk1XE7kP2ujF745lm h/rnbBC0Kh/Wq//sqdAiGHp2sdk19yIAmfdgbDVHxVldxhXdPLm9TnH3EgeY/zLnY4Ho xFJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205498; x=1738810298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HGF+tJNBjPpIRn/6drc4kak+dzYmCzWv1pBlyFX2VrQ=; b=E8XXvke+finlHY5WsfXCYp07tQ455YKvwM5OVJyOHbwry7/jShPt18LGRxYpB3IwvA imzrvn4D7kiLfWOtA0mR8KRrnfpYSnvWcPtNoVI6+ayBGPdxB5fIZsRtModz+Y1j4Ssz utShlPHoR4dfOp0RF82t75Q46TlOcY12SNJfzQN+t5k02iKcgemEwWloYx+13Cb2ynaO 1+l0OmBrPfc4GHg9X6+eXobTp0Znr69C8Xmi3xuuI5nrTvs+WX1CCJeO7M4REl2XXAjT ND57VLWLKT+oOekdUMnGNh6AdPzGmO2g9n+SoXwZ7RIdMNURJnzGWLLnhpXQyyqmZ9ia wxew== X-Gm-Message-State: AOJu0YxcdhpbzDmrUkxYR3enRRM1BcJjqCuVQpTjcHGl5cjdxPdiDu42 up3WGenoCFNcEwRaUwHR5RjkIKA9Dqrwrsqh4FitPwtqWIFNowPYYlFwgl57yEnBQCIYWFT/Hor YHZE= X-Gm-Gg: ASbGncvJQwQwPrXTo7x+k1kGxIvGj9+/MQS5c78g+YTbUqRQZX5Xtys2gy0Lss/O5LG G2Yff4mPXekaPxbAcvG4ftd+L0wQRI10cjzbOrTTiZAk6Zgoq/2eWT9S7Vc6kwjDLNZMYOM/jvD FpRo0A6GvDR1rLAfRKn7eYgvVNSbMW7Rys2KV5eiB+vGeoyn5Zf8MhdnRDZ0PRJax1xPvKVkqfi 9Lydp1Mu4hM0tlBL/NpRUxDoD6bbV8JGvm8cpD6rz3p0DX5wuIRKU4MQ0h+Qt6xHs5l73xVIDXc XWMU X-Google-Smtp-Source: AGHT+IFQyKzaCtdm23EBXio61EnRgkHpIPrp877lPK5hy2K5gxLlXyfRwTzfD/4kB8jfp4QAZoDPpQ== X-Received: by 2002:a17:903:41c3:b0:216:1079:82bb with SMTP id d9443c01a7336-21de195cd1emr22864205ad.19.1738205497705; Wed, 29 Jan 2025 18:51:37 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 10/12] oe-selftest: devtool ide-sdk use modify debug-build Date: Wed, 29 Jan 2025 18:51:11 -0800 Message-ID: <1528d6aa060811402eaecb1a9fe16bfec0417c98.1738205405.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210431 From: Adrian Freihofer Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index fc08906117..ee75687f01 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -2493,7 +2493,7 @@ class DevtoolIdeSdkTests(DevtoolBase): self.track_for_cleanup(tempdir) self.add_command_to_tearDown('bitbake -c clean %s' % recipe_name) - result = runCmd('devtool modify %s -x %s' % (recipe_name, tempdir)) + result = runCmd('devtool modify %s -x %s --debug-build' % (recipe_name, tempdir)) self.assertExists(os.path.join(tempdir, build_file), 'Extracted source could not be found') self.assertExists(os.path.join(self.workspacedir, 'conf', From patchwork Thu Jan 30 02:51:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56275 X-Patchwork-Delegate: steve@sakoman.com 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 B8720C02194 for ; Thu, 30 Jan 2025 02:51:46 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.7732.1738205499936234790 for ; Wed, 29 Jan 2025 18:51:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Og/sZHgB; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21670dce0a7so6254835ad.1 for ; Wed, 29 Jan 2025 18:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205499; x=1738810299; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kOxlbr27ZnvjGHtjWc9CIPmUuLsQtpl/yuZMOHIwal0=; b=Og/sZHgBojGOA8teoZyFK1NeWlonRPVHHPmi333d1j0WTK2/KbNUkVdeCNVO/5RY6u 9UcLU4lu1jdbPjki5ky6ERDUrbFbBxrMSmmp7UtrNTlSIviqsqU7hlyCiYHnqNtaod6u WM7qHMeDH9HwGpOBukv1ZymWPEOmHU3ch128ZEE4e8frrO1XQlSJ1ESez/+jPrR9wSNg 4KKczmJer/dl2dKv8ZmQLSAkJ7KDv0cR/DiwKvVd2RNmHW6vUEZRnIAYv8fGnOLfLoV7 +sgu+/q2I3SbOGFGZJLk2UFeQTzg4b6muzM1jwYqAB0ouWiNlf1AcED+TpXAJQ0v3YzI yaUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205499; x=1738810299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kOxlbr27ZnvjGHtjWc9CIPmUuLsQtpl/yuZMOHIwal0=; b=vTN3/W8vtdkCxpAumSjySoVunqliV1jc6lqHpS2zqNKThN0tO75Y14tNxPogZzDOwL 5v2ik/8w9zYxE4xLdLB6jrPpOgvD6KPaDS+7dy+E/lo3r5GKv75PHCTRikyCODr1VkFt Wm1M8bOyoR6Er/tdHcIru3poiMv3L9X5gs/f3is3ltQonjUkT8M3LhhARAhOiwmeYo+V SZCKPgetDdI9CnNBYONIdcaDWu4kdd/++1Ef7oQucjgb2jKCKQlZ+6WFwBS8mw6d1Ohy L+mYB4EXTARm394gz31B6TpaQRYUENiQ+B0mmk4eYJZUsN/PSCizGkjJRTPweP/TeemL WiKQ== X-Gm-Message-State: AOJu0YwqA9aHvSQ7vVsDKALfbwqlz5JzYoOQ0VlvxVMsd3nKGGgVczb8 c9ULQ8a6E5Kw11DpMDnMzevuCJU1V5mC0U4xeIm3oPnDeIWp1MkeGfoTdGAKwErYD99ZQ0AxO3R 2IMk= X-Gm-Gg: ASbGncuKErMr+QjMTSQMT6mqB+2UZdNAvCird50Toc2MG47zwrlITxWmPMz3DPutCGQ wjiZ/jRvhlAgNNxZT5Gn6NGO0hDrK9zKRkMyUcJ4L2FiHUjuiifAVwDxxQDvTRo6NdhQzb5nVJG w9otctUrFh81PUJKLjCup9g8oEKnnYRYuU7ytzIvOiMupuTN+ff/6WlTJAfSxIpIBV27dRjuf9U 8tNSbT7CB5rUn+y2fyH/vdrhyGH+hOTcLJptTlm1Yl/4tASj1HzZl2WLcLg1NnDQlz5ZcnrMufy st0M X-Google-Smtp-Source: AGHT+IFzCWjOsdCCENYC57p3irUQY8RCnGVDNA+EnvPTjNKWh5UY5zEqAVYos4kyOBR91POtml5Cog== X-Received: by 2002:a05:6a21:9211:b0:1e1:a06b:375a with SMTP id adf61e73a8af0-1ed7a6e191emr10860737637.35.1738205499158; Wed, 29 Jan 2025 18:51:39 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 11/12] devtool: ide-sdk remove the plugin from eSDK installer Date: Wed, 29 Jan 2025 18:51:12 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210432 From: Adrian Freihofer The ide-sdk command bootstraps the SDK from the bitbake environment before the IDE configuration is generated. In the case of the eSDK installer, the bootstrapping is performed during the installation of the eSDK installer. Running the ide-sdk plugin from an eSDK installer based setup would require skipping the bootstrapping and probably taking some other differences into account when generating the IDE configurations. This would be possible. But it will probably never be implemented, as running devtool ide-sdk directly from the bitbake environment is much more flexible. Also, some of the recent improvements that have made it into the core have the potential to make the eSDK installer obsolete at some point in the future: - bitbake-layers create-layers-setup replicates the layers - bitbake-config-build replicates the build configuration - The new sstate mirror features replicate the sstate - bblock locks the sstate more flexible than the eSDK installer - devtool ide-sdk bootstraps the SDK directly from the bitbake environment. The same environment-setup... file is provided with --mode=shared. The devtool modify based workflow is supported since always by devtool and also the default --mode of devtool ide-sdk. These functions essentially cover what the eSDK installer does without a need for the current implementation of the eSDK installer and the populate_sdk_ext, which is hard to maintain and takes a lot of time to build. This means that instead of making the ide-sdk plugin compatible with the eSDK installer, we should rather replace the current implementation of the eSDK installer and populate_sdk_ext with an implementation that can replicate a normal bitbake environment in a convenient way where the ide-sdk plugin also just works without additional complexity. Signed-off-by: Adrian Freihofer Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- scripts/lib/devtool/ide_sdk.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 5e4c543275..0b50165a12 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -965,6 +965,15 @@ def ide_setup(args, config, basepath, workspace): def register_commands(subparsers, context): """Register devtool subcommands from this plugin""" + # The ide-sdk command bootstraps the SDK from the bitbake environment before the IDE + # configuration is generated. In the case of the eSDK, the bootstrapping is performed + # during the installation of the eSDK installer. Running the ide-sdk plugin from an + # eSDK installer-based setup would require skipping the bootstrapping and probably + # taking some other differences into account when generating the IDE configurations. + # This would be possible. But it is not implemented. + if context.fixed_setup: + return + global ide_plugins # Search for IDE plugins in all sub-folders named ide_plugins where devtool seraches for plugins. From patchwork Thu Jan 30 02:51:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56276 X-Patchwork-Delegate: steve@sakoman.com 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 C7885C02195 for ; Thu, 30 Jan 2025 02:51:46 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.7683.1738205501243893217 for ; Wed, 29 Jan 2025 18:51:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YWKePFIj; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21bc1512a63so5347155ad.1 for ; Wed, 29 Jan 2025 18:51:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1738205500; x=1738810300; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=w8y8HeHktV3FLWcvoOOtcnC0slrtDxWbgrzGl0cbXCM=; b=YWKePFIjbooc1KYX2R6sSv8vTKiffZJqp5QxYP0C7j6mlgHvjseUTk2JpZYZPQhkpE yV2JjXpVWfrKOTvc5II++D3tNRcgWrbGSDJaqf9Yn+RYBlM+oxaQdnEu3H5LbewuvhCW 6DbIgPKiUHJ1Fan0eBY+n2VbOFhl/sRRsHBShze3G+ItsaEJkXNEmiuJaKtF3g29iS4S VIQf+xAsthkYDIwfeF5l7tUeEwSgcmkEUpHLvoC7KI6CZium77I0FMZ9Lo9TwRAmwO07 KtRzq0yxAOzKaSOvqhrE98qCmCz3h8W7cKkOnekiJkXI7+4mkM7EtLcs68jVHxOJ1oMy hQ0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738205500; x=1738810300; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w8y8HeHktV3FLWcvoOOtcnC0slrtDxWbgrzGl0cbXCM=; b=M0hNbpE8ZYht12DOOBbjbsATZ+lT/LOo4YnhGQcnwrxOdnm/Hm/oj5mM41vEDJ6J6+ GCymvECZ+hsm/VJW8Cbbti0w2eou/UgBWvCW8Cswh8fXn2jrn/1OfYUA1M9eWV5fJChL xv6V+hvV1ZyRb82gdvRTs64orGYBA6xbH6TrErTL25pZv8kV09uc5HSToL533bxdD9sn ZX+4Njwak9/dU48bBQWwzHsOOcYcpkVDKGmwiemWFMpGBGS3ajjxaHuUchX3Dp+ePQff viuMa+qCEQGflP1rufBVIdNyuTFHn+CC1BuDFEiWxWWPHQ9F4Ww/9/+4aH594yn7HN0X Koog== X-Gm-Message-State: AOJu0YyT1UItgkhMAfczb0hRmdcjhvsdhhl0yfriuwQ6VLexrxq3lJrY s0Ney9t6D50zu44yVjAqAuRxYTREN2UW+VOMCC3vQ68sPRwpm0ts6VyrdxGAtILE4DW3K2Qu2Pn UbRg= X-Gm-Gg: ASbGncuHRfn/hqpVAN85StL9kA8/cLwOzocTAjF73czx9vJ8LOAB+kUOtHePQFuu1kQ mQz09Zj4+05CzF2obd/1+y91gHKISqekvBOQi5x6mCGyyGAe5l5GNoFGAlz9psGcc3TydzaNUAg qOZrm1Cdxr4rEHxUFnVPCZ4mPx/HpeOADLe7CZYO39LtKhVTqfFR8KlCJc+NYd9C5Geg0jiwVIK 3BJrGnvM+SqweAMKJZfCQNz2EqWI1FBptcQTAkORiCpPO8ISVwpZN3lORpH2aX9awxTDHgJWms+ W7it X-Google-Smtp-Source: AGHT+IHS7on8TCmVfsxeL0Abo1dcfFQlRJ2iEIu8027aZZ253mePLm0EcgFnuZdQC99CZteh/MlbSA== X-Received: by 2002:a17:903:11cd:b0:215:7719:24f6 with SMTP id d9443c01a7336-21dd7d788ffmr77711175ad.23.1738205500519; Wed, 29 Jan 2025 18:51:40 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec04794a4sm249726a12.60.2025.01.29.18.51.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 18:51:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 12/12] uboot-config: fix devtool modify with kernel-fitimage Date: Wed, 29 Jan 2025 18:51:13 -0800 Message-ID: <37835788d0772568f3551532eacbf810a4a6e47b.1738205405.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 ; Thu, 30 Jan 2025 02:51:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210433 From: Adrian Freihofer How to reproduce: - UBOOT_CONFIG must be used. With UBOOT_MACHINE it works fine. A simple example based on oe-core is to modify the beaglebone-yocto.conf file like this: -UBOOT_MACHINE = "am335x_evm_defconfig" +UBOOT_CONFIG = "foo" +UBOOT_CONFIG[foo] = "am335x_evm_defconfig" - A build configuration which inherits the kernel-fitimage.bbclass is needed. For example: MACHINE = "beaglebone-yocto" KERNEL_IMAGETYPE = "Image" KERNEL_IMAGETYPES += " fitImage " KERNEL_CLASSES = " kernel-fitimage " devtool modify linux-yocto devtool build linux-yocto ... | cp: cannot stat '.../linux-yocto-6.6.21+git/am335x_evm_defconfig/.config': No such file or directory | WARNING: .../linux-yocto/6.6.21+git/temp/run.do_configure.2081673:172 exit 1 from 'cp .../linux-yocto-6.6.21+git/am335x_evm_defconfig/.config .../build/workspace/sources/linux-yocto/.config.baseline' The reason for this problem is that the uboot-config.bbclass sets the variable KCONFIG_CONFIG_ROOTDIR to a path that makes sense for u-boot, but not for other recipes. However, the kernel-fitimage.bbclasse, for example, inherits the uboot-config.bbclass, which brings the u-boot-specific path into the kernel build context. This change removes the uboot-specific KCONFIG_CONFIG_ROOTDIR path from recipes other than u-boot itself. Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie (cherry picked from b23581a22619c52724c8e078f29e871e2ee74259) Signed-off-by: Leonard Anderweit Signed-off-by: Steve Sakoman --- meta/classes-recipe/uboot-config.bbclass | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass index e55fc38b7c..bf21961977 100644 --- a/meta/classes-recipe/uboot-config.bbclass +++ b/meta/classes-recipe/uboot-config.bbclass @@ -101,12 +101,12 @@ python () { # The "doc" varflag is special, we don't want to see it here ubootconfigflags.pop('doc', None) ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split() + recipename = d.getVar("PN") if not ubootmachine and not ubootconfig: - PN = d.getVar("PN") FILE = os.path.basename(d.getVar("FILE")) bb.debug(1, "To build %s, see %s for instructions on \ - setting up your machine config" % (PN, FILE)) + setting up your machine config" % (recipename, FILE)) raise bb.parse.SkipRecipe("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE")) if ubootmachine and ubootconfig: @@ -140,9 +140,12 @@ python () { if not found: raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) - if len(ubootconfig) == 1: - d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join(d.getVar("B"), d.getVar("UBOOT_MACHINE").strip())) - else: - # Disable menuconfig for multiple configs - d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false") + # This recipe might be inherited e.g. by the kernel recipe via kernel-fitimage.bbclass + # Ensure the uboot specific menuconfig settings do not leak into other recipes + if 'u-boot' in recipename: + if len(ubootconfig) == 1: + d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join(d.getVar("B"), d.getVar("UBOOT_MACHINE").strip())) + else: + # Disable menuconfig for multiple configs + d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false") }