From patchwork Thu Mar 16 21:44:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21092 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 5C76EC6FD1F for ; Thu, 16 Mar 2023 21:45:34 +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.5140.1679003129632650619 for ; Thu, 16 Mar 2023 14:45:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=G19sLx/9; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id x37so1802731pga.1 for ; Thu, 16 Mar 2023 14:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003130; 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=KNsORh95K+rMUksPFwOw/sYfom3gCWb4OsaFC2o9ea4=; b=G19sLx/9OcWC6GsA0f6Wwa+xZ/2H0nWaxo74ZH3TkivPoA5XKTFgAFT+czhyygxaWk niQLlS4/Z3/qmrHWFQMXd1JH2Bgfs10yTxbRq3/dQ7zpoGQM7C1+euy/ieYFKqXEaSsC dmUP+WqOwaEU0Wl/mpE66QOrT+9ywNvLIehzA/iarG6s5p77URRvIZ0x/Q/O4An3Fg8C SVJJeUuT+xU5IqBH/rbXRnJsdzZdJvw9iqGYtQvkZt1jkoQibf+ub2xcm3hIAft51LhG ffX3Z5cgTuKVsc2iMIUC0+BUKps+jRH8dbJpkG0fy9YgwLUXbOFKvL6T+1WmlQtrgxwE mApg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003130; 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=KNsORh95K+rMUksPFwOw/sYfom3gCWb4OsaFC2o9ea4=; b=e3Jq6xgY9vG8fA1glRwRzug36dj6ii3hnHyrwtrgdDBf9wUfPbbBBG1q3cllbWf0bw h9WMOd9AR+t1fszG+PTV1YRkTEqMyXkZyF5e/Iv5191eYTwNPXOuIn3tttGCxKVZkeBw odcTFTQ0a6I25pPsIvgwNAD/Q3lNKz+0iT6aKYIVw3v73SGetKoFv0eQdaXqLVgJTxA6 bvOGA6fQzT7g2ASyErNNmThEUd0qkLXVCq0/OwoP2BvVaEO8/JDcc2y60JZdgMH/tLgO IeRrjhDF1kjVHwL85jxw072wmzQSH39UXAYe7hPowcruq0e5Uq7Z7LInrUeRe86ce75D ijiQ== X-Gm-Message-State: AO0yUKWasESb9dAw1sf+tcFVLJAJUYA8aU1Osa4qWrI+ntaO0pGUiwFx 8lNIQgNkKWNN+D4ntHQPFlPmfYhmUPf3/tiuluM= X-Google-Smtp-Source: AK7set/OKFlOS9eckIroIoLlotCKxna80W6Urp0HeWb2dFcv+WdFMN9zKpN1dYrt2HyvxrHh8Y0tgw== X-Received: by 2002:aa7:9504:0:b0:626:17b8:8586 with SMTP id b4-20020aa79504000000b0062617b88586mr931541pfp.30.1679003130475; Thu, 16 Mar 2023 14:45:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 01/23] harfbuzz: Security fix for CVE-2023-25193 Date: Thu, 16 Mar 2023 11:44:58 -1000 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 ; Thu, 16 Mar 2023 21:45:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178712 From: Siddharth Upstream-Status: Backport from [https://github.com/harfbuzz/harfbuzz/commit/8708b9e081192786c027bb7f5f23d76dbe5c19e8] Signed-off-by: Siddharth Doshi Signed-off-by: Steve Sakoman --- .../harfbuzz/CVE-2023-25193-pre1.patch | 135 ++++++++++++ .../harfbuzz/harfbuzz/CVE-2023-25193.patch | 192 ++++++++++++++++++ .../harfbuzz/harfbuzz_5.1.0.bb | 2 + 3 files changed, 329 insertions(+) create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193-pre1.patch create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193.patch diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193-pre1.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193-pre1.patch new file mode 100644 index 0000000000..47d2d7c270 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193-pre1.patch @@ -0,0 +1,135 @@ +From b29fbd16fa82b82bdf0dcb2f13a63f7dc23cf324 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Mon, 6 Feb 2023 13:08:52 -0700 +Subject: [PATCH] [gsubgpos] Refactor skippy_iter.match() + +Upstream-Status: Backport from [https://github.com/harfbuzz/harfbuzz/commit/b29fbd16fa82b82bdf0dcb2f13a63f7dc23cf324] +Comment1: To backport the fix for CVE-2023-25193, add defination for MATCH, NOT_MATCH and SKIP. +Signed-off-by: Siddharth Doshi +--- + src/hb-ot-layout-gsubgpos.hh | 94 +++++++++++++++++++++--------------- + 1 file changed, 54 insertions(+), 40 deletions(-) + +diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh +index c77ec12..04b823e 100644 +--- a/src/hb-ot-layout-gsubgpos.hh ++++ b/src/hb-ot-layout-gsubgpos.hh +@@ -532,33 +532,52 @@ struct hb_ot_apply_context_t : + may_skip (const hb_glyph_info_t &info) const + { return matcher.may_skip (c, info); } + ++ enum match_t { ++ MATCH, ++ NOT_MATCH, ++ SKIP ++ }; ++ ++ match_t match (hb_glyph_info_t &info) ++ { ++ matcher_t::may_skip_t skip = matcher.may_skip (c, info); ++ if (unlikely (skip == matcher_t::SKIP_YES)) ++ return SKIP; ++ ++ matcher_t::may_match_t match = matcher.may_match (info, get_glyph_data ()); ++ if (match == matcher_t::MATCH_YES || ++ (match == matcher_t::MATCH_MAYBE && ++ skip == matcher_t::SKIP_NO)) ++ return MATCH; ++ ++ if (skip == matcher_t::SKIP_NO) ++ return NOT_MATCH; ++ ++ return SKIP; ++ } ++ + bool next (unsigned *unsafe_to = nullptr) + { + assert (num_items > 0); + while (idx + num_items < end) + { + idx++; +- hb_glyph_info_t &info = c->buffer->info[idx]; +- +- matcher_t::may_skip_t skip = matcher.may_skip (c, info); +- if (unlikely (skip == matcher_t::SKIP_YES)) +- continue; +- +- matcher_t::may_match_t match = matcher.may_match (info, get_glyph_data ()); +- if (match == matcher_t::MATCH_YES || +- (match == matcher_t::MATCH_MAYBE && +- skip == matcher_t::SKIP_NO)) +- { +- num_items--; +- advance_glyph_data (); +- return true; +- } +- +- if (skip == matcher_t::SKIP_NO) ++ switch (match (c->buffer->info[idx])) + { +- if (unsafe_to) +- *unsafe_to = idx + 1; +- return false; ++ case MATCH: ++ { ++ num_items--; ++ advance_glyph_data (); ++ return true; ++ } ++ case NOT_MATCH: ++ { ++ if (unsafe_to) ++ *unsafe_to = idx + 1; ++ return false; ++ } ++ case SKIP: ++ continue; + } + } + if (unsafe_to) +@@ -571,27 +590,22 @@ struct hb_ot_apply_context_t : + while (idx > num_items - 1) + { + idx--; +- hb_glyph_info_t &info = c->buffer->out_info[idx]; +- +- matcher_t::may_skip_t skip = matcher.may_skip (c, info); +- if (unlikely (skip == matcher_t::SKIP_YES)) +- continue; +- +- matcher_t::may_match_t match = matcher.may_match (info, get_glyph_data ()); +- if (match == matcher_t::MATCH_YES || +- (match == matcher_t::MATCH_MAYBE && +- skip == matcher_t::SKIP_NO)) +- { +- num_items--; +- advance_glyph_data (); +- return true; +- } +- +- if (skip == matcher_t::SKIP_NO) ++ switch (match (c->buffer->out_info[idx])) + { +- if (unsafe_from) +- *unsafe_from = hb_max (1u, idx) - 1u; +- return false; ++ case MATCH: ++ { ++ num_items--; ++ advance_glyph_data (); ++ return true; ++ } ++ case NOT_MATCH: ++ { ++ if (unsafe_from) ++ *unsafe_from = hb_max (1u, idx) - 1u; ++ return false; ++ } ++ case SKIP: ++ continue; + } + } + if (unsafe_from) +-- +2.25.1 + diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193.patch new file mode 100644 index 0000000000..f5c5cf439d --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193.patch @@ -0,0 +1,192 @@ +From 8708b9e081192786c027bb7f5f23d76dbe5c19e8 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Mon, 6 Feb 2023 14:51:25 -0700 +Subject: [PATCH] [GPOS] Avoid O(n^2) behavior in mark-attachment + +Upstream-Status: Backport from [https://github.com/harfbuzz/harfbuzz/commit/8708b9e081192786c027bb7f5f23d76dbe5c19e8] +Comment1: The Original Patch [https://github.com/harfbuzz/harfbuzz/commit/85be877925ddbf34f74a1229f3ca1716bb6170dc] causes regression and was reverted. This Patch completes the fix. +CVE: CVE-2023-25193 +Signed-off-by: Siddharth Doshi + +--- + src/OT/Layout/GPOS/MarkBasePosFormat1.hh | 76 +++++++++++++++--------- + src/OT/Layout/GPOS/MarkLigPosFormat1.hh | 24 ++++++-- + src/hb-ot-layout-gsubgpos.hh | 5 +- + 3 files changed, 69 insertions(+), 36 deletions(-) + +diff --git a/src/OT/Layout/GPOS/MarkBasePosFormat1.hh b/src/OT/Layout/GPOS/MarkBasePosFormat1.hh +index ebb8c31..73839a4 100644 +--- a/src/OT/Layout/GPOS/MarkBasePosFormat1.hh ++++ b/src/OT/Layout/GPOS/MarkBasePosFormat1.hh +@@ -90,6 +90,25 @@ struct MarkBasePosFormat1_2 + + const Coverage &get_coverage () const { return this+markCoverage; } + ++ static inline bool accept (hb_buffer_t *buffer, unsigned idx) ++ { ++ /* We only want to attach to the first of a MultipleSubst sequence. ++ * https://github.com/harfbuzz/harfbuzz/issues/740 ++ * Reject others... ++ * ...but stop if we find a mark in the MultipleSubst sequence: ++ * https://github.com/harfbuzz/harfbuzz/issues/1020 */ ++ return !_hb_glyph_info_multiplied (&buffer->info[idx]) || ++ 0 == _hb_glyph_info_get_lig_comp (&buffer->info[idx]) || ++ (idx == 0 || ++ _hb_glyph_info_is_mark (&buffer->info[idx - 1]) || ++ !_hb_glyph_info_multiplied (&buffer->info[idx - 1]) || ++ _hb_glyph_info_get_lig_id (&buffer->info[idx]) != ++ _hb_glyph_info_get_lig_id (&buffer->info[idx - 1]) || ++ _hb_glyph_info_get_lig_comp (&buffer->info[idx]) != ++ _hb_glyph_info_get_lig_comp (&buffer->info[idx - 1]) + 1 ++ ); ++ } ++ + bool apply (hb_ot_apply_context_t *c) const + { + TRACE_APPLY (this); +@@ -97,48 +116,47 @@ struct MarkBasePosFormat1_2 + unsigned int mark_index = (this+markCoverage).get_coverage (buffer->cur().codepoint); + if (likely (mark_index == NOT_COVERED)) return_trace (false); + +- /* Now we search backwards for a non-mark glyph */ ++ /* Now we search backwards for a non-mark glyph. ++ * We don't use skippy_iter.prev() to avoid O(n^2) behavior. */ ++ + hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input; +- skippy_iter.reset (buffer->idx, 1); + skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks); +- do { +- unsigned unsafe_from; +- if (!skippy_iter.prev (&unsafe_from)) ++ ++ unsigned j; ++ for (j = buffer->idx; j > c->last_base_until; j--) ++ { ++ auto match = skippy_iter.match (buffer->info[j - 1]); ++ if (match == skippy_iter.MATCH) + { +- buffer->unsafe_to_concat_from_outbuffer (unsafe_from, buffer->idx + 1); +- return_trace (false); ++ if (!accept (buffer, j - 1)) ++ match = skippy_iter.SKIP; + } ++ if (match == skippy_iter.MATCH) ++ { ++ c->last_base = (signed) j - 1; ++ break; ++ } ++ } ++ c->last_base_until = buffer->idx; ++ if (c->last_base == -1) ++ { ++ buffer->unsafe_to_concat_from_outbuffer (0, buffer->idx + 1); ++ return_trace (false); ++ } + +- /* We only want to attach to the first of a MultipleSubst sequence. +- * https://github.com/harfbuzz/harfbuzz/issues/740 +- * Reject others... +- * ...but stop if we find a mark in the MultipleSubst sequence: +- * https://github.com/harfbuzz/harfbuzz/issues/1020 */ +- if (!_hb_glyph_info_multiplied (&buffer->info[skippy_iter.idx]) || +- 0 == _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]) || +- (skippy_iter.idx == 0 || +- _hb_glyph_info_is_mark (&buffer->info[skippy_iter.idx - 1]) || +- !_hb_glyph_info_multiplied (&buffer->info[skippy_iter.idx - 1]) || +- _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx]) != +- _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx - 1]) || +- _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]) != +- _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx - 1]) + 1 +- )) +- break; +- skippy_iter.reject (); +- } while (true); ++ unsigned idx = (unsigned) c->last_base; + + /* Checking that matched glyph is actually a base glyph by GDEF is too strong; disabled */ +- //if (!_hb_glyph_info_is_base_glyph (&buffer->info[skippy_iter.idx])) { return_trace (false); } ++ //if (!_hb_glyph_info_is_base_glyph (&buffer->info[idx])) { return_trace (false); } + +- unsigned int base_index = (this+baseCoverage).get_coverage (buffer->info[skippy_iter.idx].codepoint); ++ unsigned int base_index = (this+baseCoverage).get_coverage (buffer->info[idx].codepoint); + if (base_index == NOT_COVERED) + { +- buffer->unsafe_to_concat_from_outbuffer (skippy_iter.idx, buffer->idx + 1); ++ buffer->unsafe_to_concat_from_outbuffer (idx, buffer->idx + 1); + return_trace (false); + } + +- return_trace ((this+markArray).apply (c, mark_index, base_index, this+baseArray, classCount, skippy_iter.idx)); ++ return_trace ((this+markArray).apply (c, mark_index, base_index, this+baseArray, classCount, idx)); + } + + bool subset (hb_subset_context_t *c) const +diff --git a/src/OT/Layout/GPOS/MarkLigPosFormat1.hh b/src/OT/Layout/GPOS/MarkLigPosFormat1.hh +index 1a80212..4471871 100644 +--- a/src/OT/Layout/GPOS/MarkLigPosFormat1.hh ++++ b/src/OT/Layout/GPOS/MarkLigPosFormat1.hh +@@ -100,20 +100,32 @@ struct MarkLigPosFormat1_2 + if (likely (mark_index == NOT_COVERED)) return_trace (false); + + /* Now we search backwards for a non-mark glyph */ ++ + hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input; +- skippy_iter.reset (buffer->idx, 1); + skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks); +- unsigned unsafe_from; +- if (!skippy_iter.prev (&unsafe_from)) ++ ++ unsigned j; ++ for (j = buffer->idx; j > c->last_base_until; j--) + { +- buffer->unsafe_to_concat_from_outbuffer (unsafe_from, buffer->idx + 1); ++ auto match = skippy_iter.match (buffer->info[j - 1]); ++ if (match == skippy_iter.MATCH) ++ { ++ c->last_base = (signed) j - 1; ++ break; ++ } ++ } ++ c->last_base_until = buffer->idx; ++ if (c->last_base == -1) ++ { ++ buffer->unsafe_to_concat_from_outbuffer (0, buffer->idx + 1); + return_trace (false); + } + ++ j = (unsigned) c->last_base; ++ + /* Checking that matched glyph is actually a ligature by GDEF is too strong; disabled */ +- //if (!_hb_glyph_info_is_ligature (&buffer->info[skippy_iter.idx])) { return_trace (false); } ++ //if (!_hb_glyph_info_is_ligature (&buffer->info[j])) { return_trace (false); } + +- unsigned int j = skippy_iter.idx; + unsigned int lig_index = (this+ligatureCoverage).get_coverage (buffer->info[j].codepoint); + if (lig_index == NOT_COVERED) + { +diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh +index 04b823e..dc3c4b6 100644 +--- a/src/hb-ot-layout-gsubgpos.hh ++++ b/src/hb-ot-layout-gsubgpos.hh +@@ -701,6 +701,9 @@ struct hb_ot_apply_context_t : + uint32_t random_state = 1; + unsigned new_syllables = (unsigned) -1; + ++ signed last_base = -1; // GPOS uses ++ unsigned last_base_until = 0; // GPOS uses ++ + hb_ot_apply_context_t (unsigned int table_index_, + hb_font_t *font_, + hb_buffer_t *buffer_) : +@@ -738,7 +741,7 @@ struct hb_ot_apply_context_t : + iter_context.init (this, true); + } + +- void set_lookup_mask (hb_mask_t mask) { lookup_mask = mask; init_iters (); } ++ void set_lookup_mask (hb_mask_t mask) { lookup_mask = mask; last_base = -1; last_base_until = 0; init_iters (); } + void set_auto_zwj (bool auto_zwj_) { auto_zwj = auto_zwj_; init_iters (); } + void set_auto_zwnj (bool auto_zwnj_) { auto_zwnj = auto_zwnj_; init_iters (); } + void set_per_syllable (bool per_syllable_) { per_syllable = per_syllable_; init_iters (); } +-- +2.25.1 + diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb index 8e06acc011..0d68a4bf84 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \ file://0001-fix-signedness-of-char-in-tests.patch \ + file://CVE-2023-25193-pre1.patch \ + file://CVE-2023-25193.patch \ " SRC_URI[sha256sum] = "2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05" From patchwork Thu Mar 16 21:44:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21090 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 5DF8AC7618E for ; Thu, 16 Mar 2023 21:45:34 +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.5077.1679003133366338282 for ; Thu, 16 Mar 2023 14:45:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rBBMsSHA; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so3031944pjb.0 for ; Thu, 16 Mar 2023 14:45:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003132; 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=zWBopBp04rPdgGbuEMR0lhVzAS3ybdJ9J9i4JUTeB/s=; b=rBBMsSHAUenrfioLFUQEW9GGKTjvigXJ3hktvWI/WuRElxMgiIrvMFx2gosJmY6ryq LFtRO/52xmijWb/WWK04LL+ghdfQ98MUgGzt6fKwBl5Pl1QPvASfPDOdw900vvRUGGE0 gugw1M13mgKFjR+4oOFGnHgJIkagrG+FaRsS1MhBnSzFU3LsUdx/a3MJqnVw4A7Nf1zQ OSndPqmJlQesIe+koCTeuZ2XqtCJPcx27f8PusaKCBDLe13R93L86rOBj/A1vq8odppR Kws+mm9FmgRX3QpSRtn9Edg3w6kJ0BeuqcgyuCCnD8ua1e5/L5ajX7iXuU0bH25uk9yk PioA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003132; 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=zWBopBp04rPdgGbuEMR0lhVzAS3ybdJ9J9i4JUTeB/s=; b=KBMRpYLd1t4KinVyXF8Er3EIV4uiOLWyAcJ4qzp0rj25QiuDFlBSCnw6WAZ5lXhq+c RvA0J/ucXuofztfil1iNTpB5VVmjOvbrR5BcgSVMFzp/i/D1qq4lFR9DSsdsiUKPWtef TKBPtSHFNUCLHQ+VfqmV5NwZrOxIKY3lGGF1SgPxJ2SfY0WssyzBdPVycjUIuyecQlWE IoLsjBeJdPUPGcaXB6wNVMlKNtGaiHEje+aPHNplGEnG5mvvrEv/Xk8bJLJiCCgc/WZ2 RRt6ed7y1Fjxp3IgpmRp/RHeRke0FNRmB+9gZuUfrG9L950/3RszFdC/hRn3EYHx7vb1 xHXQ== X-Gm-Message-State: AO0yUKVVNc1mcb8pMYQJCn7H+XxFj+bUocL422IEnCWhpgvIlw5p9NPm wrZJUwIQPZ2M27LQDG+/kYaP3+dpPQHBJLCzKMM= X-Google-Smtp-Source: AK7set/HSjkMTYJc4dV8frr0GttCz1iz5zMGgGkeZa6L8W+R6aLHyeu8g7lZQIJ9H6IjanNhjHbFFQ== X-Received: by 2002:a05:6a20:6d15:b0:d7:3553:e53f with SMTP id fv21-20020a056a206d1500b000d73553e53fmr2524081pzb.47.1679003132268; Thu, 16 Mar 2023 14:45:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/23] sudo: update 1.9.12p2 -> 1.9.13p2 Date: Thu, 16 Mar 2023 11:44:59 -1000 Message-Id: <3195339a5cba9f141eb6e2835537897535b5bef9.1679003014.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 ; Thu, 16 Mar 2023 21:45:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178713 From: Alexander Kanavin License-update: copyright years, formatting. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 1476813725cce6754334b4a6727675640a7a1e44) Signed-off-by: Steve Sakoman --- ...o.conf.in-fix-conflict-with-multilib.patch | 21 ++++++++++--------- meta/recipes-extended/sudo/sudo.inc | 2 +- .../{sudo_1.9.12p2.bb => sudo_1.9.13p2.bb} | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) rename meta/recipes-extended/sudo/{sudo_1.9.12p2.bb => sudo_1.9.13p2.bb} (96%) diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch index f4fc376bb8..041c717e00 100644 --- a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch +++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch @@ -1,4 +1,7 @@ -sudo.conf.in: fix conflict with multilib +From 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Tue, 17 Nov 2020 11:13:40 +0800 +Subject: [PATCH] sudo.conf.in: fix conflict with multilib When pass ${libdir} to --libexecdir of sudo, it fails to install sudo and lib32-sudo at same time: @@ -12,12 +15,13 @@ Update the comments in sudo.conf.in to avoid the conflict. Signed-off-by: Kai Kang Upstream-Status: Inappropriate [OE configuration specific] + --- examples/sudo.conf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in -index 6535d3a..50afc8f 100644 +index 2187457..0908d24 100644 --- a/examples/sudo.conf.in +++ b/examples/sudo.conf.in @@ -4,7 +4,7 @@ @@ -33,8 +37,8 @@ index 6535d3a..50afc8f 100644 # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_intercept.so file. # --#Path intercept @plugindir@/sudo_intercept.so -+#Path intercept $plugindir/sudo_intercept.so +-#Path intercept @intercept_file@ ++#Path intercept $intercept_file # # Sudo noexec: @@ -42,8 +46,8 @@ index 6535d3a..50afc8f 100644 # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_noexec.so file. # --#Path noexec @plugindir@/sudo_noexec.so -+#Path noexec $plugindir/sudo_noexec.so +-#Path noexec @noexec_file@ ++#Path noexec $noexec_file # # Sudo plugin directory: @@ -55,7 +59,4 @@ index 6535d3a..50afc8f 100644 +#Path plugin_dir $plugindir # - # Sudo developer mode: --- -2.17.1 - + # Core dumps: diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index fd5bbf103d..f22b3eab99 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c \ +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5100e20d35f9015f9eef6bdb27ba194f \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.9.12p2.bb b/meta/recipes-extended/sudo/sudo_1.9.13p2.bb similarity index 96% rename from meta/recipes-extended/sudo/sudo_1.9.12p2.bb rename to meta/recipes-extended/sudo/sudo_1.9.13p2.bb index ae7207c081..a028bcc216 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.12p2.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.13p2.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539" +SRC_URI[sha256sum] = "df2004fde4c1033b1fdca339958e0ec633d393d604fcff9d1513abef1f94574d" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" From patchwork Thu Mar 16 21:45:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21097 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 3F41DC7618E for ; Thu, 16 Mar 2023 21:45:44 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web10.5141.1679003134934892300 for ; Thu, 16 Mar 2023 14:45:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pWyj5Wii; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id c4so2028537pfl.0 for ; Thu, 16 Mar 2023 14:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003134; 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=D/HXj6kbvDdMUzeqJ9ySt+J5/Sr97GJZLlzAFaUoMec=; b=pWyj5Wiiga63ag4Fnn6rR33uwmYJ5lTTP5xPoSnrhysesqLobamXn5Z2X6dxP+kfyU Z3kDFmZrcRMxQNrUPIl/FspWUgcWX8FxFe+whyRhDqFarJmYvHwu+XyzxA2qAyCirQDA 63ZV+Hvzhgmqgo0tBq6pHU93mvHAyCzc8l4F4yzqv+QHHvLFTGSSyMQbRnSAID3giRY4 I+a7AClbswjXQDLJl2WMju7A+nq4LKVHB4ginTURGJZuPnySF8Wv/02WTiu4BeGigchP fBE3HPfIfBhpGzXw+eAsQUIpNsThqIZ/bCsPbHY6G1SNW0N+D/2thXW9/RgaHOfUPo8P vTtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003134; 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=D/HXj6kbvDdMUzeqJ9ySt+J5/Sr97GJZLlzAFaUoMec=; b=nQYEaH4AVZXWT4SznvySrKH04O2X2RKzxrMS1BcR1iO/WGhCPNv8z1QNJvdUF0MsBm 7oANqBdsLniDChxH0ncgr4WOdlkPbfnOCX3Zm8r0o+FpOiE3znY3gXNmI0KsCFYCSRaG /07/I1Vbc52pGjcr/u/gx1HhvL6mz9iXQ1BCGZfRGFUSdM8p8Y2lE49bqpxgVe6b0Ln0 l5ssfoFPIw15/n8AYfRGwoIR4DQLpOJHow5n9iS31cjYkFr8wCxurNqpmDgQlO0wrHy7 yAMR1TWRmS8Lqk09/NvmrMmRkF58YKkVGci5/zR+l1Y9rVgYYlssRBGmfXLALBsqOlkk XzZw== X-Gm-Message-State: AO0yUKW9auixe9YnKhZpUW2mjCpedAFHOdbFqJPIYaGHCZmPqCJ+GT44 DMlmH06/5Tm24T6iJx8aMd0UoLub5ZSxumlloQU= X-Google-Smtp-Source: AK7set+ahu7qx7IY5CgCrSfyUqabznYXuAQ7DDUbvzNtg61giGjAI1iBKCM4xh17Scsbv2IdwQi23g== X-Received: by 2002:aa7:958a:0:b0:626:8b9:977b with SMTP id z10-20020aa7958a000000b0062608b9977bmr1838182pfj.9.1679003134010; Thu, 16 Mar 2023 14:45:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 03/23] sudo: update 1.9.13p2 -> 1.9.13p3 Date: Thu, 16 Mar 2023 11:45:00 -1000 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 ; Thu, 16 Mar 2023 21:45:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178714 From: Xiangyu Chen Signed-off-by: Xiangyu Chen Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 7d5193a9437dedb3f2cf35cb466acfe29cfa654e) Signed-off-by: Steve Sakoman --- .../sudo/{sudo_1.9.13p2.bb => sudo_1.9.13p3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/sudo/{sudo_1.9.13p2.bb => sudo_1.9.13p3.bb} (96%) diff --git a/meta/recipes-extended/sudo/sudo_1.9.13p2.bb b/meta/recipes-extended/sudo/sudo_1.9.13p3.bb similarity index 96% rename from meta/recipes-extended/sudo/sudo_1.9.13p2.bb rename to meta/recipes-extended/sudo/sudo_1.9.13p3.bb index a028bcc216..2e11739470 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.13p2.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.13p3.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "df2004fde4c1033b1fdca339958e0ec633d393d604fcff9d1513abef1f94574d" +SRC_URI[sha256sum] = "92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" From patchwork Thu Mar 16 21:45:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21098 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 4E18AC761A6 for ; Thu, 16 Mar 2023 21:45:44 +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.5142.1679003136797787459 for ; Thu, 16 Mar 2023 14:45:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KuMgGRKu; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id qe8-20020a17090b4f8800b0023f07253a2cso2997098pjb.3 for ; Thu, 16 Mar 2023 14:45:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003136; 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=54fuYvq1pzHb65XjQbW754SHkCwa5Ijklib5q92SjoE=; b=KuMgGRKufHcUBdK/Gc97pb9TcqWmAxtik2jo1RQu0n4c/S+T5+0wNNIpdnUlaSm46Z TtKfo+pjPhS0FpdT9uXVxXRVwZ3eKBWjpcdUFYVFJny33vDAoht4jEj2+yOp5eCX9682 XQhvqSyVhA3m7J1ZkvzW2vGuQxWgea1kcmHnLBkSbEJdXJ0o9wg7UknPdm3IwI/DY3wU R8d1SX5tK0qjXOzkj6Jwn+EQX1Nc21eBWs9YX13F66eo2TZ4XtLrEtxOuvlmehqVPF+S gFoL081ksFgAZ9pK3ZPrHfx873rQKCdLC6WIrswAhZavFGxjDlkn4bgapGkMA7w12bPL 9JCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003136; 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=54fuYvq1pzHb65XjQbW754SHkCwa5Ijklib5q92SjoE=; b=qU+5RdcF3D/fkiGv0gv/dJvCehTRqCTq7yMtY7l7wsTRNumwja3dJ9dXuvpD2+LHmq nu4mOQVEBktKaY6LKKIq/SqE1dfQrCKwHa4N5xNWvBOxkVhyvgsMtSxGrx0V8r7kgQBW qItbcwScwtHBdBtUHr5bjaodf6sJGKDdEK5ph1J+U3CWBa+LFiGkCx7//lm1B74hm+UI 7fF0heRmN6FyydXHBmW52uupx0J5LMJAHBnrxi7L/jHI3WRkKkuvHdwePNuwbuhJ3hSh eZK+uZlsLZNCTBXHVxrPV8NgiTVl3AKWhJH0vm65ieg0Who6LLnS+QfUoOV6j+A7+LAc Zbcg== X-Gm-Message-State: AO0yUKX5LhmR8UG9VG0fvjpMGCTif5r/eoPplWn/wWV5tjGaNmZ3NcLx GFx+xnts3+Xi9x3wDTKkn/Q4SqF1cesl06R6bew= X-Google-Smtp-Source: AK7set+f79wLFYrMkutuvqxyftC0oBnf8UwkXN2bw7qbpieie49VbpODuUcJnPqWKwljTthtq3Pu9g== X-Received: by 2002:a05:6a20:2445:b0:d4:78f7:c4e8 with SMTP id t5-20020a056a20244500b000d478f7c4e8mr5857634pzc.25.1679003135874; Thu, 16 Mar 2023 14:45:35 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:35 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 04/23] libdnf: update 0.69.0 -> 0.70.0 Date: Thu, 16 Mar 2023 11:45:01 -1000 Message-Id: <7f4f1455ecc5cef1f4938efc3af27086d5b55d86.1679003014.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 ; Thu, 16 Mar 2023 21:45:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178715 From: Alexander Kanavin - Security fixes: - Allow change of architecture for packages during security updates with noarch involved (RhBug:2124483) - Bug fixes: - "dnf_keyring_add_public_keys": reset localError to NULL after free (RhBug:2121222) - context: Get RPM db path from RPM - Fix memory leak of SolvUserdata Drop the patch as issue addressed upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit b5a4c652448284253ab1444d05fdf6bfebfa4273) Signed-off-by: Steve Sakoman --- ...xt.cpp-do-not-try-to-access-BDB-data.patch | 37 ------------------- .../{libdnf_0.69.0.bb => libdnf_0.70.0.bb} | 3 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch rename meta/recipes-devtools/libdnf/{libdnf_0.69.0.bb => libdnf_0.70.0.bb} (93%) diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch b/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch deleted file mode 100644 index 6f8a3dcb50..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2f7382b35d59fe08034603497e82ffb943fedef1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 30 Jun 2021 15:31:16 +0200 -Subject: [PATCH] libdnf/dnf-context.cpp: do not try to access BDB database - -Upstream-Status: Inappropriate [upstream needs to rework this to support -sqlite] -Signed-off-by: Alexander Kanavin ---- - libdnf/dnf-context.cpp | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp -index 86f71a79..9cdcf769 100644 ---- a/libdnf/dnf-context.cpp -+++ b/libdnf/dnf-context.cpp -@@ -2264,20 +2264,6 @@ dnf_context_setup(DnfContext *context, - !dnf_context_set_os_release(context, error)) - return FALSE; - -- /* setup a file monitor on the rpmdb, if we're operating on the native / */ -- if (g_strcmp0(priv->install_root, "/") == 0) { -- rpmdb_path = g_build_filename(priv->install_root, "var/lib/rpm/Packages", NULL); -- file_rpmdb = g_file_new_for_path(rpmdb_path); -- priv->monitor_rpmdb = g_file_monitor_file(file_rpmdb, -- G_FILE_MONITOR_NONE, -- NULL, -- error); -- if (priv->monitor_rpmdb == NULL) -- return FALSE; -- g_signal_connect(priv->monitor_rpmdb, "changed", -- G_CALLBACK(dnf_context_rpmdb_changed_cb), context); -- } -- - /* copy any vendor distributed cached metadata */ - if (!dnf_context_copy_vendor_cache(context, error)) - return FALSE; diff --git a/meta/recipes-devtools/libdnf/libdnf_0.69.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.70.0.bb similarity index 93% rename from meta/recipes-devtools/libdnf/libdnf_0.69.0.bb rename to meta/recipes-devtools/libdnf/libdnf_0.70.0.bb index da2550d323..14d6a37de1 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.69.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.70.0.bb @@ -10,10 +10,9 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://enable_test_data_dir_set.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ - file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ " -SRCREV = "5c6d9cd6e5955e7038722f091396607c60fcbdd1" +SRCREV = "93759bc5cac262906e52b6a173d7b157914ec29e" UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git" From patchwork Thu Mar 16 21:45:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21096 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 4E110C76196 for ; Thu, 16 Mar 2023 21:45:44 +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.5078.1679003138533580294 for ; Thu, 16 Mar 2023 14:45:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=dWzkdvwA; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id om3-20020a17090b3a8300b0023efab0e3bfso6754659pjb.3 for ; Thu, 16 Mar 2023 14:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003137; 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=W3Wg/YKrlBaq9JLEEUjcPIiy8neJ5NdIC1YdtsGCyTg=; b=dWzkdvwA9FUI15QOcJvDcpoTp8IR0o+8lNCEmVEJSPvJ74pNi6C4j1+l9wjpKec4aG tvXKPnAtTXvh74tliSVWT4eYyfrANNADwgZ4x5YPdlVpv5WCQNnaNZiA5BVV1/JA/bYR n1mPQAcM8INjRXVI8Siwhm8hxdFw4mME6oxxI/YfBJbtsq2LJSh4Nf74vk4+dBdEt+9Q 8+t8/9K2czEH/tFKUpFiTkLkIIdKyMyydgyFsL0FToe3xRc8Xtq7mWcIRMjMYKOEYGP8 ynxd2kEi8v+gvZjL+eqzzK2YVWVR9Qynkagt6FFMLnn4I1RSfsX0N6hYim0PYKtbJZsX Y0vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003137; 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=W3Wg/YKrlBaq9JLEEUjcPIiy8neJ5NdIC1YdtsGCyTg=; b=WRBm8n5w0ghqKN5egSQfVy9HCmo0uTO/M/Dd/9PN7qRb/ZvqzpbBZNNlwyZfZJv70+ FaueLdUtphUwcfVirECNTNlJHv8nj3pQgZIjvxrm6fl7H3qfzy6oJIslsFhwpBusB3M8 0AYDwNMj6ecleXivtVV23O7x4aNqPBt8IyZyWaWWFyuqH2hNeh/K6lL2ecTmPqgwJ7F8 SCff4WhVbfnZm6c1DNafOXihVCrz6TRRyDoMlggVQd0Jj97Ja95PfVPmuBD0EvN2BmLG avVr9fOSu/WP3QTNHcmTvaE26rmpvoMi2uf8sRryscpl5J6dTM4ig6FfNTT8HJ4iR8w7 uMHQ== X-Gm-Message-State: AO0yUKWlyC1CD2i+0eCK9Z8Vd5ko4gLouACl5YZhFEfFMuCUSBdOxJmc kxUIMpA/VgWwLuiPYCKJwp5CLKOmNYfSpzbSaBw= X-Google-Smtp-Source: AK7set90y/pM5a8AhWVwijwL9gkjs8KOW356pEF971E/6XATVuK8MXKqUTux/QjizVosKmkhI8rJKg== X-Received: by 2002:a05:6a20:7b29:b0:cd:ed5c:4be with SMTP id s41-20020a056a207b2900b000cded5c04bemr4715274pzh.25.1679003137596; Thu, 16 Mar 2023 14:45:37 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 05/23] pango: upgrade 1.50.12 -> 1.50.13 Date: Thu, 16 Mar 2023 11:45:02 -1000 Message-Id: <81a0bb83605cc545d93be93b5a234f4d4882a633.1679003014.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 ; Thu, 16 Mar 2023 21:45:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178716 From: Alexander Kanavin Overview of changes in 1.50.13, 20-02-2023 ========================================== - win32: Add back fallback for empty fontsets - win32: Improve DirectWrite support - Fix word segmentation for Japanese - Don't set backspace-deletes-char for math symbols - coretext: Fix a crash - cairo: Apply metrics hinting to underlines too - Treat COLRv1 fonts as color fonts Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 9fcb353216a70b76584a47463d419464489c5a8c) Signed-off-by: Steve Sakoman --- .../pango/{pango_1.50.12.bb => pango_1.50.13.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/pango/{pango_1.50.12.bb => pango_1.50.13.bb} (94%) diff --git a/meta/recipes-graphics/pango/pango_1.50.12.bb b/meta/recipes-graphics/pango/pango_1.50.13.bb similarity index 94% rename from meta/recipes-graphics/pango/pango_1.50.12.bb rename to meta/recipes-graphics/pango/pango_1.50.13.bb index 6779f39c4f..e673366dc7 100644 --- a/meta/recipes-graphics/pango/pango_1.50.12.bb +++ b/meta/recipes-graphics/pango/pango_1.50.13.bb @@ -24,7 +24,7 @@ SRC_URI += "file://run-ptest \ file://0001-Skip-running-test-layout-test.patch \ " -SRC_URI[archive.sha256sum] = "caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3" +SRC_URI[archive.sha256sum] = "5cdcf6d761d26a3eb9412b6cb069b32bd1d9b07abf116321167d94c2189299fd" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" From patchwork Thu Mar 16 21:45:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21093 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 3D6D9C6FD1F for ; Thu, 16 Mar 2023 21:45:44 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.5143.1679003140263320550 for ; Thu, 16 Mar 2023 14:45:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mw2UL8lR; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id h8so3238926plf.10 for ; Thu, 16 Mar 2023 14:45:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003139; 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=C+8Pxdf9CnwGOxycVdbc98ZghM7KC6uU4KWiDMVJ64U=; b=mw2UL8lRmZL6HBz2SmrdHSLziEw7IxnIW6P+xzpnhzHF++8KHBjTr8ck1rgt/T2wWh c5HFjNs7pyt6BAvRPdvVERk5Gd0crg1Mvg1Zxzin2bT8b5B3IG0fEUcRZEICEFYfPN3X btXJloqMPaqqJh2quZxmegVUyEIceInj2M+lxWHuox7iV9i3Zkc0iFyFar6NcPmpJP1G hG4EwbxLalH5cl7tT+xt3p/625Yp0E54UICQbZ5hEY+ipx5zeqSArNCvcnbdto1a+nXH NPaIaV9ICI7BFsrdRW9x1X8g8W8wbOvniwJ3rG64GPqNzBj+YRSWcZ2ORhkPbgOmZgJe oW8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003139; 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=C+8Pxdf9CnwGOxycVdbc98ZghM7KC6uU4KWiDMVJ64U=; b=F5ikZ02NCxt6t6gK1vhtSaFjJtY2FFT63HIIDcBWN79oUiTfc36eTMylA9bjf5whY3 /QgTxo8e2WOkvxbqYv9+27nAVp50C0MtT2SLxL1B1zj+PMGD0vqays7IMkItXreJGC4B o18z2Ca6ijMYaUUJ+PDiOpgB3FjcHgrkuhQ/Oqj6OSFBVxCtJlwlYBQioZHPuLUwAeqv gWB7TUi76b0oPl62NW+WfKxBnHQps7Qf9dnL7bBCWkiftd0YtkH/Kmc0AV8T2zoPGVcn OsDxXrbo/E7Uow14LjNNI5ClTIFe9jfewem3iUfrb1wRm4rsWB0/keKfBRZqbiHKxFi5 1HYw== X-Gm-Message-State: AO0yUKWVMFQeulCAQWokVEiyTDBv07RIZS53O4rg3cAZfUrVSKQP2FGM nQBtODoY8M416E9ThW4B5LqxxHaqsqZaAHmcO1c= X-Google-Smtp-Source: AK7set9UHP+3iMrmKqdREvRt86YAtZ4FFUmBg7tsBA1gj9Wj1qAfqg3QLK32+8QIuiS1NuoIP7B2+w== X-Received: by 2002:a05:6a20:baa7:b0:c7:4bf5:fa0a with SMTP id fb39-20020a056a20baa700b000c74bf5fa0amr5167487pzb.48.1679003139237; Thu, 16 Mar 2023 14:45:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 06/23] vim: upgrade to 9.0.1403 Date: Thu, 16 Mar 2023 11:45:03 -1000 Message-Id: <6752b83f62129b3d60d5189cb6e67a0865d876d9.1679003014.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 ; Thu, 16 Mar 2023 21:45:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178717 From: Ross Burton This incorporates fixes for CVE-2023-1127, CVE-2023-1170, CVE-2023-1175. Also remove runtime/doc/uganda.txt from the license checksum: the Vim license is also in the top-level LICENSE file so this is redundant. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 71111e6b62d37c5e6853d7940dec2993df127a35) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index da586a5699..40ad44486d 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -10,8 +10,7 @@ DEPENDS = "ncurses gettext-native" RSUGGESTS:${PN} = "diffutils" LICENSE = "Vim" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ - file://runtime/doc/uganda.txt;md5=001ef779f422a0e9106d428c84495b4d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -20,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1293" -SRCREV = "0caaf1e46511f7a92e036f05e6aa9d5992540117" +PV .= ".1403" +SRCREV = "e764d1b4219e6615a04df1c3a6a5c0210a0a7dac" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Thu Mar 16 21:45:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21094 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 3D720C7618A for ; Thu, 16 Mar 2023 21:45:44 +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.web10.5144.1679003141642798362 for ; Thu, 16 Mar 2023 14:45:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=FkJDyWMr; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id d13so3088710pjh.0 for ; Thu, 16 Mar 2023 14:45:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003141; 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=yui+zA39xyg61Yo1h7pkEKWqZ19kVosKBsvHkZ+S+wI=; b=FkJDyWMrLOUc1I6luoaAUtWOgQRqTbzGluRyIMHpWp+Ecg6c3uUJBAiDO43UVAXMlv ZFuai2RxQPB0x+EN6cN9SVzAL/m6YiibPYFURlF0PJpaB+cy4HiXYibAisj1vkMHKcR1 er7+UjKLov3b7a4SIlMZ6UE1RenrMQ96bLY2qlkKMGCD+pmtxNKe5x5KwG51FMNh0dft 8/jNEzCjNGQTEWkayoI7QeC5HoUZq5+mSoTvraTs9pDkSx+mn7A1AQgbV513ghCxW4GY 08kAA8cheArEqcjw/JTD5nXvQgLJAlewWQhr4W3NAEBuP9/pyxWtRciA+kYk3nRHrtCG hLBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003141; 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=yui+zA39xyg61Yo1h7pkEKWqZ19kVosKBsvHkZ+S+wI=; b=sHygcg18b39WwjJBKdDkIy3EYGA0/4SZKYI2kW8ZXBoPYAhrsL6X0BaUte7tTNDQVA OheJI5CB6gDvj/N2croAzx3FT/WuEOpc1H2z8S8nuSD8ttvyQHBCkVWA0fBpPEt2NWkF 2B9uM04uFCNz1V4HrdWwfF3/Riekg0MxAW3PoJWMon5b29AmurEyTHAP1RK/Ob3FRRp5 YsnsBBQUOrtfgvXXXR9/UNmbxsU5TIEZvn5oEWzDuIZc04IpH4gjCzTimBhLpAtC+Aq4 PBLdpGE19jpdm+hg6IZJ7vowsumG+AKV02NKCPvCvN9CpcV9OKk2C8Mz+Gql0roDj6z9 +lIQ== X-Gm-Message-State: AO0yUKWGxzyGKV7N1LVu3Y7Q1EGZtb539uxqCVy19xC1g+4TVKC4hBqE SV8LzsYd/NP4zHoVjfaexlJG5wKhxS6353kIfJE= X-Google-Smtp-Source: AK7set8o0sgInKeDYWvOwO3K5UtzRHhzndJQouft4WJ8rCvKcTxRzg/v3a75J+K1KG6pTI0obiJIvw== X-Received: by 2002:a05:6a20:1445:b0:cd:c79:50e8 with SMTP id a5-20020a056a20144500b000cd0c7950e8mr6590549pzi.62.1679003140806; Thu, 16 Mar 2023 14:45:40 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 07/23] vim: set modified-by to the recipe MAINTAINER Date: Thu, 16 Mar 2023 11:45:04 -1000 Message-Id: <9f328a42a289dd7d77bd6f08605b0ccb813b2056.1679003014.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 ; Thu, 16 Mar 2023 21:45:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178718 From: Ross Burton Clause II.3 of the Vim license states that any distribution of Vim that has been extended or modified must _at least_ indicate in the :version output that this is the case. Handily, Vim has a --with-modified-by argument to add a line in that text, so use MAINTAINER. This is the distribution maintainer contact, by default it is OE-Core Developers . Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit acc007e23445aa53182e13902dd9509c39dd5645) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 40ad44486d..42a2ba46b8 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -81,6 +81,7 @@ EXTRA_OECONF = " \ --disable-netbeans \ --disable-desktop-database-update \ --with-tlib=ncurses \ + --with-modified-by='${MAINTAINER}' \ ac_cv_small_wchar_t=no \ ac_cv_path_GLIB_COMPILE_RESOURCES=no \ vim_cv_getcwd_broken=no \ From patchwork Thu Mar 16 21:45:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21095 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 4B949C74A5B for ; Thu, 16 Mar 2023 21:45:44 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.5145.1679003143375791807 for ; Thu, 16 Mar 2023 14:45:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0CVmkTZc; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id s8so1882748pfk.5 for ; Thu, 16 Mar 2023 14:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003142; 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=uGXQ6n5kv0NyXcWEHKt48BGjpVQJGz03LuL9KRCPtAs=; b=0CVmkTZc4Jt87NutKnWyHkixNVefqJP2pdDNVdqEpEjm7x+2r25/IjIovIA6ZFSF1e n/1UbaZzJqP6/FODJPaogPMLF6bjeAUB8QeWckb78RbazUqOGN6aM3qcsovqwH5EkXLV uCrnHZtO8eJqwNK9Eb8DZ0BwcKdaro1kRKUoCbCMHbZx5t4huAgXbk6oEYDbz7oX5mzu C4N7T0VoqWRSh3T5APYzDx8vm9tLB9t/+d/Tkk/k6Xk2IhdS3px40/ErfKfD/5L9hONb nbT/w0ExD29FmXkJghQ3vhQIzjHTfxhpmK9ZrwGoW3WNzWPNrzcSCBAkSSFuAHUC3xH+ 9+kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003142; 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=uGXQ6n5kv0NyXcWEHKt48BGjpVQJGz03LuL9KRCPtAs=; b=Q7OuxFN+jHY7E9iHTSwjuz2xD8niG8EflGb2JgnIQhx2nBn4yLLSIanrA/5yMCK05+ RnbevI19f7w1oViQmuCxaGDmoU4eWJea/hfLLDwyohXSf03pHusGFM786WhM2fp/s9vi Oj2VCHyPGRcR/X86UuBYR1/pWzcd/ZTaFAAQvANzDNZUAPeTAzMErJoQEWbuLT7zvG9z WVp3n/7Q8NfQuE+WphOXmW1EtWapIkmC1JvLQvSfTTjtdWAxuSXhzClVaHHlqIx9w1mM 7fIPPTSjMzaa62Oz7oHsjoUTEVGahfBAbbD8PxFPHCYxpTfW4OkpgXasWLIiVqpczQx3 Ycvg== X-Gm-Message-State: AO0yUKUYOYD7oz5Y9xrPel7mrrYfDFjFlGlLYRgY2rlqvS3kXJBk2yDH RvbLc5Fv42qD1UjhLdyP03dVnaK8qy764gDzKo0= X-Google-Smtp-Source: AK7set++SagkB8aPCLxtEZqHyRe/Unk+ffzcfvv7C1LXw6AiXjpoWyoeyE5ztHJ19xsENKUoWwT6mA== X-Received: by 2002:aa7:983d:0:b0:625:ca90:754d with SMTP id q29-20020aa7983d000000b00625ca90754dmr992582pfl.3.1679003142375; Thu, 16 Mar 2023 14:45:42 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 08/23] staging: Separate out different multiconfig manifests Date: Thu, 16 Mar 2023 11:45:05 -1000 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 ; Thu, 16 Mar 2023 21:45:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178719 From: Richard Purdie """ require conf/multilib.conf MACHINE = "qemuarm64" MULTILIBS = "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon" bitbake gcc-cross-canadian-arm """ and then inspecting the lib32* manifest files under recipe-sysroot-native shows them referencing lib32-recipe-sysroot instead of recipe-sysroot as used by gcc-cross-canadian recipes. To fix this separate out the manifest by multilib. It is caching mechanism to optimise disk usage so this doesn't break anything, just separated out some files. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5) Signed-off-by: Steve Sakoman --- meta/classes-global/staging.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index 5a1f43de78..e6d0d1d55c 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -275,6 +275,9 @@ python extend_recipe_sysroot() { pn = d.getVar("PN") stagingdir = d.getVar("STAGING_DIR") sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" + mlprefix = d.getVar("MLPREFIX") + if mlprefix: + sharedmanifests = sharedmanifests + "/" + mlprefix recipesysroot = d.getVar("RECIPE_SYSROOT") recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") From patchwork Thu Mar 16 21:45:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21100 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 39DBBC7618A for ; Thu, 16 Mar 2023 21:45:54 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web10.5146.1679003145201429786 for ; Thu, 16 Mar 2023 14:45:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=NA3qJn5I; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id u3-20020a17090a450300b00239db6d7d47so2994790pjg.4 for ; Thu, 16 Mar 2023 14:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003144; 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=L/Y0Z9tjN6eQ3apOSR4mi3J/WsC6mec3atY6UH738II=; b=NA3qJn5IsFO15TZqgRYtRjIF179kXdpaV/EqWAEgaqEiSSXJohhEYtgJUh+4Vm4X/1 puMUgTe4z1/sR2Y3+jBFd1CMY63ZXjdIc5ZtWsOEF7DkPy244FzpWnVI8xbV9DK+R1EF 1aEgsK1YSStDaCjQl3/fldR729oL4qKZvcEQDKLhUpr/xA6L2L8caxO17cLMVozXm4SO A1f1SGqTcWuGoE66z2iB84zhYxOT7kGTZ3VGDOAfffpkKHyimCgeahy3DoDrvAbkq6RJ A4/3DKBPYHMEjRicLTOKhD/KRsX3SsI7ozRv7Uvl4Y4XiQLWlKQKidf/Oc5C/XHMa7Ak jL9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003144; 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=L/Y0Z9tjN6eQ3apOSR4mi3J/WsC6mec3atY6UH738II=; b=J+JW3CyMGdBkWlBtRBn2scAIx27rtrlz1SQawZ44+j/zROgQ7LRNuywUuVu1h9Qy+7 fTGETtEqPbKP9v3njxNVf8oRXxAUtEP/dQiSYuRib8FoVVIy7092F4La4DbG6IEGCy+f d7YzGu9ZbkItBFVFttALWYV5pi5pdnTUK3vif7HMWk1/S6nx6s2huAeC3czlZSCqX3z+ h+0Xr8XSJZYfmaNBmYgVS2pLLoaUAB5nGOy/+UVv0rtcaEgeUFEaplrAd0m8rfYqABo+ T+ajhDYiXUIKCyY24OAs8T2atohdB4UdWWfYijb+98RxKb7Em9TvQTQlYBVYcwmNptkj tnKg== X-Gm-Message-State: AO0yUKWYiTx6q3OkkYFEOhkcfJKLE5/TBSSrBXGIi4+t/pFVIT1dLMuR cOYnMPg9e+SnBV/2NBI4q1OLwWm6YwSZz4PWE68= X-Google-Smtp-Source: AK7set97QK31DUgLg7GWYnKEaAUWytwUl86g1GhWibHQGwbIwqmY1L2t/UYw5WBFLRIz+BTof5HeYw== X-Received: by 2002:a05:6a20:72a0:b0:cc:f047:afb4 with SMTP id o32-20020a056a2072a000b000ccf047afb4mr6219395pzk.37.1679003144134; Thu, 16 Mar 2023 14:45:44 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 09/23] staging/multilib: Fix manifest corruption Date: Thu, 16 Mar 2023 11:45:06 -1000 Message-Id: <2b2da04c5e88529c74b44569919fdcc136c48cca.1679003014.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 ; Thu, 16 Mar 2023 21:45:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178720 From: Richard Purdie The previous fix wasn't enough to address all the possible ways the manifests might be ordered. Rework the previous fix so it is tied to the multilib cross-canadian code which is causing the problem. RECIPE_SYSROOT_MANIFEST_SUBDIR is not documented as I'd hope nobody ever needs to use this outside the core multilib code. Signed-off-by: Richard Purdie (cherry picked from commit beab42e00713880cd95a04729c892f8662fbcbed) Signed-off-by: Steve Sakoman --- meta/classes-global/staging.bbclass | 7 ++++--- meta/classes/multilib.bbclass | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index e6d0d1d55c..a058d344fd 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -275,9 +275,10 @@ python extend_recipe_sysroot() { pn = d.getVar("PN") stagingdir = d.getVar("STAGING_DIR") sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" - mlprefix = d.getVar("MLPREFIX") - if mlprefix: - sharedmanifests = sharedmanifests + "/" + mlprefix + # only needed by multilib cross-canadian since it redefines RECIPE_SYSROOT + manifestprefix = d.getVar("RECIPE_SYSROOT_MANIFEST_SUBDIR") + if manifestprefix: + sharedmanifests = sharedmanifests + "/" + manifestprefix recipesysroot = d.getVar("RECIPE_SYSROOT") recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 10a4ef9c37..8a1a51aaba 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -51,6 +51,7 @@ python multilib_virtclass_handler () { 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 + "-") override = ":virtclass-multilib-" + variant e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) From patchwork Thu Mar 16 21:45:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21101 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 47B8CC7618E for ; Thu, 16 Mar 2023 21:45:54 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.5081.1679003146620913086 for ; Thu, 16 Mar 2023 14:45:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=E+M7Bbdw; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id a2so3270289plm.4 for ; Thu, 16 Mar 2023 14:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003146; 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=v4daizuM18z2yeix3M+QKNJjgogZqnSQtT+iP8Bo5Ro=; b=E+M7BbdwOByi6ZQ/Rd4ZCKtaVr7oaUGsJ6Xta3sv9yk+DDVUHz2IsC2bx2gdGLs2kk v4/mbn/1y7gPjtKFSLv0+f/4iNvLolHnVkLVBqxRCjeGdWz+fpUl5ESpm8qMLRZZ1u18 soHjC5e7jzpMFbS82F1YDhwqcTgyIfQaLQDz1eMzygxDvKtAxlQ89aO5DYofDfWg1QLw YItExnyp678L60llgHVvlr49em3j8S75wIJ2yqBzju3Jrh0ew7FRzT3y7oBbr4TC4izw DTZ8poDKBY5x9h6Q6Ve+R2VZcYxhpQwHZNlJBP3QjgQ/wqHwwmBNZjUhjLDopnYg118+ yZ3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003146; 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=v4daizuM18z2yeix3M+QKNJjgogZqnSQtT+iP8Bo5Ro=; b=MW9yYUnbSYoOh2/kuLXv6V+5jz3yRmw+YqHyXsk05gHD2SXxDWIyIL7i5GfsHZ/ESb YVgvSbgTCSOqKX5c5hx09hHtL8WS5D8dXkbwNddbec+AmpJCspoqbQg9SqY/VZQTvNR/ c3QLH8vuj7UVAIS+UPKYuow/wqIwt10svynNx16vd27Ygcv04XZx7eXMLSZdUbvWyKvb OGj7NLYps/EKArJnwOyPbTQ3O9NbWNJDS18paen6UhYsMyXlB0s27M1KzvzL9js1WhNJ B4BgXMEHlzUVeiGeoyMTid5zOoif9uMQeucuoXDlo5RJvbHzL7NeeIpJ17yX40SE3JG7 H1/A== X-Gm-Message-State: AO0yUKXzG5hIDeG6Z9YJsjUF5wK+tz7eA1ffijtD5GESnnGSf8agGMs1 BdXHy6UjLuPKwwPQZFUr6mWPY7JNC5qv2PDrqpc= X-Google-Smtp-Source: AK7set9jrgtQ6n5yJwfrcFq0pm7KvTNOlJJ8+qbYemAxqjIdxV8oEAhfgysoy0pZbsj4XYMtgqJ/tg== X-Received: by 2002:a05:6a20:1d58:b0:d3:aba7:807c with SMTP id cs24-20020a056a201d5800b000d3aba7807cmr3904335pzb.34.1679003145733; Thu, 16 Mar 2023 14:45:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 10/23] glibc: Add missing binutils dependency Date: Thu, 16 Mar 2023 11:45:07 -1000 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 ; Thu, 16 Mar 2023 21:45:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178721 From: Richard Purdie glibc has it's dependencies handled more manually due to it's place in the toolchain bootstrap. It depends upon the compiler and indirectly through that to binutils. This did mean that if binutils changes and the compiler does not, sstate and hash equivalence could mean that glibc wouldn't rebuild. Add a direct dependency on binutils that if it changes, it forces glibc to rebuild, as it should. Signed-off-by: Richard Purdie (cherry picked from commit c4a7b3decff636292f5e76e95406a22b6fe4a994) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index fdd241d973..3b940b8ab2 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -1,7 +1,9 @@ require glibc-common.inc require glibc-ld.inc -DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" +DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}binutils${BUSUFFIX} libgcc-initial linux-libc-headers" +BUSUFFIX= "" +BUSUFFIX:class-nativesdk = "-crosssdk" PROVIDES = "virtual/libc" PROVIDES += "virtual/libintl virtual/libiconv" From patchwork Thu Mar 16 21:45:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21102 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 47DB3C7619A for ; Thu, 16 Mar 2023 21:45:54 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.5149.1679003149403066362 for ; Thu, 16 Mar 2023 14:45:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5GJn1/OL; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id z11so1994916pfh.4 for ; Thu, 16 Mar 2023 14:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003148; 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=KCGptfzWTJp1bIoIhccF+kuQlxL1sHu+FiZbObUUISE=; b=5GJn1/OLNqV8cWiJeQa75hUGcS0xhvUgfa9D3E/qq0EPT0P6kyS5/lxpd4ezOrSxlq VZwN/AnJg8L+9T/VNfx9MtrgXvkthc729vG870W+hdaDXxeQWrlaiVrt2kFrfGZGj0F/ U16q8ZV52K15eRooJUXRmWJUrR/82Tk23K3V+m0bz+2OBI52sWQgWe7xV0c5U1Lrye28 +aAVriQ65/+rHsKf1stKTduNeEk0Jt40pEU8/EVu0WLaONykMOGIBQxlS8a0rF4eVAjz mXQKvY5+YaACu/ZwZkOhN8xiQSgs+1ZgMBGT9jqdwbKDB9OcVSt8ppEOCB+B2wkikaW6 fFeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003148; 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=KCGptfzWTJp1bIoIhccF+kuQlxL1sHu+FiZbObUUISE=; b=ES2xPbPmy8Ba1QUSaLr6XwfiW5uayx6mPUSuwVshOK2xC0smQYwBOI2lI2dCtWxTvW MuNUNxjLUpgI0XaNVzPb4cxlNRnluDmfisbt9L3xGYBlyCpyrTQ7AQlP8tBKpTsi7QxL B973AAl8DuVcxaAnzXbrr0N7uYHOaigvulRTIZow4FvuOMyL17TgWlI9WdP1pMegnHmI 9caVTEj++qDuw06ASa1e4qgzWhlrTmrBhCCVgUjzKP2iy2REb++Iqbvic0nV+Ou5zWFq 0JCcXrr+lnTQcnZob6EL3V9TYFIy68HyGs2oXLcEymouQiN7JAS87vRrGlmbyTM9nOtX DnFQ== X-Gm-Message-State: AO0yUKVU9H/9zi7CDGu+CJFRo7jOSxNs3Uq6gCwiQ2tsOzuoyTfk0lQI PgnQUmYuVl4rWobXO6MB10llzNY8cQ3FZkDT2W4= X-Google-Smtp-Source: AK7set+qqJH1wx9Sgid+fd0DYKC2LjF3G880exWLOP5/kJHoHVzYbp09NwdQAmo4Sieefp2Bd02ANQ== X-Received: by 2002:a62:640c:0:b0:625:c55f:a9b1 with SMTP id y12-20020a62640c000000b00625c55fa9b1mr4276171pfb.21.1679003148539; Thu, 16 Mar 2023 14:45:48 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 11/23] selftest/runtime_test/virgl: Disable for all Rocky Linux Date: Thu, 16 Mar 2023 11:45:08 -1000 Message-Id: <21220564ab2c6966959d6e97a37f7fe22d48c65b.1679003014.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 ; Thu, 16 Mar 2023 21:45:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178722 From: Michael Halstead RHEL compatible kernels do not support vgem so we disable virgl headless testing. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie (cherry picked from commit 78bc1ba2361249ec845d1b9e28d429a37dd83910) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/runtime_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 44f787ef12..533b5d7453 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -254,7 +254,8 @@ class TestImage(OESelftestTestCase): import subprocess, os distro = oe.lsb.distro_identifier() - if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or distro.startswith('almalinux')): + if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or + distro.startswith('almalinux') or distro.startswith('rocky')): self.skipTest('virgl headless cannot be tested with %s' %(distro)) render_hint = """If /dev/dri/renderD* is absent due to lack of suitable GPU, 'modprobe vgem' will create one suitable for mesa llvmpipe software renderer.""" From patchwork Thu Mar 16 21:45:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21103 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 39CF7C6FD1F for ; Thu, 16 Mar 2023 21:45:54 +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.web10.5150.1679003151092139877 for ; Thu, 16 Mar 2023 14:45:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Hox3UhnP; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id o6-20020a17090a9f8600b0023f32869993so2965203pjp.1 for ; Thu, 16 Mar 2023 14:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003150; 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=di20d5b/1UKyxPL2Lwx+sVaahFSG0fO52IoLHP+W2ow=; b=Hox3UhnPABq4DJ094uRk2sGkUO1Jc7exQOoJSsTUhR7KfoxqtHw12si+zrsHFiDJ+s GQt8W8tUlNYOr5hffx5TuNWMXSBH4pd1gmVk/N2CL5Fsb9vURfcivZVI1ettQ9gguqqV rXmH0DsQHCfVRZaRpGzRThLW3QCt8pimfLJUxa8Aa1xEPy/5jKHhTq9qlS4ZKBM7FNF+ /GOixRU+oTtOC2wgaUY0uUVMrtKp8hYyZjQHmhEuB+MlpTBxdh5anXIJWmFTYOqcvSN4 yJdpqg5nQp77maOMvFkHnAnE99CdwRsbKnCDW5YfyVdiN1WoxzSmGTyEy3FgqT/hKn4Z crdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003150; 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=di20d5b/1UKyxPL2Lwx+sVaahFSG0fO52IoLHP+W2ow=; b=GycHvcopMbcBIvq5MLCXdiI99AxA6E+0gBJh2AnxGW/hylV9Es3GyZ3Ia1/GyOCnrT NqinONjaBmbD9oJAjja7ODUuEqqZJySTgb/I1MH6i8dGACki9YBf+ZVo9THEde4OG2Kx kvQkgJZHzelBpw+7sSFfymkiTD9/jVWiMoVa1pKgLT1B5A0Kk+kS8FQoVhSEi8VJBx5k GM/OraQW125LiduAFte39mCwx4bjOCX9CAMKvVZ2qLnNOkOgBQyjGFO9FCYSHqEr2Ezf Z+25ns271CQTN3eptDlrZ+WYTbquqLcWO1fyS8xS+q6UyhmwzthBWpbRUNaY5XOSTNM4 DjVQ== X-Gm-Message-State: AO0yUKVLzVF6OF9jKgIYlUak36BS6XPfYxq5B4Deg3V7iAxM5TCSVVqk 45OvOvzsURlRtztq8euhesZ3iOoFZAp/pXDiLp4= X-Google-Smtp-Source: AK7set8sK38/xleZEvu2ZUAzKEYvRjwXQdIJil98pxSGsKEebc39ufvKXj3+sDjy6GeOsNiFL8XUTw== X-Received: by 2002:a05:6a20:4c2:b0:cc:d7ec:b7c with SMTP id 2-20020a056a2004c200b000ccd7ec0b7cmr4664865pzd.4.1679003150095; Thu, 16 Mar 2023 14:45:50 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 12/23] selftest/recipetool: Stop test corrupting tinfoil class Date: Thu, 16 Mar 2023 11:45:09 -1000 Message-Id: <76930f40ffeabea07f495c0011a3e6231ea3eddc.1679003014.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 ; Thu, 16 Mar 2023 21:45:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178723 From: Richard Purdie Running recipetool.RecipetoolTests.test_recipetool_handle_license_vars followed by wic.Wic2.test_biosplusefi_plugin_qemu would show a failure of: File "/media/build/poky/meta/lib/oeqa/utils/commands.py", line 351, in runqemu qemu = oeqa.targetcontrol.QemuTarget(recipedata, targetlogger, image_fstype) File "/media/build/poky/meta/lib/oeqa/targetcontrol.py", line 116, in __init__ use_kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH')) File "/media/build/poky/meta/lib/oe/types.py", line 182, in qemu_use_kvm if kvm and boolean(kvm): File "/media/build/poky/meta/lib/oe/types.py", line 128, in boolean raise ValueError("Invalid boolean value '%s'" % value) ValueError: Invalid boolean value '/media/build/poky/meta/files/common-licenses' which made no sense until you realise the recipetool test is corrupting the tinfoil class. Work on a copy instead to avoid this. Signed-off-by: Richard Purdie (cherry picked from commit 7fe76fe17f67c1bbd108d02836692fed20d24771) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/recipetool.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 25b06cdcf0..b193f0f5c8 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -581,7 +581,10 @@ class RecipetoolTests(RecipetoolBase): commonlicdir = get_bb_var('COMMON_LICENSE_DIR') - d = bb.tinfoil.TinfoilDataStoreConnector + class DataConnectorCopy(bb.tinfoil.TinfoilDataStoreConnector): + pass + + d = DataConnectorCopy d.getVar = Mock(return_value=commonlicdir) srctree = tempfile.mkdtemp(prefix='recipetoolqa') From patchwork Thu Mar 16 21:45:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21099 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 3FC75C74A5B for ; Thu, 16 Mar 2023 21:45:54 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.5152.1679003152904171980 for ; Thu, 16 Mar 2023 14:45:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Uz8pJQ4h; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id le6so3237928plb.12 for ; Thu, 16 Mar 2023 14:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003152; 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=PyNydUgeSyII4KWleaQx8cMyA1IhwjvtNqeqdtVLrSo=; b=Uz8pJQ4hYQ8V763PxlDMi17E7UHCqgBJzEDcHTPRXdT+Ez4IpdBjtOQBr5gcvpd1nN oSFO9oAo0KPi5WtdTJP2eTcVzUMGPUsIkddlMBOIP6AxPjy7BxZloz6owE6yuchTX3Z3 UffK5/6D2ET5PoeUrf1ZIfu5yPpzxR6pl3TG9cCRuW1BmAZjztkYMlF696/WyZribQRH oqDSO0iF72drkSNwhhB4JvtEO5XpC9WjxQdW7Nmf8v/MCqtVi3jeq79s7MyNquMVuxgR rYrNVpXEfkM7k9oGlpZjF6nyCmMusv8ycM+XYUCDyXFhanFvw1Bstlwt/XFyCjlB47lx ipcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003152; 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=PyNydUgeSyII4KWleaQx8cMyA1IhwjvtNqeqdtVLrSo=; b=tiok7pqvOfMaVfkKog2/I3GiQDkEYk1s2lmF/iBuOW2Z9BQBf7ox5sFdS59E/ySclC QtYQAl1PUyx/WZnWrTm8p146LwU830KSE0nyadHLToQJWq058ycsqQIoxgG65p/4pzlA 8T65hC7RBCAFoW614443vMmcIvAEwMt8gZs9GXzk7FlBUnHOwlmLha/LsfLp1OF17g5E mnptiVgJrjQ/oL5g6ejPAbWMQi8Ro3JUCDv2f8JJ3rubrRAUYOpqsGAA47Fq0+T/Pr6H Wq0QAXdeUAi1RpIG59IR3wHrbAtHiGG65PaJAtcDNUaa+TdZS9Puoy/qEKpQzQ4o4Oee ob6A== X-Gm-Message-State: AO0yUKUZNllz8KeO9/6a9oGmQOgC093mo31lVE3N2cH+HB9ekks/yhOr /E29TpCoeOdmnyAVMCtCvwvD1OJR+Api0zfuc3Y= X-Google-Smtp-Source: AK7set8KOWGEroLIVcbDtKaxPQ7RSYd8moJnRCpmHkfK+yOKSK1BiXPUcGsBqIe4oBAdrWgKWooylg== X-Received: by 2002:a05:6a20:e20:b0:d4:b0c9:ac29 with SMTP id ej32-20020a056a200e2000b000d4b0c9ac29mr4412367pzb.22.1679003151952; Thu, 16 Mar 2023 14:45:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 13/23] meson: remove obsolete RPATH stripping patch Date: Thu, 16 Mar 2023 11:45:10 -1000 Message-Id: <737edc7304884c9c5a094971f344d8e459049ec5.1679003014.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 ; Thu, 16 Mar 2023 21:45:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178724 From: Ross Burton As per the release notes for 0.55.0[1], this patch is no longer needed as Meson now only removes the RPATHs that it adds itself, any RPATHs added via LDFLAGS or pkgconfig files are left untouched. [1] https://mesonbuild.com/Release-notes-for-0-55-0.html#rpath-removal-now-more-careful Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 4011c0fadec98f1001046079f59e4e2a4a3a3fcf) Signed-off-by: Steve Sakoman --- .../meson/meson/disable-rpath-handling.patch | 37 ------------------- meta/recipes-devtools/meson/meson_0.63.3.bb | 1 - 2 files changed, 38 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/disable-rpath-handling.patch diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch deleted file mode 100644 index 7aaed8b4a3..0000000000 --- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Fri, 23 Nov 2018 15:28:28 +0000 -Subject: [PATCH] meson: Disable rpath stripping at install time - -We need to allow our rpaths generated through the compiler flags to make it into -our binaries. Therefore disable the meson manipulations of these unless there -is a specific directive to do something differently in the project. - -RP 2018/11/23 - -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] ---- - mesonbuild/minstall.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 7d0da13..17d50db 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -718,8 +718,11 @@ class Installer: - if file_copied: - self.did_install_something = True - try: -- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -- install_name_mappings, verbose=False) -+ if install_rpath: -+ self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -+ install_name_mappings, verbose=False) -+ else: -+ print("RPATH changes at install time disabled") - except SystemExit as e: - if isinstance(e.code, int) and e.code == 0: - pass --- -2.20.1 - diff --git a/meta/recipes-devtools/meson/meson_0.63.3.bb b/meta/recipes-devtools/meson/meson_0.63.3.bb index 9267077422..0d13448744 100644 --- a/meta/recipes-devtools/meson/meson_0.63.3.bb +++ b/meta/recipes-devtools/meson/meson_0.63.3.bb @@ -12,7 +12,6 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://meson-setup.py \ file://meson-wrapper \ file://0001-python-module-do-not-manipulate-the-environment-when.patch \ - file://disable-rpath-handling.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ file://0001-is_debianlike-always-return-False.patch \ From patchwork Thu Mar 16 21:45:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21105 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 33C50C6FD1F for ; Thu, 16 Mar 2023 21:46:04 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.5087.1679003154637938665 for ; Thu, 16 Mar 2023 14:45:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7mM9gS26; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id p20so3236554plw.13 for ; Thu, 16 Mar 2023 14:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003153; 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=Kxx1b/DIRh1oAvqHN+2l6yrCVrTpHEKcJ2JQw8CdSZE=; b=7mM9gS26AHbXTbiIa6GGbHckQCKmpkj5hyr2T3JuuBj6rS7Xjfbkq8CDaneOCY3EaD AcUA+QwMdKMUJIQ25GSmXWIEWbUeYTesIK/PFl3tg1x7SUW7x+xmI2YW2bxaEkSB7EU7 ebdwyphLATITBZodWUNccld3bvwW3xUCFff8ODOHU3JSmJ9u82YIy7BPMf1Qq8M9zOhg LYQkIaVHYmgxU+DXA/Tg3gTcqvEIuVrhwyYqK8z6llpD8WAkqtzd/cBitBDcevPhld7m bRgZT4/DUV0+BHi71WYuTPKDDpM7/aWG0DIn2YbMUYM5I2hmqYO4x+BAsoyZ/E/pUnYU Y2Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003153; 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=Kxx1b/DIRh1oAvqHN+2l6yrCVrTpHEKcJ2JQw8CdSZE=; b=DWsQUua/pIYBVN8Uc/GDQtjPCuMKG7wwVqmGnS01H1dlzmgRuPN7O8XweU/PAyrYC5 KZMGtsj0Xl+TgXcv4xUp1qXBgTTTRxqLz4vZpBinzowUjs/5iuYVPovEnQhBhrVWkJDr n9Tp9K+TDwQi2m2jS1OVF1A/RbIiAIaGEUGrGFylkB2uKHDKkZNru0TXwGM/2N84HYev liac16osxkK/uw6YHKc0dQsxSsRtIQjPoODnU7E05zAlhOihcqamTROEqs/Dqa/BY3DO EHBDcJVF1vN5lV2DS6OsdtANzl/BY0MynSmR3b5XU6Z20CnE1ozYhA4Wu67/QX4s1HiP vLBQ== X-Gm-Message-State: AO0yUKWc2lijb2URg6FYomZImDw+Jw0BHWAKA/hp+VgoI4+PKXWL3Y9C RI3Cu9k2SHOrKCMNXe/vET75ePO3A7eFamNIxdc= X-Google-Smtp-Source: AK7set/M2mSDItS6uNYd0bTcoINLAyrTaVth/xc7Dhwy45TsvzuR/gmNrKlzcHAw/kl7IftX5u9nLA== X-Received: by 2002:a05:6a20:1327:b0:d3:72c6:b018 with SMTP id g39-20020a056a20132700b000d372c6b018mr4067974pzh.39.1679003153528; Thu, 16 Mar 2023 14:45:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 14/23] cups: use BUILDROOT instead of DESTDIR Date: Thu, 16 Mar 2023 11:45:11 -1000 Message-Id: <992c571fc2f69c62d8f916440251a5189fae3aa1.1679003014.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 ; Thu, 16 Mar 2023 21:46:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178725 From: Trevor Woerner The cups documentation is clear that the correct way to install into an alternate root directory is to use the BUILDROOT variable. From INSTALL.md: Use the `BUILDROOT` variable to install to an alternate root directory: make BUILDROOT=/some/other/root/directory install DESTDIR works, but we should use the mechanism the project specifically created for this purpose. Signed-off-by: Trevor Woerner Signed-off-by: Alexandre Belloni (cherry picked from commit f8fc70674e0ea5df46969a06da62f8ed135cae4e) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 9c920bb133..b8b655a4fb 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -66,7 +66,7 @@ EXTRA_OECONF = " \ EXTRA_AUTORECONF += "--exclude=autoheader" do_install () { - oe_runmake "DESTDIR=${D}" install + oe_runmake "BUILDROOT=${D}" install # Remove /var/run from package as cupsd will populate it on startup rm -fr ${D}/${localstatedir}/run From patchwork Thu Mar 16 21:45:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21109 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 5A61EC761A6 for ; Thu, 16 Mar 2023 21:46:04 +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.5154.1679003156005667339 for ; Thu, 16 Mar 2023 14:45:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qsCZJJ0n; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id h12-20020a17090aea8c00b0023d1311fab3so3013767pjz.1 for ; Thu, 16 Mar 2023 14:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003155; 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=ZRyvc5C2/T0BkYcHyoIRdDdOZFKTFkUR4iRF7rkWyWc=; b=qsCZJJ0nqhr0MTfHKS4ooe1QBlOZNgT8GTI4FRPT9xHcZDKZkTTsSMvsp6B4sqdS6w 4q0HNbDy3WOHBGNhZq6DwaUwseJvQYEHdBDGv5UohdqT7qm6N5Kc4xGhXcF/caSgJZSZ UL7ostnY0Yv2oUr/3ltGSwp8UyU/NcAnp8oA1pD9hogSzzmqUi8k3HSkPFbvExgOr2Vw ZzIZavLd0+/lVv3I2y8pPRkvUiJe1DCuP5b+m8zuSAo+WigoPAVDEWXx2eRRAfEfqLhp bz5jOBNmcqQRt/iK4tcsv1EVzxEoPd/yxhtnXnjUx+Ny5XQ3uztZxPF/oDCSwpbC1OAl 5zxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003155; 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=ZRyvc5C2/T0BkYcHyoIRdDdOZFKTFkUR4iRF7rkWyWc=; b=HkufO5m9EP34+nchn336+u3oVeReaZH3g+ejQ8doE0Qx/kiFlYo31nNjlHxvas8Sci l1TNf2tBvuOFVYvZKhureZ+O7MXKZRH6zj0tfXl63Vuk3PRXCR6FPMiwHc9BW2ieHox0 V6QaDC76PUNMuKeraG3Bncw5sfKDB30ZV/Pu5JdxA8c7fUoZfACn6sr4JcWVme24r1AL 6FISamzb6Mgkehl4UeLJ8TjvmQYPedPkcgRcekPZnzaMvUGd0oV/07nBEtzloL8Gmvep 8Z2LlhbIOhqyA2WNKo3+dAi/G/HDUcWtXJZFidEF8OVQoNsYLDmkkmX9YYyw5w1oXpQa WAcw== X-Gm-Message-State: AO0yUKXG7vMe5ESakQdvZ+4hMohSg3Qu+76l1L2R7zRnAybUFr4Tkaab 24tm7z66PMCz6/2WAE1oGjB7fjpcwwcAATPAvMA= X-Google-Smtp-Source: AK7set/9JAv7q3EzllFGlbAd/dMAdue04dmJCroUgk2K8ac7KyzQGlZl8wsOX8svv8FGDjw1GsgpPg== X-Received: by 2002:a05:6a21:9989:b0:cd:4484:f2c6 with SMTP id ve9-20020a056a21998900b000cd4484f2c6mr6322059pzb.41.1679003155109; Thu, 16 Mar 2023 14:45:55 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 15/23] cups: check PACKAGECONFIG for pam feature Date: Thu, 16 Mar 2023 11:45:12 -1000 Message-Id: <2dd5c6ccdce2e402de234df3695a9058a8a126db.1679003014.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 ; Thu, 16 Mar 2023 21:46:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178726 From: Trevor Woerner The cups' PACKAGECONFIG is populated based on DISTRO_FEATURES, but a user is free to enable or disable PACKAGECONFIGs at will. In theory it is possible that pam is enabled globally in DISTRO_FEATURES but disabled in cups' PACKAGECONFIG. Checking the PACKAGECONFIG to determine whether or not pam is enabled would be a safer check rather than relying on DISTRO_FEATURES. Signed-off-by: Trevor Woerner Signed-off-by: Alexandre Belloni (cherry picked from commit a053dd177ddc99ced11e68914079be0ffe261262) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b8b655a4fb..1b522d7d85 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -74,7 +74,7 @@ do_install () { rmdir ${D}/${libexecdir}/${BPN}/driver # Fix the pam configuration file permissions - if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + if ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then chmod 0644 ${D}${sysconfdir}/pam.d/cups fi From patchwork Thu Mar 16 21:45:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21110 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 46FD6C7618A for ; Thu, 16 Mar 2023 21:46:04 +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.web11.5090.1679003157594842028 for ; Thu, 16 Mar 2023 14:45:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uwLLxmF/; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id p13-20020a17090a284d00b0023d2e945aebso6654101pjf.0 for ; Thu, 16 Mar 2023 14:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003157; 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=FQu4cZ//BHmsblYerq9w3at+0FlnktvgmdgwCPhYRgs=; b=uwLLxmF/GuINd7fUtaZqAIblIjJwAmQaHdz21ErtsVsual2jDzegcONWxCEvu8J4la 16eviKxhKyu+/Y03DF30xURnLGqhcFcXxfF/wLYQVzMYNr60FPhHWaJ0ztU+cvMj2l0l 3Um5VPhUR+GXy6uDyz6uQoLp3gpJ6V2UvedoDQ0L0d9hYYKqV06n5kcrp++gGqe4fbmq E/22swAB24FSpg/ZSJ/UqT2RyQa+ABOyYGTR4b54dlG49iG7EbfTjAc5VA+pNjvzHg+G Yn+FYOsRDzIDUlcvcM+O5qHtjsGjqlYS+YHukfNtTn27jrJaOXhe4gS+VrjAUxFStNaM GIYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003157; 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=FQu4cZ//BHmsblYerq9w3at+0FlnktvgmdgwCPhYRgs=; b=nESP1bIWJhoYmL7XtbcYxVdPJwGpKZeCRDLFSJAUjxRCPlBaleuSKTnKvxOV+6ntSd /OoE2peE8MjmNtjMZHM5JAyGBWNIyYWHitrmjKjnZnTg+1J7+Fzpfuc1q8lHm3biMtR4 rgSRw6oFn4SImUg0hEIbMFOAJKVyA5FlK585BX6pYgq462iSLdWBR7rnOcZefIWS1oAC epLkrGxfrJDJAg2Dxzvs6Npq8wzQTjeAVxo5+idybKkMCcp8r9PQlCvdbg8KKMqvA4wG YVDiDNFT4Im/2VQ2vhhG247MBotjujMndRlG/f9/9yUdbmWZdJ+CShim6GTgjzH4L/F0 i2bA== X-Gm-Message-State: AO0yUKWndHlmwNEFBqehzH5v8Abbo2G9HyWDQeHi+O4Uc8rO/C5PFsIJ 2YilDt3ctEUQH5GcjmbtnaIcSj8Lg4liEb00fj4= X-Google-Smtp-Source: AK7set/MLj8238nfVpAcwE5q0TSSqHm68Iv2P7Dh3Z8Tx23jVuSVHeWgA+wVPezwWoSrxZxdo53aXw== X-Received: by 2002:a05:6a20:8353:b0:d4:a6b3:d9e3 with SMTP id z19-20020a056a20835300b000d4a6b3d9e3mr5081058pzc.8.1679003156651; Thu, 16 Mar 2023 14:45:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 16/23] cups: add/fix web interface packaging Date: Thu, 16 Mar 2023 11:45:13 -1000 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 ; Thu, 16 Mar 2023 21:46:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178727 From: Trevor Woerner cups includes a web server. Users can surf to port 631 (default) of a machine running cups to (potentially, based on configuration, default off) view jobs, add printers, and perform other forms of administration. The location of the various resources that are used by the built-in web server (e.g. index.html) are installed under ${datadir}/doc/cups. By default these artifacts would be included in the ${PN}-doc package. The comments in this recipe, however, would suggest an attempt was made to have them added to ${PN}; albeit unsuccessfully. These resources add roughly 1.8M to an image. Since cups does include a configuration option to disable the web interface (--enable-webif), add a PACKAGECONFIG (default off) to allow the user to decide whether or not they would like the web interface configured and its pieces added to the image. Enabling this PACKAGECONFIG both enables the web interface to be configured and built into cups, and also adds (by way of a recommendation) the web interface package to the image. Considering that the previous intention was not working, defaulting this option to off preserves the existing behaviour. Previously in order to have the web interface data included in an image, a user would have needed to explicitly add the ${PN}-doc package to their image. Signed-off-by: Trevor Woerner Signed-off-by: Alexandre Belloni (cherry picked from commit 2c9bd267ec532cd86a4a1be1d4e499e2aae89aba) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 1b522d7d85..da320b1085 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -47,6 +47,7 @@ PACKAGECONFIG[gnutls] = "--with-tls=gnutls,--with-tls=no,gnutls" PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" +PACKAGECONFIG[webif] = "--enable-webif,--disable-webif" EXTRA_OECONF = " \ --enable-dbus \ @@ -92,7 +93,7 @@ do_install () { fi } -PACKAGES =+ "${PN}-lib ${PN}-libimage" +PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-webif" RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" FILES:${PN} += "${libexecdir}/cups/" @@ -101,13 +102,10 @@ FILES:${PN}-lib = "${libdir}/libcups.so.*" FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" -#package the html for the webgui inside the main packages (~1MB uncompressed) +# put the html for the web interface into its own PACKAGE +FILES:${PN}-webif += "${datadir}/doc/cups/ ${datadir}/icons/" +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'webif', '${PN}-webif', '', d)}" -FILES:${PN} += "${datadir}/doc/cups/images \ - ${datadir}/doc/cups/*html \ - ${datadir}/doc/cups/*.css \ - ${datadir}/icons/ \ - " CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" From patchwork Thu Mar 16 21:45:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21104 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 3A5B3C7618E for ; Thu, 16 Mar 2023 21:46:04 +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.5077.1679003133366338282 for ; Thu, 16 Mar 2023 14:45:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=klO7Pdx5; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so3032845pjb.0 for ; Thu, 16 Mar 2023 14:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003158; 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=ro1qdbg7BmcrU+KLg3qJ5LOf1M5T2Q0XNr3VkcYzsgE=; b=klO7Pdx5MN0J+4SQYdW4icR5iQwx1/HRHAYiYX81BmvsWpV86ZW241a7bGoOV6YKFt o1usBN8u+87MqDWcFZsmkYKTE15SZc6oEyu11+sEJjhC/D+ykPTr3pWZre7g0XcdyPIv dybzSWZNVvyU2/34tXd0szpjwt75DapKuR0FuNfnytY8LVH0JjEFNPRlnpoIkKGTJ85p QkGxqF+1j84JzFZdS1Tw8E4x9B7+hlY5AaY19I2iI3tyGmEw9KrNJWNLDTc0kyzeJzOZ oNaiUbOh4qGWzNq03DMhXBcj0KnI1I8BM9cVTnL4vTzQTzs6mGOoaRXOHlxL7dI+XhOJ 2svA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003158; 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=ro1qdbg7BmcrU+KLg3qJ5LOf1M5T2Q0XNr3VkcYzsgE=; b=f3F3hFKUHTo2CAMSVrigBXOJlhzrdgxXZxFjXqG6YxMUwpW+JcVA2Asye3OTnx634l 1H8hbXp3t03mpGegNv7HXWSTn3nXSqSOGHy3tND6gQFtuoFSRMfSaIhRLwPD5U3uLfZD 1Ho+wSNUVgad7an1Q34u2GXWFkkjxsmK4udJ5CTcpdc0I0cG2a27qIKrD0gIi/r9r3cn QVb+aeoxVAjkOYVKCb3K7L9UtWFrSdnEkayhEh3LtNYx5av6AIWx2i4MYdQG8jrPeeeX tiGZVLazEwajn+W+TJV5ZqRzXlflscpmgnpJr2azzoqK/+HKvhs2rRK48qwoyyw4idQE FatA== X-Gm-Message-State: AO0yUKVxg51CEliert66zd6vuVsfKi8CSmDyj1QbHJBbO05AuI5X0h8G WbGfhzPYR5RMB1a8rVjAo46g0FDWMbdWDUZpfw4= X-Google-Smtp-Source: AK7set/EWrh9NergmWTaMuvmBvxIGYyHRJ/4/rjTD5mvmoc8VcrLioJB88GrE6EchIhjfSUrqZDuHg== X-Received: by 2002:a05:6a20:1bdd:b0:d5:7f0b:f2f with SMTP id cv29-20020a056a201bdd00b000d57f0b0f2fmr4871243pzb.26.1679003158181; Thu, 16 Mar 2023 14:45:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 17/23] piglit: Fix build time dependency Date: Thu, 16 Mar 2023 11:45:14 -1000 Message-Id: <843848cc502fdaf013a87f73871b45a9633f861e.1679003014.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 ; Thu, 16 Mar 2023 21:46:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178728 From: Zoltan Boszormenyi Replace explicit opencl-icd-loader with virtual/opencl-icd. Signed-off-by: Zoltán Böszörményi Signed-off-by: Alexandre Belloni (cherry picked from commit 0ded85c2e4d0888e459bc98d1c8e55429f542dba) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index f758208c6b..4a4e44f685 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -39,7 +39,7 @@ do_compile[dirs] =+ "${B}/temp/" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)}" PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" -PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,opencl-icd-loader" +PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd" PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" From patchwork Thu Mar 16 21:45:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21108 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 48671C76196 for ; Thu, 16 Mar 2023 21:46:04 +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.web10.5158.1679003160760548784 for ; Thu, 16 Mar 2023 14:46:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xo8X9h7P; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id f6-20020a17090ac28600b0023b9bf9eb63so2986035pjt.5 for ; Thu, 16 Mar 2023 14:46:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003160; 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=00q50CQ41k3/LO6aGRhg+dK+uASYc2UKeBpDijjxYH8=; b=xo8X9h7PJSCM3lUWimJ3PMNliHWoGfj9FlTHgyzSu+iGHkBgFMuxqT10OHWXImpsGG Nq8qdTyLsQV4lrJ5eSW5INkCSuIOTok4uay/PweiIzGmaKCVl3jJHaUYFMZAkIV8ZixB bhkwnK0QL6DFRc6/YPAgK5XOCvT96sFczaDAz7HHVwWMMh0OR8mf8m5dvhaDoneOI+Bw WCdKX+1C6mj3ii6yg6SStbLs/tFTO7fwPUCiygbrPlYcXhuLhcmFuUx6q+bdzG5beJZS UyuvuINtvdmaSCeBo0yBMZ9DXbjnVi4Wt/Y6TdaG8iIm0SNUqznqupZ/gbNVpYknRfgd JfOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003160; 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=00q50CQ41k3/LO6aGRhg+dK+uASYc2UKeBpDijjxYH8=; b=LgoZEL43H7bncJv2sdb4AdUWAoMtbxGxY6IevR0TLw3PdQmX/ldbShX7r56chkwiGe I0u4hzVsKxFVO2zs1ocVY0f3AGyUklYvGjxB4RXELJVIoy5b9/ADR+lyUt4cEr4tXaTz BRaUdbum0Z443SATASkSnQ5Imrsp2EoIR/Q/q8dMxXMJY3GT1/t0KufXWxXDesMgnWSQ mfKE8ePpipEoIe7MS3aa5t4BsqMIm4dF4ScFe57bIKAST1TeoQSCSbWz/gnH6dPoZ44y XU2oyLFVp+KB2SNr+xKFb7+lbyPMKkHmK3gW/WqmTHVdL99fyqvz9kNPNq/FDDqEP/He arhw== X-Gm-Message-State: AO0yUKXlYX4XBN6LH3JPTBDJN0NoX6lrh61VV3qRiOsib/P0zpffSrl9 VxS6FNCnHfsxPxl+J+VSEULdpg0L69hJ7eQJyCo= X-Google-Smtp-Source: AK7set9qpHyb0QqJjIZMPsnT+DPo7Fallc08tBTsfchED46KL+1Tu6o93mD2j3BOlPyPEhGJJfmjPQ== X-Received: by 2002:a05:6a20:a103:b0:cc:8a62:d0d4 with SMTP id q3-20020a056a20a10300b000cc8a62d0d4mr6656887pzk.38.1679003159876; Thu, 16 Mar 2023 14:45:59 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.45.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:45:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 18/23] apt: re-enable version check Date: Thu, 16 Mar 2023 11:45:15 -1000 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 ; Thu, 16 Mar 2023 21:46:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178729 From: Alexander Kanavin 2.6.0 is out and so we can check for latest version again. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 9851579eeebbdced9e770c4828f521b359e0306f) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/apt/apt_2.4.5.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-devtools/apt/apt_2.4.5.bb b/meta/recipes-devtools/apt/apt_2.4.5.bb index ccdbd3d652..ef85750b84 100644 --- a/meta/recipes-devtools/apt/apt_2.4.5.bb +++ b/meta/recipes-devtools/apt/apt_2.4.5.bb @@ -38,8 +38,6 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" # is considered stable, e.g. 1.0, 1.4, 1.8, 2.2, 2.6, etc. As there is no way # to express 'divisible by 4 plus 2' in regex (that I know of), let's hardcode a few. UPSTREAM_CHECK_REGEX = "[^\d\.](?P((2\.2)|(2\.6)|(3\.0)|(3\.4)|(3\.8)|(4\.2))(\.\d+)+)\.tar" -# needs be marked as unknown until 2.6 is out -UPSTREAM_VERSION_UNKNOWN = "1" inherit cmake perlnative bash-completion useradd From patchwork Thu Mar 16 21:45:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21107 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 4700BC7619A for ; Thu, 16 Mar 2023 21:46:04 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.5094.1679003162416572699 for ; Thu, 16 Mar 2023 14:46:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=iiJooQPP; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id i5so3269006pla.2 for ; Thu, 16 Mar 2023 14:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003161; 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=GBb+6kiTDi9AqINTl6VXGr8O1iipEyt/3xUAqiDcOl4=; b=iiJooQPPsHuL0VpdB3JipyONqC5XtTHKEqZpUZZrUwqJaDTD6H3j4aKYn09CtR8bhb mIzgbS/2kOWIEMlhZDKuJPIGmFo1TTqezXnynB67l9tMgxVCDX/n+N1RfDr6XuDK3t25 vbM/4NpMtJZJRL3OI7o8bBRzah+SpAROQKk+Kyu3CrgiCemRtfPgAzcm2g9rWa6aqb3C yFNCyv84khgmTqXih7X5OMA0AstQrhVzYp4VcisPdbON3MgtcEBlrc/6yXJhUHrCCMLW 8P20VEz23Ks128XKXIaXfjJF30D83wJTh2OT9lG+1hMqcOCmiaQfbfr+WuaTV2Rv+XrH YWww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003161; 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=GBb+6kiTDi9AqINTl6VXGr8O1iipEyt/3xUAqiDcOl4=; b=u2Ph994KqntdWEppVSLp6Dyny11gueVFkZiH8Ddrs5XjqUa46qm57/975jlzd15OJd FbsVUZ3AUlzWroXFP5dYs4LBBvV9E+vooeXXQIkXft4TM92JQmqrjdBCABWHdUdMNVYw JpupDv5qpf8B2hivlqedisY6Otn6YwJM1w9Qd19mbyBcb5JRpFsnLi6O5qtfvDuvyb5+ XdpGiUbNF7GZS4FKbGK4pmRZR8wSs6Cmdn9xgdxVfkDOgA39H9ZwGogqILNwtZ00toHz TX9eKVYNvviVPW08wY0Lj2ktvMlVq5v0aGRGXwqLXMk2GrR/qsMx/aBAxw1Rp1YPr3+A zoSw== X-Gm-Message-State: AO0yUKUDBMzQLfDlhalOwyZd688ml+Vlba3SSUyN3yMVHY9t7hkIx5sX sbZ6ngP1t6Dd2Wvwr08zGdggUU2Jv8MvAK0ksg4= X-Google-Smtp-Source: AK7set9tFwH1N+pY6Yda33J7rwZ7DgGjAdNze6GvTqXVd9rJ6xgpRra4y2YS0M93w7SrWodorH5CJw== X-Received: by 2002:a05:6a20:6d21:b0:be:c1b2:514d with SMTP id fv33-20020a056a206d2100b000bec1b2514dmr869298pzb.13.1679003161485; Thu, 16 Mar 2023 14:46:01 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.46.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:46:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 19/23] buildtools-tarball: Handle spaces within user $PATH Date: Thu, 16 Mar 2023 11:45:16 -1000 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 ; Thu, 16 Mar 2023 21:46:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178730 From: Kenfe-Mickael Laventure The environment-setup script generated by the recipe was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 2d4c032bf3187aaa953a0c33a999074e695f54bb) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/buildtools-tarball.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 34f7773398..70d740b4e0 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -67,7 +67,7 @@ create_sdk_files:append () { # Generate new (mini) sdk-environment-setup file script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} touch $script - echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH' >> $script + echo 'export PATH="${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script From patchwork Thu Mar 16 21:45:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21106 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 3A01AC74A5B for ; Thu, 16 Mar 2023 21:46:04 +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.5161.1679003164026773978 for ; Thu, 16 Mar 2023 14:46:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xyyrxpAJ; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id d10so1783645pgt.12 for ; Thu, 16 Mar 2023 14:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003163; 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=uCHDJ8ortbRAkCeOIGr4lvQH41R+64GoeyNEGAnCC/U=; b=xyyrxpAJj0q6DWzp1D/dRDc0coNfx9nCI0WAFwQbQ004ynPjF7Z93Z2E+92awSPs89 aQC5OrbMli/8K7HSVdv1WL5vNDMqxQWestTJiivPohFywgIt1NJWbR/rc7zAmU/EC8yr TooYL4aOKEg5xnuZ55XRP0ACKVh9buNB7o78yWQ0WMIk/BvOwqAXmMYMHoKZeg14PyBw WQYCILYsPGORQ3RaiBan0mM0EbFf0KZSvWK6UVcPAUh5MsuW3OCeNMb6zdZOnBqZqsJ6 VdYbK9UWxZ7Qh+tLyCs+tEgTN7ys8RT7MMGQqhuxjqTa6xTs+U7Ud4mNEDqm7WGl5epZ ydjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003163; 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=uCHDJ8ortbRAkCeOIGr4lvQH41R+64GoeyNEGAnCC/U=; b=QjxEtx1h0azWgW8VbnuVGDRS3TvMhqg9Kk8aK6tmgVtsK/8B3QA9X87AmoQCOipRjO b2dVJ8HkAz84gvm18TTd3LGw5Epy30DBLxwnOsVbQD0LdIdpCab2hCQRz9xqpQbkJeEO 3JhpMiCMpHJbQROkc+Dzkl8QBhJa2uAfprQeYL3IXNBzFoiYuZ4tSipOQCXyymj5xPsP Pxyh29XqOz+cL7l4unqyBK1sI7pBBVb1ioicQCNz4ZxFogRZv6TkpidRBKiB++AJVHTH W07XkIi/+oncxILJNVILRgU9kJavQrPjoRu4ip0tNhfmw2LE6EWsuuMaMB7ceVl79d7H +idA== X-Gm-Message-State: AO0yUKWNtC+0VWfRJik49b9mXYdDZxrSecR84znUk1NrbiftpclKqbS6 xRAx12h2rx1dugdBRSK66pfBGP3RsayJpUNHzWQ= X-Google-Smtp-Source: AK7set8bCJrxWTxi6mJR0u9rSyJpPROOo/HH2AW6YFcNod7XdqN8ys8rOq1QqhDoT6L4i3jNEFOJeg== X-Received: by 2002:a62:cf04:0:b0:5a8:bcf2:125 with SMTP id b4-20020a62cf04000000b005a8bcf20125mr4155478pfg.21.1679003163096; Thu, 16 Mar 2023 14:46:03 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.46.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:46:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 20/23] toolchain-scripts: Handle spaces within user $PATH Date: Thu, 16 Mar 2023 11:45:17 -1000 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 ; Thu, 16 Mar 2023 21:46:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178731 From: Kenfe-Mickael Laventure The environment-setup script generated by the recipe was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 42177ff2d45ee70ad00917bb6fbabca49dae4f59) Signed-off-by: Steve Sakoman --- meta/classes-recipe/toolchain-scripts.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/toolchain-scripts.bbclass b/meta/classes-recipe/toolchain-scripts.bbclass index fa658a6596..6bfe0b6de0 100644 --- a/meta/classes-recipe/toolchain-scripts.bbclass +++ b/meta/classes-recipe/toolchain-scripts.bbclass @@ -53,7 +53,7 @@ toolchain_create_sdk_env_script () { for i in ${CANADIANEXTRAOS}; do EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i" done - echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script + echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':"$PATH"' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig:$SDKTARGETSYSROOT'"$prefix"'/share/pkgconfig' >> $script echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script From patchwork Thu Mar 16 21:45:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21111 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 49ACFC7618A for ; Thu, 16 Mar 2023 21:46:14 +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.web10.5150.1679003151092139877 for ; Thu, 16 Mar 2023 14:46:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=l7jgT+Gg; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id o6-20020a17090a9f8600b0023f32869993so2965653pjp.1 for ; Thu, 16 Mar 2023 14:46:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003165; 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=wV9nsdqv4vF78cAsAi0v5FJ6gUYs74nL3pSE4EThi4k=; b=l7jgT+GgGgJ9tmFjkrezpInx6ccBnpx7mWcUJ9rmvbb6uprG0N1h8Chfc6T/pCcUq8 JEB5Kae48BnDXJ9XfiQZpwLCr24j/k5IKTYKvSnGblvQb/is1bLT5IyFNzMqxEJFY0tY 3gkS7OMkiqkueZP+u2wFOTGfkI/Qd4KfYhBCpuHd8mk3z1O/S4EmnZbK43sRaB14FtLV 3tsXdFrzW5c/TZrv9LZRMXSl8Y/d0BJ9G6HQo2e3J7n4vUtfGRmZw1GV7lxgqexTt4Jf W7+/bSfWbLtSt95y4Nd54hpyV10UPOe7jve1Ghcem/wbXMAKLHSUuEX/VPn+8iA6PmjN RdDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003165; 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=wV9nsdqv4vF78cAsAi0v5FJ6gUYs74nL3pSE4EThi4k=; b=HeHJ7Vk9guWq6EUMqpvyE4rlXoiV+4IWrxPUSf9niuaPUUAHKLUKcMpkdKogT5ptt+ louOJ7YpEEvycZ0XhUhE6RGGjCnQxO+pXF/Z6NNpcncdH+nxaViIdZVUDg5Jrq/n+Vi7 B+p6FwX9v29zK258Dw6fDodqKS5bPEhv1AFv+ukGBW0pS8UBJ4V7YmAoJvOIzv/leVoB 0cPgD4lUyxjM3F5KPj/HQOeMPFCySw8K3ZBbfGfnJbH4ekl4MFpbeZTib09k7e5jx73W RJ+wGFvwavXH2Nyhe2ylm6W/bSbVzUDj0HdsSNEB4GCMeS4wYyXSgnipyDau/s9hs3n0 XP9w== X-Gm-Message-State: AO0yUKXlMkk6nIsF52ziZqhqGKuMzFx7ibmR7lE0bWFsC1U20ERfjjDj BXu3lVPUBLTcbLenK94TQ45eCq8NH5tgrrhtuOQ= X-Google-Smtp-Source: AK7set/bdVAGJFpRE+ZAO965DFfD9bX6CO36iWFZgc+KuQFeGlxbWIAf9wDalopUMxQHS4mlxSgJ9Q== X-Received: by 2002:a05:6a20:12cd:b0:d4:d0f5:d403 with SMTP id v13-20020a056a2012cd00b000d4d0f5d403mr6439774pzg.29.1679003164721; Thu, 16 Mar 2023 14:46:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.46.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:46:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 21/23] populate_sdk_ext: Handle spaces within user $PATH Date: Thu, 16 Mar 2023 11:45:18 -1000 Message-Id: <679835b6f692d7e344c115da72ddf4553657ac54.1679003014.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 ; Thu, 16 Mar 2023 21:46:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178732 From: Kenfe-Mickael Laventure The script generated by the sdk_ext_postinst function was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 00e96bf250eaaded839caf465dbc0af5b604aed7) Signed-off-by: Steve Sakoman --- meta/classes-recipe/populate_sdk_ext.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index 80f4f0be05..1b47fbe770 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass @@ -720,7 +720,7 @@ sdk_ext_postinst() { # A bit of another hack, but we need this in the path only for devtool # so put it at the end of $PATH. - echo "export PATH=$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH" >> $env_setup_script + echo "export PATH=\"$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH\"" >> $env_setup_script echo "printf 'SDK environment now set up; additionally you may now run devtool to perform development tasks.\nRun devtool --help for further details.\n'" >> $env_setup_script From patchwork Thu Mar 16 21:45:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21112 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 4B5DAC7618E for ; Thu, 16 Mar 2023 21:46:14 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.5081.1679003146620913086 for ; Thu, 16 Mar 2023 14:46:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tTR0u27f; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id a2so3271054plm.4 for ; Thu, 16 Mar 2023 14:46:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003166; 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=coBCwh3NNriX0hs+wRG9AWNzTV8VdwkI3D6aEYj4EDU=; b=tTR0u27fbj2/J8pVkq85aQN1cq8lG+IsVjrKKK3PBjsmohX72c2eIODDZet1bVyALg 2BCv/I3efOK5CV7P2DEwy9QFg7q9cz+7ZaoZ5TSsKlddqll4cNSDWGdZIo9BppzDBUX5 1fQsx5FmIaT3atoZDL2hVGsGvrdEnjj03Kgs20Xd3aLt7z57QbhTdEBxuA22Szz5d1eq eaEj2Fpp8W/WfuAATxz+zKsl2b9ko33YyUHTWr9y2yOyyKrFVEcroK5AC+LD/eSJ4W/l gi48n6msY0Un5esfTcTNYbiikrPJYW1gzLG/ubsbX8z8B7bIz5H048gapKW833oqphb0 65xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003166; 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=coBCwh3NNriX0hs+wRG9AWNzTV8VdwkI3D6aEYj4EDU=; b=SRYU5rZOFZk1ox2e2CiFybXmC4W0MVS8ehBIhMyh8+XZfwc+FMgwwKLOxmDLnciKu9 wlMAENCwXzx8ZJml4cjHh2QLiP8GupeAc6Xj67q3yoL/1GlALDLY8uV6aN6WyesltOur tNNknbRTVfc+Qhq0LOMcAPdVz2kQfq8MAOcLyJ1H4qJInwl5qq+xPJ2MAWhuzb2FvmDk /vlOjT4+F1dfCskFBMYMkQk2DmBFC5oX1OwhcJdQPmf94qfVrSrOKZ9nBvGhIU0s3UqJ B0tR++AvPFAIluM2Ftsgxt4BGYjylywfCQzFGkSn8AHsfLzuri7S9OIpAPNcJj0YXeQs Hi3A== X-Gm-Message-State: AO0yUKXoPaB1bdJv9u8HGetc5wzQdd05XnOcUw26yx3tF/wepnTT2vAw 4kEJ7G5HuJeRwV+0nvDHUPoRT7HvaBjf7z7w45M= X-Google-Smtp-Source: AK7set/7jCIIivjkyNDl8NPe4Rn1qwBk+wNtaNA4FzMJ/HqBWq/l+IH4mBdupL8qtKQW/B4H8RmyzA== X-Received: by 2002:a05:6a20:e688:b0:cc:e39e:3f64 with SMTP id mz8-20020a056a20e68800b000cce39e3f64mr4563295pzb.24.1679003166300; Thu, 16 Mar 2023 14:46:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.46.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:46:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 22/23] dhcpcd: Fix install conflict when enable multilib. Date: Thu, 16 Mar 2023 11:45:19 -1000 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 ; Thu, 16 Mar 2023 21:46:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178733 From: Wang Mingyu Error: Transaction test error: file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon The differences between the two files are as follows: @@ -821,7 +821,7 @@ If you always use the same options, put them here. .It Pa /usr/libexec/dhcpcd-run-hooks Bourne shell script that is run to configure or de-configure an interface. -.It Pa /usr/lib64/dhcpcd/dev +.It Pa /usr/lib/dhcpcd/dev Linux .Pa /dev management modules. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 65ca2c4b7349a4f7dcfcc580d926a99c673deb60) Signed-off-by: Steve Sakoman --- .../dhcpcd/dhcpcd_9.4.1.bb | 1 + ...-conflict-error-when-enable-multilib.patch | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 39e689d2f6..579fa95df7 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -19,6 +19,7 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ + file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ " SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c" diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch new file mode 100644 index 0000000000..12998aada4 --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch @@ -0,0 +1,46 @@ +From 4915a7e52fcea8fe283a842890a1e726b1e26b10 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Fri, 10 Mar 2023 03:48:46 +0000 +Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. + +Error: Transaction test error: + file /usr/share/man/man8/dhcpcd.8 conflicts between attempted + installs of dhcpcd-doc-9.4.1-r0.cortexa57 and + lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon + +The differences between the two files are as follows: +@@ -821,7 +821,7 @@ + If you always use the same options, put them here. + .It Pa /usr/libexec/dhcpcd-run-hooks + Bourne shell script that is run to configure or de-configure an interface. +-.It Pa /usr/lib64/dhcpcd/dev ++.It Pa /usr/lib/dhcpcd/dev + Linux + .Pa /dev + management modules. + +It is just a man file, there is no necessary to manage multiple +versions. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Lei Maohui +--- + src/dhcpcd.8.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in +index bc6b3b5..791f2ba 100644 +--- a/src/dhcpcd.8.in ++++ b/src/dhcpcd.8.in +@@ -821,7 +821,7 @@ Configuration file for dhcpcd. + If you always use the same options, put them here. + .It Pa @SCRIPT@ + Bourne shell script that is run to configure or de-configure an interface. +-.It Pa @LIBDIR@/dhcpcd/dev ++.It Pa /usr//dhcpcd/dev + Linux + .Pa /dev + management modules. +-- +2.34.1 + From patchwork Thu Mar 16 21:45:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21113 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 4415FC6FD1F for ; Thu, 16 Mar 2023 21:46:14 +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.5097.1679003169123355113 for ; Thu, 16 Mar 2023 14:46:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Q5b8gxre; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id y2so3056408pjg.3 for ; Thu, 16 Mar 2023 14:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679003168; 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=fjA7poPXi78Xq776K31BaqBi+vHlmIg54HrfH7uRCbk=; b=Q5b8gxre5QEuHVZNTU+WOuAgBiU4rGe4tVuuNEDBhYYB/URfmG2Om93b4OIcJqvMHW gUY1jP2WZ2URQa/2bBMqsu9YpIeckl3P0KWBA0IxzGjy0LherY6TzQ+vsEXxVFbWYoOB UFMfnKlHs2H0tHFWfXSIjcFAviCpwT+XZWYnufsUqK1ABwjI+5XYqBPyuyiaOlKGNItg blwTPY/r9RAiBnxFslGtXNeJkS1ZBGH8LuB5ebcZLQmNRhqi4cHGAXqvN9OIZjVAUORl UkaZXpD15iSi95PeRfCgjfFHp/LnMXxA5bPtlptlZjOICPqtBik6MrJxrjB26KZu+S0y /zmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679003168; 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=fjA7poPXi78Xq776K31BaqBi+vHlmIg54HrfH7uRCbk=; b=y0XG9zV8SKu0YKeacym075nH7ENriyvpDdAl2okk+ll6OPusxkGNSc5SPwuAVW4cbP lkMkfg/dQ73Rq0Db6SCQv7UjYIGJ22pCllYYcqKpfpHjq7gXKLRB1/LIMK2+iy2fVGVc 7nX3aOprHBNQAKGRWqahhBD0CyZhB7ol4fJXnq4epqgQI76b2WuEqWeP4Fxm1I2bVrn+ VwjALDUwqb1CinTs/QGNamipeEz96AmBnSlMmN1uoJKVFt75E4y56RWYXORzse9l2aaQ I557/36Ykg2SqrbyYF3wKA0aaNFgi6KSMUk9Ope9ycwFNo7x5qS3ocK56QV4wlnwqmuk Pz5A== X-Gm-Message-State: AO0yUKUYl7sopZ+VrQWxg4AI2NLRVQFAGnTFsHcedXYC3kzN2TreFL6a aMHnHGcUmFK39HZJhxILaug/61VVOddfezhD8nI= X-Google-Smtp-Source: AK7set8jveUDWKp3zFaBMzH8sMS2Gu1p3LgMbLqnkuEPttJ3H0YUzSrJETluSDJdggzGtkyAVEHH3w== X-Received: by 2002:a05:6a20:4321:b0:cb:aacb:312c with SMTP id h33-20020a056a20432100b000cbaacb312cmr5838279pzk.27.1679003168149; Thu, 16 Mar 2023 14:46:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id bn10-20020a056a00324a00b005a84ef49c63sm137746pfb.214.2023.03.16.14.46.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:46:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 23/23] base-files: Drop localhost.localdomain from hosts file Date: Thu, 16 Mar 2023 11:45:20 -1000 Message-Id: <61f268be804795fadafbc918b465561819b592ec.1679003014.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 ; Thu, 16 Mar 2023 21:46:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178734 From: Richard Purdie This was likely something we took inspiration from elsewhere with. It was added in: https://git.openembedded.org/openembedded/commit/packages/netbase/netbase/hosts?id=c8e5702127e507e82e6f68a4b8c546803accea9d in 2005. Debian added this entry around 2004 and discussed and dropped it in 2005: https://lists.debian.org/debian-devel/2005/10/msg00559.html resulting in: https://salsa.debian.org/installer-team/netcfg/-/commit/3c15ee521b2b8f47b34ccc7f610523cd284f2221 We should drop this for some of the reasons in those threads, it doesn't seem to be doing anything too helpful and isn't what most applications expect. Signed-off-by: Richard Purdie (cherry picked from commit e730d005fa8aec07f9ae25c58d4566eaa92a6997) Signed-off-by: Steve Sakoman --- meta/recipes-core/base-files/base-files/hosts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-files/base-files/hosts b/meta/recipes-core/base-files/base-files/hosts index b94f414d5c..10a5b6c704 100644 --- a/meta/recipes-core/base-files/base-files/hosts +++ b/meta/recipes-core/base-files/base-files/hosts @@ -1,4 +1,4 @@ -127.0.0.1 localhost.localdomain localhost +127.0.0.1 localhost # The following lines are desirable for IPv6 capable hosts ::1 localhost ip6-localhost ip6-loopback