From patchwork Mon Jul 29 13:12:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46963 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 7C1F9C3DA61 for ; Mon, 29 Jul 2024 13:13:06 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.55638.1722258777791213302 for ; Mon, 29 Jul 2024 06:12:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=MiEdWuDQ; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2c964f5a037so1985258a91.0 for ; Mon, 29 Jul 2024 06:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258777; x=1722863577; 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=hB3mnOvmmJmJTYOA8drOWSx2R5HbATOPvg7mnMHrST8=; b=MiEdWuDQq4H/0HeG8ojkMRfc/OZ9SB0b9Gpqa3EpDxudnLsQshp1b1aCorHsVP6Lga xSjdDvkEe2bumVRZBY0Mj90r9ITLPfFygAmRSihZczBwp+mNaJkrgTEkBS8Tp6MAg1l+ y++U4d2ZWvJ85xwY4HCO2qm1p7xY9efCzeFVvt2z2bAiq3PR9nnKcdrBqQRnT2cGaZA+ l1o8ir7EMW2SSmKCFVnlwbXVRlCL39QmaxMQWMY51KGAY8cPohh843jIX7ktF6fEMrY7 Ew8zn+w9gcZeXdGe2k7c37S/1mNLi+1kQ6T96qULTNOA0rmaN5ebTJgfoGlwmTLUiMP1 wSug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258777; x=1722863577; 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=hB3mnOvmmJmJTYOA8drOWSx2R5HbATOPvg7mnMHrST8=; b=sPAfgyT7qpUoWz9WdxPPUMzR+HFLwv9H6bSvmQRQo7ZkhDAU70lHYyLR7+bPgVe/5R N76FQJwswm2Z8r5/r+MVOxbsm6Ey06ua8cC6qwvivdumq0SzE9m/LX7/phQnEvoKo2fd Rm1dyTYwSMafKdDh5nMFpWmC6qOTELQDGhM97/HW6pNhO2JQKH4tWpOuPUyqP7AIrBRZ GKFqABWUFVKyaQ5Gd0WnajtjfLQsu4FqSJX3opdW4LgSgfEczrmHIeImQvyJ7X8A/SqT eYmcQ8GNKGey9IIEslwXlRxiBhisMK7VfpbA72Ya5iH6jv+puvjzlbdcEq0ufMAo0sjA S5Ow== X-Gm-Message-State: AOJu0YyQ/yeJLDhranl8jlFnBcpJw1SXZB/IKztiMKEL7tVg6cKq5Nwx xxOE7Y2N7R4yQ05eFDVveByTn3A39iXP5g2Is52DlQGp/cbHLlgokeqmHeCx99YISbl6mX1JkUJ xd/TYKQ== X-Google-Smtp-Source: AGHT+IE3aniToTT0HmpgFN4FJ1m9BmfDv8Mexa3CcY3GcilWQ9UPxd2u2rjQNrX0kwTg90kLitv/OQ== X-Received: by 2002:a17:90b:4f88:b0:2c9:5a85:f8dd with SMTP id 98e67ed59e1d1-2cf7e1f00b7mr5759394a91.18.1722258776877; Mon, 29 Jul 2024 06:12:56 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.12.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:12:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 01/37] ofono: fix CVE-2023-2794 Date: Mon, 29 Jul 2024 06:12:11 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202615 From: Archana Polampalli Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../ofono/ofono/CVE-2023-2794-0001.patch | 38 ++++++ .../ofono/ofono/CVE-2023-2794-0002.patch | 33 +++++ .../ofono/ofono/CVE-2023-2794-0003.patch | 45 ++++++ .../ofono/ofono/CVE-2023-2794-0004.patch | 128 ++++++++++++++++++ meta/recipes-connectivity/ofono/ofono_2.4.bb | 4 + 5 files changed, 248 insertions(+) create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0001.patch create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0002.patch create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0003.patch create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0004.patch diff --git a/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0001.patch b/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0001.patch new file mode 100644 index 0000000000..5fd495d233 --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0001.patch @@ -0,0 +1,38 @@ +From 9c7a7fe29605d3d8bb5c0cfcee21a8f01ab9f4aa Mon Sep 17 00:00:00 2001 +From: Denis Kenzior +Date: Thu, 29 Feb 2024 11:18:25 -0600 +Subject: [PATCH 1/4] smsutil: ensure the address length in bytes <= 10 + +If a specially formatted SMS is received, it is conceivable that the +address length might overflow the structure it is being parsed into. +Ensure that the length in bytes of the address never exceeds 10. + +CVE: CVE-2023-2794 + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=a90421d8e45d63b304dc010baba24633e7869682] + +Signed-off-by: Archana Polampalli +--- + src/smsutil.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/smsutil.c b/src/smsutil.c +index f46507f..d3844f3 100644 +--- a/src/smsutil.c ++++ b/src/smsutil.c +@@ -643,7 +643,12 @@ gboolean sms_decode_address_field(const unsigned char *pdu, int len, + else + byte_len = (addr_len + 1) / 2; + +- if ((len - *offset) < byte_len) ++ /* ++ * 23.040: ++ * The maximum length of the full address field ++ * (AddressLength, TypeofAddress and AddressValue) is 12 octets. ++ */ ++ if ((len - *offset) < byte_len || byte_len > 10) + return FALSE; + + out->number_type = bit_field(addr_type, 4, 3); +-- +2.40.0 diff --git a/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0002.patch b/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0002.patch new file mode 100644 index 0000000000..c93cb20c7d --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0002.patch @@ -0,0 +1,33 @@ +From 3f58f4f5260be9e9e46bc50382768563a5ce2bcd Mon Sep 17 00:00:00 2001 +From: Denis Kenzior +Date: Thu, 29 Feb 2024 11:42:28 -0600 +Subject: [PATCH 2/4] smsutil: Check cbs_dcs_decode return value + +It is better to explicitly check the return value of cbs_dcs_decode +instead of relying on udhi not being changed due to side-effects. + +CVE: CVE-2023-2794 + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=7f2adfa22fbae824f8e2c3ae86a3f51da31ee400] + +Signed-off-by: Archana Polampalli +--- + src/smsutil.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/smsutil.c b/src/smsutil.c +index d3844f3..cfa157a 100644 +--- a/src/smsutil.c ++++ b/src/smsutil.c +@@ -1765,7 +1765,8 @@ gboolean sms_udh_iter_init_from_cbs(const struct cbs *cbs, + const guint8 *hdr; + guint8 max_ud_len; + +- cbs_dcs_decode(cbs->dcs, &udhi, NULL, NULL, NULL, NULL, NULL); ++ if (!cbs_dcs_decode(cbs->dcs, &udhi, NULL, NULL, NULL, NULL, NULL)) ++ return FALSE; + + if (!udhi) + return FALSE; +-- +2.40.0 diff --git a/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0003.patch b/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0003.patch new file mode 100644 index 0000000000..d4d31206dc --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0003.patch @@ -0,0 +1,45 @@ +From be0df9a74cecdf16c26f86bf88b29d823aa2a369 Mon Sep 17 00:00:00 2001 +From: Denis Kenzior +Date: Thu, 29 Feb 2024 12:06:54 -0600 +Subject: [PATCH 3/4] simutil: Make sure set_length on the parent succeeds + +CVE: CVE-2023-2794 + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=07f48b23e3877ef7d15a7b0b8b79d32ad0a3607e] + +Signed-off-by: Archana Polampalli +--- + src/simutil.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/simutil.c b/src/simutil.c +index 0354caf..218612b 100644 +--- a/src/simutil.c ++++ b/src/simutil.c +@@ -588,8 +588,9 @@ gboolean ber_tlv_builder_set_length(struct ber_tlv_builder *builder, + if (new_pos > builder->max) + return FALSE; + +- if (builder->parent) +- ber_tlv_builder_set_length(builder->parent, new_pos); ++ if (builder->parent && ++ !ber_tlv_builder_set_length(builder->parent, new_pos)) ++ return FALSE; + + builder->len = new_len; + +@@ -730,9 +731,9 @@ gboolean comprehension_tlv_builder_set_length( + if (builder->pos + new_ctlv_len > builder->max) + return FALSE; + +- if (builder->parent) +- ber_tlv_builder_set_length(builder->parent, +- builder->pos + new_ctlv_len); ++ if (builder->parent && !ber_tlv_builder_set_length(builder->parent, ++ builder->pos + new_ctlv_len)) ++ return FALSE; + + len = MIN(builder->len, new_len); + if (len > 0 && new_len_size != len_size) +-- +2.40.0 diff --git a/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0004.patch b/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0004.patch new file mode 100644 index 0000000000..c1cf2df71a --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0004.patch @@ -0,0 +1,128 @@ +From 44648c764268b6e9e4f1c4aec44782b494385fca Mon Sep 17 00:00:00 2001 +From: Denis Kenzior +Date: Thu, 29 Feb 2024 17:16:00 -0600 +Subject: [PATCH 4/4] smsutil: Use a safer strlcpy + +sms_address_from_string is meant as private API, to be used with string +form addresses that have already been sanitized. However, to be safe, +use a safe version of strcpy to avoid overflowing the buffer in case the +input was not sanitized properly. While here, add a '__' prefix to the +function name to help make it clearer that this API is private and +should be used with more care. + +CVE: CVE-2023-2794 + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=8fa1fdfcb54e1edb588c6a5e2688880b065a39c9] + +Signed-off-by: Archana Polampalli +--- + src/smsutil.c | 14 +++++++------- + src/smsutil.h | 2 +- + unit/test-sms.c | 6 +++--- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/smsutil.c b/src/smsutil.c +index cfa157a..def47e8 100644 +--- a/src/smsutil.c ++++ b/src/smsutil.c +@@ -1887,15 +1887,15 @@ time_t sms_scts_to_time(const struct sms_scts *scts, struct tm *remote) + return ret; + } + +-void sms_address_from_string(struct sms_address *addr, const char *str) ++void __sms_address_from_string(struct sms_address *addr, const char *str) + { + addr->numbering_plan = SMS_NUMBERING_PLAN_ISDN; + if (str[0] == '+') { + addr->number_type = SMS_NUMBER_TYPE_INTERNATIONAL; +- strcpy(addr->address, str + 1); ++ l_strlcpy(addr->address, str + 1, sizeof(addr->address)); + } else { + addr->number_type = SMS_NUMBER_TYPE_UNKNOWN; +- strcpy(addr->address, str); ++ l_strlcpy(addr->address, str, sizeof(addr->address)); + } + } + +@@ -3086,7 +3086,7 @@ gboolean status_report_assembly_report(struct status_report_assembly *assembly, + } + } + +- sms_address_from_string(&addr, straddr); ++ __sms_address_from_string(&addr, straddr); + + if (pending == TRUE && node->deliverable == TRUE) { + /* +@@ -3179,7 +3179,7 @@ void status_report_assembly_expire(struct status_report_assembly *assembly, + while (g_hash_table_iter_next(&iter_addr, (gpointer) &straddr, + (gpointer) &id_table)) { + +- sms_address_from_string(&addr, straddr); ++ __sms_address_from_string(&addr, straddr); + g_hash_table_iter_init(&iter_node, id_table); + + /* Go through different messages. */ +@@ -3473,7 +3473,7 @@ GSList *sms_datagram_prepare(const char *to, + template.submit.vp.relative = 0xA7; /* 24 Hours */ + template.submit.dcs = 0x04; /* Class Unspecified, 8 Bit */ + template.submit.udhi = TRUE; +- sms_address_from_string(&template.submit.daddr, to); ++ __sms_address_from_string(&template.submit.daddr, to); + + offset = 1; + +@@ -3600,7 +3600,7 @@ GSList *sms_text_prepare_with_alphabet(const char *to, const char *utf8, + template.submit.srr = use_delivery_reports; + template.submit.mr = 0; + template.submit.vp.relative = 0xA7; /* 24 Hours */ +- sms_address_from_string(&template.submit.daddr, to); ++ __sms_address_from_string(&template.submit.daddr, to); + + /* There are two enums for the same thing */ + dialect = (enum gsm_dialect)alphabet; +diff --git a/src/smsutil.h b/src/smsutil.h +index 01487de..bc21504 100644 +--- a/src/smsutil.h ++++ b/src/smsutil.h +@@ -487,7 +487,7 @@ int sms_udl_in_bytes(guint8 ud_len, guint8 dcs); + time_t sms_scts_to_time(const struct sms_scts *scts, struct tm *remote); + + const char *sms_address_to_string(const struct sms_address *addr); +-void sms_address_from_string(struct sms_address *addr, const char *str); ++void __sms_address_from_string(struct sms_address *addr, const char *str); + + const guint8 *sms_extract_common(const struct sms *sms, gboolean *out_udhi, + guint8 *out_dcs, guint8 *out_udl, +diff --git a/unit/test-sms.c b/unit/test-sms.c +index 154bb33..66755f3 100644 +--- a/unit/test-sms.c ++++ b/unit/test-sms.c +@@ -1603,7 +1603,7 @@ static void test_sr_assembly(void) + sr3.status_report.mr); + } + +- sms_address_from_string(&addr, "+4915259911630"); ++ __sms_address_from_string(&addr, "+4915259911630"); + + sra = status_report_assembly_new(NULL); + +@@ -1626,7 +1626,7 @@ static void test_sr_assembly(void) + * Send sms-message in the national address-format, + * but receive in the international address-format. + */ +- sms_address_from_string(&addr, "9911630"); ++ __sms_address_from_string(&addr, "9911630"); + status_report_assembly_add_fragment(sra, sha1, &addr, 4, time(NULL), 2); + status_report_assembly_add_fragment(sra, sha1, &addr, 5, time(NULL), 2); + +@@ -1641,7 +1641,7 @@ static void test_sr_assembly(void) + * Send sms-message in the international address-format, + * but receive in the national address-format. + */ +- sms_address_from_string(&addr, "+358123456789"); ++ __sms_address_from_string(&addr, "+358123456789"); + status_report_assembly_add_fragment(sra, sha1, &addr, 6, time(NULL), 1); + + g_assert(status_report_assembly_report(sra, &sr3, id, &delivered)); +-- +2.40.0 diff --git a/meta/recipes-connectivity/ofono/ofono_2.4.bb b/meta/recipes-connectivity/ofono/ofono_2.4.bb index dae5cc3c25..f8ade2b2f8 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.4.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.4.bb @@ -12,6 +12,10 @@ SRC_URI = "\ file://ofono \ file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ file://0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch \ + file://CVE-2023-2794-0001.patch \ + file://CVE-2023-2794-0002.patch \ + file://CVE-2023-2794-0003.patch \ + file://CVE-2023-2794-0004.patch \ " SRC_URI[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d" From patchwork Mon Jul 29 13:12:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46968 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 C673BC52CDC for ; Mon, 29 Jul 2024 13:13:06 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.55639.1722258779556031440 for ; Mon, 29 Jul 2024 06:12:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=c7tmr6ZU; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1fed72d23a7so19695425ad.1 for ; Mon, 29 Jul 2024 06:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258779; x=1722863579; 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=QYHRH7F9Mk9pIVxGt8QXeyNyD48BSHF8D6r1HEHLk5s=; b=c7tmr6ZU/RdC/RdmXimABEre6mF8wF6E9lFTPI0uGcrYNIPm4ktCu3gFnRsoz9LH/u QIA9td47WxKDCkxCmEh/bc7lLGpdaV7xZlg8fkyCXt2mt6P80OZ5hpeZ1eSjSCcSN4AY tUegFUvwrju01W/1yv2SSoJG+XeFYGUwp9PprVwzb6kH/iIfvQg8gVwWZ/H62JiDaJxo jJOSWaO689B3vvOZ+s+qMST1SAUcd26PJZheLMHvHQK5eZG6IaDMK09SgzOz9s76/BKk 3tnZlpkyDJeKiZCBMcoKpK9cHzJUHG4EUNiLm1gc0Wm6imTNht5ha6Dcb1jC164FcPKY G2mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258779; x=1722863579; 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=QYHRH7F9Mk9pIVxGt8QXeyNyD48BSHF8D6r1HEHLk5s=; b=kkGzYiBbTTvvJ3bQ2N/cn3gqTmmu49ELuKtFjxDID726diFnRrCdprJGZvLW54Wuyz oBXTQiMu3Tu7XLZTCzTmmLlP8RdRfA6vyPnGygf6tiD/xQNaIVPGNtu7Xi9NoKnYRv/K r39AtJc+8kUYw+N3JI6+t03LBHHF+dZTuAhkvujPJb/M5pbo6eL9WWUTBmMaVpWzoMvW gAStIKOFCFPUQ5/5xk4ylR6pjcA2mLqAcuJJ3urJu/On1Qa8/vWwZ3ViArsiqiOIzoBk 7tAhea1TM6VnzUfJnLuEKdnAQSdPs9k4TY20Dkvwnt4Rx3G+L45I/ipgtnP48GS2CUAv x82w== X-Gm-Message-State: AOJu0YxC7XgFwqmYoZzJBGO6NUmrr9fSRasOxC6X7lsjDdxzDhSmXVJJ A5whzg8FVQrjWtSnXD/mzhQPSAe8srBy5ta2L3YIw/OT0y5GFxZYCWCqdDjPIgsoBt6docmb6bl YfVOoDg== X-Google-Smtp-Source: AGHT+IGN5tLBrjH6u8Zq5VUGToEwzwWTgqAYRyWEz7570+gp1kjg1znhRHRKTxDWSpdjby2vbB+I+A== X-Received: by 2002:a17:90b:3793:b0:2c9:5c7c:815d with SMTP id 98e67ed59e1d1-2cf7e2275d2mr5566638a91.22.1722258778370; Mon, 29 Jul 2024 06:12:58 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.12.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:12:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 02/37] ffmpeg: fix CVE-2023-49502 Date: Mon, 29 Jul 2024 06:12:12 -0700 Message-Id: <814a688d1dc3f22cf7d1b88bde6842b032c13d12.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202616 From: Archana Polampalli Buffer Overflow vulnerability in Ffmpeg v.n6.1-3-g466799d4f5 allows a local attacker to execute arbitrary code via the ff_bwdif_filter_intra_c function in the libavfilter/bwdifdsp.c:125:5 component. Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../ffmpeg/ffmpeg/CVE-2023-49502.patch | 107 ++++++++++++++++++ .../recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 1 + 2 files changed, 108 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2023-49502.patch diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2023-49502.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2023-49502.patch new file mode 100644 index 0000000000..bc78a46d03 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2023-49502.patch @@ -0,0 +1,107 @@ +From 737ede405b11a37fdd61d19cf25df296a0cb0b75 Mon Sep 17 00:00:00 2001 +From: Cosmin Stejerean +Date: Wed, 6 Dec 2023 18:39:32 +0800 +Subject: [PATCH] avfilter/bwdif: account for chroma sub-sampling in min size + calculation + +The current logic for detecting frames that are too small for the +algorithm does not account for chroma sub-sampling, and so a sample +where the luma plane is large enough, but the chroma planes are not +will not be rejected. In that event, a heap overflow will occur. + +This change adjusts the logic to consider the chroma planes and makes +the change to all three bwdif implementations. + +Fixes #10688 + +Signed-off-by: Cosmin Stejerean +Reviewed-by: Thomas Mundt +Signed-off-by: Philip Langdale + +CVE: CVE-2023-49502 + +Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/737ede405b11a37f] + +Signed-off-by: Archana Polampalli +--- + libavfilter/vf_bwdif.c | 9 +++++---- + libavfilter/vf_bwdif_cuda.c | 11 ++++++----- + libavfilter/vf_bwdif_vulkan.c | 11 +++++------ + 3 files changed, 16 insertions(+), 15 deletions(-) + +diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c +index 137cd5e..353cd0b 100644 +--- a/libavfilter/vf_bwdif.c ++++ b/libavfilter/vf_bwdif.c +@@ -191,13 +191,14 @@ static int config_props(AVFilterLink *link) + return ret; + } + +- if (link->w < 3 || link->h < 4) { +- av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n"); ++ yadif->csp = av_pix_fmt_desc_get(link->format); ++ yadif->filter = filter; ++ ++ if (AV_CEIL_RSHIFT(link->w, yadif->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, yadif->csp->log2_chroma_h) < 4) { ++ av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or 4 lines is not supported\n"); + return AVERROR(EINVAL); + } + +- yadif->csp = av_pix_fmt_desc_get(link->format); +- yadif->filter = filter; + ff_bwdif_init_filter_line(&s->dsp, yadif->csp->comp[0].depth); + + return 0; +diff --git a/libavfilter/vf_bwdif_cuda.c b/libavfilter/vf_bwdif_cuda.c +index a5ecfba..418f15f 100644 +--- a/libavfilter/vf_bwdif_cuda.c ++++ b/libavfilter/vf_bwdif_cuda.c +@@ -296,15 +296,16 @@ static int config_output(AVFilterLink *link) + link->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, + (AVRational){2, 1}); + +- if (link->w < 3 || link->h < 3) { +- av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n"); +- ret = AVERROR(EINVAL); +- goto exit; +- } + + y->csp = av_pix_fmt_desc_get(output_frames->sw_format); + y->filter = filter; + ++ if (AV_CEIL_RSHIFT(link->w, y->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, y->csp->log2_chroma_h) < 3) { ++ av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or lines is not supported\n"); ++ ret = AVERROR(EINVAL); ++ goto exit; ++ } ++ + ret = CHECK_CU(cu->cuCtxPushCurrent(s->hwctx->cuda_ctx)); + if (ret < 0) + goto exit; +diff --git a/libavfilter/vf_bwdif_vulkan.c b/libavfilter/vf_bwdif_vulkan.c +index 690a89c..c51df9a 100644 +--- a/libavfilter/vf_bwdif_vulkan.c ++++ b/libavfilter/vf_bwdif_vulkan.c +@@ -362,15 +362,14 @@ static int bwdif_vulkan_config_output(AVFilterLink *outlink) + outlink->frame_rate = av_mul_q(avctx->inputs[0]->frame_rate, + (AVRational){2, 1}); + +- if (outlink->w < 4 || outlink->h < 4) { +- av_log(avctx, AV_LOG_ERROR, "Video of less than 4 columns or lines is not " +- "supported\n"); +- return AVERROR(EINVAL); +- } +- + y->csp = av_pix_fmt_desc_get(vkctx->frames->sw_format); + y->filter = bwdif_vulkan_filter_frame; + ++ if (AV_CEIL_RSHIFT(outlink->w, y->csp->log2_chroma_w) < 4 || AV_CEIL_RSHIFT(outlink->h, y->csp->log2_chroma_h) < 4) { ++ av_log(avctx, AV_LOG_ERROR, "Video with planes less than 4 columns or lines is not supported\n"); ++ return AVERROR(EINVAL); ++ } ++ + return init_filter(avctx); + } + +-- +2.40.0 diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb index dea1f54580..90c15782d1 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb @@ -27,6 +27,7 @@ SRC_URI = " \ file://av1_ordering_info.patch \ file://vulkan_av1_stable_API.patch \ file://vulkan_fix_gcc14.patch \ + file://CVE-2023-49502.patch \ " SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" From patchwork Mon Jul 29 13:12:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46966 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 9D87FC49EA1 for ; Mon, 29 Jul 2024 13:13:06 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web10.55640.1722258780635222239 for ; Mon, 29 Jul 2024 06:13:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=JkkrsEs6; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7ae3d7222d4so988296a12.3 for ; Mon, 29 Jul 2024 06:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258780; x=1722863580; 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=zjZmvCad9NJzrUv33mxcohx9ni2SPHvVJqvanWO6K70=; b=JkkrsEs6cSp+LI6OInDrDk7Rr51CsG4dmc7C+fKoYqYf1SYVKBwLxItTBUx46Z0bnk nn4iDs4HYydhcAEX24xskFkr+ozAs2MyQZR1zSfF96HROdG/u63n52tivI+PD4EkdR5U 4y1iZGVvthjFAvpip2+dYReINQtnm1bv4RQ/454td4us/Fl0BMP7ISD9+R37r+36Y8lV mo0IEQohE7Pb5wtAcZ9h9kE3bOwmF9DK+af4de6RwM++vCvgUD+Ccm+iso/0XKcNrxRh 3H2qRdpFmCoFI7mUeG39KNsOBCsHbvNu+awdQkcFZCdtk/ePW4MoUKQvtvHV+5Fa498m B/wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258780; x=1722863580; 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=zjZmvCad9NJzrUv33mxcohx9ni2SPHvVJqvanWO6K70=; b=CRdqG48Ecuqov7m6+bWbsdtQx1yJ05bUnxLc0SZIcWaqrI5PK306/VU6aP6y1pjxjj UVaikGIiQVhz+azK7bdeGrWle5iIWpn6W3Eb4fOzMiUbe/MJJxkdgpf+qgGIdHtMCdo9 ikTJv/oaeWMRcXgsyLxnOb/kgwHMMDdl2YAsmWt0NbvMF7+6E40db/hlN3Qc0GmLoHMV i4757UGSLs16D2ZuAajcRMu0GZboFselbM+dc8TWaXfg5hhX/AOLHQ/pDtvLPBqEzY2L WJrYgnZd0vVryMKqUzsm/8ERdpwHbPiNhR4RgMFg0HfXJvK4OOxVvN71num+1L8GCpfu 9YCg== X-Gm-Message-State: AOJu0YwFHhntzRRXTGryI378FAoKgnP/L+rvLDn89xr8EAMvn50CQD7l VWHLbo0L7ddKA37VJAamJYJdHhBIXIVEWGZ5Z+CUHnFgY9ZZSay6MPTCG6aF2JVbXZw5gp7nRuE mqSgf+w== X-Google-Smtp-Source: AGHT+IHBm/v6ZgRi3eR3kcwMT0cHpjc868LP+LmAjgNJY2tbo22nq9YcQ/dO/nVVDAGBp703go/f8A== X-Received: by 2002:a05:6a20:840e:b0:1c2:a0b2:e69 with SMTP id adf61e73a8af0-1c4a14c75e0mr9895340637.33.1722258779868; Mon, 29 Jul 2024 06:12:59 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.12.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:12:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 03/37] ffmpeg: fix CVE-2024-31578 Date: Mon, 29 Jul 2024 06:12:13 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202617 From: Archana Polampalli FFmpeg version n6.1.1 was discovered to contain a heap use-after-free via the av_hwframe_ctx_init function. Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../ffmpeg/ffmpeg/CVE-2024-31578.patch | 49 +++++++++++++++++++ .../recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31578.patch diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31578.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31578.patch new file mode 100644 index 0000000000..f8e7e1283b --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31578.patch @@ -0,0 +1,49 @@ +From edeeb35cecb5bc0d433b14dd0e544ae826b7ece5 Mon Sep 17 00:00:00 2001 +From: Zhao Zhili +Date: Tue, 20 Feb 2024 20:08:55 +0800 +Subject: [PATCH] avutil/hwcontext: Don't assume frames_uninit is reentrant + +Fix heap use after free when vulkan_frames_init failed. + +Signed-off-by: Zhao Zhili + +CVE: CVE-2024-31578 + +Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/3bb00c0a420c3ce83] + +Signed-off-by: Archana Polampalli +--- + libavutil/hwcontext.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c +index 3650d46..0ef3479 100644 +--- a/libavutil/hwcontext.c ++++ b/libavutil/hwcontext.c +@@ -363,7 +363,7 @@ int av_hwframe_ctx_init(AVBufferRef *ref) + if (ctx->internal->hw_type->frames_init) { + ret = ctx->internal->hw_type->frames_init(ctx); + if (ret < 0) +- goto fail; ++ return ret; + } + + if (ctx->internal->pool_internal && !ctx->pool) +@@ -373,14 +373,10 @@ int av_hwframe_ctx_init(AVBufferRef *ref) + if (ctx->initial_pool_size > 0) { + ret = hwframe_pool_prealloc(ref); + if (ret < 0) +- goto fail; ++ return ret; + } + + return 0; +-fail: +- if (ctx->internal->hw_type->frames_uninit) +- ctx->internal->hw_type->frames_uninit(ctx); +- return ret; + } + + int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ref, +-- +2.40.0 diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb index 90c15782d1..06bd36e2e2 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb @@ -28,6 +28,7 @@ SRC_URI = " \ file://vulkan_av1_stable_API.patch \ file://vulkan_fix_gcc14.patch \ file://CVE-2023-49502.patch \ + file://CVE-2024-31578.patch \ " SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" From patchwork Mon Jul 29 13:12:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46967 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 AE85DC3DA4A for ; Mon, 29 Jul 2024 13:13:06 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web10.55645.1722258782144275226 for ; Mon, 29 Jul 2024 06:13:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Mlt29/9x; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-7a0e8b76813so2254635a12.3 for ; Mon, 29 Jul 2024 06:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258781; x=1722863581; 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=XXFNuR0DVCax0aTE0wD9rymRHg4C8ByN88XnyK62fsE=; b=Mlt29/9xZ6kOrjBSMFRnUcDYlw6OXi1lNjsHM4QwvcISqOQPy4BTwyhoq8+xosfg5p SC4X9+LuFoq7bwL4HYAKj8JX89+wxF496cd6UFdy5O8KWswQnID/Ipk+XUW5KcLSodDZ PSyTUpkPalHg6O5r2GUN4csbti+a4BcZc3bJAwdd3MHw4VhVuVB2jmdzNvQWPM2xIX0N qKaVrXFd36+z5Wzw9pTKDhp929jX5KEkKEWzsf0H+y8Ncr0GRRUSDz+2TZbi4HoBp2Gu 0oZxjS+uH8kUbnG9BPRD/Izkwo7MCn1NLzhG4+2745LqILz6PuZYj1HBqdlRFssaEN1I rrMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258781; x=1722863581; 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=XXFNuR0DVCax0aTE0wD9rymRHg4C8ByN88XnyK62fsE=; b=jt17WgEwctVX858r0lWubilboeR8SuXuwk6FDladUNzc3JiS6Al99LBmhMgQXapt5R ZnY23R2zPDpp2YxcXav5FgqEBwgXFerbiM0bdZSEETb/jjbhbibyMfZzkVBmm69ViXvW gQci0nRAnXHlOMt9aYelL7zHGMpW9cnP160F4F7qKuEzHwzg/Kgp9XRih/4jx5QoGup6 t6kC2HHc7LPegvhD6Kyu6tUoZZaRbjTDgFpU6XbMyee9CDCU2syuNKE1dF6JwPmUQ/hu 1sq3o3ciW3A5sxAOwPHlX5lIGbXHQtRxL6ruKHrLmofj3/8SiQe0WT8I8PwORax8gC0q BH0Q== X-Gm-Message-State: AOJu0YwAHCAm7rVYZ3t42YeCML5N61jrFXuxxQs4vsAR9p5CQHqSpVMD ncXCLPN4bK6pBDMbVvVufrhOlMPIo7VptiQsZ/BsSR2ppdkCEpfUJSfQ5xSwlq/kg5e+O+krqKe kutmGrg== X-Google-Smtp-Source: AGHT+IG2Kf9HAlFBgMcG2IZOXarxEAuVXZEGdtOxUHBsYKSHjdN5UiQPORPAODMYuJXw+Tujr/GJ7g== X-Received: by 2002:a17:90b:350d:b0:2c8:db8b:7247 with SMTP id 98e67ed59e1d1-2cf7e19e202mr8405451a91.9.1722258781286; Mon, 29 Jul 2024 06:13:01 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 04/37] pam: Fix for CVE-2024-22365 Date: Mon, 29 Jul 2024 06:12:14 -0700 Message-Id: <6d4c14e1053089a67a38a8de95625e4ba3fbc32a.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202618 From: Guðni Már Gilbert Upstream-Status: Backport from https://github.com/linux-pam/linux-pam/commit/031bb5a5d0d950253b68138b498dc93be69a64cb Signed-off-by: Guðni Már Gilbert Signed-off-by: Steve Sakoman --- .../pam/libpam/CVE-2024-22365.patch | 65 +++++++++++++++++++ meta/recipes-extended/pam/libpam_1.5.3.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-extended/pam/libpam/CVE-2024-22365.patch diff --git a/meta/recipes-extended/pam/libpam/CVE-2024-22365.patch b/meta/recipes-extended/pam/libpam/CVE-2024-22365.patch new file mode 100644 index 0000000000..e4ec862dc5 --- /dev/null +++ b/meta/recipes-extended/pam/libpam/CVE-2024-22365.patch @@ -0,0 +1,65 @@ +From 84f378d3b8573828e7ccc54b54b5e128aa993748 Mon Sep 17 00:00:00 2001 +From: Matthias Gerstner +Date: Wed, 27 Dec 2023 14:01:59 +0100 +Subject: [PATCH] pam_namespace: protect_dir(): use O_DIRECTORY to prevent + local DoS situations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without O_DIRECTORY the path crawling logic is subject to e.g. FIFOs +being placed in user controlled directories, causing the PAM module to +block indefinitely during `openat()`. + +Pass O_DIRECTORY to cause the `openat()` to fail if the path does not +refer to a directory. + +With this the check whether the final path element is a directory +becomes unnecessary, drop it. + +Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/031bb5a5d0d950253b68138b498dc93be69a64cb] +CVE: CVE-2024-22365 +Signed-off-by: Guðni Már Gilbert +--- + modules/pam_namespace/pam_namespace.c | 18 +----------------- + 1 file changed, 1 insertion(+), 17 deletions(-) + +diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c +index f34ce934..ef856443 100644 +--- a/modules/pam_namespace/pam_namespace.c ++++ b/modules/pam_namespace/pam_namespace.c +@@ -1194,7 +1194,7 @@ static int protect_dir(const char *path, mode_t mode, int do_mkdir, + int dfd = AT_FDCWD; + int dfd_next; + int save_errno; +- int flags = O_RDONLY; ++ int flags = O_RDONLY | O_DIRECTORY; + int rv = -1; + struct stat st; + +@@ -1248,22 +1248,6 @@ static int protect_dir(const char *path, mode_t mode, int do_mkdir, + rv = openat(dfd, dir, flags); + } + +- if (rv != -1) { +- if (fstat(rv, &st) != 0) { +- save_errno = errno; +- close(rv); +- rv = -1; +- errno = save_errno; +- goto error; +- } +- if (!S_ISDIR(st.st_mode)) { +- close(rv); +- errno = ENOTDIR; +- rv = -1; +- goto error; +- } +- } +- + if (flags & O_NOFOLLOW) { + /* we are inside user-owned dir - protect */ + if (protect_mount(rv, p, idata) == -1) { +-- +2.43.0 + diff --git a/meta/recipes-extended/pam/libpam_1.5.3.bb b/meta/recipes-extended/pam/libpam_1.5.3.bb index ef32d19f3d..bcaa84c9a5 100644 --- a/meta/recipes-extended/pam/libpam_1.5.3.bb +++ b/meta/recipes-extended/pam/libpam_1.5.3.bb @@ -26,6 +26,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ file://pam-volatiles.conf \ file://0001-pam_namespace-include-stdint-h.patch \ file://0001-pam_pwhistory-fix-passing-NULL-filename-argument-to-.patch \ + file://CVE-2024-22365.patch \ " SRC_URI[sha256sum] = "7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283" From patchwork Mon Jul 29 13:12:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46965 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 C3A81C52D1D for ; Mon, 29 Jul 2024 13:13:06 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.55647.1722258783448391705 for ; Mon, 29 Jul 2024 06:13:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=xaNOxmnT; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2cd34c8c588so1856624a91.0 for ; Mon, 29 Jul 2024 06:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258783; x=1722863583; 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=loSsdSCnBhc3p2Pnl1kV5T0ktXPAtBdV3J4zPCNaXCU=; b=xaNOxmnTR5H47Vsr0KqK35MHfQejCw785NsjCMN9PsoztZoVZUb1+lgnfeKMYrC9ph KpQnNL2YHXeWIxA41Ob23G1y+C8HeltRWEJxTPg4V4ZuZieAxrkf9bnULItBy4SozCGT 76wX5lCXPEZkAFWezuVjV7DTY98XYQZMCHo8XZHoC5cMGzN70dNAT381mJ1Cmj0/Ne8A l37AGKpYHaG61ML3ixJxS/eClTNRFjsEM53Zg8NOEor6ISFoRILMstRZo04Z/Pu4jbeh Mz4tgQdDFCta4nEZ+4dJ7+UA9VI7gy2/M4s2/W2q8y/tS17EVkkJ5srRYYaRdbYIxgfQ rWKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258783; x=1722863583; 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=loSsdSCnBhc3p2Pnl1kV5T0ktXPAtBdV3J4zPCNaXCU=; b=uZ9qBp01VIoYrdU5krwL1BW7aPaW856BTuTv25tP38+krZLgFPlj1rTQf80tnUFdnh q+1YixFRKHx8hKwQ5OY1AXIHvS2wJWS/GtZtqlbtHKfcZE3HYCD6jAEZ1UqJGXERChba aTWPN9FoK42DJLsvy01KBbUwVkKQukMvpLTrTUdrTf9m2Cx+aApPfCLyyUrfJ+DeYVuO CzK2jNkXEvT/FO4pjXnAQI77YmOjc9Rx3NfxmzBBxsCFWOoyDYtFdkC7Q1nYX2h4dBUe 80yjl9fGrUavmwMIM3/m3/JRnU5DEAoNd7YlI+PO0JpyaWGSKT9W3GYVQVRECNIrSLc5 E5Tg== X-Gm-Message-State: AOJu0YyOQLL4BqvhHAuKyTjcidqJMTQskR2yid0vtQHnpYaKx8nIx+La Lw4heqgSyzSq7LEECud96uAroKDaDTXentiGfRYNOjvob+x8ZmLjVB4FZW9KGtGGpSR1oQ8/BTP ac6xDdA== X-Google-Smtp-Source: AGHT+IFzTpN6s/aoTVHSgakmGegvkSL5aaEBjOrg+u5upfAu2G+am2zrcTIOKIQ2Rhn+BcQe71iykg== X-Received: by 2002:a17:90a:c7c5:b0:2c8:6793:456 with SMTP id 98e67ed59e1d1-2cf7d3e7c22mr5089672a91.0.1722258782684; Mon, 29 Jul 2024 06:13:02 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 05/37] cve-check: Introduce CVE_CHECK_MANIFEST_JSON_SUFFIX Date: Mon, 29 Jul 2024 06:12:15 -0700 Message-Id: <0cb103430d0505a3cd135e727379489bc3fe6e46.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202619 From: Aleksandar Nikolic The variable contains the suffix of the CVE JSON manifest file. By default, this variable is set to 'json', so the current behavior is not changed, but enables developers to use some other suffix, e.g., cve.json (similar to spdx.json). Signed-off-by: Aleksandar Nikolic Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit d99eee76923659c0b95bf9ef415ae5d44f736d01) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 56ba8bceef..93a2a1413d 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -49,7 +49,8 @@ CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" CVE_CHECK_RECIPE_FILE ?= "${CVE_CHECK_DIR}/${PN}" CVE_CHECK_RECIPE_FILE_JSON ?= "${CVE_CHECK_DIR}/${PN}_cve.json" CVE_CHECK_MANIFEST ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.cve" -CVE_CHECK_MANIFEST_JSON ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.json" +CVE_CHECK_MANIFEST_JSON_SUFFIX ?= "json" +CVE_CHECK_MANIFEST_JSON ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.${CVE_CHECK_MANIFEST_JSON_SUFFIX}" CVE_CHECK_COPY_FILES ??= "1" CVE_CHECK_CREATE_MANIFEST ??= "1" @@ -278,7 +279,8 @@ python cve_check_write_rootfs_manifest () { bb.plain("Image CVE report stored in: %s" % manifest_name) if enable_json: - link_path = os.path.join(deploy_dir, "%s.json" % link_name) + manifest_name_suffix = d.getVar("CVE_CHECK_MANIFEST_JSON_SUFFIX") + link_path = os.path.join(deploy_dir, "%s.%s" % (link_name, manifest_name_suffix)) manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON") with open(manifest_name, "w") as f: From patchwork Mon Jul 29 13:12:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46962 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 7CE31C3DA7E for ; Mon, 29 Jul 2024 13:13:06 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.55650.1722258784864849466 for ; Mon, 29 Jul 2024 06:13:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=uMk3MmkD; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2cb6662ba3aso2107169a91.1 for ; Mon, 29 Jul 2024 06:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258784; x=1722863584; 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=5oEQ7Ysdr79/3BcFGxfnoNt06Pi9sg0XFZQNpA3YHsc=; b=uMk3MmkDwlIxO2cRt6jA31ZupEc1XD780HJ4AroW7ASrcnEFGvTfe6hw9UyKO+c4uv V9WyiXQ2HR3jTp/SzDaL6NSwUHmvU6m4D6W23kRu48huM8RQZKhxqA2QNj6s6/N33taB fALnVC7MQ6+mLU3wPCncIrjGuIml30O29hi3ZbdZCc4ZO3xTN7WCe05st4yYWFqSnbjC 2btIdoAdhA6cmJoOdgzpOEADBieW7Aq5YePeZUxllmj8KH+izEfbOFBTeVAH98xQmWiX S43AX1DLX9W9fDHryGkYOt+rHYTSc6Z8bzM7PMvCh1t3/3yuO7Vp5V1ZsRIELXXH9TDy ivxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258784; x=1722863584; 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=5oEQ7Ysdr79/3BcFGxfnoNt06Pi9sg0XFZQNpA3YHsc=; b=E0lfn7VrLjcjvIpc8kiZQ5NlNUNYSxM4+KDSKOgU585ijDWQP2YAuKO1VitHzLbayn 9KPRbS3oBMWmnD5xdzZFTrMJ/7ejEnuGdUwgko589AN9/w3aUwazAuXt2oQAw3ZPx72L LFvSSvbQhHAS6DPDh9f1dNG1wmmsnQ9sU2qdg1uGrDM1p8hdHcH2FUhPvSzVCw7+I2+6 /1wMtgZbOTqL9tYBiMa0AK06RxqJMc3RDKKcbdAgW44/mD2p8XYIqA1LSHN99LCx6iOb gaxHyeLCkHOrB8AJi/JdSNlxaosBTVt20hTKmTycYvcohkOjKjMzxnq+XDCFyYEcIll2 d0tA== X-Gm-Message-State: AOJu0YzlIPPU1oAgpPct1MmVrMjJQgaD0Ns45g+ddpiOvtMjbINL3Zzr njMXUNvPbG1iYHDowhTyVdVx6jw1Qf930AbcOb+DJVkF2aa5CAmiOwsGhMP2Cc+qSxxa2ABllyp 7X4CTrg== X-Google-Smtp-Source: AGHT+IHq6Qjh9FoXMMSrGjzcwQrD1fqZhpUivGpN7J7l/n13dbIWA5wu61oGCL0g+EYvcu0PbF58hw== X-Received: by 2002:a17:90b:4a52:b0:2ab:8324:1b47 with SMTP id 98e67ed59e1d1-2cf7cf877ecmr12608345a91.15.1722258783940; Mon, 29 Jul 2024 06:13:03 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 06/37] weston: upgrade 13.0.0 -> 13.0.1 Date: Mon, 29 Jul 2024 06:12:16 -0700 Message-Id: <785dc256112029fcc95bcb003ab0436bee6079d1.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202620 From: Denys Dmytriyenko Weston 13.0.1, a bug fix release for 13.0.0 has been released. Full changelog: https://lists.freedesktop.org/archives/wayland-devel/2024-April/043575.html Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie (cherry picked from commit a43f4f98aeba01f05157f7784e366a964d2f766f) Signed-off-by: Steve Sakoman --- ...tools-Include-libgen.h-for-basename-signat.patch | 13 +++++-------- .../wayland/{weston_13.0.0.bb => weston_13.0.1.bb} | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) rename meta/recipes-graphics/wayland/{weston_13.0.0.bb => weston_13.0.1.bb} (98%) diff --git a/meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch b/meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch index 1d281fa832..fbec9f9d4e 100644 --- a/meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch +++ b/meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch @@ -1,4 +1,4 @@ -From 2b53236ac637dfa7fb0f438f7391a73f6ef92a06 Mon Sep 17 00:00:00 2001 +From e050830898ea37d30ef1c5339cb1665bdb92dcdc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 14 Dec 2023 09:13:54 -0800 Subject: [PATCH] libweston,tools: Include libgen.h for basename signature @@ -20,7 +20,7 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+) diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c -index ca7f2d68..74690fa7 100644 +index ca7f2d6..74690fa 100644 --- a/libweston/backend-drm/libbacklight.c +++ b/libweston/backend-drm/libbacklight.c @@ -41,6 +41,7 @@ @@ -30,19 +30,16 @@ index ca7f2d68..74690fa7 100644 +#include #include #include - + diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c -index 18f03015..9b460fa0 100644 +index 18f0301..9b460fa 100644 --- a/tools/zunitc/src/zunitc_impl.c +++ b/tools/zunitc/src/zunitc_impl.c @@ -27,6 +27,7 @@ - + #include #include +#include #include #include #include --- -2.43.0 - diff --git a/meta/recipes-graphics/wayland/weston_13.0.0.bb b/meta/recipes-graphics/wayland/weston_13.0.1.bb similarity index 98% rename from meta/recipes-graphics/wayland/weston_13.0.0.bb rename to meta/recipes-graphics/wayland/weston_13.0.1.bb index b728bd0ef3..dd9517a4dd 100644 --- a/meta/recipes-graphics/wayland/weston_13.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_13.0.1.bb @@ -14,7 +14,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo file://systemd-notify.weston-start \ " -SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" +SRC_URI[sha256sum] = "ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a" UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" UPSTREAM_CHECK_REGEX = "weston-(?P\d+\.\d+\.(?!9\d+)\d+)" From patchwork Mon Jul 29 13:12:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46964 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 C30CFC52CDA for ; Mon, 29 Jul 2024 13:13:06 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.55939.1722258786454091869 for ; Mon, 29 Jul 2024 06:13:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=rUj7IzY7; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2caff99b1c9so1868691a91.3 for ; Mon, 29 Jul 2024 06:13:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258786; x=1722863586; 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=4cev+wLS0cSzi5c+8TKZstcFd/B6Z/Fw9/ebcX/TYi0=; b=rUj7IzY7wMLBZgt83B6FZ5iKFsAJ8hRFFx8pzIaJPGOaK9jES/YB2uush7KZdkUb0w i0r0RUq+0oyC6dZN3IAXdZ0DD/G03uAyYpae2HW9nDKikQ/yG1gHyutBVZLhBBO5sdN8 HK8nQvO6RwwA9HLiNK26QCZu7Ky2clk6TwkBz7Bypgt+hVynPNEnYgOv+Yg9lssIvQVw nmuorJai0i9j78CK7cnOe64Ow5oQLTKqQOmWktW0fO0G0rzmPwCZVlmFP/S6EYhy/wZp MJquctH5tZSm80mFwxHmqvE0aGeO+qGOkX8DIf76huAZc6Mh6Wyq5iLgviugav2rYU76 ZeNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258786; x=1722863586; 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=4cev+wLS0cSzi5c+8TKZstcFd/B6Z/Fw9/ebcX/TYi0=; b=mTaT14E9F79Odyv0Tm6vSCJarFHpHwWoNPUWQFz/kxsdBW7Xi9ShfawoETSvbT6abi f0GCwnADQLuKb+frvV5pU82DhumLvGgv/+cj3jWSVCGEVRG2z6EqLOIe8+rbOeCuzTo8 azdUzDOkgCRSeTIp6MsxuGaiy2I/AUg5Ym7yXXLay/EWjbEj8+JeovYf7C+KiTYHfxkH apUzf5t35hApoP/ePR1F1De12yvzSnVZB/+wwSaoqWNsViosAv8IxhpmOf7A1elbM6IU JxKjmsjfyyIYDksmEWudco+q5PScSPNehaItnMf7QCLlvRNjfLydEYsKmyCYLpo02iag Wieg== X-Gm-Message-State: AOJu0YxNmxGf7DzKXr/itTUslgG2iHMKSuDUUII2mCkqDjOr4HJwR0Is QLjSlbE0rFtc6OZpi5YJW5hLEHaN+3plYCCOTzFEk01P8FsXTDuIuae4jSMct3LcGmfADKzaDPR mtO/hGQ== X-Google-Smtp-Source: AGHT+IEHxGLv5T1I40O231l1GLQH9ORsdXAk5jGHZ28D4bp0RMRKU0qh+jS6vQIvel7cagqY/jMNwA== X-Received: by 2002:a17:90a:9c7:b0:2c9:6278:27c9 with SMTP id 98e67ed59e1d1-2cf7e621f45mr5280064a91.38.1722258785821; Mon, 29 Jul 2024 06:13:05 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 07/37] python3-idna: upgrade 3.6 -> 3.7 Date: Mon, 29 Jul 2024 06:12:17 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202621 From: Soumya Sambu License-Update: Updated copyright year Changelog: ========== * Fix issue where specially crafted inputs to encode() could take exceptionally long amount of time to process. [CVE-2024-3651] Signed-off-by: Soumya Sambu Signed-off-by: Steve Sakoman --- .../python/{python3-idna_3.6.bb => python3-idna_3.7.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/python/{python3-idna_3.6.bb => python3-idna_3.7.bb} (62%) diff --git a/meta/recipes-devtools/python/python3-idna_3.6.bb b/meta/recipes-devtools/python/python3-idna_3.7.bb similarity index 62% rename from meta/recipes-devtools/python/python3-idna_3.6.bb rename to meta/recipes-devtools/python/python3-idna_3.7.bb index 47c080cdf8..729aff1c46 100644 --- a/meta/recipes-devtools/python/python3-idna_3.6.bb +++ b/meta/recipes-devtools/python/python3-idna_3.7.bb @@ -1,9 +1,9 @@ SUMMARY = "Internationalised Domain Names in Applications" HOMEPAGE = "https://github.com/kjd/idna" LICENSE = "BSD-3-Clause & Python-2.0 & Unicode-TOU" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dbec47b98e1469f6a104c82ff9698cee" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=204c0612e40a4dd46012a78d02c80fb1" -SRC_URI[sha256sum] = "9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca" +SRC_URI[sha256sum] = "028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc" inherit pypi python_flit_core From patchwork Mon Jul 29 13:12:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46970 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 C1703C3DA4A for ; Mon, 29 Jul 2024 13:13:16 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.55940.1722258788094761938 for ; Mon, 29 Jul 2024 06:13:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=zE3+rVWV; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-7ab09739287so1796539a12.3 for ; Mon, 29 Jul 2024 06:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258787; x=1722863587; 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=y1jHiC5bwv/7pXHOo9OqSqNFazkgeukLXVpM1668dKQ=; b=zE3+rVWV4rY/twGE+3MJp5+BBfPP4VzT4yuF7repWtvqkjLOR8KmQa5eJORNgJkyIS xh7gr339QTnvzy3Lp/150eiOvuzEbK19IIUyo79CyK5ApakBYOXrtKPTqbpD+yHGL4Go R/ODYxwhDWdvh6Zk9b/S3b9JqMIZ9ZvrB2wzElHzpP+ag6HfW89UVaqs2zinHwBKis+i /JwbP7FJB5/48ude6lUTeuf7mqhmPtWOROgZZXHJiEaOyecAmb7156ToMcq9LAp5Mm+X Xz3rQDet2hvIk+H4axtHES8Yg9m+iE82CbSWS+TeGRa/cxB/rtZnrPsHDBGm6+iTkg5X rY+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258787; x=1722863587; 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=y1jHiC5bwv/7pXHOo9OqSqNFazkgeukLXVpM1668dKQ=; b=SI9Q44RPcqH2FCQw7gHRNejwJvpng4gm/akBrS2kw3Lc3XtKQlT7/2W093MNnrQ3yy VVFWrCrOF+GYTpxXkv8H9F/v2ZDY+6J6JDbZNNlNTCGLCpAhzKiJbdnV4o8JPqp+scnh ixJCNzNAE8fY+H0KjCVnfAP+waApUmCWJCMPYJIMWzRqwRXg/7/xUJKkXliioL8mqprm iDnLLiu8GENZvQ98v0aXOTktsugYqjqY7Ci2kDIOMAyhxrK+lsq6aWwEAhRSjpcK7N+G fpiFGvqJ6eu37a3Vs2PatOh3uKI8aHxGTopaBXzGbUn2q0j1K2ekajvY5IVKEBx7rGRy CFJA== X-Gm-Message-State: AOJu0YzeiKc3IpjP0Yq9IfTz6xRLfEUsvI4k7OLpTCC50gOQVYl9n7ZK qwHCQ3PH2uKcLVZn8zpTm830yMlAIIP2xfiRmhP4zDoBOwnLiuETLrdg6NeErfaBWciBznQG9gZ 6ML1gWQ== X-Google-Smtp-Source: AGHT+IE6KPC59nPvXI9NrvoRIQPwrRc5lXsZ+e/7aBgL8xKEDWNP0bRBYGcSo4WHRU81KrLrwDrOWw== X-Received: by 2002:a17:90a:f998:b0:2cb:4c5b:2d8a with SMTP id 98e67ed59e1d1-2cf7e1c651dmr5372193a91.12.1722258787263; Mon, 29 Jul 2024 06:13:07 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 08/37] oeqa/runtime: make minidebuginfo test work with coreutils Date: Mon, 29 Jul 2024 06:12:18 -0700 Message-Id: <2b71641b9c1b8f7e67527d2242a6a65b1e849ded.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202622 From: Etienne Cordonnier The test was failing with core-image-full-cmdline which uses sleep from coreutils instead of sleep from busybox. Signed-off-by: Etienne Cordonnier Signed-off-by: Richard Purdie (cherry picked from commit 8497edf0c56da34ea7b7509b8fcd46fcba2fd0e3) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/systemd.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py index 8bf571663b..80fdae240a 100644 --- a/meta/lib/oeqa/runtime/cases/systemd.py +++ b/meta/lib/oeqa/runtime/cases/systemd.py @@ -157,7 +157,8 @@ class SystemdServiceTests(SystemdTest): (status, output) = self.target.run('coredumpctl info') self.assertEqual(status, 0, msg='MiniDebugInfo Test failed: %s' % output) - self.assertEqual('sleep_for_duration (busybox.nosuid' in output, True, msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): %s' % output) + self.assertEqual('sleep_for_duration (busybox.nosuid' in output or 'xnanosleep (sleep.coreutils' in output, + True, msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): %s' % output) class SystemdJournalTests(SystemdTest): From patchwork Mon Jul 29 13:12:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46974 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 25A37C52D1E for ; Mon, 29 Jul 2024 13:13:17 +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.web10.55651.1722258789310478673 for ; Mon, 29 Jul 2024 06:13:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=H5AQ+GI2; 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-2c964f5a037so1985377a91.0 for ; Mon, 29 Jul 2024 06:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258788; x=1722863588; 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=WgmcIcL2JzAfeUxHHPkfn/mOVs5rYi8k3cniWZE8EJY=; b=H5AQ+GI25ggnQYpkMgK6+HO/j/o4Dnh0nPHQxN9IsziTcY6veGp9WXQ6WPoHOoMXpF W0C7GOd2Q0jl0OI5xE7UwhUvpQsOeIv/8ALrVZilx+nLrXCcaJwFPcjyuXoazryo2fDb rZj41Y5dnVluhAjRnIWchqx/UvrSp6KO245ubMsYRA/1nVjFsJL0L75/8s4ycYhv4p12 /oLXhXgPT0ZddDBrU7dmECpAXan5CJ0oX02NOehxr7ZPz3bL0NfooKXFOZjHM4Gm4GNa tIgpid5YdG+hr/AwouYl945DeoB7sAD8dmlT/+i6Ng+0UkTCIroUuVeqA/CuhwaFNOEm ayFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258788; x=1722863588; 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=WgmcIcL2JzAfeUxHHPkfn/mOVs5rYi8k3cniWZE8EJY=; b=e0V+cHdDYBZoKO7x7mCfK3CGkYWqM2wWOJwAM8TytI/CYtxFk6jaHStHWE8qFx5o3J pt8WEq1KvOrMUogk7NDqxJchj6TWi5ZI3BA04RH4Z1MBrIyme1fMxOei7La2MgyvebVH g2NIzk5asffwBTHS7+5HeSMQcME+5UKlQRJ3GakFN/URPtcudGoBX6k6dmbt/Iuwu2uv ztVKlv5Y1t6XGO0xJF+oSs9SzvX4OSS/jSSMrsH0VHoH6hdqkmV3V2rgilfOQu4/oVsX 8sqmtHYXG47dsob3Xo6ektihSkoEXIGmr6cp4yCOuGvDgdNF+4QSWsMWgXxqJLhSVR4b mloA== X-Gm-Message-State: AOJu0YxlaF5XDtkZLIfaRrk54HY6Yt99mn8CKcCRTgvkYNwLsFkF+chj KsZmBNrZyPaqciOHQESf+MZcme3x280B1QNAwI51QVqGOc+w6j9bvF/Py0HZArQ79edie7Fi5nT jvAVXDQ== X-Google-Smtp-Source: AGHT+IHP45ReB6UxucrabnF0Jvqa5Oe8rHr4dYbj4qesKuAOs5SAbsIt3gVPqbG/I+InMwfSk7ue/g== X-Received: by 2002:a17:90a:ac2:b0:2c8:8a5:c1b9 with SMTP id 98e67ed59e1d1-2cf7e1f0075mr6029752a91.13.1722258788562; Mon, 29 Jul 2024 06:13:08 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 09/37] wic: bootimg-efi: fix error handling Date: Mon, 29 Jul 2024 06:12:19 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202623 From: Enrico Jörns If we check for empty variables, it does not make sense to print their content in case they are empty. Additionally, the error message in the 'kernel' check attempted to print the wrong variable ('target') which was not even defined, yet. Also, raising WicError doesn't require an extra newline. Signed-off-by: Enrico Jörns Signed-off-by: Richard Purdie (cherry picked from commit f31cf475d0235f42d73aeec07694f79b9937fd76) Signed-off-by: Steve Sakoman --- scripts/lib/wic/plugins/source/bootimg-efi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 13a9cddf4e..7cc5131541 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -428,10 +428,10 @@ class BootimgEFIPlugin(SourcePlugin): elif source_params['loader'] == 'uefi-kernel': kernel = get_bitbake_var("KERNEL_IMAGETYPE") if not kernel: - raise WicError("Empty KERNEL_IMAGETYPE %s\n" % target) + raise WicError("Empty KERNEL_IMAGETYPE") target = get_bitbake_var("TARGET_SYS") if not target: - raise WicError("Unknown arch (TARGET_SYS) %s\n" % target) + raise WicError("Empty TARGET_SYS") if re.match("x86_64", target): kernel_efi_image = "bootx64.efi" From patchwork Mon Jul 29 13:12:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46973 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 E5711C49EA1 for ; Mon, 29 Jul 2024 13:13:16 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web10.55652.1722258791177149837 for ; Mon, 29 Jul 2024 06:13:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=QH7G2LnC; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7a18ba4143bso2053046a12.2 for ; Mon, 29 Jul 2024 06:13:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258790; x=1722863590; 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=KU8ubl8XdLvP09CKEXGyC34tj8haMKi6oqAtlBhhyxY=; b=QH7G2LnC8TlRt2kiqGOr1DqtfuoVNo7qcbr7jwbO44ztQyQFZjJgzm2WKe6ePfAqtN 0XM+6+gSDuozmv7Ro38+CZ9vvVk3eY670GOoJYDXS17MknOrClbzbGPTaEhvRC/9Wn2l 6h0PlAGkDLYIZQ0lQI7LAxiFyLg1PU1e51nh80q7HK55V0zxk1+gtFlXwiluSzyCSDaC E8TDIg7ytEjc7+LOnwL82nx9yyEVnulemiCRLOwd3nWTCHHqWilCWzA8da6K87FTkh5p GJhlzBks8d0UuDbaZ0wIHhDxhNouF1GjtOwvF+ignEpf85c8ABbDeHorApkoG2ShzUMf cQIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258790; x=1722863590; 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=KU8ubl8XdLvP09CKEXGyC34tj8haMKi6oqAtlBhhyxY=; b=rEH9pQTqKLjzpsoUbCTxXE2lgjDtZliQloyiNfEaLNn/DURcla4xc+smUiK+x/Uq5m /8yUKBhZ4hcq+aPtuQmIMErVUY9BQm++b/cfE9E8uc2yIwa0Vx8xZupU4ZzvvS6OUB9/ wm0HmSzk2sCs1bmc8qlnX/HPBo3kRKq+qJVXhnhnSkMaVar7zq7Jg4hKFKGMCmXdhALD 91ytjXZJ7OkLj48LSN6B+vSqNZrPucAGl4Ez3eQ5o2hhS11VDb4vb5otRuifYIMxW83J TjPsWdlSXoBBTB0pv2Y+GPsVQ7RQd0iqeblxtYVuoeNexMPm/kqPs9Z1PcP8um/9ZCaJ 2HRA== X-Gm-Message-State: AOJu0YzdC+rwSkg0GxiRJb5Tkt7OIfxaXL1HlEVUSOqOH57IhNga2kkU cpcyU4ntd8fbsU1yOKWick8YPCRZ/a1ZM96fORp7fE1CbT5JGiUMuP8v67AJIJ7M+VIX+yI4mvI emoKyug== X-Google-Smtp-Source: AGHT+IGcvwr7aJIky1uMX7EpnhlN0guSqqFl2UwfsKqNLrki3pI0av3hLdniSC7m1XfArKRtGFVIDg== X-Received: by 2002:a17:90a:b30e:b0:2c8:f3b4:421 with SMTP id 98e67ed59e1d1-2cf7e09cd84mr5612846a91.4.1722258790217; Mon, 29 Jul 2024 06:13:10 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 10/37] multilib.bbclass: replace deprecated e.data with d Date: Mon, 29 Jul 2024 06:12:20 -0700 Message-Id: <01a84c3db74e8cc4923016c312a484a252fcfee0.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202624 From: Kai Kang Replace deprecated e.data with d in multilib.bbclass and multilib_global.bbclass. Remove event check in function multilib_virtclass_handler_vendor in multilib_global.bbclass. The function flag 'eventmask' has been set with 'bb.event.ConfigParsed', so no need to check the event any more. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie (cherry picked from commit 8d87662d676a2b9ef921cb49ea6edc07b37410e2) Signed-off-by: Steve Sakoman --- meta/classes/multilib.bbclass | 87 ++++++++++++++-------------- meta/classes/multilib_global.bbclass | 25 ++++---- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index b6c09969b1..a4151658a6 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -5,30 +5,30 @@ # python multilib_virtclass_handler () { - cls = e.data.getVar("BBEXTENDCURR") - variant = e.data.getVar("BBEXTENDVARIANT") + cls = d.getVar("BBEXTENDCURR") + variant = d.getVar("BBEXTENDVARIANT") if cls != "multilib" or not variant: return - localdata = bb.data.createCopy(e.data) + localdata = bb.data.createCopy(d) localdata.delVar('TMPDIR') - e.data.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR')) + d.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR')) # There should only be one kernel in multilib configs # We also skip multilib setup for module packages. - provides = (e.data.getVar("PROVIDES") or "").split() + provides = (d.getVar("PROVIDES") or "").split() non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split() - bpn = e.data.getVar("BPN") - if "virtual/kernel" in provides or \ - bb.data.inherits_class('module-base', e.data) or \ - bpn in non_ml_recipes: + bpn = d.getVar("BPN") + if ("virtual/kernel" in provides + or bb.data.inherits_class('module-base', d) + or bpn in non_ml_recipes): raise bb.parse.SkipRecipe("We shouldn't have multilib variants for %s" % bpn) - save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" + save_var_name = d.getVar("MULTILIB_SAVE_VARNAME") or "" for name in save_var_name.split(): - val=e.data.getVar(name) + val = d.getVar(name) if val: - e.data.setVar(name + "_MULTILIB_ORIGINAL", val) + d.setVar(name + "_MULTILIB_ORIGINAL", val) # We nearly don't need this but dependencies on NON_MULTILIB_RECIPES don't work without it d.setVar("SSTATE_ARCHS_TUNEPKG", "${@all_multilib_tune_values(d, 'TUNE_PKGARCH')}") @@ -36,66 +36,67 @@ python multilib_virtclass_handler () { overrides = e.data.getVar("OVERRIDES", False) pn = e.data.getVar("PN", False) overrides = overrides.replace("pn-${PN}", "pn-${PN}:pn-" + pn) - e.data.setVar("OVERRIDES", overrides) + d.setVar("OVERRIDES", overrides) - if bb.data.inherits_class('image', e.data): - e.data.setVar("MLPREFIX", variant + "-") - e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) - e.data.setVar('SDKTARGETSYSROOT', e.data.getVar('SDKTARGETSYSROOT')) + if bb.data.inherits_class('image', d): + d.setVar("MLPREFIX", variant + "-") + d.setVar("PN", variant + "-" + d.getVar("PN", False)) + d.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT')) override = ":virtclass-multilib-" + variant - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) - target_vendor = e.data.getVar("TARGET_VENDOR:" + "virtclass-multilib-" + variant, False) + d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override) + target_vendor = d.getVar("TARGET_VENDOR:" + "virtclass-multilib-" + variant, False) if target_vendor: - e.data.setVar("TARGET_VENDOR", target_vendor) + d.setVar("TARGET_VENDOR", target_vendor) return - if bb.data.inherits_class('cross-canadian', e.data): + if bb.data.inherits_class('cross-canadian', d): # Multilib cross-candian should use the same nativesdk sysroot without MLPREFIX - e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") - e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") - e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") - e.data.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant) - e.data.setVar("MLPREFIX", variant + "-") + d.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") + d.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") + d.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") + d.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant) + d.setVar("MLPREFIX", variant + "-") override = ":virtclass-multilib-" + variant - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) + d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override) return - if bb.data.inherits_class('native', e.data): + if bb.data.inherits_class('native', d): raise bb.parse.SkipRecipe("We can't extend native recipes") - if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data): + if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('crosssdk', d): raise bb.parse.SkipRecipe("We can't extend nativesdk recipes") - if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \ - and not bb.data.inherits_class('packagegroup', e.data): + if (bb.data.inherits_class('allarch', d) + and not d.getVar('MULTILIB_VARIANTS') + and not bb.data.inherits_class('packagegroup', d)): raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups") # Expand this since this won't work correctly once we set a multilib into place - e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS")) + d.setVar("ALL_MULTILIB_PACKAGE_ARCHS", d.getVar("ALL_MULTILIB_PACKAGE_ARCHS")) override = ":virtclass-multilib-" + variant - skip_msg = e.data.getVarFlag('SKIP_RECIPE', e.data.getVar('PN')) + skip_msg = d.getVarFlag('SKIP_RECIPE', d.getVar('PN')) if skip_msg: - pn_new = variant + "-" + e.data.getVar('PN') - if not e.data.getVarFlag('SKIP_RECIPE', pn_new): - e.data.setVarFlag('SKIP_RECIPE', pn_new, skip_msg) + pn_new = variant + "-" + d.getVar('PN') + if not d.getVarFlag('SKIP_RECIPE', pn_new): + d.setVarFlag('SKIP_RECIPE', pn_new, skip_msg) - e.data.setVar("MLPREFIX", variant + "-") - e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) + d.setVar("MLPREFIX", variant + "-") + d.setVar("PN", variant + "-" + d.getVar("PN", False)) + d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override) # Expand INCOMPATIBLE_LICENSE_EXCEPTIONS with multilib prefix - pkgs = e.data.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") + pkgs = d.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") if pkgs: for pkg in pkgs.split(): pkgs += " " + variant + "-" + pkg - e.data.setVar("INCOMPATIBLE_LICENSE_EXCEPTIONS", pkgs) + d.setVar("INCOMPATIBLE_LICENSE_EXCEPTIONS", pkgs) # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data - newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) + newtune = d.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) if newtune: - e.data.setVar("DEFAULTTUNE", newtune) + d.setVar("DEFAULTTUNE", newtune) } addhandler multilib_virtclass_handler diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index 6095d278dd..973ac9130b 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass @@ -171,24 +171,23 @@ def preferred_ml_updates(d): d.appendVar("SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS", " " + " ".join(extras)) python multilib_virtclass_handler_vendor () { - if isinstance(e, bb.event.ConfigParsed): - for v in e.data.getVar("MULTILIB_VARIANTS").split(): - if e.data.getVar("TARGET_VENDOR:virtclass-multilib-" + v, False) is None: - e.data.setVar("TARGET_VENDOR:virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v) - preferred_ml_updates(e.data) + for v in d.getVar("MULTILIB_VARIANTS").split(): + if d.getVar("TARGET_VENDOR:virtclass-multilib-" + v, False) is None: + d.setVar("TARGET_VENDOR:virtclass-multilib-" + v, d.getVar("TARGET_VENDOR", False) + "ml" + v) + preferred_ml_updates(d) } addhandler multilib_virtclass_handler_vendor multilib_virtclass_handler_vendor[eventmask] = "bb.event.ConfigParsed" python multilib_virtclass_handler_global () { - variant = e.data.getVar("BBEXTENDVARIANT") + variant = d.getVar("BBEXTENDVARIANT") if variant: return non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split() - if bb.data.inherits_class('kernel', e.data) or \ - bb.data.inherits_class('module-base', e.data) or \ + if bb.data.inherits_class('kernel', d) or \ + bb.data.inherits_class('module-base', d) or \ d.getVar('BPN') in non_ml_recipes: # We need to avoid expanding KERNEL_VERSION which we can do by deleting it @@ -197,7 +196,7 @@ python multilib_virtclass_handler_global () { localdata.delVar("KERNEL_VERSION") localdata.delVar("KERNEL_VERSION_PKG_NAME") - variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split() + variants = (d.getVar("MULTILIB_VARIANTS") or "").split() import oe.classextend clsextends = [] @@ -208,22 +207,22 @@ python multilib_virtclass_handler_global () { origprovs = provs = localdata.getVar("PROVIDES") or "" for clsextend in clsextends: provs = provs + " " + clsextend.map_variable("PROVIDES", setvar=False) - e.data.setVar("PROVIDES", provs) + d.setVar("PROVIDES", provs) # Process RPROVIDES origrprovs = rprovs = localdata.getVar("RPROVIDES") or "" for clsextend in clsextends: rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False) if rprovs.strip(): - e.data.setVar("RPROVIDES", rprovs) + d.setVar("RPROVIDES", rprovs) # Process RPROVIDES:${PN}... - for pkg in (e.data.getVar("PACKAGES") or "").split(): + for pkg in (d.getVar("PACKAGES") or "").split(): origrprovs = rprovs = localdata.getVar("RPROVIDES:%s" % pkg) or "" for clsextend in clsextends: rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES:%s" % pkg, setvar=False) rprovs = rprovs + " " + clsextend.extname + "-" + pkg - e.data.setVar("RPROVIDES:%s" % pkg, rprovs) + d.setVar("RPROVIDES:%s" % pkg, rprovs) } addhandler multilib_virtclass_handler_global From patchwork Mon Jul 29 13:12:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46971 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 07A42C52CDA for ; Mon, 29 Jul 2024 13:13:17 +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.web10.55654.1722258792327892698 for ; Mon, 29 Jul 2024 06:13:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=q6QqMdYU; 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-2cd48ad7f0dso2564811a91.0 for ; Mon, 29 Jul 2024 06:13:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258791; x=1722863591; 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=nxCvmq91ys0sy+E1dDGFdkwlkikIWRPLF3wky7JG3iE=; b=q6QqMdYUo2amA7iJfPOB6+hrRl+xYJE2so22Ari8FBk5KE5m/rqlG272XZt7WcnH6j 4KyCcea5yAkGbJpd2B7M3TG3hg3QJEEdmKGBA8gadddxb5gYhLJRkp1TXosfwccfIlsh tYMfHDy3KgjYXSJSsmT2z6CofI2DZ0XK3Wnc2My+tTJhBdJqTT2e3MWpqej9V8mB6+pd 2qarizQFreSXOIKP1Q5khuyzQTi2NozWyqqvaxYE+js/1fx8bjYqm61cbT4MG7464Khw 7IrRRNdQBb+3vcxoUf+7XoGxpuwdnGcJx6bgH3EBdejccTPKeY/8SHaLL/i5K/pjyiQy VMaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258791; x=1722863591; 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=nxCvmq91ys0sy+E1dDGFdkwlkikIWRPLF3wky7JG3iE=; b=laIaqcpmi2PHHSUb76iASO6xi/neNBTvGcgMFGba5qybinMTbeD9BmC1wM9LkuP23I yaekpz6ilNonHc9uvXVNpsDOYZ9x8PeNnsZ7NG2p/PU7AJ+hwLEvyYrAne7uy0zD1b/C YrLqyM3mUBAIj+gOJm80aBhJ+RFpEJdp7UO+3s+GF8ETfCZluCnaOtGRC/PVfXkLYh9G m1p56AJXdySHPfE6kArkhzSgfSiEpA6HXy8kXbGZYUy+xit7Cq3/0B2QDZKfaHNFNrkw HSg+xuKeN8lvAUCaT30qdXqFNkPzQP5cTuUUG99vCvkIC9fb4PQ0i1wGD1Q+av6Wl8DJ VveA== X-Gm-Message-State: AOJu0YzfF6Ks3VsGmMBxE7PaKh6vXT8YM4rzfkRg1Ox5rfVHPQJSVjMO G98nN73JzYN32Ize6TYeM+MGZSmuyiqhPBjnGowVUN4WgBy3TaDoe7ntNIz71EcmyqS/QMTSYfq O+P+lyw== X-Google-Smtp-Source: AGHT+IFQfqleU1yEzOiG7x9EujEdjIsRyEwFLzxooPU6cjREdUBFW2R/rqjWH+lb8LMYApgL9MGsng== X-Received: by 2002:a17:90a:e64f:b0:2c9:7611:e15d with SMTP id 98e67ed59e1d1-2cf7e20a113mr8613383a91.20.1722258791523; Mon, 29 Jul 2024 06:13:11 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 11/37] gawk: update patch status Date: Mon, 29 Jul 2024 06:12:21 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202625 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 6d9052884f6eefdf65acbca76e1c39556d77a1af) Signed-off-by: Steve Sakoman --- .../gawk/gawk/0001-m4-readline-add-missing-includes.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch index 5be2fd97ee..6fffd1f373 100644 --- a/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch +++ b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch @@ -14,7 +14,7 @@ conftest.c:146:14: error: implicit declaration of function 'open'; did you mean Add the missing includes so that the check doesn't always fail due to these errors. -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-gawk/2024-05/msg00000.html] +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gawk.git/commit/?id=c1613c310d71b87f509458e0259ecd10eda2b140] Signed-off-by: Ross Burton --- m4/readline.m4 | 2 ++ From patchwork Mon Jul 29 13:12:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46975 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 12F0AC52D1D for ; Mon, 29 Jul 2024 13:13:17 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.55944.1722258793886893005 for ; Mon, 29 Jul 2024 06:13:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=MYVoTJNg; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2cb682fb0cdso1900171a91.3 for ; Mon, 29 Jul 2024 06:13:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258793; x=1722863593; 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=8DLquk+b7veOUkolkHVCTBrNSJzT0e1OAX3s+UVUzyI=; b=MYVoTJNgT831sDQkGjknjP5Ht5iaYXQMMcg7r6co2DWajdS4uu9dTJv+HG8AmHusdt DlWVHttRPRStUIFXgC1kLA//NPO5r7iZNGzjcKp5QX6XkMuHKh6Bx+kFPRfFs+MET/H4 Hf9gdxq0dyJPHWqVBA6pkBFw/5XSTHIQIdvhw1RLndLzzjP+05QedtQsPO/X0Ds6nVAV ztcYKsfY+sP6iBeVTycEVq1xzNAm54in62PdTALQbe3jxVPv0trOWyzm3rriEMAamLia BLIbj5DQczNQ5+1Mb7BvZCQpDcRdMCFqpKPHPHNV7AzldfwF1w0QhkPM19Bh+S5O55c9 RSEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258793; x=1722863593; 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=8DLquk+b7veOUkolkHVCTBrNSJzT0e1OAX3s+UVUzyI=; b=BnnAvk/apFpBu0EOwj22f5qULVr2ZyB8CfYDxS0WEeOxe0PNUtFhQh9VXwsD5bPTrZ SKmWOTK9q9YsMg0hIaYQThXlb1ixCCo1UZCUCtoTYFT7Hb6SEw/fsm4Jsp0/VK91v9E7 xZBw54y4jgeLsRIN1cVHGkZ9SL3Lih/cLFSZ10MviywFzO0i1LlBEuMELImwyJKNoS1y x1xq6dt6JUOWVolh+50HjT026jfja2XoWQ9YaOvsiDsBaxJb2pYL+O56MXCqLJLHdzj4 jz/iWwmWx8/5urvCXWn6W0z/nu7WUmcz7ZuQUma/LBXYcfmO3fxpcyIpfkNaQN+HpHwz wivw== X-Gm-Message-State: AOJu0YwqFTQspy4GCstfCuG93VSV5lE1GJk1DrYaTFV+Pj6W8ds8hwht a96Orzk7mTrbCojlByBvKhupzDsmu1D7tlfUJdL/HZXIYdBOFd1YcfS5b02vvmekestw5TvMvIQ ahlX+JA== X-Google-Smtp-Source: AGHT+IFnQg1dUTc/CJ52irJIZXPPyJdSj4fQCFldiRaBA/vOsvjxaP26EanqCgUM0cH5pLZJ28JlOw== X-Received: by 2002:a17:90a:f490:b0:2c9:9b2e:61b4 with SMTP id 98e67ed59e1d1-2cf7e1fadccmr5606661a91.22.1722258793054; Mon, 29 Jul 2024 06:13:13 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 12/37] maintainers.inc: update self e-mail address Date: Mon, 29 Jul 2024 06:12:22 -0700 Message-Id: <54134c24e17f28223259eaaba41ff2e2ea5b55d6.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202626 From: Michael Opdenacker Signed-off-by: Michael Opdenacker Signed-off-by: Richard Purdie (cherry picked from commit 0d4a435141c71710e479b7f49c38aba9f57cd1d7) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 180dfc1918..12dfab80a8 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -31,13 +31,13 @@ RECIPE_MAINTAINER:pn-acl = "Chen Qi " RECIPE_MAINTAINER:pn-acpica = "Ross Burton " RECIPE_MAINTAINER:pn-acpid = "Ross Burton " RECIPE_MAINTAINER:pn-adwaita-icon-theme = "Ross Burton " -RECIPE_MAINTAINER:pn-alsa-lib = "Michael Opdenacker " -RECIPE_MAINTAINER:pn-alsa-plugins = "Michael Opdenacker " -RECIPE_MAINTAINER:pn-alsa-state = "Michael Opdenacker " -RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker " -RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker " -RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker " -RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-alsa-lib = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-alsa-plugins = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-alsa-state = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker " RECIPE_MAINTAINER:pn-appstream = "Markus Volk " RECIPE_MAINTAINER:pn-apr = "Hongxu Jia " RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia " @@ -174,7 +174,7 @@ RECIPE_MAINTAINER:pn-expect = "Alexander Kanavin " RECIPE_MAINTAINER:pn-ffmpeg = "Alexander Kanavin " RECIPE_MAINTAINER:pn-file = "Yi Zhao " RECIPE_MAINTAINER:pn-findutils = "Chen Qi " -RECIPE_MAINTAINER:pn-flac = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-flac = "Michael Opdenacker " RECIPE_MAINTAINER:pn-flex = "Chen Qi " RECIPE_MAINTAINER:pn-font-alias = "Unassigned " RECIPE_MAINTAINER:pn-font-util = "Unassigned " @@ -301,7 +301,7 @@ RECIPE_MAINTAINER:pn-keymaps = "Alexander Kanavin " RECIPE_MAINTAINER:pn-kmod = "Chen Qi " RECIPE_MAINTAINER:pn-kmscube = "Carlos Rafael Giani " RECIPE_MAINTAINER:pn-l3afpad = "Anuj Mittal " -RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker " +RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker " RECIPE_MAINTAINER:pn-ldconfig-native = "Khem Raj " RECIPE_MAINTAINER:pn-less = "Yi Zhao " RECIPE_MAINTAINER:pn-liba52 = "Unassigned " @@ -776,8 +776,8 @@ RECIPE_MAINTAINER:pn-shutdown-desktop = "Alexander Kanavin X-Patchwork-Id: 46969 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 D82FBC3DA7E for ; Mon, 29 Jul 2024 13:13:16 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.55655.1722258794871643178 for ; Mon, 29 Jul 2024 06:13:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=m+FxROCF; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2cb510cd097so2401532a91.1 for ; Mon, 29 Jul 2024 06:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258794; x=1722863594; 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=++JMG7t9VLdoky57Ej8klohBdVlcchUMZzugCYV8ThA=; b=m+FxROCFr/J8PlF1vKgpOImy6+ZcnFgw3jMIuqyCRuq1zsFAjcHnzfpc80F1UhF+uc YEj6mxelNm5ChOdylV4NMcFQOtIpBVLbj+wfo2t3DQ0p6kfworVJpkEMwOj8UJPzQBzF HoV3MA6EXRDkuAO4W5fo6HX3uIQekq7t1R1nJ51df9ZtJh6Ipn3LCGDIKHCBlDCeehKT m9AP00kZ6bR16CVAEhJH7V5iAkeQ5spX1jkoDJronD/k6n2cC3gUzOSi4cs0SYVNi3r3 aiwjos9o4VWDdAASmSxPSqdCDd6TKwNtt3AI81crufMzR+KFuycw0sb4EZpo7QIJPF0p h2MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258794; x=1722863594; 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=++JMG7t9VLdoky57Ej8klohBdVlcchUMZzugCYV8ThA=; b=oQpY88MPfgicApp/+iCXLWdeVG8t1pbY+5byNPkeu2E4AsLS9bUxEUWooaQY9vGlss 1Eul3TXyvMyiyI5iOowrXyehGvxSXwxsZXrcnjZiNNA7nPLdQ6OE/Ci5NKlnwjs8+Njh VxmplXnUWX4iIFBgXoNGZ+xrFhdzhVo8ZJ2uvLycc6cHIUxlFSN5d7e/r8tgjy2FkK36 kwjpmPmHwKs2xgf/SU4h6svhTS6PtLl9s0/IT7D10iETLAgOmr6W57H6vMTe1j23PTIX 4/LDIAMZxZ2qYoisWGZxEE8AMxY4eH1e5RQmXnWCAGAuCY+V6vVjO+bxsYfaoVDKx1uR hJ1A== X-Gm-Message-State: AOJu0Ywv0159RTUaYJUrW65e6LQwUSkC4OoBLzmaE1JsxHo5YFo3w6o4 g3IxEFVq1ZOpDCga8UY2VQ3B7ey6nOt1SiP7y+Iw7WvBuiewWOse239OhlFMbhs6XlpuMutwhi0 eX9I7XQ== X-Google-Smtp-Source: AGHT+IGubvxGuWs2iW5NWBc9vMDSYYQwyI2IqBVj2QhLaGyCqkM1iSwjtL0jtRSydWxN2pz9sUrZPg== X-Received: by 2002:a17:90b:1e03:b0:2c9:7219:1db0 with SMTP id 98e67ed59e1d1-2cf7e097ee5mr8858351a91.3.1722258794198; Mon, 29 Jul 2024 06:13:14 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 13/37] cmake-qemu.bbclass: fix if criterion Date: Mon, 29 Jul 2024 06:12:23 -0700 Message-Id: <6f73c5df726eef7db32ab0fd1aa2ea4e45b3493c.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202627 From: Kai Kang It always executes the scripts whether 'qemu-usermode' in 'MACHINE_FEATURES' or not. Fix the criterion to make it work. Signed-off-by: Kai Kang Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 9e163246dcbbd2187c9ba28432c613b0d6c850c6) Signed-off-by: Steve Sakoman --- meta/classes-recipe/cmake-qemu.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/cmake-qemu.bbclass b/meta/classes-recipe/cmake-qemu.bbclass index 46a89e2827..383fc74bf2 100644 --- a/meta/classes-recipe/cmake-qemu.bbclass +++ b/meta/classes-recipe/cmake-qemu.bbclass @@ -19,7 +19,7 @@ inherit qemu cmake DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" cmake_do_generate_toolchain_file:append:class-target() { - if [ "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}" ]; then + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then # Write out a qemu wrapper that will be used as exe_wrapper so that cmake # can run target helper binaries through that. This also allows to execute ctest. qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" From patchwork Mon Jul 29 13:12:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46972 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 F3095C3DA61 for ; Mon, 29 Jul 2024 13:13:16 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.55946.1722258796385511769 for ; Mon, 29 Jul 2024 06:13:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=l8IAN9xA; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2cb585375f6so2393234a91.3 for ; Mon, 29 Jul 2024 06:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258796; x=1722863596; 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=eqPUfjKelwl9eRHuhD0F4azLW+bvAZ/vzLPKGtzh2dw=; b=l8IAN9xAHa3VdDkYzrXVXH9OV9qnO4G/eyTLKjC5weqrzhgeSJp6Yn5c0OJxdjqAMS 7siPL5OvRfhH+bUfAzMdSVHYw0TPJtnRXwOv8r3Bcw6n5Z7rgS5zIyhAcpIHpaeO32k0 wGUJCCtcNTLg2xJwptkspRcqrhMJ0DpqMQ7wnOLznYcR+A7+osDXJt9I0YKkpZ8ZSULW Mn7BVDMZ2UAk5Jkik6JiAjeYFZroOkaRPgWJNR4iDEYJAa8I0aNcGbzwZI0e/aPmJxb/ zQM6Kbi8+J/YNIti2T/3RdjJtLpLfl70ngjausK7UawuoKpN4k/wzs0WvCU5jx7v2SL6 +p3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258796; x=1722863596; 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=eqPUfjKelwl9eRHuhD0F4azLW+bvAZ/vzLPKGtzh2dw=; b=prsSfEpBdIao9mEHImh0I+ubmkdGotE9da8u/lLYJwd7xJkwCDLcpUdV5Q5UDAH8HK ovzU5iUDumBNrkc5z80caC6L73pobYpp1o4yML8b1MoOzru/nOvFfqF5twj1hpxPQr/K alJGlX03N7j4My7UhbDiDcTXQHAe20rT2NQfcm+Bn1iwXkMwhLxrrCibW9fQzRTNcXFr 8mnWosSEOvoqqmA+oiZsfKNH8XBoRDpuDgR7WZvWFj8UO6LZTv/bTp9bQc7B2aJMChMM 56xUe1+nI/FLwLHzdvLMWs9Xfbq5Q36YpburqmO3pf6oI52fkEKKTapkL6JhKe1rUEgH auXA== X-Gm-Message-State: AOJu0YxHXwck2WfbfYsxoJU8HBgl7BUt1iRhjpL++CxeMcepqxRCsGGe 3kUPeCHRUKTp0K3mgfbzR/ewsLfhRxOh9V3fc9riLxRo6Pgnm+QA/JV4oR6aurkGWa4vqhcC/dt 9LuM+4A== X-Google-Smtp-Source: AGHT+IFc13EhtMQmfolzmr1z9m7ozkRXttQy3Sj291wLkOFXfB/or9+Wv+e1GaUn+9xcfXlAQXuMGQ== X-Received: by 2002:a17:90b:388a:b0:2cd:ba3e:38a5 with SMTP id 98e67ed59e1d1-2cf7e1facafmr8113219a91.21.1722258795636; Mon, 29 Jul 2024 06:13:15 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 14/37] iptables: fix save/restore symlinks with libnftnl PACKAGECONFIG enabled Date: Mon, 29 Jul 2024 06:12:24 -0700 Message-Id: <2c0d03ed7bb9c17b1c3ccefd00bf3a4ede9e291f.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202628 From: Kirill Yatsenko When the libnftnl PACKAGECONFIG is enabled, the "iptables" symlink is correctly points to xtables-nft-multi, however the "iptables-save" and "iptables-restore" are still point to the xtables-legacy-multi. So, when the "iptables" command is used it's using the nftables backend where is the "iptables-save/restore" are using the legacy backend. This is not consistent with other distros (e.g. Ubuntu). The issue was identified when testing the UFW firewall with nftables backend. Signed-off-by: Kirill Yatsenko Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 6579e4333b74232d8b576c399eab88e37da881ac) Signed-off-by: Steve Sakoman --- meta/recipes-extended/iptables/iptables_1.8.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb index cd2f3bce0b..0070264844 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.10.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb @@ -75,6 +75,8 @@ do_install:append() { # if libnftnl is included, make the iptables symlink point to the nft-based binary by default if ${@bb.utils.contains('PACKAGECONFIG', 'libnftnl', 'true', 'false', d)} ; then ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables + ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-save + ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-restore fi } From patchwork Mon Jul 29 13:12:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46976 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 0F935C3DA7E for ; Mon, 29 Jul 2024 13:13:27 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.55657.1722258797948129493 for ; Mon, 29 Jul 2024 06:13:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=MT5HC+Xq; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2cdadce1a57so1978693a91.2 for ; Mon, 29 Jul 2024 06:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258797; x=1722863597; 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=aRZtwkyDIkhz7XO6oZ2KwGt6AqFQEtxhzoqKcJerz3I=; b=MT5HC+XqgFuFAtXN/t8utESXCesv5X+TJtEOeFZr+d/e09YG/gFds7pY/ZpI4mjb31 YoSHmAL++UewTD/OZRVExCUNkHDnem7xXaX5q80UqzggcxIazeejgkBHUriw96XQEthN /f1cw8SjztjSnab7+ldWV1qkxIbVRiQ/0k6m9SDmQ9wO6/5w3izMgId1rTqt49eYaArf 78fFOr25rr+5QsUItfQWmHo5UQ6kY0F22vU96k0PeqxvRUtnOLhEZ5QVft1NLNEwBuai 9K8qFtXUaOadiI4BzTG+CdgKy/2suJYDHMlnc4dREAzXV5FqXQIGKWzzzbkoKgQNaWnR QV1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258797; x=1722863597; 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=aRZtwkyDIkhz7XO6oZ2KwGt6AqFQEtxhzoqKcJerz3I=; b=gTfU5FqPwtzluu0TLsYSFpsL4nO6JcI6MOinmGUTZ1PnitYC6FEEru1u4XdwYi/c35 8tfFP4PZGLWS3LKkFfRsEdR2ZONYGWNVW2wVg/N3eXYBeEP1JTM8NVXW2hiWFCx+bi4T ulQBCGC6aWcJx7B1KByLDbwU5XZYcnOOVGgZkrF6uCt2rzgwW4K1WW7qWjAKC497mOrq hkZedeeKz6fa4C5VTqFcn8Ba9hfKth3XIdx8e2vGABEnxZYUJhU2UPHTEdsPKR0j2Mdz Hb3lyd4ZjgBf1ulXehHU+KLvl4YJiO4LWeCVQimlw8pjZ2FxRdYHWZblsHfjE3wF3TQh Ws8Q== X-Gm-Message-State: AOJu0YwTrhCuHXw1GctZWtyKmpq4vOf+YfOttKyn06UfRpUlOwjGblFJ t4yTFFxedD8oCcj6kKQSqOl3qPzKpoM6+3FAqlLL8d7G3xWnaDdVfVNNYZYFo9KenFrDk3prebI 50BRugA== X-Google-Smtp-Source: AGHT+IE5Du8TkY0T2sPoUt639haoKwkSU0aZdyfInCzB2FseVdSERpuRt5s9zV+p7KV3Caa6vnHhQA== X-Received: by 2002:a17:90a:4b04:b0:2c8:538d:95b7 with SMTP id 98e67ed59e1d1-2cf7e606ca1mr5447214a91.32.1722258797121; Mon, 29 Jul 2024 06:13:17 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 15/37] selftest: add Upstream-Status to .patch files Date: Mon, 29 Jul 2024 06:12:25 -0700 Message-Id: <34185c9d70920bf42323826f1ef31feab71c44e3.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202629 From: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e5e5561c178a565b3aa7cb540fe1c8f71917c882) Signed-off-by: Steve Sakoman --- .../recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch | 2 +- .../devtool/devtool-patch-overrides/qemuarm/arm.patch | 2 ++ .../devtool/devtool-patch-overrides/qemux86/x86.patch | 2 ++ .../devtool/devtool-test-ignored/devtool-test-ignored.patch | 2 ++ .../devtool-test-ignored/devtool-test-ignored.patch.expected | 1 + ...1-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch | 2 ++ ...tch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected | 1 + .../0001-Add-a-note-line-to-the-quick-reference.patch | 2 ++ .../devtool/devtool-upgrade-test1-1.5.3/backported.patch | 2 ++ .../recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch | 2 ++ .../recipes-test/man-db/files/0001-Test-patch-here.patch | 2 ++ meta-selftest/recipes-test/recipetool/files/add-file.patch | 2 ++ 12 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch index 7569ccef7b..96be6f4a61 100644 --- a/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch +++ b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch @@ -4,7 +4,7 @@ Date: Wed, 27 Dec 2023 09:55:48 +0000 Subject: [PATCH] Greet "OE-Core" Signed-off-by: Alex Kiernan -Upstream-Status: Inappropriate +Upstream-Status: Inappropriate [Test artefact] --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch index e33a2753f9..17ed5a54f1 100644 --- a/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch +++ b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + --- source.orig 2020-10-06 13:26:10.792688630 +0100 +++ source 2020-10-06 13:26:18.853424694 +0100 @@ -1 +1 @@ diff --git a/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch index 1a0a175fa8..0af5ebbfaf 100644 --- a/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch +++ b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + --- source.orig 2020-10-06 13:26:10.792688630 +0100 +++ source 2020-10-06 13:26:18.853424694 +0100 @@ -1 +1 @@ diff --git a/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch index 96ea0eb4e3..bc1ca4bc4a 100644 --- a/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch +++ b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + diff --git a/ignored b/ignored index a579759..e3d7b43 100644 --- a/ignored diff --git a/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected index 68ec6d9875..8ead9ee1ce 100644 --- a/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected +++ b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected @@ -3,6 +3,7 @@ From: Martin Jansa Date: Thu, 28 May 2020 01:32:31 +0200 Subject: [PATCH] meta-selftest: add test of .gitignore in tarball +Upstream-Status: Inappropriate [Test artefact] --- ignored | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch index 6aaf409ebc..2b7088e367 100644 --- a/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch +++ b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + diff --git a/patch-me b/patch-me index a20b29a..5e35d1b 100644 --- a/patch-me diff --git a/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected index 1bf25a61d0..52b0df74ce 100644 --- a/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected +++ b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected @@ -3,6 +3,7 @@ From: Martin Jansa Date: Thu, 28 May 2020 02:03:39 +0200 Subject: [PATCH] meta-selftest: add test for .patch file with long filename +Upstream-Status: Inappropriate [Test artefact] --- patch-me | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch index 4ea3d74f0f..db66a284b7 100644 --- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch @@ -4,6 +4,8 @@ Date: Wed, 24 Feb 2016 17:43:03 +1300 Subject: [PATCH] Add a note line to the quick reference A test patch so we have a file to move around. + +Upstream-Status: Inappropriate [Test artefact] --- doc/quickref.1.in | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch index c4f3f12666..5159652f69 100644 --- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch @@ -4,6 +4,8 @@ Date: Mon Nov 18 18:43:15 2019 +0100 Backport of the NEWS file from version 1.6.0 +Upstream-Status: Inappropriate [Test artefact] + diff --git a/doc/NEWS b/doc/NEWS index 69793fc..fd49b1c 100644 --- a/doc/NEWS diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch b/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch index bccda17ee9..4f8b745995 100644 --- a/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + diff --git a/Makefile.am b/Makefile.am index 432a9b4..bbf7c74 100644 --- a/Makefile.am diff --git a/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch index b1d5eab2b8..7df224e5c8 100644 --- a/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch +++ b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch @@ -4,6 +4,8 @@ Date: Fri, 9 Feb 2018 17:37:48 +0200 Subject: [PATCH] Test patch here! This is an invalid patch used by oe-selftest + +Upstream-Status: Inappropriate [Test artefact] --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-selftest/recipes-test/recipetool/files/add-file.patch b/meta-selftest/recipes-test/recipetool/files/add-file.patch index bdc99c94f0..cb43cc629d 100644 --- a/meta-selftest/recipes-test/recipetool/files/add-file.patch +++ b/meta-selftest/recipes-test/recipetool/files/add-file.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + diff --git a/file2 b/file2 new file mode 100644 index 0000000..049b42e From patchwork Mon Jul 29 13:12:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46980 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 6789FC52D1F for ; Mon, 29 Jul 2024 13:13:27 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web10.55658.1722258799407072792 for ; Mon, 29 Jul 2024 06:13:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=uKWSaxT9; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-710437d0affso1981297a12.3 for ; Mon, 29 Jul 2024 06:13:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258798; x=1722863598; 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=0+DZT/6YvMGaD+jpCufnA5XxiMp32uZATzUjFoGGBDw=; b=uKWSaxT9AYtZMcRMkd9saXStF50rKlr2jIXyRkhz6c/u4m6pS9sGZ/A4c9L2Wk3LIr 4qDv5kJuNP5xuWDmaE3jF8HnrVqUJjFAi6F4V+gZYHPl5Hj7fdxh6W6ai1lLwcqG65r/ g7AepwDfn3/10o0lEZhsSIrLJnR9E3yQ0DQpC3AfIjsH5lJm7ujuB08Yl3bRKP2516lE 8CtNL2aUsr4xZiCUXV+Dck79Q9i+rZ9A8LcBKPa4Zi2h2gpzMgy29+veOgn0Xwe4z4Yy eUu7xHJXHVG8sLeGCIoapi52KOoH58Yg8IS3j2D/0VG29StBulSGr521EWrZLJ3RryBo yQXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258798; x=1722863598; 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=0+DZT/6YvMGaD+jpCufnA5XxiMp32uZATzUjFoGGBDw=; b=LMUk0nvEgzhz2aqUo68wnW+ytnR5C3lekuUUqVB/httOJxs0tbMpJT09HoEHY7c4YR a5eqQJld7BLZ0uD2xNo1CLsYO775CkI612X1lSjAxTJlNx2BfmB3ggKUq+W0G2Ab1MCJ Hagf8bxci6jyuK0Uq34Wk8FVsk7A4lnf2eCbW6KAo3JVzRDygSqp6D85kdrkTXY1sAW4 SJy9/3mn4qzL6SM+6pFU/fOgP1oJSUbIRmBEYS368cMXpfbXYUe5ikzXGV3EKh1C1wPX n8rw42hU92ucBviq4MrVVWEqH+g1QtmKTzaXKe/QxpD5LqsryqoWS0akpVSZui2Rr368 B4Wg== X-Gm-Message-State: AOJu0YzSGbyUYMp1Su7z0jYsQS7JMZtqnI/hoWxOBBqYzBpFxvI/Z76O Vlvrnu/wlrcU8JKG9iWmTUwG3C9g1rjaM4rHSkQO2ZCKGRN/6UP+Nn+SmyfA7/h13v0tHW2Nk58 82smTkQ== X-Google-Smtp-Source: AGHT+IFkULXin/4Gr9qIMx9d6CM/OFeiPZ4D8IIgwj75f5YFpd0wj2fIPUerKV322dkRODMTqjBBcQ== X-Received: by 2002:a17:90b:270b:b0:2cd:3445:f87b with SMTP id 98e67ed59e1d1-2cf7e5c12damr5185301a91.29.1722258798566; Mon, 29 Jul 2024 06:13:18 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 16/37] grub,grub-efi: Remove -mfpmath=sse on x86 Date: Mon, 29 Jul 2024 06:12:26 -0700 Message-Id: <17273366f23702077fe7a270afc7b5d26a650bf7.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202630 From: Khem Raj This option fails with clang compiler when testing for soft-float because OE enforces this option via CCARGS however, gtub's makefile/configure does disable all sse options when checking for soft-float support, but it can not disable -mfpmath=sse as its inserted by OE, therefore remove it in recipe Fixes build errors seen with clang/musl like on x86 error: the 'sse' unit is not supported with this instruction set Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ad76da4ff6d7110747b620621ae3728de9905465) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/grub/grub2.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index bb9aacb478..54c0e9bdd5 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -52,6 +52,10 @@ GRUBPLATFORM ??= "pc" inherit autotools gettext texinfo pkgconfig CFLAGS:remove = "-O2" +# It doesn't support sse, its make.defaults sets: +# CFLAGS += -mno-mmx -mno-sse +# So also remove -mfpmath=sse from TUNE_CCARGS +TUNE_CCARGS:remove = "-mfpmath=sse" EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \ --disable-grub-mkfont \ From patchwork Mon Jul 29 13:12:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46977 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 4E1FCC49EA1 for ; Mon, 29 Jul 2024 13:13:27 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.55660.1722258800800574523 for ; Mon, 29 Jul 2024 06:13:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=2KjMG12n; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2cd2f89825fso1976845a91.1 for ; Mon, 29 Jul 2024 06:13:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258800; x=1722863600; 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=83dROXBrUVHqQtlAVa5WTQg2NFGnEdT3+q8XinPWK2M=; b=2KjMG12nUkP1nRUZCLx1ar05TUX4jQfAGI2QifAmNUBwLVSpCNeqvGc6KJPRdjVts7 FZqWQ0qHKXuf+SXPaLQ1Ok+4hR+SBqEslJUoc4MeXjISEpa+FgoTL9PV77JG0pSGt7al GmsDn14BBR+H9l8c8C52fwFqCHM9Es62CvLAoqGqq5gtTvwiBMOfM5MYfRpoknW9eMEA xdKhj0JU9AK3+9XRSMPAf3C/M2u9S8LPIjxkHEvS/0KpUDkCzfO5xKgDk3uyyQi3u76U 6fIqC8uOGfWrIqSbmxjJOhlZzwwGDahLY4rW/Phe52HEXSkpWTtotLGHaZmvOjGgOqr5 npxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258800; x=1722863600; 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=83dROXBrUVHqQtlAVa5WTQg2NFGnEdT3+q8XinPWK2M=; b=azRY02xqMMfnuMowsuO2nZ86dId2LMDpA93u7ywpSnCiAFAn4oVrxjVfh+lLqQM28u A8exKM9+eZWzada9ED8muvtJYX4UM9bM4q6t4x1b+c6dH9LQyokv77BQLstqWY9FbCem 7iioYSu6cxIpl85OXQaUrdVDV7+ClP7m7aKaIHluN6oEYxlm/QNI9InlQRxnbbL0qOO2 xsiO6QKk6UEPzh2i8lkYZBdIQSKbsLGlD2ktWzvlAduZr16I2K1e3TzpDZVOdnJgbQfx toq+yxdhFy5m+E7Mx9fPfRBtpzAXS4NaDcVX1xJrBMfOshVXiA0QZnIWh/rlq/n/9kTK HSVA== X-Gm-Message-State: AOJu0YypbXhfr1hgzm1png1RSGoW1+zJN+fB729fTlm9tMOz+EWehe3K Vg/nb+WbJ+8teL+4vIGO5J86aHEX+6ZNOflMg+nS5jM3a4xICpnseAcw9BK/ok8tklm+FvOL9U0 mHUo/oA== X-Google-Smtp-Source: AGHT+IG0QWr6xoQEZEpR/wzpU5k6X+2InQl0pbtYgeX6M4H5QtG22i8qdmaobO0VlPB62GiaQGZYOw== X-Received: by 2002:a17:90a:558d:b0:2c7:1370:f12f with SMTP id 98e67ed59e1d1-2cf7e86eabcmr4574597a91.40.1722258800023; Mon, 29 Jul 2024 06:13:20 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 17/37] python3: Treat UID/GID overflow as failure Date: Mon, 29 Jul 2024 06:12:27 -0700 Message-Id: <371124fa4bf1a255a4fc646b028398db8c9f3681.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202631 From: Khem Raj This fixes ptest failures on 32bit architectures AssertionError: Failed ptests: {'python3': ['test_extractall_none_gid', 'test_extractall_none_gname', 'test_extractall_none_mode', 'test_extractall_none_mtime', 'test_extractall_none_uid', 'test_extractall_none_uname', 'setUpClass', 'python3']} Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 43104b547cb79693c83df0882773ae8dd74b1d35) Signed-off-by: Steve Sakoman --- ...e-treat-overflow-in-UID-GID-as-failu.patch | 40 +++++++++++++++++++ .../recipes-devtools/python/python3_3.12.4.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch diff --git a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch new file mode 100644 index 0000000000..88b84c6024 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch @@ -0,0 +1,40 @@ +From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001 +From: Petr Viktorin +Date: Wed, 23 Aug 2023 20:00:07 +0200 +Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to + set it (#108369) + +Upstream-Status: Backport [https://github.com/python/cpython/pull/108369] +Signed-off-by: Khem Raj +--- + Lib/tarfile.py | 3 ++- + .../Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index 3bbbcaa..473167d 100755 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -2557,7 +2557,8 @@ class TarFile(object): + os.lchown(targetpath, u, g) + else: + os.chown(targetpath, u, g) +- except OSError as e: ++ except (OSError, OverflowError) as e: ++ # OverflowError can be raised if an ID doesn't fit in `id_t` + raise ExtractError("could not change owner") from e + + def chmod(self, tarinfo, targetpath): +diff --git a/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst +new file mode 100644 +index 0000000..ffca413 +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst +@@ -0,0 +1,3 @@ ++:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on ++an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to ++set the ID. +-- +2.45.0 + diff --git a/meta/recipes-devtools/python/python3_3.12.4.bb b/meta/recipes-devtools/python/python3_3.12.4.bb index 0cb84b91b4..c5ba009e7f 100644 --- a/meta/recipes-devtools/python/python3_3.12.4.bb +++ b/meta/recipes-devtools/python/python3_3.12.4.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-test_storlines-skip-due-to-load-variability.patch \ file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ file://0001-test_shutdown-skip-problematic-test.patch \ + file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ " SRC_URI:append:class-native = " \ From patchwork Mon Jul 29 13:12:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46981 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 5B921C52D1D for ; Mon, 29 Jul 2024 13:13:27 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.55948.1722258802177594274 for ; Mon, 29 Jul 2024 06:13:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=T7VdgAyy; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7515437ff16so2581761a12.2 for ; Mon, 29 Jul 2024 06:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258801; x=1722863601; 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=YDW26OTb7871Bx8YpL40xB+uY01YMRvefyDPdaaZa+E=; b=T7VdgAyy+RMnLTHPL+LXBzEo3mdgg5U0gv+WytEiajvoWyHUwR4TuBc2uHhz270qOp oqCOYdpfliOmIRrUJIC9eJ52/StXcnD9O+zfzl38NF1aSF/UPRE7GGeRTrYx++TpSYCS z9GYVKfJ98SlgJcHEITQJ9X6qPnSsAf6kibh7+RwYxrbkuRCCqNCbxQUb7BFhkyexmWR EcsAKAFNuHwSECmr5ILnhrBucZox6rcD8B5aMMN7Vh7yVRtXGeXY9uRRp66LxD834VJF Z16KBspQ+aBlGprXDjsHQFyBZQou4VhMQjgtXOtUlytOnzIvxDOyqhGJqONiT14qIWgM nvDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258801; x=1722863601; 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=YDW26OTb7871Bx8YpL40xB+uY01YMRvefyDPdaaZa+E=; b=Gy2NSdkGMo7e4baIOtxY+G+3hPRwRoxQ9ay+K4w8NG74AOUdjPtPrfmOPMQBYCAKFd zvzd1TOSmCEeJbh2VJyhIYsYviGoS89GxbxBlDkhNbtKKSVnbKAhKJluTr6Gz8uyj2PV i8lRMzYc4Wqsvj9My9OMF9u/N50PZtsVS449QDn4aLIz44vb9lmiTq6GYnIKh9pi0MSw ezavzRcUy9MzSoQxpzVxpzZ15q/KUtZf/JC/y+8NRL5NyxOXwasAd73Q11pcQnG3/GXm zElGfY5ltsHDG2dhD97c1R17gxXJ6n+F+ijsCT52ylcezMuAo/WmUsLsXtvULOWcKH1b Qw3A== X-Gm-Message-State: AOJu0YxldNWcSyD6ODaWZFxg7qkpHqoupOs+1za1MRQDLNiqNZlNq+GF PfQL2wlAfByPDQXwXpij14hBJ61+D8GlhrlK2xIVEQ9McPBzk4ihJG832+IVJTJh3VHS3lInV23 F0HIrFg== X-Google-Smtp-Source: AGHT+IHx7yKqk9fM66JM27JBFSBCqUfTR7Hx1ajKEuugPleVJgTspIXviyNfnAcBZui2suOOk0e45w== X-Received: by 2002:a17:90a:668b:b0:2c9:649c:5e10 with SMTP id 98e67ed59e1d1-2cf7e1df022mr9924858a91.10.1722258801379; Mon, 29 Jul 2024 06:13:21 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 18/37] python3: skip test_concurrent_futures/test_deadlock Date: Mon, 29 Jul 2024 06:12:28 -0700 Message-Id: <141c348ce83552beae88e115d9c4db5802c6e0f4.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202632 From: Trevor Gamblin These tests are causing hangs on the Autobuilder, so disable them for now. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie (cherry picked from commit 291f37808f1a2b2fdc8190696867f974994457c0) Signed-off-by: Steve Sakoman --- ...-test_deadlock-skip-problematic-test.patch | 30 +++++++++++++++++++ .../recipes-devtools/python/python3_3.12.4.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch diff --git a/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch new file mode 100644 index 0000000000..f0a7cfd39b --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch @@ -0,0 +1,30 @@ +From d7e3f26e7094fbe20e2271d75f18ac3b23a67f58 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin +Date: Wed, 12 Jun 2024 10:29:03 -0400 +Subject: [PATCH] test_deadlock: skip problematic test + +This test hangs frequently when run on the Autobuilder. Disable it in +testing until the cause can be determined. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Trevor Gamblin +--- + Lib/test/test_concurrent_futures/test_deadlock.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py +index 1db4cd0099..fd07895a17 100644 +--- a/Lib/test/test_concurrent_futures/test_deadlock.py ++++ b/Lib/test/test_concurrent_futures/test_deadlock.py +@@ -90,6 +90,7 @@ def __reduce__(self): + return _raise_error_ignore_stderr, (UnpicklingError, ) + + ++@unittest.skip("skipping problematic test") + class ExecutorDeadlockTest: + TIMEOUT = support.LONG_TIMEOUT + +-- +2.45.2 + diff --git a/meta/recipes-devtools/python/python3_3.12.4.bb b/meta/recipes-devtools/python/python3_3.12.4.bb index c5ba009e7f..9dd1417f2a 100644 --- a/meta/recipes-devtools/python/python3_3.12.4.bb +++ b/meta/recipes-devtools/python/python3_3.12.4.bb @@ -32,6 +32,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ file://0001-test_shutdown-skip-problematic-test.patch \ file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ + file://0001-test_deadlock-skip-problematic-test.patch \ " SRC_URI:append:class-native = " \ From patchwork Mon Jul 29 13:12:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46982 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 6786EC52D1E for ; Mon, 29 Jul 2024 13:13:27 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.55950.1722258803547776582 for ; Mon, 29 Jul 2024 06:13:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=MrOeQZrA; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2cd48ad7f0dso2564972a91.0 for ; Mon, 29 Jul 2024 06:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258803; x=1722863603; 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=oXuxnI9fKkf5z5q2X53sE8PJ9h4yQmP5kIHquG8YHDU=; b=MrOeQZrAuTKqtYhHS2K8hX90N9x3BWnbRJBAhdOa/U1JhgsKT9vqTjeMSlMh2DRhvT G+yIiN8Rp/Hgu6sY8eqSFqx0RBDLFPFOuDiLMZQGMBJhnts/FHijQFx920YEopG/Kh+K l3FE/JqY3dFjxGCaRUASk88MB0+q85rOPF87b/Y14beGgVL5zMvAwKX76bBN3u8zBgvt f9sWolWfEW3Zt7Q5t5jQf6x843RVHYZ1Ytrc+Ge2Po9EvsPqc+EhGTZ3jnuq8pMgVApv jETQBC5Z/d0Dk8sEWhNaXTxgFWmZmUhI04r1pJup8L6sPZEDbd1FAEGAULwRjisBrwkj FPBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258803; x=1722863603; 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=oXuxnI9fKkf5z5q2X53sE8PJ9h4yQmP5kIHquG8YHDU=; b=GP6fjFi/a5ur73rBgcG9m2vuC33k6P6FNo06W5zOTqGcn6fj+uKar6ouhJNvMLV5P4 V9V3BaXaivn9qwX5xZDwxdDmK3feMsNkLQQ/yuNbfHYdPvRoY/DIBJ+EjqNFBhLbvjFj G+5JiH/9jqO4//nSvzsRRDoGSwuB4PMFnVf6e5kBACejvvMAnn30zSf1wNSiHhchLAVY UPmkDi1ekIejdLsQAOZZNtnl3/0XiT4xFmvUeTQBwP+i3CFhXy4lAwBH8l2frj+K8ow2 6CBP2jR9HMej+RB3aaV8DSOVu08PXSJWFsgU0svpcbDZePCtHKAbybEv8AAoH1VnFD9J 5t0w== X-Gm-Message-State: AOJu0Yz2R5A8srM3ohS1K49pj1TCws4bDaANEzQwjjujrTrXQOchiqKD pLm5guaR16lwpYtugkNlRoOdpkiouAH4fEazs2ldUZnBj1R2/eRVaGouSrybi54SrKFfQ+y+f87 6+AiFMg== X-Google-Smtp-Source: AGHT+IEOZGun8QaG7vVfMy+rTmaTyyAURLk7UlvBSax2h2jWJgajQwxWdWQZK8+P2bf218R8OBRWfQ== X-Received: by 2002:a17:90b:1c86:b0:2c1:a9a2:fcea with SMTP id 98e67ed59e1d1-2cf7e20f3bemr9090518a91.24.1722258802722; Mon, 29 Jul 2024 06:13:22 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 19/37] python3: skip test_multiprocessing/test_active_children test Date: Mon, 29 Jul 2024 06:12:29 -0700 Message-Id: <9eafd0c56b279a7c3025b0dcd00745baead15bb6.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202633 From: Trevor Gamblin This test is causing problems on the Autobuilder, so disable it for now. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie (cherry picked from commit ac000b00ec615b3e51dda8d819015d5e7110ed88) Signed-off-by: Steve Sakoman --- ...ctive_children-skip-problematic-test.patch | 30 +++++++++++++++++++ .../recipes-devtools/python/python3_3.12.4.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch diff --git a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch new file mode 100644 index 0000000000..6ebbaf10e0 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch @@ -0,0 +1,30 @@ +From bf3eb28bba24509a3e1cd40f1f0e26db833779a2 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin +Date: Thu, 13 Jun 2024 10:54:31 -0400 +Subject: [PATCH] test_active_children: skip problematic test + +This test is failing in some tests on the Autobuilder. Since it's of a +similar nature to other failing/hanging tests, disable it for now. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Trevor Gamblin +--- + Lib/test/_test_multiprocessing.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py +index 3955123455..a1861fa3a0 100644 +--- a/Lib/test/_test_multiprocessing.py ++++ b/Lib/test/_test_multiprocessing.py +@@ -579,6 +579,7 @@ def test_cpu_count(self): + self.assertTrue(type(cpus) is int) + self.assertTrue(cpus >= 1) + ++ @unittest.skip("skipping problematic test") + def test_active_children(self): + self.assertEqual(type(self.active_children()), list) + +-- +2.45.2 + diff --git a/meta/recipes-devtools/python/python3_3.12.4.bb b/meta/recipes-devtools/python/python3_3.12.4.bb index 9dd1417f2a..e4c3fbb673 100644 --- a/meta/recipes-devtools/python/python3_3.12.4.bb +++ b/meta/recipes-devtools/python/python3_3.12.4.bb @@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-test_shutdown-skip-problematic-test.patch \ file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ file://0001-test_deadlock-skip-problematic-test.patch \ + file://0001-test_active_children-skip-problematic-test.patch \ " SRC_URI:append:class-native = " \ From patchwork Mon Jul 29 13:12:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46978 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 22A34C3DA61 for ; Mon, 29 Jul 2024 13:13:27 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.55952.1722258804782699692 for ; Mon, 29 Jul 2024 06:13:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ZnLdNjir; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2cdadce1a57so1978822a91.2 for ; Mon, 29 Jul 2024 06:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258804; x=1722863604; 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=1LIQsEwxymgdrIL+EhjYr2gyswMZogX4N1BPX1VdGGY=; b=ZnLdNjirNruEo2nuygQ/yPlNgY6Y2PdBEnjupFlNyTA492bM2G5Lq5eFg89fJCStLi pmRL0PrhhjBDxVCiQ3f42MOkGJmPnJmCapOaBHbEU2WEenp3Q0CwxzzWS9j1v0hUhsY3 UnLuIJhenL1tvwtyVS6F6hX4Eus6ZmOCozMELx6lSRQr4+cPgeUwwHwDWxYkxJsdy0KM Dgh9/9I6OuuweGlWXRGBzedsOUdVj8H4yiDSdp8gYlbrfFFpyWgZ4jsTg1E4HJldNjnM PZcCtAEu5e0Dfkp95wcVHt0Bwf8maIyRDZ/Gw14AksGwtzyr2N7IU+vdgpdshe8W4pg9 kMDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258804; x=1722863604; 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=1LIQsEwxymgdrIL+EhjYr2gyswMZogX4N1BPX1VdGGY=; b=Le3zsLMdsBMHjv9t9r/ZAVtP1AqJenrboVP7MdAeXRtTaXw0HBvTcl8rko4DZBjYiv tUu7n+fx/fWO5l0dDs13MjWb2CQkMDQx5COOG7dvT6voPBDMSYXirslD0ZTUMikiSWD0 C1II5+YtcPD5biIE8omT04IgSsfHhaZQgPJf+NFBEPukPPOzLfgTj7uGYrUZ1gdnnBoO eE0n/dxxq7bVgwKs7JxmKwmSDgn6aueZzW/9S9iJvrmaU1cE5gIvt8FAcSp28lukzyu6 vccZVKg2fUUfeMeebIH8f8dzKrtb8GTZ9iOa//pCA2pLnh0+CR6i+u4YCSnUIF3C9byw Kttg== X-Gm-Message-State: AOJu0YyZ41BIn+6ynOf/KVdR0oKXzmSUU1wY+ZQiRHW4QmcYAkrB552R XXotOUzMLctXId9CaJJn2WLTZMhsIWYCZy3LBrZqF9RfSLGSyQgZhG4nPXWJ/vw7GgOYLbrI4c9 0ublXRA== X-Google-Smtp-Source: AGHT+IHLSdi1IRhtFaEmCYiZeohvrCAWOpY8z2kxGAV+m2WdrQNj03qisfadtugsPvwbUju25gijxA== X-Received: by 2002:a17:90b:e8e:b0:2c9:5a87:f17c with SMTP id 98e67ed59e1d1-2cf7e1d8e63mr4881006a91.15.1722258804076; Mon, 29 Jul 2024 06:13:24 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 20/37] oeqa/sdk/case: Ensure DL_DIR is populated with artefacts if used Date: Mon, 29 Jul 2024 06:12:30 -0700 Message-Id: <048467673ceb075277c5a4fbbb40b9c3e41864e0.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202634 From: Richard Purdie Where we're using DL_DIR in sdk archive to try and cache testing artefacts, copy into the cache so that it gets populated and this doesn't have to be done manually. Currently we're making a lot of repeat requests to github as this wasn't being populated. Signed-off-by: Richard Purdie (cherry picked from commit a3284958a2cc6c90a5fac26976bddc23f821c972) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/sdk/case.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/sdk/case.py b/meta/lib/oeqa/sdk/case.py index c45882689c..46a3789f57 100644 --- a/meta/lib/oeqa/sdk/case.py +++ b/meta/lib/oeqa/sdk/case.py @@ -6,6 +6,7 @@ import os import subprocess +import shutil from oeqa.core.case import OETestCase @@ -21,12 +22,14 @@ class OESDKTestCase(OETestCase): archive = os.path.basename(urlparse(url).path) if dl_dir: - tarball = os.path.join(dl_dir, archive) - if os.path.exists(tarball): - return tarball + archive_tarball = os.path.join(dl_dir, archive) + if os.path.exists(archive_tarball): + return archive_tarball tarball = os.path.join(workdir, archive) subprocess.check_output(["wget", "-O", tarball, url], stderr=subprocess.STDOUT) + if dl_dir and not os.path.exists(archive_tarball): + shutil.copyfile(tarball, archive_tarball) return tarball def check_elf(self, path, target_os=None, target_arch=None): From patchwork Mon Jul 29 13:12:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46979 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 4E622C52CDC for ; Mon, 29 Jul 2024 13:13:27 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web11.55953.1722258806540851605 for ; Mon, 29 Jul 2024 06:13:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=tq4uZWBB; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-70d1fb6c108so2190285b3a.3 for ; Mon, 29 Jul 2024 06:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258805; x=1722863605; 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=G4jdaQwR8aj4iMKQwsHgDJ8ndsmfWXC3Frk+oB3URoY=; b=tq4uZWBBVl18YNscRWfwTgEs4sceW4u2iXy9jhq5u9MKItc1oCSYaS+aelnva911wQ D0XL0tjTxNmxgcTeN3S4JIn7U2eE3Esra3m8k3/ziPP++0IFQZll1ajoqzWlO9CiQLMl pVSHUPQbyz8CFUnE5jV+j9iJ9dzmAuum2hwK8c+P0pzzwJsgumvZdKItc5+3LUob4tJp c1ojeBYlE3ICRSMrK64W4SIEP13q7M5d6K/8qq6yOTzF6WqAHRLnoQ2pusTujn5U6AnX Zu5myqaO43RWu6ZLzM9dgZnmoNHS1/M3nQD74ixI+yyKlIV6TWDETxTaMsxxbpJkfvb6 /5bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258805; x=1722863605; 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=G4jdaQwR8aj4iMKQwsHgDJ8ndsmfWXC3Frk+oB3URoY=; b=MZOp5zT8CWvdNICbQXH0qDadnt5mb5mga+4GJKzmPET+vcss9h9X+wfDNur23PjEkn 9fbRY0ZKoTObaytSndJsdLpRLhCToMZj6M/Dns4i3guYdHp/QThCAiuvBVlXhjD9vPZ6 zTqfHjVLhQpHBkQRTDforoi4WVhvD6xgS1oz7gBa73bxUxQMLbuPp5lprGnRIE+MY1hj jMoNPVY6dtgMIDq/oEo+LS9B9Vw7gJmQ9mUaFe1/julS5DcnorCyJ82l2+ZyQOvU9buY 3vi7SVdUgfOWeoe5dsBj1fI/WRavZ8hSUiuiWC9NPR10Ane1bArTUMDmZBh0d53pWqjC E2AA== X-Gm-Message-State: AOJu0YzCQLd3P325ImmCxDN9lYi6meY+aeRAFasVzlrFofnM4o+Ev002 AJSo3jYu4fbAY6JUvg8VH2Ft6iujh7GmUcVWBqoXob+qOBjS03kKUEAVySy6HDs5WkBuRTjqXU8 vPc+k5Q== X-Google-Smtp-Source: AGHT+IELMBagniaI+/vXxeDZMphEEW/wnm6Ixd4UrRy+AqTFI5kyq2t2wEOHI1tgIljbD2CeThAn1w== X-Received: by 2002:a05:6a21:6da6:b0:1c4:8294:3963 with SMTP id adf61e73a8af0-1c4a12cbab5mr6839021637.24.1722258805456; Mon, 29 Jul 2024 06:13:25 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 21/37] gawk: Remove References to /usr/local/bin/gawk Date: Mon, 29 Jul 2024 06:12:31 -0700 Message-Id: <64ae7492c69599019ef2bec62a834335539908ef.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202635 From: Khem Raj Also replace the hashbangs using /bin/gawk to use ${bindir}/gawk This fixes issues such as https://github.com/riscv/meta-riscv/issues/384 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit 9f58ad97f6587322b716de1c9dc409bb4e1376f0) Signed-off-by: Steve Sakoman --- meta/recipes-extended/gawk/gawk_5.3.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/gawk/gawk_5.3.0.bb b/meta/recipes-extended/gawk/gawk_5.3.0.bb index e94cf19db4..ac9d8500d6 100644 --- a/meta/recipes-extended/gawk/gawk_5.3.0.bb +++ b/meta/recipes-extended/gawk/gawk_5.3.0.bb @@ -52,6 +52,8 @@ do_install_ptest() { cp ${S}/test/$i* ${D}${PTEST_PATH}/test done sed -i \ + -e 's|#! /bin/gawk|#! ${bindir}/gawk|g' \ + -e 's|#! /usr/local/bin/gawk|#! ${bindir}/gawk|g' \ -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests From patchwork Mon Jul 29 13:12:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46983 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 5C8EEC3DA61 for ; Mon, 29 Jul 2024 13:13:37 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web11.55955.1722258807661455071 for ; Mon, 29 Jul 2024 06:13:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=dr//Tb/p; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2cb53da06a9so2120467a91.0 for ; Mon, 29 Jul 2024 06:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258807; x=1722863607; 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=frHvG8eQCsCeu4IArpEP5n/yWsCZcElq2S8Z/IwOTP4=; b=dr//Tb/pJzjoXrK7EBzy+LrrVuu8CcZblqtC3BlWyPylsutRgB1ekXynlDgbl9s8PT NwA0XHXH3rx5bIClz8vDQ4PUmBN2pWuyK5bG18yjtiJSUauRs8Y95bmnIRoxm/X/ck+l yRrSTkffI9h34DfjZPbuZ8qfGku9ja1NhGmD8XnCu9EQWgf9nYFFjdSTNJb+on0ps6kx 5ut406ncH8p98JiHPTLlFbn9WmbFfZRWI9elhVPE2m+ggUU/Fc8HlpQQoh5wpQe4JTts ONI+IRxRJSZwQVNeqT66JZCcNZeOtYfy50zcpc0fXXrOV+HK4L4mO1OONRoXmDwaU68c l/yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258807; x=1722863607; 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=frHvG8eQCsCeu4IArpEP5n/yWsCZcElq2S8Z/IwOTP4=; b=DV/uDqoOKimp7SKeBDS295fHldYPta+IUQfKvFnkmfkq+ECslrCcdzKgASePEYSC2y 2FVTDPihdKGm3cntKPqIBRGh/g/noNDLjwu/J/+KJiF2BFiH/T14cI1brhCespWytxOc HqRLHo5czRPfYB41JtB9sw8iW0W/QAk13IAuhcKEsbzX9fB/ZFJ4JR/WLEdkRYYPdqv+ QKibZd7Zg9OP9smJELH58FKZpFgQHdQQFcMHtKJa5x9hoxRxogcrdNrz41QNMGd222dB m3EyJAHtH3Mu87WfnYIzNi1Ij6wdFyyADaXKgrrFblV36rwRB4d7ZLjcj+3i1Q3BKmGY coHw== X-Gm-Message-State: AOJu0YxvVoIWUM4Llzhhtns7/TOrMfg1B44WdkzactC+OOXfyrNKuqtv D+lDIs4pDX7HecvDEpcIQrdJCObJguCKaRz4VucDezInLKU8c+L0aQUDfz/q/JxNjvyUQ0W6ljo 5dgQJ3A== X-Google-Smtp-Source: AGHT+IGC4ajPvMnCQZ01KOt63tI8/G/0pIoduhUpUMTpYLZvwlGJW0MGy0QkNwO3te26373ik8DyeA== X-Received: by 2002:a17:90a:5314:b0:2c9:6188:f3e with SMTP id 98e67ed59e1d1-2cf7cf7fd35mr12214951a91.16.1722258806858; Mon, 29 Jul 2024 06:13:26 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 22/37] archiver.bbclass: Fix work-shared checking for kernel recipes Date: Mon, 29 Jul 2024 06:12:32 -0700 Message-Id: <340dc094df5eda4a3834a90578b331d9edcffa94.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202636 From: Benjamin Szőke Source dir can be a symbolic link in some BSP's linux kernel recipe which points to work-shared path (like linux-fslc in meta-freescale). Change to use os.path.realpath() in order to get real path of source dir. Signed-off-by: Benjamin Szőke Signed-off-by: Richard Purdie (cherry picked from commit 9191aa685418af32f003e067ef7c5737a271e3a5) Signed-off-by: Steve Sakoman --- meta/classes/archiver.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 2d0bbfbd42..9d286224d6 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -473,7 +473,8 @@ def create_diff_gz(d, src_orig, src, ar_outdir): def is_work_shared(d): sharedworkdir = os.path.join(d.getVar('TMPDIR'), 'work-shared') - return d.getVar('S').startswith(sharedworkdir) + sourcedir = os.path.realpath(d.getVar('S')) + return sourcedir.startswith(sharedworkdir) # Run do_unpack and do_patch python do_unpack_and_patch() { From patchwork Mon Jul 29 13:12:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46985 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 A7B7BC52D1E for ; Mon, 29 Jul 2024 13:13:37 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.55662.1722258808996920660 for ; Mon, 29 Jul 2024 06:13:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=tuEqvxFY; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2cb5789297eso1841469a91.3 for ; Mon, 29 Jul 2024 06:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258808; x=1722863608; 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=hiuTza/CYjbYWPuOe5NXHUchpjBzqOsp/RlhESbS3o8=; b=tuEqvxFY1jlCCGzSUDbl7mcgQ9V2YzuaIm3AgTm1NwnDC3zd9LZK5Vbdu8FXfluFcr 6sAFz2DYakz7pfCvjIHia9Lg2l6pb91t2L9mSiNMTs0D6imjeoYIcKkGPOBAsFXcmLVO myzLZ2dB8CzcQZ78NAckJMroDV/N9++PpYVCiFrzYnYGWwyecwK/a/N3PNiiZhGMJwRt 1/3m7UT109niESDEbOv+OQHv9gOnu3u1NwCXHoY71hyLYdM5H+8SsOC4C1IatRi25OhF bXbs+3hk2HctrVXLNcf48Tb4xMAad/WLM40uV9qMWvmccNjSMJhnPOF8J6pCXhxNBOI2 EJeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258808; x=1722863608; 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=hiuTza/CYjbYWPuOe5NXHUchpjBzqOsp/RlhESbS3o8=; b=WNpQ+SMxtKsboA3CC5cuGNAjGcZMhnvigwPddFhIemvlBvNyqgW9++XpEDWuujHRxL 3VmDH6v4xtbVP/OfCY+ykCTPi5gQwqGUmc5ACm3bpjxq3GkUtAEAKID+6XReOH3JRLy+ xuhkJRNBQ68WZSVUYvfoLmgWO46JSUad0qRQfE1XDMSvABqTBYZVgb96wBVLiW/ZowVC ZgRV2eBFeYy2mNrBvp5/ElCCuRx5lDkB3TpzhL7MXTVJAOtDEptd4wDu8VjrhArwtDeC 3sweCmwdDwYQ2kwY83Ojp2qNduu4OAeztQG7FXUeH6xT9KYUBNpu+HCGmUFMwEt3+t7/ MQIA== X-Gm-Message-State: AOJu0YxjhEVb+8HPSWBEVagRueevYc6Zhi5jFE37OgQtp1hJkQAYfTBF z7irrtx9aWJ3XLVr3WJgEBTn+gPssieFskRtlvvCH75WLa9i7l69Xuyns7vYQIp4ywKZLhZ0a2W mmBEzEA== X-Google-Smtp-Source: AGHT+IHkkm+bm2n+wJ5k/H3raHBitiQdZYEVBh86TGDxJZtSJlbU13eysDd+RMmZg72Sg4LWpigjZA== X-Received: by 2002:a17:90a:468d:b0:2c9:9658:d704 with SMTP id 98e67ed59e1d1-2cf7e7307e2mr4497888a91.40.1722258808234; Mon, 29 Jul 2024 06:13:28 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:27 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 23/37] classes/kernel: No symlink in postinst without KERNEL_IMAGETYPE_SYMLINK Date: Mon, 29 Jul 2024 06:12:33 -0700 Message-Id: <6916c19c8a09d8d0334c957ae541aafcbbcf92df.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202637 From: Jörg Sommer The commit “Use a copy of image for kernel*.rpm if fs doesn't support symlinks” [1] added postinst and postrm scripts to the kernel package which create a symlink after package installation. This should not happen if `KERNEL_IMAGETYPE_SYMLINK` is not `1`. Background: The u-boot implementation of jffs2 does not support symlinks. Using a hardlink or removing `${KERNEL_VERSION}` from the file name fails, because the current postinst script replaces the file with the symlink. [1] 8b6b95106a5d4f1f6d34209ec5c475c900270ecd Cc: Bruce Ashfield Cc: Richard Purdie Cc: Yanfei Xu Signed-off-by: Jörg Sommer Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 6a763401862d9ee96749ad18378b6344778c2c66) Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index c0a2056fec..4c1cb89a46 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -115,7 +115,9 @@ python __anonymous () { d.setVar('PKG:%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower)) d.setVar('ALLOW_EMPTY:%s-image-%s' % (kname, typelower), '1') - d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e + + if d.getVar('KERNEL_IMAGETYPE_SYMLINK') == '1': + d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e if [ -n "$D" ]; then ln -sf %s-${KERNEL_VERSION} $D/${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 else @@ -127,7 +129,7 @@ else fi set -e """ % (type, type, type, type, type, type, type)) - d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e + d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e if [ -f "${KERNEL_IMAGEDEST}/%s" -o -L "${KERNEL_IMAGEDEST}/%s" ]; then rm -f ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 fi From patchwork Mon Jul 29 13:12:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46988 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 811CDC3DA4A for ; Mon, 29 Jul 2024 13:13:37 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.55666.1722258810645028105 for ; Mon, 29 Jul 2024 06:13:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YVulEww2; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2c964f5a037so1985665a91.0 for ; Mon, 29 Jul 2024 06:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258810; x=1722863610; 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=Cj0CmydQgCcJEd8BsooaBT6rDw/bPTiAIxm8KzdKxE8=; b=YVulEww24RtWs2J3AKkix+2jKJsv1St60x2DzqBqCMgSSEYh2A4VDxKaxhW/F/BJKE GBWbJN1LC+9QX0Kz9rOpusGQzCQ4eNC+YPt5DhdXMVzPvPQRaHquMZlxpJnMKBcVZS/c HdNqmZn2WVmrUKvf9mXZ4nRipoTBriJaQVKw27TEDNlzjwJ5dYGaomSCSUVRYYjIwEhd c3NRMNV/Atth5MbEqmaMpMFfLMk2TRIrVNemQiwzLglkNMxzvVRftZDglZZMWPV1LK5s 8AnwOdzP2EqowT6qAAQqkQleCms7toRC5a41bRhZqEP2BtefHqT/Uo4ufw+3qGDLg4eo lKIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258810; x=1722863610; 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=Cj0CmydQgCcJEd8BsooaBT6rDw/bPTiAIxm8KzdKxE8=; b=uRr2JINPoES0nDzt3jDMA1N7VEMcJrWjFgA1r83zjViZlF3kvTU2VLozC7Zo1OH59k uEpyx9hfygZYtkAheJ+Qd0DQSC9+1zfBEPnEfMFdRffmnCU1yWV16iwXmrfQZ/L4A7cV c0hDSw6SrvvLFnofiZ1oSIoW/F91JDiDVgnIJzBgB2jw7bgx5Scz/vy1ZBFifJkkjsSu hkiiE1Ojo5INFFXdtTrrp1FYwPbUq9viLfKhBeY0bFnKbTbrZrUJseXhg82QIA7VPBTd otO/I4CxbSmvqJNguw6Y+arGXWmm/9fc1XOf8adtgozRGmeOcZSUtjw3poG42ovA5ZaH fP+Q== X-Gm-Message-State: AOJu0Yw+K4guTpiwWooGcQAt01MCP20NRs0kruvg9aOV2iHmDZgmmupM JR/x632BKYlqPccv4WkJMIeC0rbaD4qZjtUUQIsfG4mD3UJ0tpy9ySUdVyXLQ/BontRbOb+KYP1 77tWVJw== X-Google-Smtp-Source: AGHT+IGmKJ4AGEkhs1ceUEJmL5FMTRRkXtBBeRkr1LnHgHm+IaFH9es/EgXIVveqMUi72D+xtChCwQ== X-Received: by 2002:a17:90a:8a15:b0:2c9:6cd2:1732 with SMTP id 98e67ed59e1d1-2cf7d42322cmr5209580a91.0.1722258809590; Mon, 29 Jul 2024 06:13:29 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 24/37] oeqa/runtime: fix race-condition in minidebuginfo test Date: Mon, 29 Jul 2024 06:12:34 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202638 From: Etienne Cordonnier Fix this error where 'coredumpctl info' warns that the coredump is still being processed: ``` AssertionError: 1 != 0 : MiniDebugInfo Test failed: No match found. -- Notice: 1 systemd-coredump@.service unit is running, output may be incomplete. ``` (From OE-Core rev: ad1ce64f5c1f22a7b10025d8cba20dc74354ac81) Signed-off-by: Etienne Cordonnier Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ed562345d5a5f2edb649028553199f3f7966e19e) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/systemd.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py index 80fdae240a..640f28abe9 100644 --- a/meta/lib/oeqa/runtime/cases/systemd.py +++ b/meta/lib/oeqa/runtime/cases/systemd.py @@ -150,12 +150,21 @@ class SystemdServiceTests(SystemdTest): t_thread.start() time.sleep(1) - status, output = self.target.run('pidof sleep') + status, sleep_pid = self.target.run('pidof sleep') # cause segfault on purpose - self.target.run('kill -SEGV %s' % output) - self.assertEqual(status, 0, msg = 'Not able to find process that runs sleep, output : %s' % output) + self.target.run('kill -SEGV %s' % sleep_pid) + self.assertEqual(status, 0, msg = 'Not able to find process that runs sleep, output : %s' % sleep_pid) - (status, output) = self.target.run('coredumpctl info') + # Give some time to systemd-coredump@.service to process the coredump + for x in range(20): + status, output = self.target.run('coredumpctl list %s' % sleep_pid) + if status == 0: + break + time.sleep(1) + else: + self.fail("Timed out waiting for coredump creation") + + (status, output) = self.target.run('coredumpctl info %s' % sleep_pid) self.assertEqual(status, 0, msg='MiniDebugInfo Test failed: %s' % output) self.assertEqual('sleep_for_duration (busybox.nosuid' in output or 'xnanosleep (sleep.coreutils' in output, True, msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): %s' % output) From patchwork Mon Jul 29 13:12:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46987 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 9A8A0C52CDA for ; Mon, 29 Jul 2024 13:13:37 +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.55957.1722258811856638611 for ; Mon, 29 Jul 2024 06:13:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=p0Sj4pQm; 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-2cb674b48ccso1871347a91.2 for ; Mon, 29 Jul 2024 06:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258811; x=1722863611; 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=7LZN/k5/MAxVXFG7luXNUcL5R75Lg+j/87JdfG/X6pA=; b=p0Sj4pQmBQZXejqEnFmDPIpAFb/WVCCbesldryVEi1njY6ZLP7QedMnRfbM3KA/Do9 V4VHJG7aFwYAkGA5o/pguJf7oyHRmNc/YgJ5HsZCtK3jIgOuPiVELtj2as6VjQRH7Hp9 Ep8g1egTCGnx4krc8bMTR1cBKVb122l4sKpdGpJljJS0IAARJEUdncntcV0JpBrD30ls SI/1fNEbV0yjdAMTe8jzQuYVjnFNqL+qJhcLfvPaqJElWwSuwtwN95TXFGEHrT8lF35v SjjMeAgRpuOid7Rb5coqWwTKiSlyOURBt9p931ZDSCog2xtdySzOsMubHJrZfyhSMa6H hJQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258811; x=1722863611; 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=7LZN/k5/MAxVXFG7luXNUcL5R75Lg+j/87JdfG/X6pA=; b=WrwzopSmoO8Ck3e0GTsiQWiAkMuWGtCicWaCB3fcG3o7d2lZQtG4bUG48QZFNRNDxT 2YRSFnsX0WbhEHr6xs0L1oex98/A441POQZnFCwfb/5PzvH64XCaITtOubOG6DrNpWOK u89fZYrQT7wbhXDSrDlJE3KHvLKpLM0s1lHzGnRLnpEY6sdKh6NiyeEg8d3kiofhmY9o +WVPq1rCWlC9Htq0kHoFsk8n02Q1K0maViw13aEWGRKzm3uFHvl5wCCkP0YI9b5F63VQ dMQH5+1h2D17oxqsP54rZ2+V288AyaOzBSM0dDKgqwJ1vB8JGJFQ8jmrO0+wWDXy/DBS 5kBQ== X-Gm-Message-State: AOJu0YwEivudNtcmy2YINjaAYeRwCD2mny21zA/fhvl6GvqpAAN/jSyd rr12ZpBdgSGcnNYFCIbOnpuYn7Nw1Lv56OS7fz2+EoIhLTJiLzs5OytDvUGemx4lMm05ty+0FGn iod5Drg== X-Google-Smtp-Source: AGHT+IHVGyy6wS78Xf3OgwHGhZHMZLVIiQNxg7Y4kaALvMHJmbctxR5IAAl7DlV7xSERRfFONlHZOQ== X-Received: by 2002:a17:90a:7447:b0:2cc:f538:7cf0 with SMTP id 98e67ed59e1d1-2cf7e098498mr5437985a91.4.1722258811058; Mon, 29 Jul 2024 06:13:31 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 25/37] python3: submit deterministic_imports.patch upstream as a ticket Date: Mon, 29 Jul 2024 06:12:35 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202639 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit d77511cc9add70857e4a9d7237b23d7d6ae14e98) Signed-off-by: Steve Sakoman --- .../recipes-devtools/python/python3/deterministic_imports.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3/deterministic_imports.patch b/meta/recipes-devtools/python/python3/deterministic_imports.patch index 104df94964..2de6ae2e98 100644 --- a/meta/recipes-devtools/python/python3/deterministic_imports.patch +++ b/meta/recipes-devtools/python/python3/deterministic_imports.patch @@ -11,7 +11,7 @@ has caused a long string of different issues for us. As a result, patch this to a behaviour which works for us. -Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] +Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes] Signed-off-by: Richard Purdie --- From patchwork Mon Jul 29 13:12:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46986 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 A79C2C52D1D for ; Mon, 29 Jul 2024 13:13:37 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web10.55670.1722258813239659974 for ; Mon, 29 Jul 2024 06:13:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=14XbrQU7; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-6c5bcb8e8edso2515407a12.2 for ; Mon, 29 Jul 2024 06:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258812; x=1722863612; 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=vHeRv5mdCdEy7SXZq/ns27qbHzcIsXxYrawbFbAoRtk=; b=14XbrQU7Lt5U21LMcdpMrzb5f9ZxI97xv0NQcTmvMrBTFJamL/UdUupfEEgYEZOKoP 6lWlAhlshtmW9/hiTeKN5oNyoPP6W7sEKursClAoELbqYRuJO4q8lNJyLzZhG837sMfT ElK+1s8j9gULMZeKOK/YQNLLAzmLQ+WFcFkDhUc4NK4dQ+A1/QlrlsExl4fuJnWt15R1 SvGk1s1iN6lUkDY9+FOflv8vRmBak+SgVABg4f2qc68oCBFiijB7fsm2aYp53h8kWheQ n1YmVd2aPHOYgAYK7zI1Efox2u1mfAijHtUte/oqhFGfcg26gHFqumtdcIPjqfWgFU1Y Zrjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258812; x=1722863612; 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=vHeRv5mdCdEy7SXZq/ns27qbHzcIsXxYrawbFbAoRtk=; b=NWel04ccyo7aUpGmFBt3r5v3OtW8VCr27xezxVf//7na5UHvQAvNR0XtaToEUjSJOL k2m3AhYGf0hV79XyZItRCjcHg+F/Oj3qmSBHcyZ5J+IzieoEKfLrKX2RmRhxNzyn/xFQ VR8mIpPMmeeH36DeYA7Y1RKpjxA8SeVLxa1Qq7JHwy4rMWQr6H61nrhs1a3rajR/6aiX EiEF/538AACN20qTV2zSZtCk6DR2EPxvx5txMDttcZx6JmYNDqvWMFleT0SRtPrKoUKZ 59fXymUa8bzQYYxlVVewBK3S6iz/maENLrrP7mDquEeh4hJMuV/24d4AD9d2xhwLjsLF cnKw== X-Gm-Message-State: AOJu0Yzq95DiL32AGkQc0vmshnanrkG+/we886OTfFUDg/aDO7K2m8QO xf/cVoB2Lbnc6X3A3LmV/qddpuleqY1Iott6rDkU70/2osVJlmBheFW6l31aSCcU5LvbHB1pYFq tUg4Hhw== X-Google-Smtp-Source: AGHT+IHCFq0ypis2frTCzmftYEC//Co5MpJ0V5jlrQXeT/0qifkghfBn+R/3jnnl6y4uKKCV+Zs4Sw== X-Received: by 2002:a17:90a:644c:b0:2c9:9fcd:aa51 with SMTP id 98e67ed59e1d1-2cf7e19e13dmr9011991a91.5.1722258812392; Mon, 29 Jul 2024 06:13:32 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 26/37] glib-networking: submit eagain.patch upstream Date: Mon, 29 Jul 2024 06:12:36 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202640 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit eb3958bab8e1a7307f4de7615ddac8222aaae5b0) Signed-off-by: Steve Sakoman --- meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch index 6c2e3c634b..98ff476071 100644 --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch @@ -12,7 +12,7 @@ FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6) The test should probably retry in this situation so test a patch which does this. -Upstream-Status: Pending [testing to see if patch resolves the issue] +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/253] Signed-off-by: Richard Purdie --- From patchwork Mon Jul 29 13:12:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46984 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 73E87C3DA7E for ; Mon, 29 Jul 2024 13:13:37 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.55958.1722258814542993130 for ; Mon, 29 Jul 2024 06:13:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=L8n9NT3N; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-70ef732ff95so145344b3a.0 for ; Mon, 29 Jul 2024 06:13:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258814; x=1722863614; 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=gBvhNGD2joEcZKe9AaHw8BYK1nXPP/HA3XWfGWopguA=; b=L8n9NT3NVRe5yjMnTWtUfA5lOLMs4Xfx4ovjl8bCDOMfVeY4VueyBhbbGI6VUYLxAs U4UWowToMM+gGpUmFynjqCT3gqUBzo1Eqvbs7GgAWQhyqSvr/c6gZeOQQKrDB6HZhmUF EVAYk+DTQWJ2/ldTkBQjxYEICTsZ+hmqRRAQClFX5lQG7jsR1RT6MiM3VhszPYh3tQoJ t15AdKFbYpMKvIV7geIQsFQB9XKbe4uKuv1huDiteE1ntJ+0SI+QBapN92h4/MOZvq0+ Wh+ZgniTtoTSZmJqvKuyPtTj5Qcv8MK5qDE+nrG6IfotS31O84O8pjzbuUpHEZskdRHz dJKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258814; x=1722863614; 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=gBvhNGD2joEcZKe9AaHw8BYK1nXPP/HA3XWfGWopguA=; b=UbbJ7etzal3Ts6MpoKps/kOh6uoXFyBPB+PesIEGDMGaeLR3gFMzlHdaS7JiGK7WXl 6L0sEkolPKXh1k6B6g/cwjTFky232UKStLYtp1jgE3MfgWLOhwnD2kK+19s/tXBQVanH NC9ez2OZ8KCm3viYuD5FE04LHJpyYetRpElZaVhl3j2tC7G9d7yccxRipebNxWvMZJeb 8NKNzZqLASrqCAZdZvCx8JKQrvXY2gSq4Qfc60o3PGqV6gmbwX8LPkmnxN1U+JARd6en itIJg6T591mK5zdzMDNcP2Xn1XSLAR9lwqYgf0eYKe087TxK9I19iXVjMrhjQ2Nu20N9 qHBg== X-Gm-Message-State: AOJu0YzrVENNW2S1Qegs/5VljHtJNgdG+UY/o004ltWmqicGd71mUtk+ bkWsLWozAJBVR9dklGB82lUws5pNrTgExHeBu/zf0z3Okl0tHc1MkqgbiX84rKLMnldVhCh8aVw Q2ewU/Q== X-Google-Smtp-Source: AGHT+IHZpQJ60lfBdvwP94E1WWUxYc/80alvVXrMs54yPss3CpLaCdyvF9jwHuyHTCSbE3KgcPdy8g== X-Received: by 2002:a05:6a21:3406:b0:1c2:93eb:c178 with SMTP id adf61e73a8af0-1c4a14ef873mr5603768637.51.1722258813684; Mon, 29 Jul 2024 06:13:33 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 27/37] glslang: mark 0001-generate-glslang-pkg-config.patch as Inappropriate Date: Mon, 29 Jul 2024 06:12:37 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202641 From: Alexander Kanavin Issue is already being independently fixed upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e65af6571ad49d914c788b73f678e3565faac69e) Signed-off-by: Steve Sakoman --- .../glslang/glslang/0001-generate-glslang-pkg-config.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch index 316a57fa4a..337a999bfa 100644 --- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch +++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] generate glslang pkg-config Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch -Upstream-Status: Pending +Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371] Signed-off-by: Jose Quaresma --- From patchwork Mon Jul 29 13:12:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46989 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 8DE85C49EA1 for ; Mon, 29 Jul 2024 13:13:37 +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.web10.55673.1722258816352016232 for ; Mon, 29 Jul 2024 06:13:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wuboZYZh; 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-2cb576db1c5so1848937a91.1 for ; Mon, 29 Jul 2024 06:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258815; x=1722863615; 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=v4Us9LYVpvpZGCBrsF3QThilsCu0VJ4rUUESuyqNBTI=; b=wuboZYZh3z+frHmJ8lK8s+ypUQ/p6Zw3adM7NyvbMt7zQ3aqiz84AKkrhPzwcszGID mdxC9sAHEUC+SYcCpqRuFAwj8OHZg84iC3IV47woG6rKLKJXI4Bmr+KsujgQB6SBiGwQ cyKGK1zgFKnMx+/jL2fJFsG+4jbaO9UHoedlZNxeV7u9EY7axtkp9VZlpSb97t6Kl/No vanxWNXBWilVmPbP8Tl6bgM2Kz77FB1H0rtwqoL4ZcJeJXTAbqBVF8Z7oGguMvFB8mW6 gBl3SBxSgrNJyMvIppZ9JPSoPDIUW9/4P8/mpkxhJC/iTTl4ofLhH2yF+de4NHjlhYJm GJJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258815; x=1722863615; 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=v4Us9LYVpvpZGCBrsF3QThilsCu0VJ4rUUESuyqNBTI=; b=IEOvkTUltHTlhObLdCXJ98dAVn1x8F59r/5C/YZhFzv4PNEtimbzyohdXoQKBRrRr3 yf49kScO10fqQcZcj3MFQj8FC6fenr6zeCisRnvO0WCSe8EflBbKnCP4cYI5Iuc2IUfC upYnt7AiXQoQmpF8D/l3AXrt4WKk8ax8m+uReom6asAh6w1neTMgeGsGmaI33I++24x3 wndyYHPsItSGCkBff2cLNrrXuX6x/oNaP/RoMmN4vIQVkOIJyvFaYKm9Ba/wER9I7pww T0Gm/1tkH50LdaVI+08B3uA1HYSOOwdFtJQlf2vVLHa58y2bK13FJL3SHhwaVO1Y+XMX Ql+A== X-Gm-Message-State: AOJu0YzoMDmdEYoao5A5zox0mMH16soIPeMhfbjXpuqYukbw4Vkjd3Y4 kcJGe5kjQyP1lFDQ5lv8fd+sv8yrNIPqMrXPSZLGhRWPGeC1EidT+qZ3+ows+ES6M4dxINFfxye ZbJ3HdA== X-Google-Smtp-Source: AGHT+IG8VDxWJSXnQ79N7S1fzdC9M4CBk0IkU/oNygmW1zx63I1SaSwcROqePcgsG6nOgXrxetZIDg== X-Received: by 2002:a17:90a:f481:b0:2bf:7eb7:373b with SMTP id 98e67ed59e1d1-2cf7e5eee82mr5250213a91.33.1722258815149; Mon, 29 Jul 2024 06:13:35 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 28/37] tcp-wrappers: mark all patches as inactive-upstream Date: Mon, 29 Jul 2024 06:12:38 -0700 Message-Id: <81d8c2567d9319e68854217022bb038546b6298a.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202642 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0bc555fce11e1d25928310961c53aefd407fbd23) Signed-off-by: Steve Sakoman --- .../tcp-wrappers-7.6/0001-Fix-build-with-clang.patch | 2 +- .../0001-Fix-implicit-function-declaration-warnings.patch | 2 +- .../tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/ldflags.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch | 2 +- meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch index 9d1e05d7f4..9ca227d68d 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix build with clang Fix "error: non-void function 'fix_options' should return a value". Add function prototype to tcpd.c and miscd.c. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Oleksiy Obitotskyy --- diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch index 474703885d..8503177926 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix implicit-function-declaration warnings These are seen with clang-15+ -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj --- hosts_access.c | 3 +++ diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch index 88c8d9cae7..f485fe3fb6 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remove fgets() extern declaration These sources already include which should bring the correct declaration -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj --- hosts_access.c | 1 - diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff index 16d6719cbc..c5ba3af306 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch index 9a735bff6d..fea8ab9d7a 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 --- tcp_wrappers_7.6.orig/hosts_access.3 2005-03-09 18:30:25.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch index 9e188027fc..525cd3531b 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=17847 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch index 725f4b5957..1f3f9e24ac 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] * Mon Feb 5 2001 Preston Brown - fix gethostbyname to work better with dot "." notation (#16949) diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch index 96d47c39f4..ea45777734 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c --- tcp_wrappers_7.6.orig/fix_options.c 1997-04-08 02:29:19.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch index 226106f4ff..77d5b42342 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Path: news.porcupine.org!news.porcupine.org!not-for-mail From: Wietse Venema diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch index 260e8d3138..09a1e0527e 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c --- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch index d473fb6342..895a72e6b4 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Index: tcp_wrappers_7.6/Makefile =================================================================== diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch index bd1396bc79..9503fb3c88 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile --- tcp_wrappers_7.6.orig/Makefile 2004-05-02 15:37:59.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch index eb5685c576..b6681df8ce 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 2003-08-21 03:15:36.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch index 3ca6874119..0c8594cac3 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 2004-04-25 12:17:59.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch index 3087377976..0c54ba6d35 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c --- tcp_wrappers_7.6.orig/eval.c 1995-01-30 19:51:46.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch index 965544cc0b..0fd2ca7b2b 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch @@ -1,7 +1,7 @@ Compile warning fixes from Debian Signed-off-by: Adrian Bunk -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- a/options.c +++ b/options.c diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch index 27157a2e6d..d9a6909db7 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch @@ -1,7 +1,7 @@ Compile warning fixes from Debian Signed-off-by: Adrian Bunk -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- a/clean_exit.c +++ b/clean_exit.c diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch index 4cc554fc38..9b1a3c0fa1 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c --- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch index 3ba214d241..79b677f456 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Index: tcp_wrappers_7.6.orig/Makefile =================================================================== diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch index 797352579b..23762449ac 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch @@ -12,7 +12,7 @@ problem. Also fixed: Fatal error: can't create shared/hosts_access.o: No such file or directory -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Robert Yang --- diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch index 19bd7d3c0f..30e74a1de1 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 --- tcp_wrappers_7.6.orig/hosts_access.3 2004-04-25 00:10:48.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch index eee640e8a8..b998675aa0 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch @@ -1,7 +1,7 @@ __BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl glibc and uclibc had sys/cdefs.h doing it. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj Index: tcp_wrappers_7.6/tcpd.h diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch index 7650600ab5..f42b9d2799 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch @@ -1,6 +1,6 @@ STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings) -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Martin Jansa diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch index 5875b81b2f..a864e38129 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:40:08.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff index 723f4f136a..2d0f548f89 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c --- tcp_wrappers_7.6.orig/scaffold.c 2005-03-09 18:22:04.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch index fc2afeef15..b6543fc92e 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- tcp-wrappers-7.6-ipv6.1.orig/safe_finger.c +++ tcp-wrappers-7.6-ipv6.1/safe_finger.c diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch index 9d7ea042b2..843063fd7c 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] * Mon Feb 10 2003 Harald Hoyer 7.6-29 - added security patch tcp_wrappers-7.6-sig.patch diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch index 76dd6340b2..d4a1146594 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch index cf4f993c1a..fb64f93f1d 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch @@ -7,7 +7,7 @@ Date: Tue Feb 12 09:53:50 2013 -0500 Added support for socklen_t type to len argument passed to socket related calls. This fixes a bug that causes tcp wrappers to fail when using sshd. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: farrah rashid diff --git a/fix_options.c b/fix_options.c diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch index be29bdcfaa..2e3b1719fd 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c --- tcp_wrappers_7.6.orig/tcpdchk.c 2003-08-21 02:50:37.000000000 +0200 From patchwork Mon Jul 29 13:12:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46991 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 A2013C3DA4A for ; Mon, 29 Jul 2024 13:13:47 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web10.55674.1722258817669041841 for ; Mon, 29 Jul 2024 06:13:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=vDwv7jQj; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-7a2123e9ad5so1938079a12.1 for ; Mon, 29 Jul 2024 06:13:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258817; x=1722863617; 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=Sfka7jcnveQyP7J0llF7Gg+UbDGTk72GmseDGdv0EaI=; b=vDwv7jQj3bAVMwUNovgwTBK0lnmm3ZDYyRDKJtAAB73e5TnVP/EFfEprI/GI7n2VOv 1v4zOxrPzpg0i8zQVfr037B/+lw3S7DPW/O4IZAVsGAH1pMRM0M/WGOE/xrU56G60gcT eJFeoJLvHXe5Kgh6j5b6Ibk7JMQP1h4SFBrXJW0/z9KmEjvqOzSMWn88CCjpxf+Bz7P3 8sNGVKClDcVrQcXBh8U4vRUFPzMw8iBzmDia4cg/Jd+uVVScsQeJNo+7remYphC+ROUe NYG8TzK1KirsV6uJNtPoQ2Xnw5MaZ/BCQ/yOHg1Bxtq9bEuSNe2zD7E/ZbDhR8UW+QuL C/yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258817; x=1722863617; 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=Sfka7jcnveQyP7J0llF7Gg+UbDGTk72GmseDGdv0EaI=; b=kKdryZKxjJI2dgtScve5v23p8oe3qFV0A+bbwosh195//sq6GJj9VofXd7pGJv6tmN nWsFApE6dG5hM9jcbCos6PO4EoUbLSBBR8FCBJHpKG+ksw8YYgDRlLmPM8UFDG2speHl CWlNSKzxbUXK00+Pv3vPcSTLmfizzylORpP81G/vJRew/tnho2i6RBTjsu1W4/D6RBk1 PjoE17qvPhTiM6tw2FL9ETRU0KdW8SSGhjz6n2D6TxDN8ImTkApgU/wB8ldUQXRP7mmC xljihCLTaha3Gcqp8doa7u39wXaRWBEtHvhhT1Kvk5CV6CIrJw0W7DRfe/Nc7GVw/khp hryg== X-Gm-Message-State: AOJu0YwsxQb928n6aiBY3GOTJb3BApQkS1SxWamfNJRbw7m0JpgXJR2A os006D2+kUOpxtahZbtJUpB5DIFpDh3SePx1bXCQk14JdEwqCQW6hbpi2/K5leAbt+B3wupuF6S JEMNQMg== X-Google-Smtp-Source: AGHT+IGbmdSg2EKOwCCsP8jEcSCbWF33uwfv4nzq7cCkma41cW76BL+P/hOVgFmYZZtBOOqrh8NABg== X-Received: by 2002:a17:90a:7c4c:b0:2c9:36bf:ba6f with SMTP id 98e67ed59e1d1-2cf7ce854a1mr12490454a91.3.1722258816849; Mon, 29 Jul 2024 06:13:36 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 29/37] automake: mark new_rt_path_for_test-driver.patch as Inappropriate Date: Mon, 29 Jul 2024 06:12:39 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202643 From: Alexander Kanavin The patch is specific to how oe-core runs autotools-generated tests: by cherry-picking needed bits from builddir and srcdir, then hacking Makefile with sed until it runs. As GNU is not interested in installable tests, they wouldn't be interested in this patch either; and if they become interested, it's probably going to be done in a whole different way. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit dd13c29bee330d381e1e574351348e526500e396) Signed-off-by: Steve Sakoman --- .../automake/automake/new_rt_path_for_test-driver.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch index 1f71722334..f92ec6b548 100644 --- a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch +++ b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Set relative to top_builddir path in Makefile to access test-driver Signed-off-by: Adrian Calianu -Upstream-Status: Pending +Upstream-Status: Inappropriate [specific to oe-core target ptest installation] Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 --- From patchwork Mon Jul 29 13:12:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46996 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 E4EF9C52D1D for ; Mon, 29 Jul 2024 13:13:47 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.55961.1722258819178564840 for ; Mon, 29 Jul 2024 06:13:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jB9O/Y7W; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2cb4c584029so1976315a91.3 for ; Mon, 29 Jul 2024 06:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258818; x=1722863618; 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=4BzBNPUib5IrHvwaPYqT+h7iUr4uiT4YOcriqmg82RA=; b=jB9O/Y7WnIeRpFfeY4TzuO/ui7Uh1A1NrnkL3G02VlGN2iiATFjWy6lG/ve1EplH1k 6Qhe7fpngNbDEzoK1FvWS8Ec/2WkTJO0LUPtpQKz+Rfrol8X1eVkHVS90iLLn0mJzsJS EIT6C07UEqM6Id0HZactBfZoJO9Kt+mimH5NQqSzSulCwM7aJYp0wAcC0UUKbW+rFs+6 zw0yxAr8H1pj6RWixTyWYH8OaZ+HWihAaUqHfAjJUOx8xDdGhvOJq+Gw0nno7H/tygTk jaARdgSg5G8c6WyS1sl/UlJNWpq3dHuIJVvvz3u0oAs/mPlpmY9nSI1vCqSHNpT8Qcfv xHDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258818; x=1722863618; 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=4BzBNPUib5IrHvwaPYqT+h7iUr4uiT4YOcriqmg82RA=; b=gUideI4DIm/nMprJzy9lpRV2eCB1brOqT0cqpdCmdgvCUyiQr+reo9yJcWcIg31ZF0 fBRIPXoKxUNi5JRhN2Fo9Nl5VQ5zZ3gHc56nE1keUePzYrrOEKkIiTxLsMIgyHcv3sD+ I6GVobfVWe9pbOc6E4SG5E2Yk1ZPa1vEDEbESUzKpWJ3HMLTCBQy05CDUHUrOokorRUU ZooyPumKQZcvw5RXKnGTn+34FY/iA3Wd5AfuSerNfLoMZFUTipiArUvmnOUeODjJ6Aex lQo9ql0n0Pw2KtWspsAQ7thjxMPpqUnWhv7Lbr2blzV+RFDzgHY9LwR6a9xr+bR/kaH3 OvjA== X-Gm-Message-State: AOJu0YwLBW+R2sVuiiRTs9OU1TZY7sNvZtOuTRDpov/Aea/mfqQy9Tz1 XodrI6jp4gm/5z9J9qDAztfICsvV2VG46JxQJzGHNAPH3rYcH2YY+xuzzYMI8cTw2y4Bz/OMr0g 4DNU+KA== X-Google-Smtp-Source: AGHT+IFjigDooLiA+nlhHb97V2n52mZw3J2aEmQwqtCPT72Jj1E1A8ieqRoCy3uUz7jmWGV4E++ryg== X-Received: by 2002:a17:90b:1649:b0:2c9:6f91:fc43 with SMTP id 98e67ed59e1d1-2cf7e1a3e76mr5556235a91.3.1722258818357; Mon, 29 Jul 2024 06:13:38 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 30/37] settings-daemon: submit addsoundkeys.patch upstream and update to a revision that has it Date: Mon, 29 Jul 2024 06:12:40 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202644 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0d56c7b444d94778808cce8ede3374b8212b22a7) Signed-off-by: Steve Sakoman --- .../settings-daemon/files/addsoundkeys.patch | 49 ------------------- .../settings-daemon/settings-daemon_0.0.2.bb | 8 +-- 2 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-sato/settings-daemon/files/addsoundkeys.patch diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch deleted file mode 100644 index baf06d6b84..0000000000 --- a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch +++ /dev/null @@ -1,49 +0,0 @@ -Upstream-Status: Pending - -Index: settings-daemon/settings-daemon.c -=================================================================== ---- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 -+++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100 -@@ -187,6 +187,10 @@ - GCONF_VALUE_STRING, translate_string_string }, - { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme", - GCONF_VALUE_STRING, translate_string_string }, -+ { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName", -+ GCONF_VALUE_STRING, translate_string_string }, -+ { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" , -+ GCONF_VALUE_BOOL, translate_bool_int }, - }; - - static const TranslationEntry* -Index: settings-daemon/settings-daemon.schemas -=================================================================== ---- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100 -+++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100 -@@ -196,6 +196,27 @@ - - - -+ -+ /schemas/desktop/gnome/sound/theme_name -+ /desktop/gnome/sound/theme_name -+ gnome -+ string -+ freedesktop -+ -+ Sound Theme Name -+ -+ -+ -+ -+ /schemas/desktop/gnome/sound/event_sounds -+ /desktop/gnome/sound/event_sounds -+ gnome -+ bool -+ true -+ -+ Enable Sound Events -+ -+ - - - diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index 4bdbefcb75..d38cd4e2dd 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc DEPENDS = "gconf glib-2.0 gtk+3" SECTION = "x11" -# SRCREV tagged 0.0.2 -SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" +PV .= "+git" +# SRCREV tagged 0.0.2 + one patch +SRCREV = "df669c6579a6ac7e1ef56be66617f35ae7d33d68" SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=https \ - file://addsoundkeys.patch \ file://70settings-daemon.sh \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig gconf features_check -FILES:${PN} = "${bindir}/* ${sysconfdir}" +FILES:${PN} = "${bindir}/* ${sysconfdir}" # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" From patchwork Mon Jul 29 13:12:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46994 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 BE991C3DA61 for ; Mon, 29 Jul 2024 13:13:47 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.55963.1722258820491245149 for ; Mon, 29 Jul 2024 06:13:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=RksWBenK; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2cb7cd6f5f2so2489184a91.2 for ; Mon, 29 Jul 2024 06:13:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258820; x=1722863620; 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=68rMcpHNuLTAakc5Iwt2tRhMrKLvg0iFDpfulHgzST0=; b=RksWBenKMN3xRUasPD69guujz0ABLktSvlylm2SJ5a9xgESTpZvZdkrrHDFoBjwKen np2RfnHZMeh9x0FIdCbPdRi/oaWvxEwqaKzhaBO7aOAmj6U5TPQ1ea4Dl2txfuX4ifgW zYsZtquKSwU0JJjSH5+pOfbIWISdrcKZp2km8RiS3sVwSnOyUvp4ES1beQqUUOdSIcv8 fRF52IE5w6DnVdPUhaiOIrxoS6MC0XT9DeeL+dupNQ/PSCZ9tHU8kjrGvyyr15iXupuG k9LfrCRkSK28dVlTpk0I2/sGz6GLWg0pDWDK//ciQWzrPaLtGIYWKxDFvSJiFu9zoSgp qsHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258820; x=1722863620; 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=68rMcpHNuLTAakc5Iwt2tRhMrKLvg0iFDpfulHgzST0=; b=vy3xU89uN94YKJ7NgPNhYmM7i5qvy/Fec62pTydugq817TBWyHGgI0CjuQW8FuJ6Pp JtuUb+dhZqPinCqzM7fHJSojQBZ0M6QLKVUlFDHwS2rDQRiRlYg3eZwJiRIpNT+fBP4E 771WfIy3vkCh6gevizI4Ihbhav+AAgAS0qK6pOCpcpNKC8azgms+CFfad3pm6qWBvI75 5DDan4x/571uAmQloWNUdZbnr3Qg96JTeSrsw6YCblxUi2SVAG9qdKkqXQJNUh08Qh9g a9ktGXe43l5OLPDi4ZaZ9ZL5wWb4RC0wjnk7t2NyEWNQKMyc89xM6389WVqyuGN7rEZq +m+A== X-Gm-Message-State: AOJu0YxdDvb59fCZ+J0PyY4jz9NHnPkkXh6cPAYyO39cgfQTd9HX2PYX UJZcQ29JeYC3ziVxis3Uo76Uz0AKsM+K01ah+wMtvGRCYPSupAacNbGQSyX9Un8EgCCO4URTrIP puy2+hA== X-Google-Smtp-Source: AGHT+IEUWFIveWetwUZNoT8trs5OdV7c/B4uSuptUsW1sUGTZTmGDAybfzBgflJ2pZW1wlnXDcaUTw== X-Received: by 2002:a17:90a:b30f:b0:2c9:731b:8561 with SMTP id 98e67ed59e1d1-2cf7e1ac614mr8876842a91.8.1722258819713; Mon, 29 Jul 2024 06:13:39 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 31/37] dpkg: mark patches adding custom non-debian architectures as inappropriate for upstream Date: Mon, 29 Jul 2024 06:12:41 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202645 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit da9906553c69af0db8b14c39ee224348d539e7b1) Signed-off-by: Steve Sakoman --- .../dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch | 2 +- .../dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch | 2 +- .../dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch | 2 +- meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch | 2 +- meta/recipes-devtools/dpkg/dpkg/arch_pm.patch | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch index 52e85705fa..a137764409 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch @@ -3,7 +3,7 @@ From: Khem Raj Date: Wed, 29 Apr 2020 22:02:23 -0700 Subject: [PATCH] Add support for riscv32 CPU -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Signed-off-by: Khem Raj --- data/cputable | 1 + diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch index d66ab4476a..9677a8cd23 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch @@ -3,7 +3,7 @@ From: sweeaun Date: Sun, 10 Sep 2017 00:14:15 -0700 Subject: [PATCH] dpkg: Support muslx32 build -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Changes made on ostable and tupletable to enable muslx32 build. Signed-off-by: sweeaun diff --git a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch index 8797ea55c6..76708f5bef 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add musleabi to known target tripets helps compiling dpkg for musl/arm-softfloat -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Signed-off-by: Khem Raj Signed-off-by: Aníbal Limón --- diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch index d165616a19..417beafb63 100644 --- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch +++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch @@ -21,7 +21,7 @@ the required combination of "gnueabi-linux-armeb" was not found in the triplettable file thereby returning dpkg_arch as empty in configure script. -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Signed-off-by: Krishnanjanappa, Jagadeesh Signed-off-by: Aníbal Limón diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch index 4e0d22acbb..f8be0f940e 100644 --- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch +++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch @@ -3,7 +3,7 @@ architecture for mips64, and possibly other arch's because of faulty code added to Arch.pm in the latest release from upstream. We remove that code. -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Signed-off-by: Joe Slater From patchwork Mon Jul 29 13:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46992 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 CACD6C49EA1 for ; Mon, 29 Jul 2024 13:13:47 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.55964.1722258821804078894 for ; Mon, 29 Jul 2024 06:13:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=VBYKLLJg; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2cb63ceff6dso1985432a91.1 for ; Mon, 29 Jul 2024 06:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258821; x=1722863621; 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=+gBmYd+EGNgqOcdmyLSvljzSWztKBzsoobxcyNxwbf4=; b=VBYKLLJg6nD/yfj8aS2AW+U018yNlkm4j7x2blHEA41IYI0P+2t4lj0Vd896ezFllf Hm+BbfjKcLiQg0tzhz2HUUuWTR1zIGxZkUYUPbKxSjInHvQGCiyvuYmWxUzH1aByBfvH ljwWTHAV1cyV1KnxKr74SNcf3d6Cr5fwDPDRvqRMqEOPrTwoKgHB/1AtVPA22GRTViBs dwJz6NotXfqmv6XjSlhuk8oJIf/Fp8q3gmfBNgWen7zcJIeFy7uyCES2JnfLPkm9Yt82 zDajwtdnQ8GCAL8QRbyE7OLcatKo1cQL8uJGcS1QYRr8zM/9lu9tpCudeiHaUodjCnEz JsAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258821; x=1722863621; 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=+gBmYd+EGNgqOcdmyLSvljzSWztKBzsoobxcyNxwbf4=; b=qsGjAo+3ddJMA+GupAkH5lOY81oIab8zCgfnieBDrPsbdNs8X3TeseObr6uPgzQHeW 2ZVDZtKMdyJPtXfBV4KjIuu/MRuQ3EA52VKaEE3ysgZp3SKEBGDUpjU7AeyJgXSfaraa mmvkESjjCY/iQgfMCYZtKMm+c4gZ9buOFsQays6NBG+ipAI6YRq+JilUbwk0NuQZBBM/ C65havyyg+JWv7XL6ddxa7dYcFKj660g5BIUEo3P9Gx3vd5/+K57d+8C6JHrIcqZQT+0 HW7YyQEgDy4nqtBlICxSIi2/3pQQS/umAiZcIGG5hTFvK1DFQklF3avVByVM0Exop1ac k9qw== X-Gm-Message-State: AOJu0Yzpn2bM6JW1Wb6MNfxE2XUuu7ObtrVZoG+eK2eMC/ejCSlrf9QW BqqC0BoOf4javYlM5nP2rG70+yoDnj/CB5huKFMlIG53nEIslM1lElTVJf69sCqNGqyiDnmzI8S qS0SofQ== X-Google-Smtp-Source: AGHT+IFhCerS+fP14byinsoIgAABc7Zh4cPh5Q6Bh84JCyKus7dH2udiz51ondGLhBxtFempb7vCWA== X-Received: by 2002:a17:90a:c17:b0:2cf:c2da:771d with SMTP id 98e67ed59e1d1-2cfc2da7f13mr701891a91.25.1722258821061; Mon, 29 Jul 2024 06:13:41 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 32/37] libacpi: mark patches as inactive-upstream Date: Mon, 29 Jul 2024 06:12:42 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202646 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 722ac78f151fb6c433379ff50394b34ec06ca816) Signed-off-by: Steve Sakoman --- .../files/0001-libacpi-Fix-build-witth-fno-commom.patch | 2 +- meta/recipes-bsp/libacpi/files/ldflags.patch | 3 +-- meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch | 2 +- meta/recipes-bsp/libacpi/files/makefile-fix.patch | 2 +- .../libacpi/files/use_correct_strip_in_cross_environment.patch | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch b/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch index 32808fb92a..e8ff78082c 100644 --- a/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch +++ b/meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch @@ -3,7 +3,7 @@ From: Khem Raj Date: Wed, 5 Aug 2020 12:06:01 -0700 Subject: [PATCH] libacpi: Fix build witth -fno-commom -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] Signed-off-by: Khem Raj --- diff --git a/meta/recipes-bsp/libacpi/files/ldflags.patch b/meta/recipes-bsp/libacpi/files/ldflags.patch index a7424c39da..db0974104b 100644 --- a/meta/recipes-bsp/libacpi/files/ldflags.patch +++ b/meta/recipes-bsp/libacpi/files/ldflags.patch @@ -1,7 +1,6 @@ libacpi: Remove QA warning: No GNU_HASH in the elf binary -Upstream-Status: Inappropriate [other] - Useful within bitbake environment only. +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] Signed-off-by: Muhammad Shakeel diff --git a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch index 06f20e5a78..955a175c96 100644 --- a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch +++ b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch @@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] Fix libacpi for x32 diff --git a/meta/recipes-bsp/libacpi/files/makefile-fix.patch b/meta/recipes-bsp/libacpi/files/makefile-fix.patch index c34ef34e09..3b91bfaee1 100644 --- a/meta/recipes-bsp/libacpi/files/makefile-fix.patch +++ b/meta/recipes-bsp/libacpi/files/makefile-fix.patch @@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] --- Makefile | 6 +++--- diff --git a/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch b/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch index ef376aa316..901e5fa3b4 100644 --- a/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch +++ b/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch @@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] Used the cross strip instead of host strip to avoid this build error: From patchwork Mon Jul 29 13:12:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46993 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 D7713C52CDC for ; Mon, 29 Jul 2024 13:13:47 +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.55965.1722258823025839111 for ; Mon, 29 Jul 2024 06:13:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hn9NsDCw; 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-2cb4c584029so1976366a91.3 for ; Mon, 29 Jul 2024 06:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258822; x=1722863622; 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=2l52NfHHjYHuRR6c/ozMj9QriAdMovt/xDOlEnGyWpA=; b=hn9NsDCwZW5S2eu6y5RY6BDzEUq4CcI8G9kG2JHlz72bGnMZ4YfDONPTSzc+x9r2kJ eM0agr93tklIWJBSTsSWljNQNhxNvqS70RDlJ7K2d2rmhhN4NcmDlOXLQpz+LKLKifNX sLepN3HU0KvJwpscCj5xOZJ5GQqt/nOva1bNRSoI0MBHATnD/IPw8TILnAmvvP8tr3iV ZgvcP7lDfr/zNDL3EZsHGnGsoGzWzP0/eAbKFqgXR9TW2cfyUqMyw78B3G/rkawZu2LN eQbeKMcIAt2G9iWTAi3MqVA93zp+j4ZcHG1D6GBiAN2I4wZtJBNmtB12H+iGWYR7I7iu l1Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258822; x=1722863622; 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=2l52NfHHjYHuRR6c/ozMj9QriAdMovt/xDOlEnGyWpA=; b=KTogXXbwgQ7eQfIoPhBnEKELEC6AEXxOP39dXGTX0MY7yHXo9/uvWCDFTnolJx0jdL vmyiDug3UzPtMM97keFpqsijc5lDD30sf8ndV2+dAG2g1WXblqTXZN88R17hEMVYRjCk DA7SP0DQQIXDzNF9kE+PQG894c+aG1gruVjRFYEVqWTvaJuzo9p5qZLIgF5rHXpXrTBJ TOLM+T8Bk6vxet9SL27pwHEnp8Wil1IT+9ztSd6GBkpdFYy+i91assJkZsXpM9oAcR2g goF5eNRK9PBSPKQU3bk25Gn7ibsRANUcWndvnDMDJfTjPlKMf5JyoiYF3eSSbV/8MZ99 0amg== X-Gm-Message-State: AOJu0YzbeovjvuQ7p8DI0zQp6LYDTCp+WWWnSCpMf099BfBOP6jqWlvn 6O9sZdhfmTO+jjD84+3yLALiFZ2KwMJcw+g5Wx3HvfP0ANUJLW0CdOYbiT3VsFYijcNMb9vShXj C+l8PyQ== X-Google-Smtp-Source: AGHT+IEmjMHilcOc1nzf9AIH6LZ/ar/1etQ4Sd8T/w+nNHLNN45KGzvAp7s+lHRl5/o8WvAuxzq5zg== X-Received: by 2002:a17:90a:c281:b0:2cd:55be:785a with SMTP id 98e67ed59e1d1-2cf7e1a102cmr5670077a91.1.1722258822288; Mon, 29 Jul 2024 06:13:42 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 33/37] python3-attrs: drop python3-ctypes from RDEPENDS Date: Mon, 29 Jul 2024 06:12:43 -0700 Message-Id: <48c43d2ff467c067d1518dc55d8d6da39bea159a.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202647 From: Guðni Már Gilbert python3-ctypes was dropped as a dependency in v19.2.0 Signed-off-by: Guðni Már Gilbert Signed-off-by: Richard Purdie (cherry picked from commit 8d06116caf2382ad4782b9b2da50534d076a736d) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3-attrs_23.2.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-attrs_23.2.0.bb b/meta/recipes-devtools/python/python3-attrs_23.2.0.bb index a638097988..e39b64306c 100644 --- a/meta/recipes-devtools/python/python3-attrs_23.2.0.bb +++ b/meta/recipes-devtools/python/python3-attrs_23.2.0.bb @@ -20,7 +20,6 @@ DEPENDS += " \ RDEPENDS:${PN}+= " \ python3-compression \ - python3-ctypes \ python3-crypt \ " From patchwork Mon Jul 29 13:12:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46990 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 B18E4C3DA7E for ; Mon, 29 Jul 2024 13:13:47 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.55967.1722258824433546856 for ; Mon, 29 Jul 2024 06:13:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DUsGVWrl; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-70d2b921c48so2362796b3a.1 for ; Mon, 29 Jul 2024 06:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258824; x=1722863624; 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=pAXDgbUqsvLbvKjqtUSB4yl1qnk+flIBAVyqDqXbqms=; b=DUsGVWrlbB15HHRUdl3mWJ59al27j13wSVSmyhmzuTX3MRdg0tzeAQPCcA0v2MHh4+ FmRCE5+p9L+mNi/uzUVNLMrco3NweOJdwRgg597MyAqe+P+9ZVnjAKGP3pkm9h6s9Xxw qk4BV16adLWtYonrphcZ+9RQvg47A4MFryuNNSgkO/OLV2lgicxRvGhxlxG8ixzrU2D/ bAJbIE2PAniRlWQiv1mkCk7+FlvYQp9Empwl5J04W6l7Pfm+20GyvqM1LmUnPLLJP07C E36ESV946EO6J25TVdCLM61ZQuKAZkMebCaurLRbDrs+51RQ+X+Tjn84EJNp9pmUrdad 62wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258824; x=1722863624; 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=pAXDgbUqsvLbvKjqtUSB4yl1qnk+flIBAVyqDqXbqms=; b=BH9xW8dH0ZduuXlPEfWkZxLvvtDiGU/g/RMiqtvYtp/IorIG2tmEXypBmsllxAGHxq 0Czg3yMUaw1s1IaAXzEU/ztTBabwJTbVG2vbWOzi9i+VZkdkfMzm/bzmHsYyE7lTCxxt IrnsBOkKIRzdcVkTUpiqiD78QQAP6c5hkpPY3HVUxHaR0rl1Km1Xlflc847mZPcyrMFH hT9Moz+HTUmBBNsnTzHmnseXG97chKUUfyZMiE0aGDmF6FVJT2Kq4fgGu8WwtKxOHhAI Dhpx1EhCXt3g5lpQiHpUaapfxsDABdIs0LZ0SkLeVza+mMu7u8VpuBUX1ce3OK0WmSvS g1wA== X-Gm-Message-State: AOJu0Yw7nfFUfXME4QdgcwPjWJFb8OKrbXXTrv+OHn5xgqZyAnV7zFww pyTV4n4yUWZlFhEvkIEySLYM/wiXwl3QEQ9U19bO03P/WS7qoiJzVUjLVwNAXXqZGsSQl9Tx/F3 1bgjI9A== X-Google-Smtp-Source: AGHT+IFoBSNZNUU/ZCCrIv6HPjjDzp2wxegY3R8/xQ8hkkMjzMgnJzt23ShI0WXutX5aCGqaC2W0qQ== X-Received: by 2002:a05:6a21:3483:b0:1c3:b1e3:eb42 with SMTP id adf61e73a8af0-1c4a129d69amr5519692637.15.1722258823686; Mon, 29 Jul 2024 06:13:43 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 34/37] oeqa/runtime/scp: requires openssh-sftp-server Date: Mon, 29 Jul 2024 06:12:44 -0700 Message-Id: <7629a47d6cac36c78184788010f754175853bb03.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202648 From: Jose Quaresma The SCP protocol was deprecated in favor of the SFTP. For the legacy SCP protocol scp should be run with "-O". Instead of adding "-O" on the scp_options ssh oeqa we can require the openssh-sftp-server to be instaled on the target. This way the test will work more deterministic regardless of the host machine client used. For the old fashion clients still using legacy SCP protocol the openssh-sshd server will be used, for the new ones using the SFTP the openssh-sftp-server will be picked. Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 2f43da91ba20d18bc419bca7651bb383a51f20af) Signed-off-by: Jose Quaresma Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/scp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/scp.py b/meta/lib/oeqa/runtime/cases/scp.py index ee97b8ef66..364264369a 100644 --- a/meta/lib/oeqa/runtime/cases/scp.py +++ b/meta/lib/oeqa/runtime/cases/scp.py @@ -25,7 +25,7 @@ class ScpTest(OERuntimeTestCase): os.remove(cls.tmp_path) @OETestDepends(['ssh.SSHTest.test_ssh']) - @OEHasPackage(['openssh-scp']) + @OEHasPackage({'openssh-scp', 'openssh-sftp-server'}) def test_scp_file(self): dst = '/tmp/test_scp_file' From patchwork Mon Jul 29 13:12:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46995 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 C3657C52CDA for ; Mon, 29 Jul 2024 13:13:47 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.55970.1722258826448863153 for ; Mon, 29 Jul 2024 06:13:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wjHXKgmZ; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7669d62b5bfso1846136a12.1 for ; Mon, 29 Jul 2024 06:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258826; x=1722863626; 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=Xe+jmpvBiUOh74xlesQFjio+wB8Imwfvps58vyv655k=; b=wjHXKgmZq7YTeAlUKoXivimpvpIO+BZnR/ZDiZ6WqvmJ/uhEcffSMl5pV9PuN7RqOp RXbwHUs2TUpR80WArWNiCkxeUywQOzCLrWBFTZenm+xqUT1V0fGN6f6EKd/eSGnykbKV emKH59+u8WLnew9xx9r4kXENVXKrtmD2cEuJzOcSF65tx/BehYT0t3ycvqKFQYLeZpPN VCst0u/cd0DBdzF2GC8AyDUhxvxcmuAtRe0ixpfULbDpGMoGoaU+kfvTr5V+L0tNFIWi 2MGeCJz5g6iDmjV30hlp9IO5prS//s4/C4Wz1fThPnbTWuXuv3Qow8rm0vl470iB30NW g/EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258826; x=1722863626; 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=Xe+jmpvBiUOh74xlesQFjio+wB8Imwfvps58vyv655k=; b=jnDfmIPL5zxxx6AeW/E/J0Qe2wKp5EcUTAVu09zJxyZvyYjVqhfesZo3RF+eC778Cw DZjJ//KhPzA54bfwEGHWTraFr/ovfyiWEGRmoUFW/Cxpuvf3hujxZa9SuFj3wDQJYr2m m1tV7XF7H48TRe8KHZ9Hv0GneTdA+tZmFZDIayUHHR+gZ5eGHRJaUgKQRAHtT4ejZE6y ct2R1qhEWznhoJBTIvxqKcG68QWeDHEdyb2rJdoM8GFvLDjizZkIVFx9FwbUH/coZqEC JNEbDe4odTxTzS+FBtfM7SvG0nonAP6Uk0Kl6QMGtZwk6nn7hTeeOJXO8l7HXVqh1bHR Xi7g== X-Gm-Message-State: AOJu0Yw1XMVRcVEUF9/W9yFXEPutJGkYmDvY/ctI23CrbYJAkTad1Nk2 SfmNP9StipCc+KyFBg7CU2vVnlHB/f2L3qtGr7GjoxD53oyhO/b7n/b8bDQ3soSlZkzxxrbgcad kqZM3FQ== X-Google-Smtp-Source: AGHT+IGNmEZ5X0FHCde1Ms49oO7kEjB4i7cPT7DxCuBm0w8zgj+b/lFPtkho+hZnLna8czCxWqtkIA== X-Received: by 2002:a17:90a:9a6:b0:2ca:8a93:a40b with SMTP id 98e67ed59e1d1-2cf7e606ccemr5450712a91.31.1722258825524; Mon, 29 Jul 2024 06:13:45 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 35/37] openssh: drop rejected patch fixed in 8.6p1 release Date: Mon, 29 Jul 2024 06:12:45 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202649 From: Jose Quaresma The rationale [1] is that C11 6.5.6.9 says: """ When two pointers are subtracted, both shall point to elements of the same array object, or one past the last element of the array object; the result is the difference of the subscripts of the two array elements. """ In these cases the objects are arrays of char so the result is defined, and we believe that the compiler incorrectly trapping on defined behaviour. I also found https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63303 ("Pointer subtraction is broken when using -fsanitize=undefined") which seems to support this position. [1] https://bugzilla.mindrot.org/show_bug.cgi?id=2608 Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie (cherry picked from commit cf193ea67ca852e76b19a7997b62f043b1bca8a1) Signed-off-by: Jose Quaresma Signed-off-by: Steve Sakoman --- ...igned-overflow-in-pointer-arithmatic.patch | 111 ------------------ .../openssh/openssh_9.6p1.bb | 1 - 2 files changed, 112 deletions(-) delete mode 100644 meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch diff --git a/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch b/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch deleted file mode 100644 index 20036da931..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 3328e98bcbf2930cd7eea3e6c92ad5dcbdf4794f Mon Sep 17 00:00:00 2001 -From: Yuanjie Huang -Date: Wed, 24 Aug 2016 03:15:43 +0000 -Subject: [PATCH] Fix potential signed overflow in pointer arithmatic - -Pointer arithmatic results in implementation defined signed integer -type, so that 's - src' in strlcpy and others may trigger signed overflow. -In case of compilation by gcc or clang with -ftrapv option, the overflow -would lead to program abort. - -Upstream-Status: Submitted [http://bugzilla.mindrot.org/show_bug.cgi?id=2608] - -Signed-off-by: Yuanjie Huang - -Complete the fix -Signed-off-by: Hongxu Jia ---- - openbsd-compat/strlcat.c | 10 +++++++--- - openbsd-compat/strlcpy.c | 8 ++++++-- - openbsd-compat/strnlen.c | 8 ++++++-- - 3 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c -index bcc1b61..124e1e3 100644 ---- a/openbsd-compat/strlcat.c -+++ b/openbsd-compat/strlcat.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - /* - * Appends src to string dst of size siz (unlike strncat, siz is the -@@ -42,7 +43,7 @@ strlcat(char *dst, const char *src, size_t siz) - /* Find the end of dst and adjust bytes left but don't go past end */ - while (n-- != 0 && *d != '\0') - d++; -- dlen = d - dst; -+ dlen = (uintptr_t)d - (uintptr_t)dst; - n = siz - dlen; - - if (n == 0) -@@ -55,8 +56,11 @@ strlcat(char *dst, const char *src, size_t siz) - s++; - } - *d = '\0'; -- -- return(dlen + (s - src)); /* count does not include NUL */ -+ /* -+ * Cast pointers to unsigned type before calculation, to avoid signed -+ * overflow when the string ends where the MSB has changed. -+ */ -+ return (dlen + ((uintptr_t)s - (uintptr_t)src)); /* count does not include NUL */ - } - - #endif /* !HAVE_STRLCAT */ -diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c -index b4b1b60..b06f374 100644 ---- a/openbsd-compat/strlcpy.c -+++ b/openbsd-compat/strlcpy.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - /* - * Copy src to string dst of size siz. At most siz-1 characters -@@ -51,8 +52,11 @@ strlcpy(char *dst, const char *src, size_t siz) - while (*s++) - ; - } -- -- return(s - src - 1); /* count does not include NUL */ -+ /* -+ * Cast pointers to unsigned type before calculation, to avoid signed -+ * overflow when the string ends where the MSB has changed. -+ */ -+ return ((uintptr_t)s - (uintptr_t)src - 1); /* count does not include NUL */ - } - - #endif /* !HAVE_STRLCPY */ -diff --git a/openbsd-compat/strnlen.c b/openbsd-compat/strnlen.c -index 7ad3573..7040f1f 100644 ---- a/openbsd-compat/strnlen.c -+++ b/openbsd-compat/strnlen.c -@@ -23,6 +23,7 @@ - #include - - #include -+#include - - size_t - strnlen(const char *str, size_t maxlen) -@@ -31,7 +32,10 @@ strnlen(const char *str, size_t maxlen) - - for (cp = str; maxlen != 0 && *cp != '\0'; cp++, maxlen--) - ; -- -- return (size_t)(cp - str); -+ /* -+ * Cast pointers to unsigned type before calculation, to avoid signed -+ * overflow when the string ends where the MSB has changed. -+ */ -+ return (size_t)((uintptr_t)cp - (uintptr_t)str); - } - #endif --- -2.17.1 - diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb index 8bc4f4269a..c71245b6c0 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb @@ -22,7 +22,6 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://sshdgenkeys.service \ file://volatiles.99_sshd \ file://run-ptest \ - file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ file://sshd_check_keys \ file://add-test-support-for-busybox.patch \ file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \ From patchwork Mon Jul 29 13:12:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46997 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 D2CB7C3DA4A for ; Mon, 29 Jul 2024 13:13:57 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.55679.1722258827883048180 for ; Mon, 29 Jul 2024 06:13:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=0iGKUgy6; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2cb5e0b020eso2551297a91.2 for ; Mon, 29 Jul 2024 06:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258827; x=1722863627; 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=/+Er1OJEdyaJAwnLRWSkiKCDV439t5DJ7kXDIRJWeJE=; b=0iGKUgy6ao9GY42J2CyiyTN6zazvG0JG3xSNkONzVwnFlJk45tT4DojqMiSqdsRtd6 foc32cFraZy7XjlMydXma0akXjzXP9ZRN7Rb5OtulPWA21L79c5g7UDw2E2mLMOESc4R 1tQ++FidOuILH3P/Vp8ItZL2ykfSr9kPhAk5MD9wMaNV8htHLsBO3bnqlBDLxRml6qIi NxZTRnh16KxUfg64OJP9nuw/H9R6ymtimPSeJB8IXvf2pD3CEbTHHTLCbAQ0RV8WyKnk EO4lrEXSmW49btV8WRlzXha3Hdl13jD6w114DrzyBl3kkFh2yRjMGrXkRf4oLIqyYHBF TCtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258827; x=1722863627; 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=/+Er1OJEdyaJAwnLRWSkiKCDV439t5DJ7kXDIRJWeJE=; b=dMHAdvGA6hy8eUvwRSnsIO4jWDBNaX4flTP8WNiegVlvyJEFM46+k5dzJ4cjcxXWYF A1gs0leFIMKkRv9figbcjy0BMFeAQm0TETi0EH+Tn7BLxZIB4mgvl08tiF71rt7D2scM ILGyXfHs54s92w1q96WInb5OxiPeU2kXfUjTyjtkOrmv66zZZ9fFk0yPDa4WRlSTiaxy gM59jfUtZi04PI1DPXxaQBMVy8MT8xtzus+kOjmVRn/3akuTVaJgPwHKmoqy0w5Rl1Gt ObW1KJWaPqebi/dum5oFX/4W3X4fiJCCoSNrMQPYf/LmXsUOkNHWWT7uY91zAVOTv5NW saKg== X-Gm-Message-State: AOJu0YwLgtqCKzJCfdGsBOhS08uKF08e5b2CPtkMS0bsWPUBS3U8unUO 0Y7ape5yiRxWnjIrE+Eb3ipW2WDBRIgYd7nkzps5OQy4WMy+f/YX6RBI3T4X9mQ7qq6UiOtQ3Vl 8x8jH1g== X-Google-Smtp-Source: AGHT+IGEWNackji9SmU1xGCFXah2wjb5Vcrlm1fWG+k18Lxoi9OA/WkMxkIHj26nI2hy2QKOSOYFcw== X-Received: by 2002:a17:90a:f011:b0:2cd:3e23:fc85 with SMTP id 98e67ed59e1d1-2cf7e1d6ec2mr9673214a91.13.1722258826996; Mon, 29 Jul 2024 06:13:46 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 36/37] openssh: systemd sd-notify patch was rejected upstream Date: Mon, 29 Jul 2024 06:12:46 -0700 Message-Id: <29faae166366dd022598b95fb1595bd9473d2a17.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202650 From: Jose Quaresma Still side effects of the XZ backdoor. Racional [1]: License incompatibility and library bloatedness were the reasons. Given recent events we're never going to take a dependency on libsystemd, though we might implement the notification protocol ourselves if it isn't too much work. [1] https://github.com/openssh/openssh-portable/pull/375#issuecomment-2027749729 Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie (cherry picked from commit c3403bb6254d027356b25ce3f00786e2c4545207) Signed-off-by: Jose Quaresma Signed-off-by: Steve Sakoman --- ...001-systemd-Add-optional-support-for-systemd-sd_notify.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch index acda8f1ce9..f7a1d12e8d 100644 --- a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch +++ b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch @@ -6,7 +6,7 @@ Subject: [PATCH] systemd: Add optional support for systemd `sd_notify` This is a rebase of Dennis Lamm's patch based on Jakub Jelen's original patch -Upstream-Status: Submitted [https://github.com/openssh/openssh-portable/pull/375/commits/be187435911cde6cc3cef6982a508261074f1e56] +Upstream-Status: Denied [https://github.com/openssh/openssh-portable/pull/375/commits/be187435911cde6cc3cef6982a508261074f1e56] Signed-off-by: Xiangyu Chen --- From patchwork Mon Jul 29 13:12:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46998 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 E08D5C3DA7E for ; Mon, 29 Jul 2024 13:13:57 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web10.55681.1722258829378414974 for ; Mon, 29 Jul 2024 06:13:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=twgpjWzt; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-75cda3719efso1856737a12.3 for ; Mon, 29 Jul 2024 06:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1722258829; x=1722863629; 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=eY3RFV459WWjDrMxXb6jLdm6dulO16kogjfxU3I+mZA=; b=twgpjWztp08ImHQwx5dc9meK4twn76ElWhOU+43nFJ6mG6zX6Skq/gSDHP04ZxBTlp mlsjGrs9XG/ltPbGopNfHSPnsHopTjAyqOhe5cs8jxrT3CZ05hWd1wMjSk/PvZEggUT9 gQZdWo6c2mqm9mxWSEbNqDmpItpTciTXOPZuFSQ5FuiYveeXyiWt9oJzfr1O4EfEkjTq oqL6lxs4sdBumpFY4gCL4lIk82jihVxj3u/qYsJ43bVDDO6xFhd1WQ2failycWrxZ40E GDFc7mA9z9PbzZ5m2JQXBeAiFJLmx/wEd6CnxwrpLXan7TO58DtYDiPClOu2QGJ0/eDm ddPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722258829; x=1722863629; 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=eY3RFV459WWjDrMxXb6jLdm6dulO16kogjfxU3I+mZA=; b=sGIXonGV1/IxDhMkFu6IfI+FICPdkELvtm0MENPLmVbxegE7JfN8MyJWtCTd/B6IJi sjyZeIcXwA5LSKC5dwOlb3xCspB7ZDaUM7MpwZBbaFMen9cpcH8e2e0bv6OpFNd31Eon +czvbsWZDc8emyRi6+H/c/VcrFpsYecAPfsjdzOqRl54qfS6jLwJtF5cT4nys0ynztnx bAYlbZ1yXdFw4YaDd+Deq43fWiSBlhFDc3QCvl+wh9t9qL+mZepNMn802VaffVyjzmyN 2kG1TW7lr+OJsyEN3JC4FhMTmbNPHWmqrq9+Qa5G0x4Vxjq6J4dntW2V5hK28HbRB65U aqUg== X-Gm-Message-State: AOJu0YzmQEx2jABQFj8QYwXOozj/d8FcldFsQuUUNfWvH1BpMtf5uf2V V5G0682DMBvgpyML1eUuc0skFX+QEseKrLNmaRdkGN3k9Oryxnw3L+OWQRvy9LY792OISr1P2pa pra+X5Q== X-Google-Smtp-Source: AGHT+IG3J553UeNjPQ1Zee9nj6EwnAmmuikOij2Ttk5Z8mv9OQ+9Z6EKsxqF5wSSJmYnArlEM/0yqw== X-Received: by 2002:a17:90a:730b:b0:2c7:8a94:215d with SMTP id 98e67ed59e1d1-2cf7e1d7111mr5335670a91.12.1722258828416; Mon, 29 Jul 2024 06:13:48 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cdb73b32cbsm10493788a91.17.2024.07.29.06.13.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 06:13:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 37/37] openssh: systemd notification was implemented upstream Date: Mon, 29 Jul 2024 06:12:47 -0700 Message-Id: <1c9d3c22718bf49ae85c2d06e0ee60ebdc2fd0c1.1722258106.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 29 Jul 2024 13:13:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202651 From: Jose Quaresma Drop our sd-notify patch and switch to the upstream standalone implementation that does not depend on libsystemd. Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie (cherry picked from commit 07522f85a987b673b0a3c98690c3c17ab0c4b608) Signed-off-by: Jose Quaresma Signed-off-by: Steve Sakoman --- ...-notify-systemd-on-listen-and-reload.patch | 225 ++++++++++++++++++ ...tional-support-for-systemd-sd_notify.patch | 99 -------- .../openssh/openssh/sshd.service | 2 +- .../openssh/openssh_9.6p1.bb | 4 +- 4 files changed, 227 insertions(+), 103 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-notify-systemd-on-listen-and-reload.patch delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch diff --git a/meta/recipes-connectivity/openssh/openssh/0001-notify-systemd-on-listen-and-reload.patch b/meta/recipes-connectivity/openssh/openssh/0001-notify-systemd-on-listen-and-reload.patch new file mode 100644 index 0000000000..4925c969fe --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/0001-notify-systemd-on-listen-and-reload.patch @@ -0,0 +1,225 @@ +From fc73e2405a8ca928465580b74a4d76112919367b Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Wed, 3 Apr 2024 14:40:32 +1100 +Subject: [PATCH] notify systemd on listen and reload + +Standalone implementation that does not depend on libsystemd. +With assistance from Luca Boccassi, and feedback/testing from Colin +Watson. bz2641 + +Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/08f579231cd38a1c657aaa6ddeb8ab57a1fd4f5c] + +Signed-off-by: Jose Quaresma +--- + configure.ac | 1 + + openbsd-compat/port-linux.c | 97 ++++++++++++++++++++++++++++++++++++- + openbsd-compat/port-linux.h | 5 ++ + platform.c | 11 +++++ + platform.h | 1 + + sshd.c | 2 + + 6 files changed, 115 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 82e8bb7c1..854f92b5b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -915,6 +915,7 @@ int main(void) { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + AC_DEFINE([_PATH_BTMP], ["/var/log/btmp"], [log for bad login attempts]) + AC_DEFINE([USE_BTMP]) + AC_DEFINE([LINUX_OOM_ADJUST], [1], [Adjust Linux out-of-memory killer]) ++ AC_DEFINE([SYSTEMD_NOTIFY], [1], [Have sshd notify systemd on start/reload]) + inet6_default_4in6=yes + case `uname -r` in + 1.*|2.0.*) +diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c +index 0457e28d0..df7290246 100644 +--- a/openbsd-compat/port-linux.c ++++ b/openbsd-compat/port-linux.c +@@ -21,16 +21,23 @@ + + #include "includes.h" + +-#if defined(WITH_SELINUX) || defined(LINUX_OOM_ADJUST) ++#if defined(WITH_SELINUX) || defined(LINUX_OOM_ADJUST) || \ ++ defined(SYSTEMD_NOTIFY) ++#include ++#include ++ + #include ++#include + #include + #include + #include + #include ++#include + + #include "log.h" + #include "xmalloc.h" + #include "port-linux.h" ++#include "misc.h" + + #ifdef WITH_SELINUX + #include +@@ -310,4 +317,90 @@ oom_adjust_restore(void) + return; + } + #endif /* LINUX_OOM_ADJUST */ +-#endif /* WITH_SELINUX || LINUX_OOM_ADJUST */ ++ ++#ifdef SYSTEMD_NOTIFY ++ ++static void ssh_systemd_notify(const char *, ...) ++ __attribute__((__format__ (printf, 1, 2))) __attribute__((__nonnull__ (1))); ++ ++static void ++ssh_systemd_notify(const char *fmt, ...) ++{ ++ char *s = NULL; ++ const char *path; ++ struct stat sb; ++ struct sockaddr_un addr; ++ int fd = -1; ++ va_list ap; ++ ++ if ((path = getenv("NOTIFY_SOCKET")) == NULL || strlen(path) == 0) ++ return; ++ ++ va_start(ap, fmt); ++ xvasprintf(&s, fmt, ap); ++ va_end(ap); ++ ++ /* Only AF_UNIX is supported, with path or abstract sockets */ ++ if (path[0] != '/' && path[0] != '@') { ++ error_f("socket \"%s\" is not compatible with AF_UNIX", path); ++ goto out; ++ } ++ ++ if (path[0] == '/' && stat(path, &sb) != 0) { ++ error_f("socket \"%s\" stat: %s", path, strerror(errno)); ++ goto out; ++ } ++ ++ memset(&addr, 0, sizeof(addr)); ++ addr.sun_family = AF_UNIX; ++ if (strlcpy(addr.sun_path, path, ++ sizeof(addr.sun_path)) >= sizeof(addr.sun_path)) { ++ error_f("socket path \"%s\" too long", path); ++ goto out; ++ } ++ /* Support for abstract socket */ ++ if (addr.sun_path[0] == '@') ++ addr.sun_path[0] = 0; ++ if ((fd = socket(PF_UNIX, SOCK_DGRAM, 0)) == -1) { ++ error_f("socket \"%s\": %s", path, strerror(errno)); ++ goto out; ++ } ++ if (connect(fd, &addr, sizeof(addr)) != 0) { ++ error_f("socket \"%s\" connect: %s", path, strerror(errno)); ++ goto out; ++ } ++ if (write(fd, s, strlen(s)) != (ssize_t)strlen(s)) { ++ error_f("socket \"%s\" write: %s", path, strerror(errno)); ++ goto out; ++ } ++ debug_f("socket \"%s\" notified %s", path, s); ++ out: ++ if (fd != -1) ++ close(fd); ++ free(s); ++} ++ ++void ++ssh_systemd_notify_ready(void) ++{ ++ ssh_systemd_notify("READY=1"); ++} ++ ++void ++ssh_systemd_notify_reload(void) ++{ ++ struct timespec now; ++ ++ monotime_ts(&now); ++ if (now.tv_sec < 0 || now.tv_nsec < 0) { ++ error_f("monotime returned negative value"); ++ ssh_systemd_notify("RELOADING=1"); ++ } else { ++ ssh_systemd_notify("RELOADING=1\nMONOTONIC_USEC=%llu", ++ ((uint64_t)now.tv_sec * 1000000ULL) + ++ ((uint64_t)now.tv_nsec / 1000ULL)); ++ } ++} ++#endif /* SYSTEMD_NOTIFY */ ++ ++#endif /* WITH_SELINUX || LINUX_OOM_ADJUST || SYSTEMD_NOTIFY */ +diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h +index 3c22a854d..14064f87d 100644 +--- a/openbsd-compat/port-linux.h ++++ b/openbsd-compat/port-linux.h +@@ -30,4 +30,9 @@ void oom_adjust_restore(void); + void oom_adjust_setup(void); + #endif + ++#ifdef SYSTEMD_NOTIFY ++void ssh_systemd_notify_ready(void); ++void ssh_systemd_notify_reload(void); ++#endif ++ + #endif /* ! _PORT_LINUX_H */ +diff --git a/platform.c b/platform.c +index 4fe8744ee..9cf818153 100644 +--- a/platform.c ++++ b/platform.c +@@ -44,6 +44,14 @@ platform_pre_listen(void) + #endif + } + ++void ++platform_post_listen(void) ++{ ++#ifdef SYSTEMD_NOTIFY ++ ssh_systemd_notify_ready(); ++#endif ++} ++ + void + platform_pre_fork(void) + { +@@ -55,6 +63,9 @@ platform_pre_fork(void) + void + platform_pre_restart(void) + { ++#ifdef SYSTEMD_NOTIFY ++ ssh_systemd_notify_reload(); ++#endif + #ifdef LINUX_OOM_ADJUST + oom_adjust_restore(); + #endif +diff --git a/platform.h b/platform.h +index 7fef8c983..5dec23276 100644 +--- a/platform.h ++++ b/platform.h +@@ -21,6 +21,7 @@ + void platform_pre_listen(void); + void platform_pre_fork(void); + void platform_pre_restart(void); ++void platform_post_listen(void); + void platform_post_fork_parent(pid_t child_pid); + void platform_post_fork_child(void); + int platform_privileged_uidswap(void); +diff --git a/sshd.c b/sshd.c +index b4f2b9742..865331b46 100644 +--- a/sshd.c ++++ b/sshd.c +@@ -2077,6 +2077,8 @@ main(int ac, char **av) + ssh_signal(SIGTERM, sigterm_handler); + ssh_signal(SIGQUIT, sigterm_handler); + ++ platform_post_listen(); ++ + /* + * Write out the pid file after the sigterm handler + * is setup and the listen sockets are bound +-- +2.45.2 + diff --git a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch deleted file mode 100644 index f7a1d12e8d..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch +++ /dev/null @@ -1,99 +0,0 @@ -From be187435911cde6cc3cef6982a508261074f1e56 Mon Sep 17 00:00:00 2001 -From: Matt Jolly -Date: Thu, 2 Feb 2023 21:05:40 +1100 -Subject: [PATCH] systemd: Add optional support for systemd `sd_notify` - -This is a rebase of Dennis Lamm's -patch based on Jakub Jelen's original patch - -Upstream-Status: Denied [https://github.com/openssh/openssh-portable/pull/375/commits/be187435911cde6cc3cef6982a508261074f1e56] - -Signed-off-by: Xiangyu Chen ---- - configure.ac | 24 ++++++++++++++++++++++++ - sshd.c | 13 +++++++++++++ - 2 files changed, 37 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 22fee70f..486c189f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4835,6 +4835,29 @@ AC_SUBST([GSSLIBS]) - AC_SUBST([K5LIBS]) - AC_SUBST([CHANNELLIBS]) - -+# Check whether user wants systemd support -+SYSTEMD_MSG="no" -+AC_ARG_WITH(systemd, -+ [ --with-systemd Enable systemd support], -+ [ if test "x$withval" != "xno" ; then -+ AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no]) -+ if test "$PKGCONFIG" != "no"; then -+ AC_MSG_CHECKING([for libsystemd]) -+ if $PKGCONFIG --exists libsystemd; then -+ SYSTEMD_CFLAGS=`$PKGCONFIG --cflags libsystemd` -+ SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd` -+ CPPFLAGS="$CPPFLAGS $SYSTEMD_CFLAGS" -+ SSHDLIBS="$SSHDLIBS $SYSTEMD_LIBS" -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if you want systemd support.]) -+ SYSTEMD_MSG="yes" -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ fi -+ fi ] -+) -+ - # Looking for programs, paths and files - - PRIVSEP_PATH=/var/empty -@@ -5634,6 +5657,7 @@ echo " libldns support: $LDNS_MSG" - echo " Solaris process contract support: $SPC_MSG" - echo " Solaris project support: $SP_MSG" - echo " Solaris privilege support: $SPP_MSG" -+echo " systemd support: $SYSTEMD_MSG" - echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" - echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" - echo " BSD Auth support: $BSD_AUTH_MSG" -diff --git a/sshd.c b/sshd.c -index 6321936c..859d6a0b 100644 ---- a/sshd.c -+++ b/sshd.c -@@ -88,6 +88,10 @@ - #include - #endif - -+#ifdef HAVE_SYSTEMD -+#include -+#endif -+ - #include "xmalloc.h" - #include "ssh.h" - #include "ssh2.h" -@@ -310,6 +314,10 @@ static void - sighup_restart(void) - { - logit("Received SIGHUP; restarting."); -+#ifdef HAVE_SYSTEMD -+ /* Signal systemd that we are reloading */ -+ sd_notify(0, "RELOADING=1"); -+#endif - if (options.pid_file != NULL) - unlink(options.pid_file); - platform_pre_restart(); -@@ -2086,6 +2094,11 @@ main(int ac, char **av) - } - } - -+#ifdef HAVE_SYSTEMD -+ /* Signal systemd that we are ready to accept connections */ -+ sd_notify(0, "READY=1"); -+#endif -+ - /* Accept a connection and return in a forked child */ - server_accept_loop(&sock_in, &sock_out, - &newsock, config_s); --- -2.25.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service b/meta/recipes-connectivity/openssh/openssh/sshd.service index 2a997b656a..24062a6817 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshd.service +++ b/meta/recipes-connectivity/openssh/openssh/sshd.service @@ -4,11 +4,11 @@ Wants=sshdgenkeys.service After=sshdgenkeys.service [Service] +Type=notify-reload Environment="SSHD_OPTS=" EnvironmentFile=-/etc/default/ssh ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd ExecStart=-@SBINDIR@/sshd -D $SSHD_OPTS -ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID KillMode=process Restart=on-failure RestartSec=42s diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb index c71245b6c0..042acffe6a 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb @@ -25,7 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://sshd_check_keys \ file://add-test-support-for-busybox.patch \ file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \ - file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \ + file://0001-notify-systemd-on-listen-and-reload.patch \ file://CVE-2024-6387.patch \ file://CVE-2024-39894.patch \ " @@ -54,7 +54,6 @@ SYSTEMD_PACKAGES = "${PN}-sshd" SYSTEMD_SERVICE:${PN}-sshd = "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket', '', d)} ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service', '', d)}" inherit autotools-brokensep ptest pkgconfig -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" # systemd-sshd-socket-mode means installing sshd.socket # and systemd-sshd-service-mode corresponding to sshd.service @@ -77,7 +76,6 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ --sysconfdir=${sysconfdir}/ssh \ --with-xauth=${bindir}/xauth \ --disable-strip \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)} \ " # musl doesn't implement wtmp/utmp and logwtmp