From patchwork Fri Mar 3 16:16:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20399 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 430D3C7EE32 for ; Fri, 3 Mar 2023 16:17:37 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.27597.1677860255012991679 for ; Fri, 03 Mar 2023 08:17:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=BC5ZhA7H; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id a2so3195815plm.4 for ; Fri, 03 Mar 2023 08:17:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860254; 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=o9AL6B8+N8kw0h1Kg5uiT+Qm7MzkwmwsJLisTedxB2U=; b=BC5ZhA7HMlvo8U11V5YShY42Zkb2KuzR3sYtVY8iIf1+N9ka8pkzu/u9nzHHlABBIa LPfnxN11kxyxvFCZ7DNVC06ER785MOkgECcdUn1CMjU8yi8ZL3+dJr6G1eq5yFgeTtCC jcUMKlgmAIsZ2OGQVL1RbvXj+QLhQuszB7NvFkHXCXOB8aThN4ufbxCT7zyfVHvfA/kR ROFSBnDQuAnSWF1wSYVi9FR3sUkpGTM0CYnFS66VjXGeQZOQJXaLAcIYILiWxmIqa4G6 l5JSPC4h0cv53+p20hB1rbHQASNtQRe+RoMes0P3ToJyY/7DX+jl71e9j7rUF+Ye9yyA nMjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860254; 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=o9AL6B8+N8kw0h1Kg5uiT+Qm7MzkwmwsJLisTedxB2U=; b=YGcVC9Hh84Ew7Uh7xt+Sb4lIEO5T1VQzkJezYGAcZNFvhNuJpX+5Wpkume3oA7ZUAX ZjkXrZCk8in44na1ERdfzPs4u1AUKhpDILNThZX8YcQreUHIoW5XD+WgzZzu+4xv5cBL nCviU+tyoLmZ1HxMR3UavXCtfXxPMtbz8iSVbKkKBQlplt4MXSOpatj0JlBrvyjZ47SE AYTrbq985sEfIkQar4k/Vt9EXiU7khkV54H9eNwZA3F9yyYlHm2fCrOYOpzcMFL0i3A8 9dkINNJUyCWD52txG+ChcLBoh3o2mwKjsMYw4RVjXGqGo7EPy2UDCe9bgAWFqaddBTDT bXZg== X-Gm-Message-State: AO0yUKUm34WfIsw+fKchfy0jvNmXw873koHViAlJ/VRR98uJlpqRigJf q0dxn2w8Ex3910E7LHIwbzzR4IJo39ZiszOcBJQ= X-Google-Smtp-Source: AK7set9oNh7K7UD++B5Yembwmls8Q4/a7yyk7GJy9q0CjgGKeS3JEPdPfsKaNeXNvQn6uHxnkoYJIQ== X-Received: by 2002:a17:903:2310:b0:19a:9833:704 with SMTP id d16-20020a170903231000b0019a98330704mr2787226plh.61.1677860253308; Fri, 03 Mar 2023 08:17:33 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:32 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/29] binutils : Fix CVE-2023-22608 Date: Fri, 3 Mar 2023 06:16:59 -1000 Message-Id: <3dd27bbe8c19aa358916de940453de81d3831510.1677859897.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 ; Fri, 03 Mar 2023 16:17:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177990 From: Yash Shinde Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=8af23b30edbaedf009bc9b243cd4dfa10ae1ac09] Signed-off-by: Yash Shinde Signed-off-by: Steve Sakoman --- .../binutils/binutils-2.38.inc | 3 + .../binutils/0020-CVE-2023-22608-1.patch | 506 ++++++++++++++++++ .../binutils/0020-CVE-2023-22608-2.patch | 210 ++++++++ .../binutils/0020-CVE-2023-22608-3.patch | 32 ++ 4 files changed, 751 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-1.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-2.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-3.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.38.inc b/meta/recipes-devtools/binutils/binutils-2.38.inc index 0a4a0d7bc1..30a34d7ba4 100644 --- a/meta/recipes-devtools/binutils/binutils-2.38.inc +++ b/meta/recipes-devtools/binutils/binutils-2.38.inc @@ -43,5 +43,8 @@ SRC_URI = "\ file://0018-CVE-2022-38128-2.patch \ file://0018-CVE-2022-38128-3.patch \ file://0019-CVE-2022-4285.patch \ + file://0020-CVE-2023-22608-1.patch \ + file://0020-CVE-2023-22608-2.patch \ + file://0020-CVE-2023-22608-3.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-1.patch b/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-1.patch new file mode 100644 index 0000000000..18d4ac5f9d --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-1.patch @@ -0,0 +1,506 @@ +From 116aac1447ee92df25599859293752648e3c6ea0 Mon Sep 17 00:00:00 2001 +From: "Steinar H. Gunderson" +Date: Fri, 20 May 2022 16:10:34 +0200 +Subject: [PATCH] add a trie to map quickly from address range to compilation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + unit +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using perf to profile large binaries, _bfd_dwarf2_find_nearest_line() +becomes a hotspot, as perf wants to get line number information +(for inline-detection purposes) for each and every sample. In Chromium +in particular (the content_shell binary), this entails going through +475k address ranges, which takes a long time when done repeatedly. + +Add a radix-256 trie over the address space to quickly map address to +compilation unit spaces; for content_shell, which is 1.6 GB when some +(but not full) debug information turned is on, we go from 6 ms to +0.006 ms (6 µs) for each lookup from address to compilation unit, a 1000x +speedup. + +There is a modest RAM increase of 180 MB in this binary (the existing +linked list over ranges uses about 10 MB, and the entire perf job uses +between 2-3 GB for a medium-size profile); for smaller binaries with few +ranges, there should be hardly any extra RAM usage at all. + +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=b43771b045fb5616da3964f2994eefbe8ae70d32] + +CVE: CVE-2023-22608 + +Signed-off-by: Yash Shinde + +--- + bfd/dwarf2.c | 326 ++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 312 insertions(+), 14 deletions(-) + +diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c +index fdf071c3..0ae50a37 100644 +--- a/bfd/dwarf2.c ++++ b/bfd/dwarf2.c +@@ -82,6 +82,77 @@ struct adjusted_section + bfd_vma adj_vma; + }; + ++/* A trie to map quickly from address range to compilation unit. ++ ++ This is a fairly standard radix-256 trie, used to quickly locate which ++ compilation unit any given address belongs to. Given that each compilation ++ unit may register hundreds of very small and unaligned ranges (which may ++ potentially overlap, due to inlining and other concerns), and a large ++ program may end up containing hundreds of thousands of such ranges, we cannot ++ scan through them linearly without undue slowdown. ++ ++ We use a hybrid trie to avoid memory explosion: There are two types of trie ++ nodes, leaves and interior nodes. (Almost all nodes are leaves, so they ++ take up the bulk of the memory usage.) Leaves contain a simple array of ++ ranges (high/low address) and which compilation unit contains those ranges, ++ and when we get to a leaf, we scan through it linearly. Interior nodes ++ contain pointers to 256 other nodes, keyed by the next byte of the address. ++ So for a 64-bit address like 0x1234567abcd, we would start at the root and go ++ down child[0x00]->child[0x00]->child[0x01]->child[0x23]->child[0x45] etc., ++ until we hit a leaf. (Nodes are, in general, leaves until they exceed the ++ default allocation of 16 elements, at which point they are converted to ++ interior node if possible.) This gives us near-constant lookup times; ++ the only thing that can be costly is if there are lots of overlapping ranges ++ within a single 256-byte segment of the binary, in which case we have to ++ scan through them all to find the best match. ++ ++ For a binary with few ranges, we will in practice only have a single leaf ++ node at the root, containing a simple array. Thus, the scheme is efficient ++ for both small and large binaries. ++ */ ++ ++/* Experiments have shown 16 to be a memory-efficient default leaf size. ++ The only case where a leaf will hold more memory than this, is at the ++ bottomost level (covering 256 bytes in the binary), where we'll expand ++ the leaf to be able to hold more ranges if needed. ++ */ ++#define TRIE_LEAF_SIZE 16 ++ ++/* All trie_node pointers will really be trie_leaf or trie_interior, ++ but they have this common head. */ ++struct trie_node ++{ ++ /* If zero, we are an interior node. ++ Otherwise, how many ranges we have room for in this leaf. */ ++ unsigned int num_room_in_leaf; ++}; ++ ++struct trie_leaf ++{ ++ struct trie_node head; ++ unsigned int num_stored_in_leaf; ++ struct { ++ struct comp_unit *unit; ++ bfd_vma low_pc, high_pc; ++ } ranges[TRIE_LEAF_SIZE]; ++}; ++ ++struct trie_interior ++{ ++ struct trie_node head; ++ struct trie_node *children[256]; ++}; ++ ++static struct trie_node *alloc_trie_leaf (bfd *abfd) ++{ ++ struct trie_leaf *leaf = ++ bfd_zalloc (abfd, sizeof (struct trie_leaf)); ++ if (leaf == NULL) ++ return NULL; ++ leaf->head.num_room_in_leaf = TRIE_LEAF_SIZE; ++ return &leaf->head; ++} ++ + struct dwarf2_debug_file + { + /* The actual bfd from which debug info was loaded. Might be +@@ -139,6 +210,9 @@ struct dwarf2_debug_file + /* A list of all previously read comp_units. */ + struct comp_unit *all_comp_units; + ++ /* A list of all previously read comp_units with no ranges (yet). */ ++ struct comp_unit *all_comp_units_without_ranges; ++ + /* Last comp unit in list above. */ + struct comp_unit *last_comp_unit; + +@@ -147,6 +221,9 @@ struct dwarf2_debug_file + + /* Hash table to map offsets to decoded abbrevs. */ + htab_t abbrev_offsets; ++ ++ /* Root of a trie to map addresses to compilation units. */ ++ struct trie_node *trie_root; + }; + + struct dwarf2_debug +@@ -220,6 +297,11 @@ struct comp_unit + /* Chain the previously read compilation units. */ + struct comp_unit *next_unit; + ++ /* Chain the previously read compilation units that have no ranges yet. ++ We scan these separately when we have a trie over the ranges. ++ Unused if arange.high != 0. */ ++ struct comp_unit *next_unit_without_ranges; ++ + /* Likewise, chain the compilation unit read after this one. + The comp units are stored in reversed reading order. */ + struct comp_unit *prev_unit; +@@ -296,6 +378,10 @@ struct comp_unit + + /* TRUE if symbols are cached in hash table for faster lookup by name. */ + bool cached; ++ ++ /* Used when iterating over trie leaves to know which units we have ++ already seen in this iteration. */ ++ bool mark; + }; + + /* This data structure holds the information of an abbrev. */ +@@ -1766,9 +1852,189 @@ concat_filename (struct line_info_table *table, unsigned int file) + return strdup (filename); + } + ++/* Number of bits in a bfd_vma. */ ++#define VMA_BITS (8 * sizeof (bfd_vma)) ++ ++/* Check whether [low1, high1) can be combined with [low2, high2), ++ i.e., they touch or overlap. */ ++static bool ranges_overlap (bfd_vma low1, ++ bfd_vma high1, ++ bfd_vma low2, ++ bfd_vma high2) ++{ ++ if (low1 == low2 || high1 == high2) ++ return true; ++ ++ /* Sort so that low1 is below low2. */ ++ if (low1 > low2) ++ { ++ bfd_vma tmp; ++ ++ tmp = low1; ++ low1 = low2; ++ low2 = tmp; ++ ++ tmp = high1; ++ high1 = high2; ++ high2 = tmp; ++ } ++ ++ /* We touch iff low2 == high1. ++ We overlap iff low2 is within [low1, high1). */ ++ return (low2 <= high1); ++} ++ ++/* Insert an address range in the trie mapping addresses to compilation units. ++ Will return the new trie node (usually the same as is being sent in, but ++ in case of a leaf-to-interior conversion, or expansion of a leaf, it may be ++ different), or NULL on failure. ++ */ ++static struct trie_node *insert_arange_in_trie(bfd *abfd, ++ struct trie_node *trie, ++ bfd_vma trie_pc, ++ unsigned int trie_pc_bits, ++ struct comp_unit *unit, ++ bfd_vma low_pc, ++ bfd_vma high_pc) ++{ ++ bfd_vma clamped_low_pc, clamped_high_pc; ++ int ch, from_ch, to_ch; ++ bool is_full_leaf = false; ++ ++ /* See if we can extend any of the existing ranges. This merging ++ isn't perfect (if merging opens up the possibility of merging two existing ++ ranges, we won't find them), but it takes the majority of the cases. */ ++ if (trie->num_room_in_leaf > 0) ++ { ++ struct trie_leaf *leaf = (struct trie_leaf *) trie; ++ unsigned int i; ++ ++ for (i = 0; i < leaf->num_stored_in_leaf; ++i) ++ { ++ if (leaf->ranges[i].unit == unit && ++ ranges_overlap(low_pc, high_pc, ++ leaf->ranges[i].low_pc, leaf->ranges[i].high_pc)) ++ { ++ if (low_pc < leaf->ranges[i].low_pc) ++ leaf->ranges[i].low_pc = low_pc; ++ if (high_pc > leaf->ranges[i].high_pc) ++ leaf->ranges[i].high_pc = high_pc; ++ return trie; ++ } ++ } ++ ++ is_full_leaf = leaf->num_stored_in_leaf == trie->num_room_in_leaf; ++ } ++ ++ /* If we're a leaf with no more room and we're _not_ at the bottom, ++ convert to an interior node. */ ++ if (is_full_leaf && trie_pc_bits < VMA_BITS) ++ { ++ const struct trie_leaf *leaf = (struct trie_leaf *) trie; ++ unsigned int i; ++ ++ trie = bfd_zalloc (abfd, sizeof (struct trie_interior)); ++ if (!trie) ++ return NULL; ++ is_full_leaf = false; ++ ++ /* TODO: If we wanted to save a little more memory at the cost of ++ complexity, we could have reused the old leaf node as one of the ++ children of the new interior node, instead of throwing it away. */ ++ for (i = 0; i < leaf->num_stored_in_leaf; ++i) ++ { ++ if (!insert_arange_in_trie (abfd, trie, trie_pc, trie_pc_bits, ++ leaf->ranges[i].unit, leaf->ranges[i].low_pc, ++ leaf->ranges[i].high_pc)) ++ return NULL; ++ } ++ } ++ ++ /* If we're a leaf with no more room and we _are_ at the bottom, ++ we have no choice but to just make it larger. */ ++ if (is_full_leaf) ++ { ++ const struct trie_leaf *leaf = (struct trie_leaf *) trie; ++ unsigned int new_room_in_leaf = trie->num_room_in_leaf * 2; ++ struct trie_leaf *new_leaf; ++ ++ new_leaf = bfd_zalloc (abfd, ++ sizeof (struct trie_leaf) + ++ (new_room_in_leaf - TRIE_LEAF_SIZE) * sizeof (leaf->ranges[0])); ++ new_leaf->head.num_room_in_leaf = new_room_in_leaf; ++ new_leaf->num_stored_in_leaf = leaf->num_stored_in_leaf; ++ ++ memcpy (new_leaf->ranges, ++ leaf->ranges, ++ leaf->num_stored_in_leaf * sizeof (leaf->ranges[0])); ++ trie = &new_leaf->head; ++ is_full_leaf = false; ++ ++ /* Now the insert below will go through. */ ++ } ++ ++ /* If we're a leaf (now with room), we can just insert at the end. */ ++ if (trie->num_room_in_leaf > 0) ++ { ++ struct trie_leaf *leaf = (struct trie_leaf *) trie; ++ ++ unsigned int i = leaf->num_stored_in_leaf++; ++ leaf->ranges[i].unit = unit; ++ leaf->ranges[i].low_pc = low_pc; ++ leaf->ranges[i].high_pc = high_pc; ++ return trie; ++ } ++ ++ /* Now we are definitely an interior node, so recurse into all ++ the relevant buckets. */ ++ ++ /* Clamp the range to the current trie bucket. */ ++ clamped_low_pc = low_pc; ++ clamped_high_pc = high_pc; ++ if (trie_pc_bits > 0) ++ { ++ bfd_vma bucket_high_pc = ++ trie_pc + ((bfd_vma)-1 >> trie_pc_bits); /* Inclusive. */ ++ if (clamped_low_pc < trie_pc) ++ clamped_low_pc = trie_pc; ++ if (clamped_high_pc > bucket_high_pc) ++ clamped_high_pc = bucket_high_pc; ++ } ++ ++ /* Insert the ranges in all buckets that it spans. */ ++ from_ch = (clamped_low_pc >> (VMA_BITS - trie_pc_bits - 8)) & 0xff; ++ to_ch = ((clamped_high_pc - 1) >> (VMA_BITS - trie_pc_bits - 8)) & 0xff; ++ for (ch = from_ch; ch <= to_ch; ++ch) ++ { ++ struct trie_interior *interior = (struct trie_interior *) trie; ++ struct trie_node *child = interior->children[ch]; ++ ++ if (child == NULL) ++ { ++ child = alloc_trie_leaf (abfd); ++ if (!child) ++ return NULL; ++ } ++ child = insert_arange_in_trie (abfd, ++ child, ++ trie_pc + ((bfd_vma)ch << (VMA_BITS - trie_pc_bits - 8)), ++ trie_pc_bits + 8, ++ unit, ++ low_pc, ++ high_pc); ++ if (!child) ++ return NULL; ++ ++ interior->children[ch] = child; ++ } ++ ++ return trie; ++} ++ ++ + static bool +-arange_add (const struct comp_unit *unit, struct arange *first_arange, +- bfd_vma low_pc, bfd_vma high_pc) ++arange_add (struct comp_unit *unit, struct arange *first_arange, ++ struct trie_node **trie_root, bfd_vma low_pc, bfd_vma high_pc) + { + struct arange *arange; + +@@ -1776,6 +2042,19 @@ arange_add (const struct comp_unit *unit, struct arange *first_arange, + if (low_pc == high_pc) + return true; + ++ if (trie_root != NULL) ++ { ++ *trie_root = insert_arange_in_trie (unit->file->bfd_ptr, ++ *trie_root, ++ 0, ++ 0, ++ unit, ++ low_pc, ++ high_pc); ++ if (*trie_root == NULL) ++ return false; ++ } ++ + /* If the first arange is empty, use it. */ + if (first_arange->high == 0) + { +@@ -2410,7 +2689,8 @@ decode_line_info (struct comp_unit *unit) + low_pc = address; + if (address > high_pc) + high_pc = address; +- if (!arange_add (unit, &unit->arange, low_pc, high_pc)) ++ if (!arange_add (unit, &unit->arange, &unit->file->trie_root, ++ low_pc, high_pc)) + goto line_fail; + break; + case DW_LNE_set_address: +@@ -3134,7 +3414,7 @@ find_abstract_instance (struct comp_unit *unit, + + static bool + read_ranges (struct comp_unit *unit, struct arange *arange, +- bfd_uint64_t offset) ++ struct trie_node **trie_root, bfd_uint64_t offset) + { + bfd_byte *ranges_ptr; + bfd_byte *ranges_end; +@@ -3169,7 +3449,7 @@ read_ranges (struct comp_unit *unit, struct arange *arange, + base_address = high_pc; + else + { +- if (!arange_add (unit, arange, ++ if (!arange_add (unit, arange, trie_root, + base_address + low_pc, base_address + high_pc)) + return false; + } +@@ -3179,7 +3459,7 @@ read_ranges (struct comp_unit *unit, struct arange *arange, + + static bool + read_rnglists (struct comp_unit *unit, struct arange *arange, +- bfd_uint64_t offset) ++ struct trie_node **trie_root, bfd_uint64_t offset) + { + bfd_byte *rngs_ptr; + bfd_byte *rngs_end; +@@ -3253,19 +3533,19 @@ read_rnglists (struct comp_unit *unit, struct arange *arange, + return false; + } + +- if (!arange_add (unit, arange, low_pc, high_pc)) ++ if (!arange_add (unit, arange, trie_root, low_pc, high_pc)) + return false; + } + } + + static bool + read_rangelist (struct comp_unit *unit, struct arange *arange, +- bfd_uint64_t offset) ++ struct trie_node **trie_root, bfd_uint64_t offset) + { + if (unit->version <= 4) +- return read_ranges (unit, arange, offset); ++ return read_ranges (unit, arange, trie_root, offset); + else +- return read_rnglists (unit, arange, offset); ++ return read_rnglists (unit, arange, trie_root, offset); + } + + static struct funcinfo * +@@ -3563,7 +3843,8 @@ scan_unit_for_symbols (struct comp_unit *unit) + + case DW_AT_ranges: + if (is_int_form (&attr) +- && !read_rangelist (unit, &func->arange, attr.u.val)) ++ && !read_rangelist (unit, &func->arange, ++ &unit->file->trie_root, attr.u.val)) + goto fail; + break; + +@@ -3679,7 +3960,8 @@ scan_unit_for_symbols (struct comp_unit *unit) + + if (func && high_pc != 0) + { +- if (!arange_add (unit, &func->arange, low_pc, high_pc)) ++ if (!arange_add (unit, &func->arange, &unit->file->trie_root, ++ low_pc, high_pc)) + goto fail; + } + } +@@ -3874,7 +4156,8 @@ parse_comp_unit (struct dwarf2_debug *stash, + + case DW_AT_ranges: + if (is_int_form (&attr) +- && !read_rangelist (unit, &unit->arange, attr.u.val)) ++ && !read_rangelist (unit, &unit->arange, ++ &unit->file->trie_root, attr.u.val)) + return NULL; + break; + +@@ -3916,7 +4199,8 @@ parse_comp_unit (struct dwarf2_debug *stash, + high_pc += low_pc; + if (high_pc != 0) + { +- if (!arange_add (unit, &unit->arange, low_pc, high_pc)) ++ if (!arange_add (unit, &unit->arange, &unit->file->trie_root, ++ low_pc, high_pc)) + return NULL; + } + +@@ -4747,6 +5031,14 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd, + if (!stash->alt.abbrev_offsets) + return false; + ++ stash->f.trie_root = alloc_trie_leaf (abfd); ++ if (!stash->f.trie_root) ++ return false; ++ ++ stash->alt.trie_root = alloc_trie_leaf (abfd); ++ if (!stash->alt.trie_root) ++ return false; ++ + *pinfo = stash; + + if (debug_bfd == NULL) +@@ -4918,6 +5210,12 @@ stash_comp_unit (struct dwarf2_debug *stash, struct dwarf2_debug_file *file) + each->next_unit = file->all_comp_units; + file->all_comp_units = each; + ++ if (each->arange.high == 0) ++ { ++ each->next_unit_without_ranges = file->all_comp_units_without_ranges; ++ file->all_comp_units_without_ranges = each->next_unit_without_ranges; ++ } ++ + file->info_ptr += length; + return each; + } diff --git a/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-2.patch b/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-2.patch new file mode 100644 index 0000000000..a58b8dccdc --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-2.patch @@ -0,0 +1,210 @@ +From 1e716c1b160d56c2ab8711e199cad5b4db47cedf Mon Sep 17 00:00:00 2001 +From: Nick Clifton +Date: Tue, 30 Aug 2022 16:01:20 +0100 +Subject: [PATCH] BFD library: Use entry 0 in directory and filename tables of + + DWARF-5 debug info. + + PR 29529 + * dwarf2.c (struct line_info_table): Add new field: + use_dir_and_file_0. + (concat_filename): Use new field to help select the correct table + slot. + (read_formatted_entries): Do not skip entry 0. + (decode_line_info): Set new field depending upon the version of + DWARF being parsed. Initialise filename based upon the setting of + the new field. + +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=37833b966576c5d25e797ea3b6c33d0459a71892] +CVE: CVE-2023-22608 + +Signed-off-by: Yash Shinde + +--- + bfd/dwarf2.c | 86 ++++++++++++++++++++---------- + ld/testsuite/ld-x86-64/pr27587.err | 2 +- + 2 files changed, 59 insertions(+), 29 deletions(-) + +diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c +index 0ae50a37..b7839ad6 100644 +--- a/bfd/dwarf2.c ++++ b/bfd/dwarf2.c +@@ -1571,6 +1571,7 @@ struct line_info_table + unsigned int num_files; + unsigned int num_dirs; + unsigned int num_sequences; ++ bool use_dir_and_file_0; + char * comp_dir; + char ** dirs; + struct fileinfo* files; +@@ -1791,16 +1792,30 @@ concat_filename (struct line_info_table *table, unsigned int file) + { + char *filename; + +- if (table == NULL || file - 1 >= table->num_files) ++ /* Pre DWARF-5 entry 0 in the directory and filename tables was not used. ++ So in order to save space in the tables used here the info for, eg ++ directory 1 is stored in slot 0 of the directory table, directory 2 ++ in slot 1 and so on. ++ ++ Starting with DWARF-5 the 0'th entry is used so there is a one to one ++ mapping between DWARF slots and internal table entries. */ ++ if (! table->use_dir_and_file_0) + { +- /* FILE == 0 means unknown. */ +- if (file) +- _bfd_error_handler +- (_("DWARF error: mangled line number section (bad file number)")); ++ /* Pre DWARF-5, FILE == 0 means unknown. */ ++ if (file == 0) ++ return strdup (""); ++ -- file; ++ } ++ ++ if (table == NULL || file >= table->num_files) ++ { ++ _bfd_error_handler ++ (_("DWARF error: mangled line number section (bad file number)")); + return strdup (""); + } + +- filename = table->files[file - 1].name; ++ filename = table->files[file].name; ++ + if (filename == NULL) + return strdup (""); + +@@ -1811,12 +1826,17 @@ concat_filename (struct line_info_table *table, unsigned int file) + char *name; + size_t len; + +- if (table->files[file - 1].dir ++ if (table->files[file].dir + /* PR 17512: file: 0317e960. */ +- && table->files[file - 1].dir <= table->num_dirs ++ && table->files[file].dir <= table->num_dirs + /* PR 17512: file: 7f3d2e4b. */ + && table->dirs != NULL) +- subdir_name = table->dirs[table->files[file - 1].dir - 1]; ++ { ++ if (table->use_dir_and_file_0) ++ subdir_name = table->dirs[table->files[file].dir]; ++ else ++ subdir_name = table->dirs[table->files[file].dir - 1]; ++ } + + if (!subdir_name || !IS_ABSOLUTE_PATH (subdir_name)) + dir_name = table->comp_dir; +@@ -1857,10 +1877,12 @@ concat_filename (struct line_info_table *table, unsigned int file) + + /* Check whether [low1, high1) can be combined with [low2, high2), + i.e., they touch or overlap. */ +-static bool ranges_overlap (bfd_vma low1, +- bfd_vma high1, +- bfd_vma low2, +- bfd_vma high2) ++ ++static bool ++ranges_overlap (bfd_vma low1, ++ bfd_vma high1, ++ bfd_vma low2, ++ bfd_vma high2) + { + if (low1 == low2 || high1 == high2) + return true; +@@ -1887,15 +1909,16 @@ static bool ranges_overlap (bfd_vma low1, + /* Insert an address range in the trie mapping addresses to compilation units. + Will return the new trie node (usually the same as is being sent in, but + in case of a leaf-to-interior conversion, or expansion of a leaf, it may be +- different), or NULL on failure. +- */ +-static struct trie_node *insert_arange_in_trie(bfd *abfd, +- struct trie_node *trie, +- bfd_vma trie_pc, +- unsigned int trie_pc_bits, +- struct comp_unit *unit, +- bfd_vma low_pc, +- bfd_vma high_pc) ++ different), or NULL on failure. */ ++ ++static struct trie_node * ++insert_arange_in_trie (bfd *abfd, ++ struct trie_node *trie, ++ bfd_vma trie_pc, ++ unsigned int trie_pc_bits, ++ struct comp_unit *unit, ++ bfd_vma low_pc, ++ bfd_vma high_pc) + { + bfd_vma clamped_low_pc, clamped_high_pc; + int ch, from_ch, to_ch; +@@ -2031,7 +2054,6 @@ static struct trie_node *insert_arange_in_trie(bfd *abfd, + return trie; + } + +- + static bool + arange_add (struct comp_unit *unit, struct arange *first_arange, + struct trie_node **trie_root, bfd_vma low_pc, bfd_vma high_pc) +@@ -2412,10 +2434,8 @@ read_formatted_entries (struct comp_unit *unit, bfd_byte **bufp, + } + } + +- /* Skip the first "zero entry", which is the compilation dir/file. */ +- if (datai != 0) +- if (!callback (table, fe.name, fe.dir, fe.time, fe.size)) +- return false; ++ if (!callback (table, fe.name, fe.dir, fe.time, fe.size)) ++ return false; + } + + *bufp = buf; +@@ -2592,6 +2612,7 @@ decode_line_info (struct comp_unit *unit) + if (!read_formatted_entries (unit, &line_ptr, line_end, table, + line_info_add_file_name)) + goto fail; ++ table->use_dir_and_file_0 = true; + } + else + { +@@ -2614,6 +2635,7 @@ decode_line_info (struct comp_unit *unit) + if (!line_info_add_file_name (table, cur_file, dir, xtime, size)) + goto fail; + } ++ table->use_dir_and_file_0 = false; + } + + /* Read the statement sequences until there's nothing left. */ +@@ -2622,7 +2644,7 @@ decode_line_info (struct comp_unit *unit) + /* State machine registers. */ + bfd_vma address = 0; + unsigned char op_index = 0; +- char * filename = table->num_files ? concat_filename (table, 1) : NULL; ++ char * filename = NULL; + unsigned int line = 1; + unsigned int column = 0; + unsigned int discriminator = 0; +@@ -2637,6 +2659,14 @@ decode_line_info (struct comp_unit *unit) + bfd_vma low_pc = (bfd_vma) -1; + bfd_vma high_pc = 0; + ++ if (table->num_files) ++ { ++ if (table->use_dir_and_file_0) ++ filename = concat_filename (table, 0); ++ else ++ filename = concat_filename (table, 1); ++ } ++ + /* Decode the table. */ + while (!end_sequence && line_ptr < line_end) + { +diff --git a/ld/testsuite/ld-x86-64/pr27587.err b/ld/testsuite/ld-x86-64/pr27587.err +index fa870790..807750ca 100644 +--- a/ld/testsuite/ld-x86-64/pr27587.err ++++ b/ld/testsuite/ld-x86-64/pr27587.err +@@ -1,3 +1,3 @@ + #... +-.*pr27587.i:4: undefined reference to `stack_size' ++.*pr27587/:4: undefined reference to `stack_size' + #... diff --git a/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-3.patch b/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-3.patch new file mode 100644 index 0000000000..a1b74248ce --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0020-CVE-2023-22608-3.patch @@ -0,0 +1,32 @@ +From 4b8386a90802ed8e43eac2266f6e03c92b4462ed Mon Sep 17 00:00:00 2001 +From: Nick Clifton +Date: Fri, 23 Dec 2022 13:02:04 +0000 +Subject: [PATCH] Fix illegal memory access parsing corrupt DWARF information. + + PR 29936 + * dwarf2.c (concat_filename): Fix check for a directory index off + the end of the directory table. + +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=8af23b30edbaedf009bc9b243cd4dfa10ae1ac09] +CVE: CVE-2023-22608 + +Signed-off-by: Yash Shinde + +--- + bfd/dwarf2.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c +index b7839ad6..8b07a24c 100644 +--- a/bfd/dwarf2.c ++++ b/bfd/dwarf2.c +@@ -1828,7 +1828,8 @@ concat_filename (struct line_info_table *table, unsigned int file) + + if (table->files[file].dir + /* PR 17512: file: 0317e960. */ +- && table->files[file].dir <= table->num_dirs ++ && table->files[file].dir ++ <= (table->use_dir_and_file_0 ? table->num_dirs - 1 : table->num_dirs) + /* PR 17512: file: 7f3d2e4b. */ + && table->dirs != NULL) + { From patchwork Fri Mar 3 16:17: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: 20398 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 422C0C64EC4 for ; Fri, 3 Mar 2023 16:17:37 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.27598.1677860256132335378 for ; Fri, 03 Mar 2023 08:17:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=K1DdfSOn; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id n6so3189649plf.5 for ; Fri, 03 Mar 2023 08:17:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860255; 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=JrXOFZ3UyPMxvUsPtGIlWJTpLK0dN0uMg9pacr3V9GE=; b=K1DdfSOnMtMIiC6qtts4lghx7Z6/QApHUISjPraKzMhBczkk6rrkcjiWHs7vHIILZA EzV/pz+YvXHMw8g8ny1UdEZk3Ye8t6UCDchGiwZ70fRQLBmemV4XJGSFmnXO8TBe3oCm iFN1N+KsOvsvlItFzlfqusoZH6qhLEPgtHc0UqbdYP5cHviT5zR1U5sJdTKlFgHCtJq3 6i+xWCVyHkxz+Np8a1mO1D+BF/lTHpis0x9pshGsIZH5fFlRvY+T8Qidl6kZPEhPDxrj HcnRK6cEywIk/fCAi4jm61+UYiRAM7mwnhDrcpG3cVS+8FEk4/DCxNzUAWw1VKPInoHQ BkQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860255; 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=JrXOFZ3UyPMxvUsPtGIlWJTpLK0dN0uMg9pacr3V9GE=; b=3VeXk3B6gzhhKFKfKTnJMhtwpuoLHa0BqC8svN6CcY/bzDMFxb8pQ3507bCcMWS5WH My9mG1fa6mB2qi78L88Pyy3mXR3wcuxf+hyqz8iK/77i6DhKYdz85g+YQHVprp+ho3Ki lGj3+A3VvPWRjqAEGDBmn6jUCYvT0Ebwl7XerHSsKNA2YOvnpGswUX73+cCk47khHvXd J8cXIOXYNthw2lRvICV02OqgTUte0EzkSvDotIJwb9WoN37H7An3ucCsLZJcV2L7mZda cEwGWKHz7h0T2p0+sblIHPEim6DAvzQHGRbcSizGW4mcR/V0qa+LcgiVw3zwYJayZoeG RxaA== X-Gm-Message-State: AO0yUKV5gagtwsbvjNlkysf1NTgvWmbIaVh3hW61tKS78NCWYG4UT/xg n/byBXPn1aBetJPp68keVuX5kd2apIDzg3JhngQ= X-Google-Smtp-Source: AK7set/is8PF0QtqJtPYOx9KoPKXTheYUv1f3wE0mAPzl/r/d9Nd3nnlUjT0a01Hzk9cyBd+dCUUwA== X-Received: by 2002:a17:902:e801:b0:19a:b4a9:9df7 with SMTP id u1-20020a170902e80100b0019ab4a99df7mr2604627plg.53.1677860255005; Fri, 03 Mar 2023 08:17:35 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:34 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/29] harfbuzz: fix CVE-2023-25193 allows attackers to trigger O(n^2) growth via consecutive marks Date: Fri, 3 Mar 2023 06:17:00 -1000 Message-Id: <9bc6342a9e02e14806903fdb589bf5a854093639.1677859897.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 ; Fri, 03 Mar 2023 16:17:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177991 From: Vivek Kumbhar [layout] Limit how far we skip when looking back Signed-off-by: Vivek Kumbhar Signed-off-by: Steve Sakoman --- .../harfbuzz/harfbuzz/CVE-2023-25193.patch | 71 +++++++++++++++++++ .../harfbuzz/harfbuzz_4.0.1.bb | 4 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193.patch 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..54ceebcf93 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz/CVE-2023-25193.patch @@ -0,0 +1,71 @@ +From 85be877925ddbf34f74a1229f3ca1716bb6170dc Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Wed, 1 Feb 2023 20:00:43 -0700 +Subject: [PATCH] [layout] Limit how far we skip when looking back + +Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/85be877925ddbf34f74a1229f3ca1716bb6170dc] +CVE: CVE-2023-25193 +Signed-off-by: Vivek Kumbhar +--- + src/hb-ot-layout-common.hh | 7 +++++++ + src/hb-ot-layout-gsubgpos.hh | 19 ++++++++++++++++--- + 2 files changed, 23 insertions(+), 3 deletions(-) + +diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh +index 60a1906..f7f8d5f 100644 +--- a/src/hb-ot-layout-common.hh ++++ b/src/hb-ot-layout-common.hh +@@ -72,6 +72,13 @@ + #define HB_MAX_LOOKUP_VISIT_COUNT 35000 + #endif + ++#ifndef HB_MAX_NESTING_LEVEL ++#define HB_MAX_NESTING_LEVEL 6 ++#endif ++#ifndef HB_MAX_CONTEXT_LENGTH ++#define HB_MAX_CONTEXT_LENGTH 64 ++#endif ++ + + namespace OT { + +diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh +index 65de131..891d96a 100644 +--- a/src/hb-ot-layout-gsubgpos.hh ++++ b/src/hb-ot-layout-gsubgpos.hh +@@ -525,7 +525,10 @@ struct hb_ot_apply_context_t : + bool next (unsigned *unsafe_to = nullptr) + { + assert (num_items > 0); +- while (idx + num_items < end) ++ unsigned stop = end - num_items; ++ if (c->buffer->flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) ++ stop = end - 1; ++ while (idx < stop) + { + idx++; + const hb_glyph_info_t &info = c->buffer->info[idx]; +@@ -557,8 +560,18 @@ struct hb_ot_apply_context_t : + } + bool prev (unsigned *unsafe_from = nullptr) + { +- assert (num_items > 0); +- while (idx > num_items - 1) ++ assert (num_items > 0); ++ unsigned stop = 1 - num_items; ++ if (c->buffer->flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) ++ stop = 1 - 1; ++ ++ /* When looking back, limit how far we search; this function is mostly ++ * used for looking back for base glyphs when attaching marks. If we ++ * don't limit, we can get O(n^2) behavior where n is the number of ++ * consecutive marks. */ ++ stop = (unsigned) hb_max ((int) stop, (int) idx - HB_MAX_CONTEXT_LENGTH); ++ ++ while (idx > stop) + { + idx--; + const hb_glyph_info_t &info = c->buffer->out_info[idx]; +-- +2.25.1 + diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb index bdbb322e42..2a2ec714d0 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb @@ -13,7 +13,9 @@ UPSTREAM_CHECK_REGEX = "harfbuzz-(?P\d+(\.\d+)+).tar" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ file://CVE-2022-33068.patch \ - file://0001-Fix-conditional.patch" + file://0001-Fix-conditional.patch \ + file://CVE-2023-25193.patch \ + " SRC_URI[sha256sum] = "98f68777272db6cd7a3d5152bac75083cd52a26176d87bc04c8b3929d33bce49" inherit meson pkgconfig lib_package gtk-doc gobject-introspection From patchwork Fri Mar 3 16:17: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: 20405 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 1ED94C7EE32 for ; Fri, 3 Mar 2023 16:17:47 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.27599.1677860257650685133 for ; Fri, 03 Mar 2023 08:17:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=x2ZemCWh; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id y11so3215011plg.1 for ; Fri, 03 Mar 2023 08:17:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860257; 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=+fcejv/l6QBrzLy9JL5sarH6ivo99OyIK7qvFWC9br4=; b=x2ZemCWhZuYUigtTGaPZDGxp79oppeGj6UDR/MSJw0T4mwV+F4Qw9iAXoN8eqEjAUR jADTNHq6S27QmP89ySx/ZbPX37QhYegZYrBCnuIkfeu3KaJxyZz6Pg54z1B7HwFdsqSY n3ql6F/edFWxTjeV7dhWp9SulfzFw9tvUog6u3zuMAVKeuSVq1e30naYnqVNkNDssK1n tC4FFA5f5CXw5runKJHk0bLg4n705kx0q5af8pwVLnOW6l59Vn1zLQz+e4NQfkBJ1Hib j68/Hu4gFZ/2KqYxgiJU/NP+WkLei/pmnNJtZ7k/J3XeSU7kOtvbZZHwWtvKlsYqG1pl OX9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860257; 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=+fcejv/l6QBrzLy9JL5sarH6ivo99OyIK7qvFWC9br4=; b=cO6B6pMCRgy5qZHFpVuF8y/sOW0kKJZBF0QtWp/NmlRRLDaJ62iFl6AC6EUGuI13Se tMubKMjHHfR5ZZY5MBFZYvK+QnZ2P8PoWdYXQ3Fp3VnxwceF8H+kDXPgiW5ZuIKQ7I65 9GJ4aPX4kBAfKqIe5Jz5f4CIiNIPALvkzmmJ6MXgFvs7q56twWYHW/4VDH0rLO1jNnGg 39PQ9hMHQngra4yNpd4Jb2eLsWalLKPz7pyO4Xh0FAtnIrQMp9YcD1yOM74fRFlcUNfd Lkig+3wf9F89mIxP4V+W63wciagFsN0BZuW0U5sblJAFGYb5ikKTc4zhoBMBjgyTVAnq 6d/g== X-Gm-Message-State: AO0yUKWcTEfJ7/HyGsnbMEyJRTj0h0QmcnF6a0TKuLxYi0mrbDAOqPes RgAw1tPKMQSXisU3YMBkuYKnuVIRzPa1ZUHZb2c= X-Google-Smtp-Source: AK7set8f6scGWA/qNE8hR/BoBLti71AzVWYXRAkBKo7n9JhfZ0DPDqmCHhYi1E3f1prgzdtj6m1ApA== X-Received: by 2002:a17:902:f68a:b0:19e:6084:da58 with SMTP id l10-20020a170902f68a00b0019e6084da58mr2938383plg.4.1677860256761; Fri, 03 Mar 2023 08:17:36 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:36 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/29] libsdl2: fix CVE-2022-4743 Date: Fri, 3 Mar 2023 06:17:01 -1000 Message-Id: <01b75e75fceff8dfe4676772ab0653f52c0584e4.1677859897.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 ; Fri, 03 Mar 2023 16:17:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177992 From: Changqing Li Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- ...ial-memory-leak-in-GLES_CreateTextur.patch | 40 +++++++++++++++++++ .../libsdl2/libsdl2_2.0.20.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-potential-memory-leak-in-GLES_CreateTextur.patch diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-potential-memory-leak-in-GLES_CreateTextur.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-potential-memory-leak-in-GLES_CreateTextur.patch new file mode 100644 index 0000000000..31bda54dd3 --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-potential-memory-leak-in-GLES_CreateTextur.patch @@ -0,0 +1,40 @@ +From 3cf2048b647484cc3a6abd0d78be60cead47b42d Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 24 Feb 2023 16:59:19 +0800 +Subject: [PATCH] Fix potential memory leak in GLES_CreateTextur + +CVE: CVE-2022-4743 +Upstream-Status: Backport [https://github.com/libsdl-org/SDL/commit/00b67f55727bc0944c3266e2b875440da132ce4b] + +Signed-off-by: Changqing Li +--- + src/render/opengles/SDL_render_gles.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c +index a6b58f2..237b1d6 100644 +--- a/src/render/opengles/SDL_render_gles.c ++++ b/src/render/opengles/SDL_render_gles.c +@@ -368,6 +368,9 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) + renderdata->glGenTextures(1, &data->texture); + result = renderdata->glGetError(); + if (result != GL_NO_ERROR) { ++ if (texture->access == SDL_TEXTUREACCESS_STREAMING) { ++ SDL_free(data->pixels); ++ } + SDL_free(data); + return GLES_SetError("glGenTextures()", result); + } +@@ -396,6 +399,9 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) + + result = renderdata->glGetError(); + if (result != GL_NO_ERROR) { ++ if (texture->access == SDL_TEXTUREACCESS_STREAMING) { ++ SDL_free(data->pixels); ++ } + SDL_free(data); + return GLES_SetError("glTexImage2D()", result); + } +-- +2.25.1 + diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb index c1c827af79..abcf232e25 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb @@ -24,6 +24,7 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://optional-libunwind-generic.patch \ file://0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch \ + file://0001-Fix-potential-memory-leak-in-GLES_CreateTextur.patch \ " SRC_URI:append:class-native = " file://0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch" From patchwork Fri Mar 3 16:17: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: 20401 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 1ED45C7EE2D for ; Fri, 3 Mar 2023 16:17:47 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web11.27600.1677860259281506072 for ; Fri, 03 Mar 2023 08:17:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=K7ZTcVVU; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id qa18-20020a17090b4fd200b0023750b675f5so6631944pjb.3 for ; Fri, 03 Mar 2023 08:17:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860258; 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=oFNyNfSPeY8WWZjecDj289XDJ0qXHlG+XKohL0pe/nI=; b=K7ZTcVVU9ttC187kQciaxQPy6C/Nul+Eoa66mkSi57guRkp1KKErNRQTGCM9hKzYwi oQePTQHuGEeWA4tVlK0DVlro4F2akdXdWKML1nvjoHbrTUXKEYO++w38kz35EQBsyrQA Wnq+6CFGXNs7OuUcm4vT09/DE/H2353EBcqaQ/XOEobU47+wdZcxh9ZqEAY/+sa+OkTE Ymi1u7McF2+n/oHNAYDkZLbqnRHOd01+AGq6HX/RnxIrzrIsv2EU0TRX8B3ngHJW/u53 Cj2dkQVbsE98MMVuvhCyDtll/IJvsdwzxZyeR98UkhU1+TBIs7ZbNrxfEZXRos2+ApVI FBdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860258; 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=oFNyNfSPeY8WWZjecDj289XDJ0qXHlG+XKohL0pe/nI=; b=rTkOaUfN9RuNjf87nGqsKKGxmPCDmdREjUWnEzbCyDmDaL5fWDmGPT/5FvR/z8yl9B LI0E7clggJ+LxP52Duk6TPLELLPrIr8FuZIJSYm0hZBJU7AVQPcZbb/ayCh6RmOzTtuh I6kn4rlem7YcSl5qV11Om46xoKhufskZ2Y4OOwakQM6AivEZQPXI2m6n6mz+IoAFMN5R QFuxbsOKs89CZYc51U9xr7+kDK7W/BEBMUPTIGdefb92UQwzPyR+QYO54XTnAWRcmTVF y4I3aJdGm/K9XlCxBuwYL/ZB6QBDxtGvW4ZASY/e0vGGRPMzwXWkIJWm7xj0XPgTimxx aLwg== X-Gm-Message-State: AO0yUKXOixvHlE7Ddwz7aCUVhaS1wNNm06ZdfeekDzRo12Zykekmb4Sf iwqTC0w6VHxvnQmsPo7X3R0qL3PTerscGZE11EY= X-Google-Smtp-Source: AK7set9F6m7oaZV9eL0CJ1GiZ3Af0GCqcOiKlgBAxV5Y+5GUlalrOXEwExd7Ufb5vqxaff1eOovqVw== X-Received: by 2002:a17:903:2308:b0:19a:a673:4ee2 with SMTP id d8-20020a170903230800b0019aa6734ee2mr3062354plh.31.1677860258312; Fri, 03 Mar 2023 08:17:38 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/29] less: backport the fix for CVE-2022-46663 Date: Fri, 3 Mar 2023 06:17:02 -1000 Message-Id: <1c17fb5bcb996f95f91676c65c9debc123672ac3.1677859897.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 ; Fri, 03 Mar 2023 16:17:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177993 From: Hitendra Prajapati Upstream-Status: Backport from https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../less/less/CVE-2022-46663.patch | 31 +++++++++++++++++++ meta/recipes-extended/less/less_600.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-extended/less/less/CVE-2022-46663.patch diff --git a/meta/recipes-extended/less/less/CVE-2022-46663.patch b/meta/recipes-extended/less/less/CVE-2022-46663.patch new file mode 100644 index 0000000000..4d61a52fa6 --- /dev/null +++ b/meta/recipes-extended/less/less/CVE-2022-46663.patch @@ -0,0 +1,31 @@ +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + + +CVE: CVE-2022-46663 +Upstream-Status: Backport [https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] +Signed-off-by: Hitendra Prajapati +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 0ef9b07..9d49cf8 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } +-- +2.25.1 + diff --git a/meta/recipes-extended/less/less_600.bb b/meta/recipes-extended/less/less_600.bb index 9ebe39daab..f68281ac93 100644 --- a/meta/recipes-extended/less/less_600.bb +++ b/meta/recipes-extended/less/less_600.bb @@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ DEPENDS = "ncurses" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ + file://CVE-2022-46663.patch \ " SRC_URI[sha256sum] = "6633d6aa2b3cc717afb2c205778c7c42c4620f63b1d682f3d12c98af0be74d20" From patchwork Fri Mar 3 16:17: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: 20402 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 18A2BC64EC4 for ; Fri, 3 Mar 2023 16:17:47 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.27554.1677860261318179499 for ; Fri, 03 Mar 2023 08:17:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Mf7P8wqK; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id x20-20020a17090a8a9400b00233ba727724so5923370pjn.1 for ; Fri, 03 Mar 2023 08:17:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860260; 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=1cmO1kHUBsFsNzWF/t4LfA6W5w0qoCpN0ZKgCvhflIU=; b=Mf7P8wqKX0YSB09jWlsgN+GRtwh0k+SEF5RbFT3u+Sq1Hm1N8/S8OfgLDhT31o6qQj nqU7N3ADYRT0bsqqOnh8yD8H+mKMHH2EzyQWQUjXqvev324EdSQPLbxZg4YIEfPEDy9o T/lgS+P3arlkt41JrPPttBn+PRsxLb5NUrQNrOO9Z3/p+rhVdhwMImXUUhfvwhwAJKRS btgrnOrruHqG0Prj+Dfl6zWjnNy6aR+MrNQWEqjHlGXeBmZ6pYK/ZXfd340ltz1RazCN j6JUy4n7csyETDiSM+3d5p9Jczgo+HxkiNwblzTWUyW6A4BGm4VPRW1kz9QNMPyi00lB J4yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860260; 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=1cmO1kHUBsFsNzWF/t4LfA6W5w0qoCpN0ZKgCvhflIU=; b=1MgvzGrSBzkC8geCp1mqLvaYTOZgPrvCDj/W+iCeaAEqeUfzNAQdnkqmPm97naiENA 8JLUTrX3EBF4LtImUiB0jgguiw6R6F8Rn9fL9qRf59P8Yuq5+idHp62tiaKgaIMAYUvH jvC6szin4jg7aNFZ0eNI3QiSD+Oa2dLUp73BBEE9k1Q/PeNsgQpiy+tYzN3EXA+9Mf56 lKPb8o9D9pJD1IAl3g1UzLX4dPk0pKoDlTG4QOgbNrq/sZzS5kvYd1kdiZVLlzMsVzir 0rmltoNqJRseRBMWWCPexiGlHuX1F4X3NcsxoJLFTWV13hCUD5fPqZuV0YkkZXXqWUGL z2ow== X-Gm-Message-State: AO0yUKW2piM0CMIpRUYYv7FZx/3YJbBidIA43/kboN16ucIR/BrWHupX ryc2xGi4VtTT3b4+2Pwi0NPDzPj3349Kh6NJTpE= X-Google-Smtp-Source: AK7set9kBSJbcCLR8w+NiS5ugvBAxDFwpHbMx/RD2uzCE6M2lMTiVQHpE0nSPTTXoBDIO2O0m0vlRA== X-Received: by 2002:a17:90a:1d1:b0:237:5834:294b with SMTP id 17-20020a17090a01d100b002375834294bmr2230845pjd.41.1677860260177; Fri, 03 Mar 2023 08:17:40 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:39 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/29] package.bbclase: Add check for /build in copydebugsources() Date: Fri, 3 Mar 2023 06:17:03 -1000 Message-Id: <02f4dd52a0a8e91636e44e1611abfedac3176106.1677859897.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 ; Fri, 03 Mar 2023 16:17:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177994 From: Saul Wold This is needed when the SDK or eSDK is installed in a /build top level directory as it conflicts with the build directory within the existing /usr/src/debug/build (which is really a link). Rename it and then do the copy, this is not an issue with master currently due to some other changes that occurred in master. Fixes: [YOCTO #15026] Signed-off-by: Saul Wold Signed-off-by: Steve Sakoman --- meta/classes/package.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 8b11fdd155..2950218145 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -636,6 +636,13 @@ def copydebugsources(debugsrcdir, sources, d): # Same check as above for externalsrc if workdir not in sdir: if os.path.exists(dvar + debugsrcdir + sdir): + # Special case for /build since we need to move into + # /usr/src/debug/build so rename sdir to build.build + if sdir.find("/build") == 0: + cmd = "mv %s%s%s %s%s%s" % (dvar, debugsrcdir, "/build", dvar, debugsrcdir, "/build.build") + subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) + sdir = sdir.replace("/build", "/build.build", 1) + cmd = "mv %s%s%s/* %s%s" % (dvar, debugsrcdir, sdir, dvar,debugsrcdir) subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) From patchwork Fri Mar 3 16:17: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: 20406 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 26B12C7EE37 for ; Fri, 3 Mar 2023 16:17:47 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.27598.1677860256132335378 for ; Fri, 03 Mar 2023 08:17:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vkMt0j9i; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id n6so3190018plf.5 for ; Fri, 03 Mar 2023 08:17:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860262; 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=MWMi79EH1gDn7Eydgj/2DR3muAh142q0eE5bl72OeBI=; b=vkMt0j9iqog93rRAIYEaj17ig6G6uhTf8Af2p8ohHPeCzf0uiSrxPDf2lEMXzw2u8L SQcnRhfAgGoMPf44NGaaJAOy0Fuh+gjt0DVxmvry36inCSa9ojWF2ElA6EeF6jKbNmKv PxQuDwfN4LFEVpjaazSq2FIvSKQJWIgdxvDnx8nAcbGvyGqLDbwCfiNHCAaxwMyNPSEn T4sPJPOavT0r2t5uLK3v7zbHXkC7RG5YLxzWItRCfaoiidHr1WmbU7VaKO0xyL3fHelT fjTsD+bin2KFUQYzbd/STsG6zMiEY1yEryxHcKiOnnBvTCzkhApMKfmOyCyCMzC5O+tT CpKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860262; 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=MWMi79EH1gDn7Eydgj/2DR3muAh142q0eE5bl72OeBI=; b=Jk62rsc4twVKHJJhGt2y58Zh5tWb+REJusfpjZC+osBKLEKSIjJJMIa7XgU2nj7Z1a AeYJWdSwPC+/c4zOhE8Jt+5WLrpe+uxaCP6CrWSlJHhB4dn07x28UUvjeeVxZiNp8OaM zYVCM2Rz1LtulI8g02O+i9ZB/SZHKyZ/kFruheTT2Arf8YX2LPfKjNBQfdR7BJbjfoLl lsUkchsVbpe4Y8hnERsh281hIumK5xXQETwvSsJaYDBt/Ua3KR70qQ1i5drjcYBE0HgA we+X1zHaC/sFbLEpWRcDWo1ZqelOUuwhxBhwmhCs8ZgF0Fv0anf54s0irYdIb8Iq2oRz iiNQ== X-Gm-Message-State: AO0yUKUVF3PrSndWAWkkhXdJfHNiu/L/m3KBUb5Bsf/UYmuUXOiU1FjF mrfF2JW1NDtLBBbEoxzbludUT3b74yk/lXBinKE= X-Google-Smtp-Source: AK7set+05c/e/pA7cxd/KQUcVMyNoNzD1aoxthv2CH56YaJMo2Lmg3R752KhGNdXzLHDbBR5jL1mxQ== X-Received: by 2002:a17:902:720b:b0:19c:cf89:b7ee with SMTP id ba11-20020a170902720b00b0019ccf89b7eemr2049648plb.69.1677860262251; Fri, 03 Mar 2023 08:17:42 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/29] xserver-xorg: 21.1.6 -> 21.1.7 Date: Fri, 3 Mar 2023 06:17:04 -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 ; Fri, 03 Mar 2023 16:17:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177995 From: Kai Kang According to the ANNOUNCE of xorg-server 21.1.7[1]: This release contains the fix for CVE-2023-0494 in today's security advisory: https://lists.x.org/archives/xorg-announce/2023-February/003320.html It also fixes a second possible OOB access during EnqueueEvent and a crasher caused by ResourceClientBits not correctly honouring the MaxClients value in the configuration file. Finally, a bunch of Xquartz updates including the ability to correctly detect ssh-tunneled clients as remote. [1]: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Signed-off-by: Kai Kang Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 60737bee6466e206d8f3c751910dfce00b60d703) Signed-off-by: Steve Sakoman --- .../{xserver-xorg_21.1.6.bb => xserver-xorg_21.1.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.6.bb => xserver-xorg_21.1.7.bb} (92%) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb similarity index 92% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb index 256903ce5f..212c7d39c2 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb @@ -3,7 +3,7 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ " -SRC_URI[sha256sum] = "1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484" +SRC_URI[sha256sum] = "d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. From patchwork Fri Mar 3 16:17: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: 20404 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 3719DC7EE3A for ; Fri, 3 Mar 2023 16:17:47 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.27605.1677860264917639768 for ; Fri, 03 Mar 2023 08:17:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=OuEPRLc5; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id u3-20020a17090a450300b00239db6d7d47so2726907pjg.4 for ; Fri, 03 Mar 2023 08:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860264; 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=TWzSKx6nI+vmiL8fx93n5TH7au1OwUyLw0JdENbtbN4=; b=OuEPRLc5oAi4E/UVfVK9tGMIpugWW9MS9z4LegVJxH5+hkXYbHl+bHpoArBLATtUpg RVHoo0RG/XxkQk8BJtiEszIAsYj1Gbq2JFf9SdISDcztjv/zonzbnDK5sSE7MPSeJpDp NM6NBTdrDw7AQ66DWec63f3OpGVWP0wThIBzV57NZGxFFS74mwDHMq44qCLQXPt5/7kP myYheE2Fss4NLV2702ZcTdaXZZwBZq01S1dDpnEHPYt4lY++bLPlGYAGnHODxKrYOSfk quuYEPsMkctZFqRUCCWVWLWSrNfkZtwAsb9C5XpbjepZ0lPglfLWudQTtbg/nviTE8WQ Xx/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860264; 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=TWzSKx6nI+vmiL8fx93n5TH7au1OwUyLw0JdENbtbN4=; b=HTHebvoZkcDEZo1NBJ6tQ1YVVu5/ne3sY0CJM5xLJDw1R24JLzwfBouOKvy0Pryfq7 cnBfrpau0OIqPlNTTsh5xYKeCEJhN8ph/TfQsNSTGwD0KKCWeugIRyK6GBCy5z0AEeYA c42M1KOr4SaSsnKxhUvDMMwUA7K0Y2j3UGtCDgmRwRGTl0VXtrKaws8dsK8Tcy12Go9W /ApK7KB6IejmxOPLU8hQRMu7Uaxm7LGKrZBw+5PoM0wkQ07ji9tY4FnkuOkxuBtqRpan FQ1ClvN7h4NdS40gfLwxPotnRtPivOpfy+wXbd1A8oh0yPCuOxbPmPgxiV0mtwnFXhGo aEwg== X-Gm-Message-State: AO0yUKWoMyjfh1ps9mLT2bpDgVEqnf+3gihMzEqlt0/MfkhOT3Mz8ZLK NEG1RgYzasIgbpjsFXsNPOFG3M6zQAdR/QwfCuc= X-Google-Smtp-Source: AK7set9MsQ0RnahlCGIfh9w+x/U/VlyIOGWWiEgekMEPBLtrh+s1u6PAMLqfMI7rSqko43JngExpgw== X-Received: by 2002:a17:902:e80d:b0:19c:cb64:dacc with SMTP id u13-20020a170902e80d00b0019ccb64daccmr3057366plg.61.1677860263918; Fri, 03 Mar 2023 08:17:43 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/29] vim: update 9.0.1211 -> 9.0.1293 to resolve open CVEs Date: Fri, 3 Mar 2023 06:17:05 -1000 Message-Id: <8cbcdf1ca8bc5fcda25ccbb4063b3f9c5dd8e2e2.1677859897.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 ; Fri, 03 Mar 2023 16:17:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177996 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6d77dbe499ee362b6e28902f1efcf52b961037a5) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 9bc6881fce..fcb5cf6334 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1211" -SRCREV = "f7d1c6e1884c76680980571f1cf15e0928d247b5" +PV .= ".1293" +SRCREV = "0caaf1e46511f7a92e036f05e6aa9d5992540117" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Fri Mar 3 16:17: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: 20403 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 35FB2C7EE2F for ; Fri, 3 Mar 2023 16:17:47 +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.27556.1677860266661907687 for ; Fri, 03 Mar 2023 08:17:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1SP7+vza; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id m20-20020a17090ab79400b00239d8e182efso6618367pjr.5 for ; Fri, 03 Mar 2023 08:17:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860266; 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=xyERdo5BnSGm8o2jGzq4Pg26IPo5bMm2yjiWid5Bte4=; b=1SP7+vzagl8NIoPukS5bEOz+H9SCpqgv5bCYbejfC5wGyeS01iZ7fitcrDQYqqFVkZ QTZ9WKfh3yYubnAVUijFdzAorRI9eeyQ6ZFnIgL9PGs7kDPnW/lEcEFA2JhTpn+xXlxZ NFBAzvPMYHlb46aFnh06Oh8ImX21W7qWQqRtzgi59HdQpLS2Ccl7FpFyxhYUvdKER5/8 7cG1YvfjOC6mIaRsHQms1/WsnsuXTow7cM3qmgiFgf2KmWB480kVdFh4DOlB2oV9YlMu HiU+n/Btl86pqWOUmGpo9gD7xbU2rgj6iGlMt7ez+qZVtDTmTAeiKftFCSgKPjEN5Emq 0BLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860266; 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=xyERdo5BnSGm8o2jGzq4Pg26IPo5bMm2yjiWid5Bte4=; b=LgvSpDJKTa7YWzigltcjb/zqJbfbwsy3130rzCa/vTQdpTsJGu1C7zhrZv7CGqdkK6 mwFMsfog+QPxngv2WQyXjkvTX6R4VgS/C8d5xfbIV65dd3jH5Aq9MKL+m5/5tKiEsFCh ToYylfgRO7lqWuR+8jN0NSsb8v4VA2gPIEpKG/vT+PL2jFrInMVmjKZFydnCC1FLnLri seJxCxqOwJPqPhXPCDffZg8Z/Ym4XwuyOwXHCpTXyorgEDXhwVQaMNQC9EPuVDDVi3TJ kCdR8JEo8Hgba1J2KIonYT7g7KNoVdY0/d/KmJVE4BzxCwTbi7RKWRI+JpvQf01n/hDV fqqg== X-Gm-Message-State: AO0yUKUHDdOTYXYadP14dixhRSObQUfeptGFupRF8+D8iSXm7sEJeyRU IMJPB2rwSJHp2eiRUIg1BL8IHLcEN6U69J22iHU= X-Google-Smtp-Source: AK7set9xjCartcsm0SI6TiV+KXHf3kArF4oMTrqhNlYgGqXUlWp5DooNE0ueHiFh+gaLNK/gtLH4Fw== X-Received: by 2002:a17:903:1211:b0:19b:98ce:48e6 with SMTP id l17-20020a170903121100b0019b98ce48e6mr2947080plh.6.1677860265645; Fri, 03 Mar 2023 08:17:45 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:45 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/29] libjpeg-turbo: upgrade 2.1.5 -> 2.1.5.1 Date: Fri, 3 Mar 2023 06:17:06 -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 ; Fri, 03 Mar 2023 16:17:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177997 From: Wang Mingyu Changelog: ========== 1. The SIMD dispatchers in libjpeg-turbo 2.1.4 and prior stored the list of supported SIMD instruction sets in a global variable, which caused an innocuous race condition whereby the variable could have been initialized multiple times if 'jpeg_start_*compress()' was called simultaneously in multiple threads. libjpeg-turbo 2.1.5 included an undocumented attempt to fix this race condition by making the SIMD support variable thread-local. However, that caused another issue whereby, if 'jpeg_start_*compress()' was called in one thread and 'jpeg_read_*()' or 'jpeg_write_*()' was called in a second thread, the SIMD support variable was never initialized in the second thread. On x86 systems, this led the second thread to incorrectly assume that AVX2 instructions were always available, and when it attempted to use those instructions on older x86 CPUs that do not support them, an illegal instruction error occurred. The SIMD dispatchers now ensure that the SIMD support variable is initialized before dispatching based on its value. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 009a1b0390d791d614b8d4a1407e7479c261f60d) Signed-off-by: Steve Sakoman (cherry picked from commit d57de2a7169de369105ed9bce19a43dad68f350a) Signed-off-by: Steve Sakoman --- .../jpeg/{libjpeg-turbo_2.1.5.bb => libjpeg-turbo_2.1.5.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.1.5.bb => libjpeg-turbo_2.1.5.1.bb} (97%) diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb similarity index 97% rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb index 4d21ca1e1d..e086830c02 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb @@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ " -SRC_URI[sha256sum] = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf" +SRC_URI[sha256sum] = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/" From patchwork Fri Mar 3 16:17: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: 20411 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 1F97EC7EE2D for ; Fri, 3 Mar 2023 16:17:57 +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.web11.27606.1677860268373605161 for ; Fri, 03 Mar 2023 08:17:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=nwOtnfn2; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id y2so3026575pjg.3 for ; Fri, 03 Mar 2023 08:17:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860267; 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=3V1XsZ8M0WjetKTJHxDXfXPaG2lYb+vKxPpjZx6VUAA=; b=nwOtnfn2bNcK9+olGrgfE6fGtYpI/rn8uU2q3PZLzOBxSiNdsLWBX7jWLfdkXHnqA1 sz2KbVIJZBGGEf7CNAp+Bpo1l6r7iJdPZv7LIPocFRmwB7AodeIO0t4fl5utwWmBnKVH HpKHzRfL+ddfH6o59uEsQWKCY7m8EN5di3ZQvYQMsu3cHx2OqpvWwgR7j5p3K4RQlRqs hj4rfYJavgEwmdnu+0rpQzug3S6WOAxqtg9Ye5Q/yN+vmUaVh4ur4u1HP++yHSiCa1sd 1YhoTwQTdJUeTdOgXQGDj8TRV9f+JdtX8aWloSOatv7EV5Uke5QWhGDKWwgtMXNGj88M JhEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860267; 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=3V1XsZ8M0WjetKTJHxDXfXPaG2lYb+vKxPpjZx6VUAA=; b=EpWhvrjPW6RGR6FaeH5j65QcM+fL/oXyqeZNO1l4Xr4UUMxXaqqSW1kII9muefW8Yu j87He3zrx/yIiFJLGFrB4d/lIlvBRtf87o9jIg1Z8hXhUPJmRXRkC52rX3xBWLq+2llS uz7ti3eyw6Fi2PC2xY1dK3PIecTSZaveEO/51mNov6PkEHRhdsR0BRcGGv/8CJcQGlLU NG73U+/NIDD1W9MDzY4uWPefv0PJT0pbXr+PD8uLG9xUNl3tXrseIMVNMhn8ehtqVir/ L8IaCCd/oAzja3hQJTOgUCKH94pP0f79sIK3Ks17SPj6wG03AvB6oINrJQPDtXld+294 EAyA== X-Gm-Message-State: AO0yUKXlqViJuwk34tA3UJS+THoJUtzolRLtBiAW3n9EQakQVhrJ8NCZ wKnML2gGNMxiokHdMNaHZkdEeQKI4h5n0ezRz5U= X-Google-Smtp-Source: AK7set/8W5N/gguQbqCwoyOwqaB4zNzWnXoxAvTfnmd4688OlavGUHBpcWbfxqTBe3IqzTH6rmICZQ== X-Received: by 2002:a17:902:ce91:b0:19d:1dfe:eac8 with SMTP id f17-20020a170902ce9100b0019d1dfeeac8mr6711260plg.26.1677860267452; Fri, 03 Mar 2023 08:17:47 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/29] xwayland: upgrade 22.1.7 -> 22.1.8 Date: Fri, 3 Mar 2023 06:17:07 -1000 Message-Id: <5dd1721731dec2a322bdd305d8410179580ab4dc.1677859897.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 ; Fri, 03 Mar 2023 16:17:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177998 From: Wang Mingyu xwayland 22.1.8 - Security fix for CVE-2023-0494 Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e0ca374267cce807d12d706564989900fe61bd97) Signed-off-by: Steve Sakoman (cherry picked from commit 964ca02debe1e85cb91789dee1d08344f4fcf33a) Signed-off-by: Steve Sakoman --- .../xwayland/{xwayland_22.1.7.bb => xwayland_22.1.8.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xwayland/{xwayland_22.1.7.bb => xwayland_22.1.8.bb} (95%) diff --git a/meta/recipes-graphics/xwayland/xwayland_22.1.7.bb b/meta/recipes-graphics/xwayland/xwayland_22.1.8.bb similarity index 95% rename from meta/recipes-graphics/xwayland/xwayland_22.1.7.bb rename to meta/recipes-graphics/xwayland/xwayland_22.1.8.bb index dd32bd0111..6919ba421b 100644 --- a/meta/recipes-graphics/xwayland/xwayland_22.1.7.bb +++ b/meta/recipes-graphics/xwayland/xwayland_22.1.8.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "d53afac6c71953f5cf66d03d289dacd8961da5bd309c1dff125d5955d9db5f76" +SRC_URI[sha256sum] = "d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" From patchwork Fri Mar 3 16:17:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20409 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 2650BC64EC4 for ; Fri, 3 Mar 2023 16:17:57 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.27558.1677860270170731301 for ; Fri, 03 Mar 2023 08:17:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fObyWKu2; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 6-20020a17090a190600b00237c5b6ecd7so6623247pjg.4 for ; Fri, 03 Mar 2023 08:17:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860269; 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=kjWmTW+ZrvJ0bjyT3AY+pGSOO38N3bJuo8/0dXAXyUE=; b=fObyWKu2HDp2XZMFqozPtt3W9OUd/Y1v3r1wPH2EGgZEGSZtweR8ZqcjGIHpH9FFv4 dduqXjc3S8/H1Q05Ldr8qYYNqiGUpNZod696Fx/FhPJN9E3Tge9brOVwviMxgog+JRTK eDQXrC3Vu2YLLEzYKpv1xV7MJw5ZLuyr1lReZSjO3qwqwithfRl0dLs/66Mgblehntsk xAhO5S1oHJRaP5mGMu0LoiUA2aBQMpuI/bKHyiNaYCyTEXu42jeZRXxWqwoOWX0HGI6W AAPicyEn7trEDM8pg1T9JpsIPE0A6oBl+trcCbpdbj1ZU5FwY86X1jiS+wIV1m75TZfg cuWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860269; 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=kjWmTW+ZrvJ0bjyT3AY+pGSOO38N3bJuo8/0dXAXyUE=; b=Wu7tJGd8Xz5hK4Xs9dj86J8Ul7360eEfMRe72HqJ2Co1JNoF0nejniAIwhvY7rMIP7 nwbaFUTA1kyktzKFjd7xY7q9TmXbjOcWeLbFUVsDxdO0pZSmpRIm/QCnSspZNOltifp3 xOiTF5AdzkksjHGOFZ28t+6jLWD6bQxrkyc/PB5U3+dXXHLFKSti2CKy1KKV1y03+BuJ 631CY94j+mG9sBpahRD9ycG27IsN1tvzvIaYvRmoWX3YmBmX3cdR5JLATXGiecmt1MKs /O3XBEeC9wx6uqEy9XaEVGxBsA5i+B+qc0Ulcr9ERCwiMV83xm3bosfYMYKyrWgkGoiM D7kw== X-Gm-Message-State: AO0yUKVyLPfHBwk4ZuVybAiywwKki1X9YoSAuCNzpQhdzj9tL51nAkeG dlp2hu3DSocQ0aN41FaOB5HJFgicsot+2T9ggVY= X-Google-Smtp-Source: AK7set+x0cCqMu8PG0g8dsVjzZ+gQAjLxSpF0FfBmWmHYlAg5cNrqCZl65kcP3cIgqR+Nz/SUbetOw== X-Received: by 2002:a17:902:7007:b0:19d:47b:67c8 with SMTP id y7-20020a170902700700b0019d047b67c8mr1969750plk.48.1677860269174; Fri, 03 Mar 2023 08:17:49 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:48 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/29] dbus: upgrade 1.14.4 -> 1.14.6 Date: Fri, 3 Mar 2023 06:17:08 -1000 Message-Id: <0623230fcdc02492c0a67506530b25438cf75c79.1677859897.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 ; Fri, 03 Mar 2023 16:17:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177999 From: Alexander Kanavin Denial of service fixes: • Fix an incorrect assertion that could be used to crash dbus-daemon or other users of DBusServer prior to authentication, if libdbus was compiled with assertions enabled. We recommend that production builds of dbus, for example in OS distributions, should be compiled with checks but without assertions. (dbus#421, Ralf Habacker; thanks to Evgeny Vereshchagin) Other fixes: • When connected to a dbus-broker, stop dbus-monitor from incorrectly replying to Peer method calls that were sent to the dbus-broker with a NULL destination (dbus#301, Kai A. Hiller) • Fix out-of-bounds varargs read in the dbus-daemon's config-parser. This is not attacker-triggerable and appears to be harmless in practice, but is technically undefined behaviour and is detected as such by AddressSanitizer. (dbus!357, Evgeny Vereshchagin) • Avoid a data race in multi-threaded use of DBusCounter (dbus#426, Ralf Habacker) • Fix a crash with some glibc versions when non-auditable SELinux events are logged (dbus!386, Jeremi Piotrowski) • If dbus_message_demarshal() runs out of memory while validating a message, report it as NoMemory rather than InvalidArgs (dbus#420, Simon McVittie) • Use C11 _Alignof if available, for better standards-compliance (dbus!389, Khem Raj) • Stop including an outdated copy of pkg.m4 in the git tree (dbus!365, Simon McVittie) • Documentation: · Consistently use Gitlab bug reporting URL (dbus!372, Marco Trevisan) • Tests fixes: · Fix the test-apparmor-activation test after dbus#416 (dbus!380, Dave Jones) Internal changes: • Fix CI builds with recent git versions (dbus#447, Simon McVittie) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 31245df3061c1a913bffe5e11ad6ac7fa9c83915) Signed-off-by: Steve Sakoman (cherry picked from commit 83e9bd1507fd5f79c680dde30b0f66df84cde6b0) Signed-off-by: Steve Sakoman --- meta/recipes-core/dbus/{dbus_1.14.4.bb => dbus_1.14.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/dbus/{dbus_1.14.4.bb => dbus_1.14.6.bb} (98%) diff --git a/meta/recipes-core/dbus/dbus_1.14.4.bb b/meta/recipes-core/dbus/dbus_1.14.6.bb similarity index 98% rename from meta/recipes-core/dbus/dbus_1.14.4.bb rename to meta/recipes-core/dbus/dbus_1.14.6.bb index 85db58e214..cc81047cef 100644 --- a/meta/recipes-core/dbus/dbus_1.14.4.bb +++ b/meta/recipes-core/dbus/dbus_1.14.6.bb @@ -14,9 +14,9 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://run-ptest \ file://tmpdir.patch \ file://dbus-1.init \ -" + " -SRC_URI[sha256sum] = "7c0f9b8e5ec0ff2479383e62c0084a3a29af99edf1514e9f659b81b30d4e353e" +SRC_URI[sha256sum] = "fd2bdf1bb89dc365a46531bff631536f22b0d1c6d5ce2c5c5e59b55265b3d66b" EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ From patchwork Fri Mar 3 16:17: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: 20408 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 1FC37C7EE2F for ; Fri, 3 Mar 2023 16:17:57 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.27599.1677860257650685133 for ; Fri, 03 Mar 2023 08:17:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Da39JkV8; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id y11so3215747plg.1 for ; Fri, 03 Mar 2023 08:17:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860271; 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=4tdPuxLZwPepHbPeprYAtw+LM9IspLqWHc1kQv1HuWA=; b=Da39JkV8UuV1Ihu6QjG0WvGdiyG0pR+gvsLdrm0aDnJeJXQhdoYQCb8pD3WMkGG/cV L+a5Tg1NnbghOo27c6GDm+gA/Dnui6CxgbrCXjL95e7eVK81iKZ0IkC30h4Y4EOJ6yOd AvR7D3zRzMWvyFeQ7oUViDnNvnGesFvCFmM1OCdZiIxO7bFGWMsuuLjRLDppDYbvC4X4 swLjLPKY41I4wvxjM9B2q9mae/slkYldbr5pnwLXNFZ/40i532rF2vHeA96YhZODrP59 4TARb6LjR6sauSfGthUbb+cc0oVNW8tYxXyIcWR97NY3uDRR697an61o2Dd3eI3wxrvI oWqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860271; 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=4tdPuxLZwPepHbPeprYAtw+LM9IspLqWHc1kQv1HuWA=; b=e2BH7aKDlwXmzy7CRk3si+p7DmtchRx0e3CkjkhhHvoxnNOaVsGoFDlBJ0dOEflg7E /BUSkP1W1udx3t1haqehxD3p9i8gXoko6PE3d5D5G8czLNC0FVyzgETpjpeBzRgXo5Kp 0yLdYVQ933/lADcnxmT2QFkVrHgny0n7O4+q2FJx35l1K7JJvmlku7IlF5XfXzjoNcTp aYfEXncMO40R/Yf3BcM0Bl1rH0iJ2jmsT3GbxwxaRIxaBinh0oiabJqOnkEckYivAMQl O4ymwoZlo3wfZpujhhvGLp009ljKbdEpayvhidW4qU0i+C3LZQfun0wkX4WGOIz1rJQ1 vN6w== X-Gm-Message-State: AO0yUKX5gIA+44hKkuG/qQ3XLYmwM533ljaXGHNaBXKWiuPhlOBCyaO4 H2cMJX+FFKuv27vE5zlo48OC4QzG6OoJSU+nuaw= X-Google-Smtp-Source: AK7set+e4C0gnlJaSUv9PBhrpupU4mXiZm8HM3ghmi19RU6VpRdGcPb9CdrcI9l6G+qouI14NcYB+A== X-Received: by 2002:a17:902:f548:b0:19c:947c:8819 with SMTP id h8-20020a170902f54800b0019c947c8819mr3018556plf.59.1677860270854; Fri, 03 Mar 2023 08:17:50 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:50 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/29] openssl: Upgrade 3.0.7 -> 3.0.8 Date: Fri, 3 Mar 2023 06:17:09 -1000 Message-Id: <006cdd236505803a72719fa2856432c7feb59082.1677859897.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 ; Fri, 03 Mar 2023 16:17:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178000 From: Siddharth Doshi OpenSSL 3.0.8 fixes 1 HIGH level security vulnerability and 7 MODERATE level security vulnerability [1]. Upgrade the recipe to point to 3.0.8. CVE-2022-3996 is reported fixed in 3.0.8, so drop the patch for that as well. [1] https://www.openssl.org/news/vulnerabilities.html CVEs Fixed: https://www.openssl.org/news/secadv/20230207.txt Signed-off-by: Siddharth Doshi Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 8461466f63200a0b1c9c247b70fdf5819651544c) Signed-off-by: Steve Sakoman (cherry picked from commit f5dce7274bfd65c05df932f36a5e43cfc884fd41) Signed-off-by: Steve Sakoman --- .../openssl/openssl/CVE-2022-3996.patch | 43 ------------------- .../{openssl_3.0.7.bb => openssl_3.0.8.bb} | 3 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch rename meta/recipes-connectivity/openssl/{openssl_3.0.7.bb => openssl_3.0.8.bb} (98%) diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch deleted file mode 100644 index 6d70b323d1..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 -From: Pauli -Date: Fri, 11 Nov 2022 09:40:19 +1100 -Subject: [PATCH] x509: fix double locking problem - -This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the -redundant flag setting. - -Fixes #19643 - -Fixes LOW CVE-2022-3996 - -Reviewed-by: Dmitry Belyavskiy -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/19652) - -(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) - -Upstream-Status: Backport [https://github.com/openssl/openssl/commit/7725e7bfe6f2ce8146b6552b44e0d226be7638e7] -CVE: CVE-2022-3996 -Signed-off-by: Vivek Kumbhar ---- - crypto/x509/pcy_map.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c -index 05406c6493..60dfd1e320 100644 ---- a/crypto/x509/pcy_map.c -+++ b/crypto/x509/pcy_map.c -@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) - - ret = 1; - bad_mapping: -- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { -- x->ex_flags |= EXFLAG_INVALID_POLICY; -- CRYPTO_THREAD_unlock(x->lock); -- } - sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); - return ret; - --- -2.30.2 - diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb b/meta/recipes-connectivity/openssl/openssl_3.0.8.bb similarity index 98% rename from meta/recipes-connectivity/openssl/openssl_3.0.7.bb rename to meta/recipes-connectivity/openssl/openssl_3.0.8.bb index 5156586661..75f9e44748 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.8.bb @@ -12,14 +12,13 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ - file://CVE-2022-3996.patch \ " SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e" +SRC_URI[sha256sum] = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e" inherit lib_package multilib_header multilib_script ptest perlnative MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" From patchwork Fri Mar 3 16:17: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: 20407 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 301DAC7EE39 for ; Fri, 3 Mar 2023 16:17:57 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.27598.1677860256132335378 for ; Fri, 03 Mar 2023 08:17:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=IuO9N7NH; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id n6so3190559plf.5 for ; Fri, 03 Mar 2023 08:17:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860273; 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=BBxssKUUCtNR98jAIHYefdIW3aaDb2b3Byhsu4003NY=; b=IuO9N7NHyMpI6nN2zTDY8+69S84A8wVuXo7iaq84vV4mtLaE7FY8S167ZSr2HIalSM MmvSrm+RAeQZonV3bJrPsNaYVWgFAnL+o856919cBbr0CijkRQ1Xrl+kkV4wy4xwKwjH wBoixcNlZW/JvknLidGvGUSaQyBLGtso5J6RsWif6b851HxmjwIlx0LLf6GJDiDEQ5BJ Ppna6B+09NAIoPZefyWoptlOZzfUpjk1GxST7iY3Z7gVF8K8iQJlZA1mn0nftspRqRMN phx+udD/p7SCTI6Kp5sCfJ/9bqTi/ZeE1tBYt8CP/Ypar/5RnOs9c77NQL0IWvl+oCRj 8d5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860273; 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=BBxssKUUCtNR98jAIHYefdIW3aaDb2b3Byhsu4003NY=; b=g4wKA+la4FxxrUYUS/ahVFOhVm9rU+rf3NMqNfpH7K+RriWq1yo24WhCDI4CpJqeE2 pN8GVH/8CoRE/HaDl+S4qbI1Do2MsSW4gyr7VsDVZr/SFpeHjOT+Xe3JcuOWr0w4ro1I 0pdQAuOiTUp3wJBoThhPicVHbGsM/uP17velSvO3QpV8WH8ZaQgGVjNw+ylur5iou9rv AgcDyeSE9dUq/oJK7uhNwT3k13GtMunqia9oCUoF8ylbvU4GaxvNninaIYC1Psjyhtdu 9QmM0tmF1qA+iqTmLEXwfrPOsmkhc+UPGkk7gA39vG1Cuctf5EsW7vODvHVtv8j0zcUy x6rQ== X-Gm-Message-State: AO0yUKUf+BLGOLAuAXpp7SYgrmjlSxxjFgaoWqzc8LhJzRFp/+nVvLC7 +PvLIvBTCFsjW4O/7UjnE2Rk1vwb1V9WEMksGY4= X-Google-Smtp-Source: AK7set/d0HVErPDqn0rCZylJlwwL1KQl060TegkixMWZ0xOV7fpV01F1t9BCG2h4f4MM5yyfwrS7aw== X-Received: by 2002:a17:903:2290:b0:19e:25b4:7740 with SMTP id b16-20020a170903229000b0019e25b47740mr2938107plh.28.1677860273228; Fri, 03 Mar 2023 08:17:53 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/29] linux-firmware: properly set license for all Qualcomm firmware Date: Fri, 3 Mar 2023 06:17:10 -1000 Message-Id: <4e4cc519c26ac8799e786171d4366f683c734c08.1677859897.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 ; Fri, 03 Mar 2023 16:17:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178001 From: Dmitry Baryshkov It is not enough to depend on the ${PN}-qcom-license package. Set LICENSE variable for all the qcom packages to point to the proper license. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 9dc41e18dc138a7cce920f8e4c85eb3130c0d553) Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20230117.bb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb index 1dce06c8f5..9ae0b2be13 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb @@ -983,6 +983,31 @@ RDEPENDS:${PN}-qat = "${PN}-qat-license" # For QCOM VPU/GPU and SDM845 LICENSE:${PN}-qcom-license = "Firmware-qcom" +LICENSE:${PN}-qcom-venus-1.8 = "Firmware-qcom" +LICENSE:${PN}-qcom-venus-4.2 = "Firmware-qcom" +LICENSE:${PN}-qcom-venus-5.2 = "Firmware-qcom" +LICENSE:${PN}-qcom-venus-5.4 = "Firmware-qcom" +LICENSE:${PN}-qcom-vpu-1.0 = "Firmware-qcom" +LICENSE:${PN}-qcom-vpu-2.0 = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a2xx = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a3xx = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a4xx = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a530 = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a630 = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a650 = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a660 = "Firmware-qcom" +LICENSE:${PN}-qcom-apq8096-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-apq8096-modem = "Firmware-qcom" +LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "Firmware-qcom" +LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "Firmware-qcom" +LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-sensors = "Firmware-qcom" +LICENSE:${PN}-qcom-sdm845-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-sdm845-compute = "Firmware-qcom" +LICENSE:${PN}-qcom-sdm845-modem = "Firmware-qcom" +LICENSE:${PN}-qcom-sm8250-audio = "Firmware-qcom" +LICENSE:${PN}-qcom-sm8250-compute = "Firmware-qcom" + FILES:${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" FILES:${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES:${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" From patchwork Fri Mar 3 16:17: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: 20410 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 301A3C7EE32 for ; Fri, 3 Mar 2023 16:17:57 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.27567.1677860276935366832 for ; Fri, 03 Mar 2023 08:17:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cWhYXs8i; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id u5so3173496plq.7 for ; Fri, 03 Mar 2023 08:17:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860276; 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=bQkJbmgZGUiVVRYsg4ceaD2pbFN4yU5Gqyfu4DroiYo=; b=cWhYXs8i/n791FezvfRNpPHkouSdwyqckskKXsC64qfOc/k2gWpknXQtl1M0IMKJbq ZKwMf6Hz3DlMCeYJPGYdaT2VrF9WYAykXUCvOCD2a1WqIpirm417C+0IBc8OzxgaNVnc rMVKgfCN59f4ghVAmJaM9uTaeQkazreISqum0DVVaAYoS4EdhWTdsxUXBkLVSd2yuUPg 5kSt8jhYT8A68UhBmuxJ/BIM6WqQbO2jAguh9Bqkh0katieoutQvIELIAXE2XtNtvRfM o4UoeegAoxj06P0Z4VifX01eGbXC3nIcur2Y/f2yrzEGaSJmhz9AeCMCBxX4vApC4eVj wWVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860276; 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=bQkJbmgZGUiVVRYsg4ceaD2pbFN4yU5Gqyfu4DroiYo=; b=txdq4sif/ktkea8xy97494dQmqfUATzEltf2vEvX54IzYihwQSgOoqdogI1QYjcBpJ PH3tLEkXcpzvQeKtvOYz9rmhL+X7VtZmgSrmBlug4ZwZN7uJHRBMxJfUTVxuXXj7JV5X iytQ6qquQ2Obbosw78QX7cldNf+fwGFXzvL+woCoLSQ9SSpw0spLLScC8ZBiYZ2DBsro EJgwADvGt7/3ug6f9ZNLbfC5ZpxV6RD/3xRiOY09R8pLadHLJ2BQNC2a2ei2R+LriQU9 EtCmWwMEKELSSCMvND+ItqdcIjXMoy/1DiOJZq8Z/PQf6choWp5LX9RxREhTgAtv4RjJ 0W5g== X-Gm-Message-State: AO0yUKW3Lga5Pz/JKUjnNgfgvReWog1Q3WD+9FOvBsr1F2WrJIWVWRX1 tvK7XQ9UsYruplvkmHRUubXzMbj4l8BqSi4hA8c= X-Google-Smtp-Source: AK7set87aLcXaDUpkZBkmFiK/8gJuq125TF1QLUS9thmdThke7mkry7qU8tNjhVpOJAOhQEP+yB22Q== X-Received: by 2002:a17:902:da86:b0:19e:31a3:1a87 with SMTP id j6-20020a170902da8600b0019e31a31a87mr2662269plx.39.1677860275893; Fri, 03 Mar 2023 08:17:55 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:55 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/29] linux-firmware: add yamato fw files to qcom-adreno-a2xx package Date: Fri, 3 Mar 2023 06:17:11 -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 ; Fri, 03 Mar 2023 16:17:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178002 From: Dmitry Baryshkov Newest linux-firmware release got firmware for Adreno A200. Add these two files to the ${PN}-qcom-adreno-a2xx package. As these files are licensed under a separate BSD-3-Clause license, add separate license package too. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 56e1b2b06ef7f22d4ac5899046f650ae8ec0d547) Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20230117.bb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb index 9ae0b2be13..fa9e6f604b 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb @@ -45,6 +45,7 @@ LICENSE = "\ & Firmware-phanfw \ & Firmware-qat \ & Firmware-qcom \ + & Firmware-qcom-yamato \ & Firmware-qla1280 \ & Firmware-qla2xxx \ & Firmware-qualcommAthos_ar3k \ @@ -109,6 +110,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \ + file://LICENSE.qcom_yamato;md5=d0de0eeccaf1843a850bf7a6777eec5c \ file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ @@ -177,6 +179,7 @@ NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware" NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw" NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware" NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom" +NO_GENERIC_LICENSE[Firmware-qcom-yamato] = "LICENSE.qcom_yamato" NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280" NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx" NO_GENERIC_LICENSE[Firmware-qualcommAthos_ar3k] = "LICENSE.QualcommAtheros_ar3k" @@ -307,7 +310,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-nvidia-gpu \ ${PN}-netronome-license ${PN}-netronome \ ${PN}-qat ${PN}-qat-license \ - ${PN}-qcom-license \ + ${PN}-qcom-license ${PN}-qcom-yamato-license \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ ${PN}-qcom-vpu-1.0 ${PN}-qcom-vpu-2.0 \ ${PN}-qcom-adreno-a2xx ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a4xx ${PN}-qcom-adreno-a530 \ @@ -983,13 +986,14 @@ RDEPENDS:${PN}-qat = "${PN}-qat-license" # For QCOM VPU/GPU and SDM845 LICENSE:${PN}-qcom-license = "Firmware-qcom" +LICENSE:${PN}-qcom-yamato-license = "Firmware-qcom-yamato" LICENSE:${PN}-qcom-venus-1.8 = "Firmware-qcom" LICENSE:${PN}-qcom-venus-4.2 = "Firmware-qcom" LICENSE:${PN}-qcom-venus-5.2 = "Firmware-qcom" LICENSE:${PN}-qcom-venus-5.4 = "Firmware-qcom" LICENSE:${PN}-qcom-vpu-1.0 = "Firmware-qcom" LICENSE:${PN}-qcom-vpu-2.0 = "Firmware-qcom" -LICENSE:${PN}-qcom-adreno-a2xx = "Firmware-qcom" +LICENSE:${PN}-qcom-adreno-a2xx = "Firmware-qcom Firmware-qcom-yamato" LICENSE:${PN}-qcom-adreno-a3xx = "Firmware-qcom" LICENSE:${PN}-qcom-adreno-a4xx = "Firmware-qcom" LICENSE:${PN}-qcom-adreno-a530 = "Firmware-qcom" @@ -1009,13 +1013,14 @@ LICENSE:${PN}-qcom-sm8250-audio = "Firmware-qcom" LICENSE:${PN}-qcom-sm8250-compute = "Firmware-qcom" FILES:${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" +FILES:${PN}-qcom-yamato-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom_yamato" FILES:${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES:${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" FILES:${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*" FILES:${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*" FILES:${PN}-qcom-vpu-1.0 = "${nonarch_base_libdir}/firmware/qcom/vpu-1.0/*" FILES:${PN}-qcom-vpu-2.0 = "${nonarch_base_libdir}/firmware/qcom/vpu-2.0/*" -FILES:${PN}-qcom-adreno-a2xx = "${nonarch_base_libdir}/firmware/qcom/leia_*.fw" +FILES:${PN}-qcom-adreno-a2xx = "${nonarch_base_libdir}/firmware/qcom/leia_*.fw ${nonarch_base_libdir}/firmware/qcom/yamato_*.fw" FILES:${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a3*_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES:${PN}-qcom-adreno-a4xx = "${nonarch_base_libdir}/firmware/qcom/a4*_*.fw" FILES:${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.* ${nonarch_base_libdir}/firmware/qcom/apq8096/a530*.*" @@ -1034,13 +1039,14 @@ FILES:${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/c FILES:${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" FILES:${PN}-qcom-sm8250-audio = "${nonarch_base_libdir}/firmware/qcom/sm8250/adsp*.*" FILES:${PN}-qcom-sm8250-compute = "${nonarch_base_libdir}/firmware/qcom/sm8250/cdsp*.*" + RDEPENDS:${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-venus-5.2 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-venus-5.4 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-vpu-1.0 = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-vpu-2.0 = "${PN}-qcom-license" -RDEPENDS:${PN}-qcom-adreno-a2xx = "${PN}-qcom-license" +RDEPENDS:${PN}-qcom-adreno-a2xx = "${PN}-qcom-license ${PN}-qcom-yamato-license" RDEPENDS:${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a4xx = "${PN}-qcom-license" RDEPENDS:${PN}-qcom-adreno-a530 = "${PN}-qcom-license" From patchwork Fri Mar 3 16:17: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: 20414 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 2036EC7EE2F for ; Fri, 3 Mar 2023 16:18:07 +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.27556.1677860266661907687 for ; Fri, 03 Mar 2023 08:17:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=AfISQn2X; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id m20-20020a17090ab79400b00239d8e182efso6618976pjr.5 for ; Fri, 03 Mar 2023 08:17:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860277; 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=TWCIsNeZxac7FpPAaaFhCClSmEHalorBM8SXNfJScM0=; b=AfISQn2XRnG3+C8wpznWZwOSH6X7KZHnCngjnWEDfJlMU4kWPGLDniQ3EL58uAuI68 1dse2oKDkpI/SV56rqCNUaFmIScEwyRPCh8mLDvdcV+PZtOVtuD3me/QXH9LjkKmgQZx TLNPMoHRllRXlxRYffe1FfJab0gcbUbVBRmrZQufofzNNaBcfGhFwfP0nzz1a6u2UHiK 2B6s5jq6IIZzecDHBXxEdR43021BGR7X0UKQsQ8vvw69I3whue7U6AXO/6JWXX0wNgIg WwGaNMBdZsdvsb0BQeSNHrSWYQxQookBC4X05Ca0FkvJ8nBbVEQMXsrpB6vgHN3kHTTz 9Txw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860277; 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=TWCIsNeZxac7FpPAaaFhCClSmEHalorBM8SXNfJScM0=; b=FcncqDSxahls4mWQWHDV/PNy/T1fRcuilX3BUCYoVyXOlCDL1Ejz2tJ93nqo7UfoLl p5mBqcTxxl4B2tjXlwntlm5ZwEB/y9R6M06zeHB9zJ8CrHomtycyYDFmXkhnohz03q4H Rh41RPc2QISF9NHwNVaCgkc1kFOwQDzhgt3Fd/wqlOCvSVa12yo1+xNwz6o9TwQ3hXcg QjKNeyy2U8aXewYRH8gsJHCsGZx/uL1t+kvJdBMF/H2TFK6Cc7Yroyje7j2W8bBG8ZH9 mWnD64DJoAZ2Vf7wCz+8WJPsc1uPyXfHcdmaE6SZpTEORFuOthrd/ChnuZQ5Um89EN4B u8FQ== X-Gm-Message-State: AO0yUKXbnHtiSMBIxwTbIjz4zTAzgB9dySKVFStMkrA0y5rzg38/mM9s 2zXLd4ObTRLKESj5ZWQVhKEn3bzc2P1Q8dgDE1A= X-Google-Smtp-Source: AK7set/AJswUOKtN0OeYcguiadoNh1Chz9f7Msw+7/NheU5f7bp4hHzENeyA+B5kL3iweIcXguBylA== X-Received: by 2002:a17:902:ee82:b0:19a:b7c0:f097 with SMTP id a2-20020a170902ee8200b0019ab7c0f097mr2263460pld.57.1677860277476; Fri, 03 Mar 2023 08:17:57 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:57 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/29] linux-firmware: upgrade 20230117 -> 20230210 Date: Fri, 3 Mar 2023 06:17:12 -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 ; Fri, 03 Mar 2023 16:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178003 From: Alexander Kanavin License-Update: additional firmwares Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 8e6134d39b840d96e1c37d3df21a522afea8bc76) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20230117.bb => linux-firmware_20230210.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20230117.bb => linux-firmware_20230210.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb index fa9e6f604b..bf5d4f54e6 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb @@ -134,7 +134,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "05f1d941972cedadbf667c05f6010378" +WHENCE_CHKSUM = "aadb3cccbde1e53fc244a409e9bd5a22" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -212,7 +212,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "df11e25ba2fb4d5343473757e17a3b4cef599250a26b1f7e0f038850f0cb3d64" +SRC_URI[sha256sum] = "6e3d9e8d52cffc4ec0dbe8533a8445328e0524a20f159a5b61c2706f983ce38a" inherit allarch From patchwork Fri Mar 3 16:17: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: 20412 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 1AC27C64EC4 for ; Fri, 3 Mar 2023 16:18:07 +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.web11.27606.1677860268373605161 for ; Fri, 03 Mar 2023 08:17:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=eez21ke1; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id y2so3027124pjg.3 for ; Fri, 03 Mar 2023 08:17:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860279; 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=PfTMj45keV43866JrwdJFHzFpagnu9oQm63+2JVeIX0=; b=eez21ke1sBjRB0oTBBSIRpJ7+1EJ3dKan9iWKMHdqPoj3sNv20wn7rJR0rgZ7YxiwW H8pZuROS1OTxs4xfz6ROdc1r095pnExajy+Vmo6Jw579NoFw6jK7QQqFVFfhv4gLg5+B MnpNr1AryhS+RXa54u9bCXQOOU8P+CbfWuz/6tTRZpuRseQnT9Hhk7v++NfEMEUWOQH4 3fSFJWjknFaVDRKrSawXWiL5ngMPJxXH8aN31qgOJQNDIN7JxjDDSBtF3Tq1Uo7LyTRp dMrofn+iRnmtiO05qq5Tl7lA+yeHm22Pe7sIXvZEAUpQM7kk120RILgRAC8+v41J8Unr H/wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860279; 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=PfTMj45keV43866JrwdJFHzFpagnu9oQm63+2JVeIX0=; b=PR4Y9MTBLum5zC8BAjkGJqwvDfMr5GjZVphco0yoPfshS17p6txzi59D4CcDoLPPqQ xZTHh4dtLM3GH8GKXrXvLPEAMzwX5FDU5QsP1hBN2GvkblhTnr3A/vtMWg8oRtH/C2S/ Cy9d299At6SGZR+p5oN9UOT6m2E05mJ2Uj04jLvd2TsIYFSSP5VPh+nj6KIAFESrqRja HZINTOWfSJoTK3J8FWeXc2xZRduNTXHKkJ4odKsxCKDFLHuIVjHUO9Mxpn8qRGUfGpx6 Jnqe3SYkKOvNOoGkpvsDB14NwIx9b69WQqOILyjB/wPQfAlC2WJUcgQUIKJAq0ANgjTh d64Q== X-Gm-Message-State: AO0yUKVSO7oguhFfPaJowjGa8fqYiN5z/q7wtrRej0qG7OLVpID40Bb+ sx6PXeGLWBAdV9U4Cy5QwnUq1w70zvbsAYJWyIg= X-Google-Smtp-Source: AK7set8c31UBuywor/pAbgpuzFMbcJJu41/96cpJ83IQgj3X2ByF7dkV+/33+dwVEgG9dwjiRMn6dA== X-Received: by 2002:a17:903:1212:b0:19a:996c:5c2b with SMTP id l18-20020a170903121200b0019a996c5c2bmr2613210plh.39.1677860278981; Fri, 03 Mar 2023 08:17:58 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:17:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/29] wireless-regdb: upgrade 2022.08.12 -> 2023.02.13 Date: Fri, 3 Mar 2023 06:17:13 -1000 Message-Id: <1b58ad41177323bd61821dc0025d2be66e33c2a8.1677859897.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 ; Fri, 03 Mar 2023 16:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178004 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit a8e8ea1b4b100b6f0ba5ca9441a8f3f1ac31fbfd) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2022.08.12.bb => wireless-regdb_2023.02.13.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.08.12.bb => wireless-regdb_2023.02.13.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb index 357e79d7e1..ce60154f1e 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "59c8f7d17966db71b27f90e735ee8f5b42ca3527694a8c5e6e9b56bd379c3b84" +SRC_URI[sha256sum] = "fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73" inherit bin_package allarch From patchwork Fri Mar 3 16:17:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20416 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 21471C7EE32 for ; Fri, 3 Mar 2023 16:18:07 +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.27574.1677860281482518539 for ; Fri, 03 Mar 2023 08:18:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=B+bTT+pP; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id q31-20020a17090a17a200b0023750b69614so2727084pja.5 for ; Fri, 03 Mar 2023 08:18:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860280; 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=XR6VwhAk5Vbs96AUV5lHoBl7H0Mlna9Xob7QkBpD1cs=; b=B+bTT+pPsbkNUXmAyG/NQwuNBJHH2RdFNwBhNZurQhuECD+JFh9H0KsBrjtiAfB9Dr mKtnTfuwzDTu4RbFy0ztF9Vfz2RaHBAkxtFnnKSAsKvGyh6zI0rv2TCFLR5+9rMt0I2S WuEJan20+s1ypg3cnq7bZ3m9ANhN8VgG+IxTbj5VXXG8gauYc4Lf5Bmd/aQacCjdEo3f /Y7j5GaVQrbtKH/cZ47Z4Mb3OO/WNv13+/4rGJnr0jeJwIn9TkoOWgW5+IMH2Zjm+UP+ dnJCi79CHDHCbupbWrE60mBwCYeoJ/xd9KfIWYsnNVm6JBUFtPeJo7zBalxTYPEG4aMv wuBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860280; 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=XR6VwhAk5Vbs96AUV5lHoBl7H0Mlna9Xob7QkBpD1cs=; b=ejyHr37nZedwfTNgfxVfRbQBiRaQOJLwvUEgNt/Nzi8lcAviPZmDXokkUTJRs/YbHI DtmycGRNFaj0l5UjWENgjsFSQ1+zMGYID33OuHJ9YP/uIEHLDvanJQbpKYdmllNdiLwC U80Z6RqNfvHFmThZWb29KPfHwfhMZCde+0+v1f0/G8aJ7ercqEfIxNxWyIa/fCvk6LhM R6HoDceTYAOAvBMzAZSmgmF5tgwLQgvVrC73b8qiYE2mNMGDX0csTOQimROYvupQlgK3 n6MinwWHrCroySKUp0lPnAa3LmENF+DiXS1n5bbJ2QjWxjBUj8KFu8iQiSYnLFMDBm8z L0dA== X-Gm-Message-State: AO0yUKWRtRvNTmcvVahWhmFpat7BUb9ffykEfiYuOp2XcCXqc7GidK7Z 0WTh2usElN+/NcONCkLT2Jd+GZagu0ZOCs2hb90= X-Google-Smtp-Source: AK7set/jTilSF/3j6vQASHXG6VkOYGSX2QOTRw14iVVfteopD/R6hKJBtxyaK/wwJ7MoZNDYYo1bOw== X-Received: by 2002:a17:90b:390c:b0:23a:333c:6bab with SMTP id ob12-20020a17090b390c00b0023a333c6babmr2274372pjb.23.1677860280493; Fri, 03 Mar 2023 08:18:00 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.17.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/29] curl: fix dependencies when building with ldap/ldaps Date: Fri, 3 Mar 2023 06:17:14 -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 ; Fri, 03 Mar 2023 16:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178005 From: Federico Pellegrin openldap is added as a dependency so the build will not fail, as otherwise ldap headers are not found during configure phase Note: due to upstream bug (now fixed) building LDAP/LDAPS support with minimal configurations can sometimes not work, see details at: https://github.com/curl/curl/pull/10445 Signed-off-by: Federico Pellegrin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit a999f62f5692687a5557f7a50c7c768c50f3d7d3) Signed-off-by: Steve Sakoman --- meta/recipes-support/curl/curl_7.82.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.82.0.bb b/meta/recipes-support/curl/curl_7.82.0.bb index 13f157ead8..b08af29059 100644 --- a/meta/recipes-support/curl/curl_7.82.0.bb +++ b/meta/recipes-support/curl/curl_7.82.0.bb @@ -59,8 +59,8 @@ PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," -PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap" +PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps,openldap" PACKAGECONFIG[libgsasl] = "--with-libgsasl,--without-libgsasl,libgsasl" PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" From patchwork Fri Mar 3 16:17: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: 20413 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 28F5FC7EE2D for ; Fri, 3 Mar 2023 16:18:07 +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.27577.1677860282984369368 for ; Fri, 03 Mar 2023 08:18:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PJi7WsBA; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id ky4so3206742plb.3 for ; Fri, 03 Mar 2023 08:18:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860282; 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=2VCYzpuyHnqcjP23NMv647gb1JwYfwnX23mHt5hUbvU=; b=PJi7WsBAg5iEylqwFfL3zALzW5zGIQGqb5TziTr7iZ7q3S9oMZJi4Nr3STLI44u1Z7 5N79PzjZRx9NX2fS+oBKVK83MowrJfa2cfn0stcVhB4DWg1X70EY7a6LZNIRSS73pQI4 gl4eqbuOKr7vLtLhuDWpvKcKe1eK11L9ldkxxmnaM94dB0Z70k0Ah6ecxFkW6J1MzBCX 0gHjtWP/UyX/ZqNxznsa/RhKm9QA6h6eNLpkgQdvjA6oEFPN0VQlExgvBEW8sfgl3ltU bvGty8ieYrZrc+py+TfV4yws9dfhVo3wKEu5MkuUqjE7sVozRpS43p8RGh0oZKt+8rmp Ys1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860282; 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=2VCYzpuyHnqcjP23NMv647gb1JwYfwnX23mHt5hUbvU=; b=LMo//nYV4Oyd+rta+WwQfrZSLI+N0LRjLjdiC9ZE9IKuPhrIteREkQUl1I2HakoZiu YJN1bgeoUsLU48urHur5DAwDzWzlqMaPCYoltlSeJ8RRJVxf8AaWxY/HL/cYcYDPsiyy BvzxS2btl/p5eDCGASnsM6P2QmX7XCg6f6jN5HN/qneq/hw8dG12dI8Q2bJhjJu4JXJD pgibq+y6/WDTwg/sgnoKUEz3FkIamHN+Gu0gvvMdSPT9M6yQzG6DHOot7Ab9RJRxVYS+ +6bjrjpmTNyCu3MsVLTO4VzTLoQg7re9nzwA6eph0jXqcQFEInJvKWMg+tjCsmN3JlZL 7DEg== X-Gm-Message-State: AO0yUKWsieOK7GWDUv0mwZmt6ZwKK3dBSrAPccZg+fpj6BViU5kuKePR mzMlvOYuCpjEt3m8B1h4e29HX0kQ3Gf/5u2z16E= X-Google-Smtp-Source: AK7set+54hYzPlUpsgvbCAL2PwMYFzNAF9za1AUe2Dk/99mkwP1ukSzj88T5rrI9n6ieTL000C9gKA== X-Received: by 2002:a17:902:b193:b0:19a:a815:2876 with SMTP id s19-20020a170902b19300b0019aa8152876mr2057290plr.62.1677860281996; Fri, 03 Mar 2023 08:18:01 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:01 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/29] wic: Fix usage of fstype=none in wic Date: Fri, 3 Mar 2023 06:17: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 ; Fri, 03 Mar 2023 16:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178006 From: Pavel Zhukov This allows to specify partition with fstype=none in the wks file to have partition created but without following mkfs. The none fstype is in the list already but the usage is not documented. Example; part /data --ondisk mmcblk0 --fstype=none --align 4096 --fixed-size 512 will create a partition, filesystem may be created manualy on the host or target and data will be preserved if the device is reflashed using same wks. Works with bmaptool and probably does not work with dd. Use case is persistent filesystem/data between reflashing of the image. Signed-off-by: Pavel Zhukov Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 351cb64da37aa43113e5192605d04436652aa3b8) Signed-off-by: Steve Sakoman --- scripts/lib/wic/partition.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 5563f4448a..dce5d1485b 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -132,6 +132,8 @@ class Partition(): self.update_fstab_in_rootfs = True if not self.source: + if self.fstype == "none": + return if not self.size and not self.fixed_size: raise WicError("The %s partition has a size of zero. Please " "specify a non-zero --size/--fixed-size for that " @@ -404,6 +406,9 @@ class Partition(): (extraopts, self.fsuuid, rootfs, rootfs_dir) exec_native_cmd(erofs_cmd, native_sysroot, pseudo=pseudo) + def prepare_empty_partition_none(self, rootfs, oe_builddir, native_sysroot): + pass + def prepare_empty_partition_ext(self, rootfs, oe_builddir, native_sysroot): """ From patchwork Fri Mar 3 16:17: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: 20415 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 2E76BC7EE37 for ; Fri, 3 Mar 2023 16:18:07 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web11.27600.1677860259281506072 for ; Fri, 03 Mar 2023 08:18:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=s2YdaG5y; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id qa18-20020a17090b4fd200b0023750b675f5so6633297pjb.3 for ; Fri, 03 Mar 2023 08:18:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860283; 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=Zr2RDf6eBegaQnve+uHA/0F54eR6z7WAVuSvjIKSA8w=; b=s2YdaG5ybz3we4C0DySNQCWmTYEHrqdlBG8ryPkdG0qSCfEBKbZUbjfJwD9KN5QuiI WoPKfllfta1t+JtIsPsnL8Vs884L0a/9E9aJztimpdWV9cGwM1WxsiUnne3KygatnfnN gQ7+K6Ng7y5/ei0evgBbz+WX24aCfa3NVgUSjHNN8H9gQHE+CV/kNXMXCi27V6x7cRk1 T4kwB4I5dwNKfyq7bCKKO7En+S8OH+Pfv6SWkJqmjRdClyUfgtQHa806PRLWQokudVAx giA0yXiRlgtnV8wVGEz0MRzvAG/kgaHqMAKzY2kw+vELyrn0XChNk5Ewl5hWBi/L17ao q6VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860283; 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=Zr2RDf6eBegaQnve+uHA/0F54eR6z7WAVuSvjIKSA8w=; b=SjrHkZPGQOeUbC5rYKHZI1cow+syA0/rEuxaKvRIL8pF36FO4DVEdJm2T7vl8Eo6az j7mZp4Qtew41eJOgTrlKNKJxquu87vaiJfiry8fb4ysW1R5wOTx4AYzfur0ORhpgg4jT PpTVDr+wQRNDF6S8WSB+OMZtZP1CAraL5flNCDhC5f8h1eTiUkRQoszNqF5Tg6jAT1Df on1sDLU2J/C4EkcYhTIBlEZxj68ZkeD4h5zJLzbYiePitHpZN4Iv7mMgla8ddh1wCGp6 ccfwKgWmA60KrUCxFsXZXgjTycFKwUAkCOn0Q37dSG2/LgE8sI7QS9nduCg7wJ3BbJwU Rzaw== X-Gm-Message-State: AO0yUKVLD8RPrM8nSwUmCYYnMoEc+XO1AM7B9/gIGYCNIHkohc8awIb/ eFJTlclHovN4+SC4ZpnZDDcVzWFvUHhn6a6xefg= X-Google-Smtp-Source: AK7set+DSkDsP7wyzWiEpakr2mX+0y9/yn9EnND8QdWYjIau55FsHscw2GtjiWonjBX/sS21GIofzA== X-Received: by 2002:a17:902:ea94:b0:19e:7879:f084 with SMTP id x20-20020a170902ea9400b0019e7879f084mr2330682plb.40.1677860283576; Fri, 03 Mar 2023 08:18:03 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:03 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/29] busybox: Fix depmod patch Date: Fri, 3 Mar 2023 06:17:16 -1000 Message-Id: <03e437782b1b295334a95cea8678fc425cafe9d3.1677859897.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 ; Fri, 03 Mar 2023 16:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178007 From: Saul Wold The original patch was actually allowing .debug modules though which was in-correct. This change blocks the parsing of .debug modules (which is correct). As noted in [YOCTO #15022] this should address the empty modules.dep when using the BusyBox depmod. Signed-off-by: Saul Wold Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 339c3c3abe8d405cfe7b3f34db9b3547bcaaf878) Signed-off-by: Steve Sakoman --- .../busybox/busybox/0001-depmod-Ignore-.debug-directories.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch b/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch index 354f83a4a5..d76118f85b 100644 --- a/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch +++ b/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch @@ -21,7 +21,7 @@ index bb42bbe..aa5a2de 100644 /* Arbitrary. Was sb->st_size, but that breaks .gz etc */ size_t len = (64*1024*1024 - 4096); -+ if (strstr(fname, ".debug") == NULL) ++ if (strstr(fname, ".debug") != NULL) + return TRUE; + if (strrstr(fname, ".ko") == NULL) From patchwork Fri Mar 3 16:17: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: 20417 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 2F0C8C7EE3A for ; Fri, 3 Mar 2023 16:18:07 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.27558.1677860270170731301 for ; Fri, 03 Mar 2023 08:18:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ti0ZLz7D; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 6-20020a17090a190600b00237c5b6ecd7so6624073pjg.4 for ; Fri, 03 Mar 2023 08:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860285; 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=TxxanPs1WVfZKo4qep5G5+ElH9neRAKtIzQm1g6Ws5E=; b=ti0ZLz7DU5yTVF0Fkw2bR0iGZhfSerFQJQKh20cii6/GyP/xhu9vcg/vTz00gtvFH/ hiBLGxwURMfuJAGMasdvv4uSMhoJZ3jkbDaexJeTsTklcZbvbMryK6LsTMqIMB4QL/nL B46s3nTG69zdO1eqVSD0bYwmcWllqZv+QvA0EC3qnjk0pUqyVN0j0n62dLVFATU6DVYJ Pt8rjk88m3Oj2vyg3N8xWj4E9Ej/8nsW5vMEaDGe1SM59uttgpOLGfgE5LLYprfhttKo lO4lizc0EaZ4dp19Eui0ex9hYPkW3jiFWNUT8/L1S0HV5IezJ5OTjYlNdpHFEk5BT4Y8 N1NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860285; 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=TxxanPs1WVfZKo4qep5G5+ElH9neRAKtIzQm1g6Ws5E=; b=gjNOOwZ3c7kYeg3ZGMGOMG5MACq57mm2Fp4Dz3l2vIlCj9UZGExtcS5ARPYLMhA+Ix oiBQyb9xSzXzWLo2XI2IHiRT503c3CTEWoQIPmiPJ/9FbIruK8cP4od5gR5bHu2rUIUi DyMyuPAghL7r3sOoByhTZ5fteCdP41vZZSGCJB+TOxdYOlAXKJrR8P7yagO3n+n5fIqW Ej2+jJ48CmbNJF03Ly4rZLfaoeOSKNIxh9FS4D+gHOGgo+TdJA/YeciQrZbn+VE45Ctw ez0Hq38YpGxP7MGa6YoKvxU+bZudufDimOzmypgtIg+VRE9NUvhwBN3CF4++1rp1eDvs IUYg== X-Gm-Message-State: AO0yUKVwCharci+1PJxEHzG9380jQSHabCvkxaT0nCQJuVYEcvZj6Z86 1ZG5WUMNFyL2nqdJrlWhb558vBJ7Bl3xYYN4FrU= X-Google-Smtp-Source: AK7set+W79p+qYh9mI8hNl6IETmgO50XRpynnTZQR61nvoP8eKMHeP/70JKCsUHw6jLgnAc/EkTWHA== X-Received: by 2002:a17:903:32d0:b0:19a:a810:542 with SMTP id i16-20020a17090332d000b0019aa8100542mr2649548plr.61.1677860285240; Fri, 03 Mar 2023 08:18:05 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:04 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/29] sstatesig: Improve output hash calculation Date: Fri, 3 Mar 2023 06:17:17 -1000 Message-Id: <7b1f82d53901fc9d485756ff4acf34fce4154a91.1677859897.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 ; Fri, 03 Mar 2023 16:18:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178008 From: Mateusz Marciniec Symbolic links to the files are included during the output hash calculation but symlinks to the directories are missed. So if the new symlink to a directory was the only change made, then the output hash won't change, and the Hash Equivalence server may change unihash. In the next run bitbake may use an older package from sstate-cache. To fix this followlinks=True flag could be set for os.walk but it can lead to infinite recursion if link points to a parent directory of itself. Also, all files from a directory to which symlink points would be included in depsig file. Therefore another solution was applied, I added code that will loop through directories and process those that are symlinks. Signed-off-by: Mateusz Marciniec Signed-off-by: Tomasz Dziendzielski Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ee729163f31f26b1462a47e1e53f7a0f9de9b464) Signed-off-by: Steve Sakoman --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index bbe28efa81..30f27b0f4f 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -660,6 +660,10 @@ def OEOuthashBasic(path, sigfile, task, d): if f == 'fixmepath': continue process(os.path.join(root, f)) + + for dir in dirs: + if os.path.islink(os.path.join(root, dir)): + process(os.path.join(root, dir)) finally: os.chdir(prev_dir) From patchwork Fri Mar 3 16:17: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: 20418 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 25A8CC7EE32 for ; Fri, 3 Mar 2023 16:18:17 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.27598.1677860256132335378 for ; Fri, 03 Mar 2023 08:18:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=apT6gj0r; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id n6so3191269plf.5 for ; Fri, 03 Mar 2023 08:18:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860287; 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=GgaU1jloGCLapcq54PC8SDiLyxVBf+hCZlPJmyRowkQ=; b=apT6gj0rnT3lKVD7JEAeUAf7zKoe/5XZzs7j3el1a99jzVudscOPm45pZRhgYY5qiw I6tL7ZhpBgrRn9TXFfezF30LreIzdIK6D9p5DEhtPsZ0AsYGzAWNYPwR03rPJs7ebfH7 AErdflrarsNMOvku6Z+JatvYxcddpRLaWPDLN4Q8kQ89yZNSxaVgvD2wS5KQPgOpbWgy ouaQo6lSSEDdNQjcBQFQk1AdaxMtXp7nZoBdUBdWcMxKdEeA7g80/ZCCaT8J/vinDfH2 C/hO2DsNUneGiIKK/fYmHT5Fny+3+Gv3vq8KA9QzVNJd9TUbIkw2aMwnlpkGnJBHZf3w tJPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860287; 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=GgaU1jloGCLapcq54PC8SDiLyxVBf+hCZlPJmyRowkQ=; b=Hyo3j/1NSM2kPlqK4qAkWIr2a1ybRqxTmxUg5USbWwy6CgZ3sI6iJpE1WGn23d1OTR u+mL9GJ/53yIDVgUT1jH8R45QcuSLcu6f14kA0xIf7PZCW/SmFL1mMMSJekTrcLqYki9 q3GCAxJfYMPEbkqlH2aCFVED+PkN7ge8aih919Xq9u1iKlpn+yqJLZFhtZLqUU2pghRs GgJAcAnn2H1XsdRLBOmP8BFjDriarqrpGJz2SnFp90pO4wrmSLs3lcZXwcmw+Ks6r8SN Tbs1vHH4umxbfsrFjlbhMOcbEkdh3hqbF/zJnMUP9boMBy/tuR535Z6lfa3/Dn1RbLsD D8uA== X-Gm-Message-State: AO0yUKVKW4Z9sX6XJple6GqSyP/WgRvJeq10rhtVnun54Zjxt8DLOWzW 25sfIxDAu32QA+36ekkwF4J3VhfewT1YOKzL82M= X-Google-Smtp-Source: AK7set8aZayIz+2DAxZuagK4XljrydlhyGegudNspGedUAhHKg1o6kwv+6qvL+BJM289y/4LCZ5lew== X-Received: by 2002:a17:902:c94b:b0:19c:f84b:58be with SMTP id i11-20020a170902c94b00b0019cf84b58bemr2823201pla.3.1677860286993; Fri, 03 Mar 2023 08:18:06 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/29] dhcpcd: fix dhcpcd start failure on qemuppc64 Date: Fri, 3 Mar 2023 06:17:18 -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 ; Fri, 03 Mar 2023 16:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178009 From: Xiangyu Chen Backport patch to fix dhcpcd start failed on qemuppc64. Signed-off-by: Xiangyu Chen Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit a31d658198566de12cdd1aad18776b8da8065787) Signed-off-by: Steve Sakoman --- .../dhcpcd/dhcpcd_9.4.1.bb | 1 + ...x-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 5cf77fa0f6..39e689d2f6 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -16,6 +16,7 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \ file://0002-privsep-Allow-newfstatat-syscall-as-well.patch \ + file://0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ " diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch new file mode 100644 index 0000000000..1c514f9b8c --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch @@ -0,0 +1,34 @@ +From 7a2d9767585ed2c407d4985bd2d81552034fb90a Mon Sep 17 00:00:00 2001 +From: CHEN Xiangyu +Date: Thu, 9 Feb 2023 18:41:52 +0800 +Subject: [PATCH] privsep-linux: fix SECCOMP_AUDIT_ARCH missing ppc64le (#181) + +when dhcpcd running on ppc64le platform, it would be killed by SIGSYS. + +Upstream-Status: Backport [7a2d9767585ed2c407d4985bd2d81552034fb90a] + +Signed-off-by: Xiangyu Chen +--- + src/privsep-linux.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 7372d26b..6a301950 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -232,7 +232,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + #elif defined(__or1k__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC + #elif defined(__powerpc64__) +-# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 ++# endif + #elif defined(__powerpc__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC + #elif defined(__riscv) +-- +2.34.1 + From patchwork Fri Mar 3 16:17: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: 20423 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 1F794C7EE2D for ; Fri, 3 Mar 2023 16:18:17 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.27581.1677860289592608573 for ; Fri, 03 Mar 2023 08:18:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gfisfuJz; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id i10so3160702plr.9 for ; Fri, 03 Mar 2023 08:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860289; 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=EBdb7h866JIkWIWUPARzfGhexWB+VeEHHIyiw3IuXVU=; b=gfisfuJzk3ZILoVJi7isz7WTDH4dpiVv+PWIlXtrJ+3lXh8leoL5Un0t4HuX+bwRV5 aQ/VN9d/6LoAEAwzV6qdLUVX7UiYahX5MrZ8icNEFecmZwy1mTQRL9vAtnFXGuWlVQ2q trx3WkdgzrWRFGTNbBuZj+Y7yyQsNUx4qSxztJZ/ukZQr3JnmWaQ1of5VF0ex5spk10W 7wC6O9ut1P6ulu+v1B1RkVlvUhCw0rgLjAYHvsiX7yju1u9l/PtEXmWnlbSUB6dKgaOe 0hTmZSiVDLwWIk44gtspVobMT8XdyfKHX6qsqa9Rc+JHsvvAfhweYxQnND47+Q8l8cDI NfdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860289; 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=EBdb7h866JIkWIWUPARzfGhexWB+VeEHHIyiw3IuXVU=; b=ZUSn1eh4OMgTUmTyjWSFQ3bIiZSiuSMQ3rTOLJhO4hVBhoXLmWeAL3F6DR1yP+uFug QMthouJQjo0nJT4pzlq7wrg7lhx4c6UgxZvrUw2B3v3jUiiPj4/YzkgY4/fnQfrlt41K iICwBU4Bgidk3qE2bQv2Yl8LWgLBSsJ1UZmVkv1i7ew7ktYXUH1clZvJBAZnduPTR91x HAOQfYyisaZ4yh6gTPFt2t+gnFXe5VBabMlxOjNQMLjNDkytJ7OQOHoy8NkX9eggxQ1M 0c6oqeuucYzpOWtB8ztY7JGuiFiCAIZH4Ylgu/kl88xAn9iLOVQDJZpo85g+DXDkDeNI wQkw== X-Gm-Message-State: AO0yUKXka8qKaY+v1im5YKlhdFigtc/rL8WswwyX8Rr71sQzon4mpM1g X3jSKZJ9nJdGhy+0ArbLkQAf538KaFmyFmtUHPM= X-Google-Smtp-Source: AK7set8McP4OSvGPHBE6A+PB87QQLIzdz1U3A19CYzDGJAAnx3B3v61VrnDnTgv7rI+ZqbMJeMTrUQ== X-Received: by 2002:a17:902:e744:b0:19c:d169:cb3f with SMTP id p4-20020a170902e74400b0019cd169cb3fmr2892608plf.21.1677860288596; Fri, 03 Mar 2023 08:18:08 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:08 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/29] lttng-modules: fix for kernel 6.2+ Date: Fri, 3 Mar 2023 06:17:19 -1000 Message-Id: <5377410f29ba094b613571677b3f6a3f30e08d97.1677859897.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 ; Fri, 03 Mar 2023 16:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178010 From: Bruce Ashfield Backporting a patching from the 2.13.x stable branch of lttng to fix the build against kernel 6.2+. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 3aed7dfe5ff6f52497dcffa58bc2f06cf709ea18) Signed-off-by: Steve Sakoman --- ...ccessor-helpers-into-accessors.h-v6..patch | 45 +++++++++++++++++++ .../lttng/lttng-modules_2.13.8.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch new file mode 100644 index 0000000000..26ae605b31 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch @@ -0,0 +1,45 @@ +From 69d3aa79a641f539cfd5c11b46b2dd9b4df9b0f0 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 16 Jan 2023 15:01:51 -0500 +Subject: [PATCH] fix: btrfs: move accessor helpers into accessors.h (v6.2) + +See upstream commit : + + commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703 + Author: Josef Bacik + Date: Wed Oct 19 10:51:00 2022 -0400 + + btrfs: move accessor helpers into accessors.h + + This is a large patch, but because they're all macros it's impossible to + split up. Simply copy all of the item accessors in ctree.h and paste + them in accessors.h, and then update any files to include the header so + everything compiles. + +Upstream-Status: Backport + +Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52 +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +--- + include/instrumentation/events/btrfs.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h +index 785f16ac..01157107 100644 +--- a/include/instrumentation/events/btrfs.h ++++ b/include/instrumentation/events/btrfs.h +@@ -9,6 +9,10 @@ + #include + #include + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0)) ++#include <../fs/btrfs/accessors.h> ++#endif ++ + #ifndef _TRACE_BTRFS_DEF_ + #define _TRACE_BTRFS_DEF_ + struct btrfs_root; +-- +2.34.1 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb index 3cfc1bc58e..c04796be16 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb @@ -13,6 +13,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ file://fix-jbd2-use-the-correct-print-format-v5.10.163.patch \ file://fix-jbd2-upper-bound-for-v5.10.163.patch \ + file://0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch \ " # Use :append here so that the patch is applied also when using devupstream From patchwork Fri Mar 3 16:17: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: 20419 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 1F519C64EC4 for ; Fri, 3 Mar 2023 16:18:17 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.27625.1677860291226399531 for ; Fri, 03 Mar 2023 08:18:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5brhR5ti; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id l1so3048913pjt.2 for ; Fri, 03 Mar 2023 08:18:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860290; 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=BzZDvQhb20sSm0dLc6YC8XOiEpUO2kkao8AplX4LZLo=; b=5brhR5tiDmnGFFSt8wQOknZmh9VdtpE3XDO8FzzbGwvpVt+oK+MJ85vHnzECdFyigo Y1mZrGh2w3iT/1+S8XbBDo2kT3QPb8Gyqlg6+2kdicUK6lmd7Qct+40B7cp15K9Uto0b eyWxGzH2tbPdLAxdKUaszDH7seelUh/KSVFHVMdX+6cYDI7b/dovXTShHnjs+uhBZ1bL ZhJAUP51SX6WeVRhyOT1A9WRI2ebalBMiZColLT6Jylc9A/xS4UbG0uSSrnp1ke1Dv9d X9TpLIC/KEPh2apjKEqIQ/J/Mk/ou9Qe/7oQX1Ox9UvK7nzh8h8aNmgaOGZ3kBHXbouc PLWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860290; 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=BzZDvQhb20sSm0dLc6YC8XOiEpUO2kkao8AplX4LZLo=; b=Li35WVu0RnuWCFNO7CLM3JSnfQNKGZ0ktLhj68QIT38qh7CajLmlnjO5DQ4pBGBo92 IQ4bMisWfia81/3V3qFVXIc+/O1QgHT8sdLfalE7hu0d1YxneSJygSshmXs5MeDqi0lF KkEj4cyiqk8h94ia7TZkoyqGr2Tr/BQwmb7CFXH+M+TuJtjLHwZLwMiHvB5dhqB/pdBn S7xsa8po4OnUAp7Vg63/HzLTLRbDt2GawgYyjqs1Fupqqf0kUkAjyI6weJxR6cTYvD3u EJrdI28zsE8SlIX9Qw7GT5QPaRe0FcVL9FEWfYi0zvA4HtScE9oF2jUtr4pDKpCtJJdM vj2Q== X-Gm-Message-State: AO0yUKWO7/+9k15ICBF63NuMK+cdmhbh/M5Hk4630zWH2ECxB7WQ9n9x CRYnDi2kY8cd7tx08mMdpAm9YN3K7uAY1PHvIc8= X-Google-Smtp-Source: AK7set9A66iEuHWIS39w231TXRLY9EKkjwxtP9Jj+7JVgjT202777MxltwdGNu3hLD32sOkagDQArw== X-Received: by 2002:a17:903:1cf:b0:196:2ade:6e21 with SMTP id e15-20020a17090301cf00b001962ade6e21mr2291184plh.14.1677860290226; Fri, 03 Mar 2023 08:18:10 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/29] libssh2: Clean up ptest patch/coverage Date: Fri, 3 Mar 2023 06:17:20 -1000 Message-Id: <69b660e76c30e4bcc355be19cbe560db275e90b1.1677859897.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 ; Fri, 03 Mar 2023 16:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178011 From: Richard Purdie Martin Jansa spotted patchreview.py reports Malformed Upstream-Status in a patch in this recipe. The patch is not being applied since there is no ptest override. The test in question was also disabled due to an issue with new versions of openssh. Add a workaround for the broken test, enable it, drop the broken patch. Signed-off-by: Richard Purdie (cherry picked from commit e9f2cc084638ce9cb5339df611e473c30f0e40b1) Signed-off-by: Steve Sakoman --- ...nviroment-to-decide-if-a-test-is-bui.patch | 44 ------------------- .../libssh2/libssh2/fix-ssh2-test.patch | 23 ++++++++++ .../libssh2/{files => libssh2}/run-ptest | 3 +- .../recipes-support/libssh2/libssh2_1.10.0.bb | 3 +- 4 files changed, 25 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch create mode 100644 meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch rename meta/recipes-support/libssh2/{files => libssh2}/run-ptest (67%) diff --git a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch deleted file mode 100644 index b1204e49eb..0000000000 --- a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f6abce5ba41a412a247250dcd80e387e53474466 Mon Sep 17 00:00:00 2001 -From: Your Name -Date: Mon, 28 Dec 2020 02:08:03 +0000 -Subject: [PATCH] Don't let host enviroment to decide if a test is build - -test ssh2.sh need sshd, for cross compile, we need it on target, so -don't use SSHD on host to decide weither to build a test - -Upstream-Status: Inappropriate[oe specific] - -Signed-off-by: Changqing Li - ---- - tests/Makefile.am | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index dc0922f..6cbc35d 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,16 +1,12 @@ - AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src - LDADD = ../src/libssh2.la - --if SSHD - noinst_PROGRAMS = ssh2 - ssh2_SOURCES = ssh2.c --endif - - ctests = simple$(EXEEXT) - TESTS = $(ctests) mansyntax.sh --if SSHD - TESTS += ssh2.sh --endif - check_PROGRAMS = $(ctests) - - TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT) -@@ -38,4 +34,4 @@ if OPENSSL - # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c - # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c - EXTRA_DIST += test_public_key_auth_succeeds_with_correct_rsa_openssh_key.c --endif -\ No newline at end of file -+endif diff --git a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch new file mode 100644 index 0000000000..ee916c42d4 --- /dev/null +++ b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch @@ -0,0 +1,23 @@ +In 8.8 OpenSSH disabled sha1 rsa-sha keys out of the box, +so we need to re-enable them as a workaround for the test +suite until upstream updates the tests. + +See: https://github.com/libssh2/libssh2/issues/630 + +Upstream-Status: Backport [alternative fixes merged upstream] + +Patch taken from https://github.com/mirror-rpm/libssh2/commit/47f7114f7d0780f3075bad51a71881f45cc933c5 + +--- a/tests/ssh2.sh ++++ b/tests/ssh2.sh +@@ -25,7 +25,8 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host + -o 'Port 4711' \ + -o 'Protocol 2' \ + -o "AuthorizedKeysFile $srcdir/etc/user.pub" \ +- -o 'UsePrivilegeSeparation no' \ ++ -o 'HostKeyAlgorithms +ssh-rsa' \ ++ -o 'PubkeyAcceptedAlgorithms +ssh-rsa' \ + -o 'StrictModes no' \ + -D \ + $libssh2_sshd_params & + diff --git a/meta/recipes-support/libssh2/files/run-ptest b/meta/recipes-support/libssh2/libssh2/run-ptest similarity index 67% rename from meta/recipes-support/libssh2/files/run-ptest rename to meta/recipes-support/libssh2/libssh2/run-ptest index 9e2fce2d24..5e7426f79d 100644 --- a/meta/recipes-support/libssh2/files/run-ptest +++ b/meta/recipes-support/libssh2/libssh2/run-ptest @@ -2,8 +2,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") cd tests -# omit ssh2.sh until https://github.com/libssh2/libssh2/issues/630 is fixed -for test in simple mansyntax.sh +for test in simple mansyntax.sh ssh2.sh do ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta/recipes-support/libssh2/libssh2_1.10.0.bb b/meta/recipes-support/libssh2/libssh2_1.10.0.bb index 072d6819c0..d5513373b0 100644 --- a/meta/recipes-support/libssh2/libssh2_1.10.0.bb +++ b/meta/recipes-support/libssh2/libssh2_1.10.0.bb @@ -8,11 +8,10 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ + file://fix-ssh2-test.patch \ file://run-ptest \ " -SRC_URI:append:ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" - SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51" inherit autotools pkgconfig ptest From patchwork Fri Mar 3 16:17:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20420 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 2E2BCC7EE39 for ; Fri, 3 Mar 2023 16:18:17 +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.27577.1677860282984369368 for ; Fri, 03 Mar 2023 08:18:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xKf6eMJO; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id ky4so3207207plb.3 for ; Fri, 03 Mar 2023 08:18:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860292; 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=oE8886/SakktqjbcnxBRaORL6k7fYBvmTDUHvl3z0Uc=; b=xKf6eMJOIeNByaL0f8S1xu62gvelcuIoaLWB4eqmIxx67m7f61rLqTs+sVA1tzsq1C 5zU2bR9Ow6U07UhWHIg6lJlUPzE3PNk5M26/a/wo6qZLfuwSFvSSxnbBUUsq9KWsuu6o qm0yi4dd4l0BT1TXMrFKzCoWHLAPQa8F7UrWFygDp9Uwqch9pLsp6o45wKrEnyJSvGqA xpPVepNCrupx5jkPqshZnk2geCWVAxHK3K65xxsI5ohF6ww8UJuyKoLcjlXm1Q8ZkV1S 7C9t6DmJ9IsYNcUl3EvhFAC20uO7ErLX7axj931qwqIeFBWLL4ZpL9hmDMgFizLzKpr0 2Kng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860292; 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=oE8886/SakktqjbcnxBRaORL6k7fYBvmTDUHvl3z0Uc=; b=p5HRM1wY9oOTKMwcx/V8AT3JjGmYaHu4puparvRpEdT85j59pGokAxMKjuF6w58cRE tNhl7hSUkcfK5kI/z2m2c7R1MuMhe2ILwnbdReGZZMvEOWFmQ1IZarBtkQvYIBNlYR34 TZdYIWQg0/1tiW5IgQti+p91bRoAFv5M4Fxuzx2Rnw4q1nPZxwlB38EJ9ofzWX4qU4rp g8ymU+lGDq5HOIPgnx+y3OTS05xAv4X2ln5rR4SHgAAly+XKn2XHeDBltNfEDYqStTia W5a+6aLHwRzA5qgPGTBPvMBLpXyDQxd1v74n+LitjBBPsldk5hLrx2lSlyiK5PdmnREX 1UTw== X-Gm-Message-State: AO0yUKXFkgsvwQ0bY9eliNXCvu8vyMCI4cWaFnD9/fMz0NUx3C59Pwmz wzO/4i3ADsm8N+dce9M58DTSnAJh4aXw3mx1uxY= X-Google-Smtp-Source: AK7set/uu3fgb8VEnvFtvtOuIrV20bQdVRLkBk9ctOJxsX39XSnjRnxxLIKWsVeeHBtY+88G5iD3dg== X-Received: by 2002:a17:902:d509:b0:19c:65bd:d44b with SMTP id b9-20020a170902d50900b0019c65bdd44bmr2922064plg.60.1677860291860; Fri, 03 Mar 2023 08:18:11 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/29] oeqa/selftest/resulttooltests: fix minor typo Date: Fri, 3 Mar 2023 06:17:21 -1000 Message-Id: <39e1a9960a4911d7519be496be20e6c35a08b618.1677859897.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 ; Fri, 03 Mar 2023 16:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178012 From: Alexis Lothoré Signed-off-by: Alexis Lothoré Signed-off-by: Richard Purdie (cherry picked from commit 80cfa56d133bd3abbb1f37272607d8e15ce70861) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/resulttooltests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/resulttooltests.py b/meta/lib/oeqa/selftest/cases/resulttooltests.py index dac5c46801..490f3fc5cf 100644 --- a/meta/lib/oeqa/selftest/cases/resulttooltests.py +++ b/meta/lib/oeqa/selftest/cases/resulttooltests.py @@ -69,7 +69,7 @@ class ResultToolTests(OESelftestTestCase): self.assertTrue('target_result1' in results['runtime/mydistro/qemux86/image'], msg="Pair not correct:%s" % results) self.assertTrue('target_result3' in results['runtime/mydistro/qemux86-64/image'], msg="Pair not correct:%s" % results) - def test_regrresion_can_get_regression_result(self): + def test_regression_can_get_regression_result(self): base_result_data = {'result': {'test1': {'status': 'PASSED'}, 'test2': {'status': 'PASSED'}, 'test3': {'status': 'FAILED'}, From patchwork Fri Mar 3 16:17:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20422 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 2D7E5C7EE37 for ; Fri, 3 Mar 2023 16:18:17 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.27631.1677860295058854966 for ; Fri, 03 Mar 2023 08:18:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pRx7qnAp; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id a2so3197840plm.4 for ; Fri, 03 Mar 2023 08:18:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860294; 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=u19ySk5mzWwdtnN97PsRUuXvNnggpXfKO+LxfPiPQk8=; b=pRx7qnAp0MsNhTvh6MOSW1gONvA1CAa9fUvxqjdwhEPErz5uSZZKMfPBzUujmPnZsP YEwudmi1DQpBX2VXhNzjkRtCbW2Vvlf2rGyoTkrxw1GMdXNvAFs3yHeDZyr+r5rxKEZ1 V4YsgiChJXn3/hWl9snf0g3au0aupOICETZKhOWsUTzNMydFN2nDOx52ApnLG2HfO03R wIS1FlPyjmh9jQyUZ33qEl2OwSdapgfUCGnvCdCdHFMJ6EJVFGLnPQG/mSg1NB5Xw9bR /Yq8hchui2dzjr1DN1WbXBuxscA10SjH3T22l4V+MVhV9DlV4NxPOgOxB3HHSHrl8to2 Jsaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860294; 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=u19ySk5mzWwdtnN97PsRUuXvNnggpXfKO+LxfPiPQk8=; b=MPiWsTiOw4ylp3ULP61QRP/S67aSHsOSjNORQYaV5ru+mZutQqvuoAkT2IQ2qG74Cy OUvSEkSapeusB5+REhQk0J5NQNe8F9rEc2saC1fIANMKaEtX521EtDKWRSRpXzEUp3wa 7SKMQ7HLrdjv7m/dpMum/ziT40NPp6iICIdx+zYfm03CU+3zYAn9FiXNP/G3rUavS8fi 3iAICH9b6MKK04bC99oNKHlKW0EQIL1sDcIv+juuywhaONAQ4ztb0gnAmBM7IAgbHnBq efKLshfy7l80N5JV52raruB30vsl8JTmQ20465i7sFYvOZu9K317oIOTafIYMA7Jrn0W fzJg== X-Gm-Message-State: AO0yUKVpuATWqT9O0Cnx0xD9jzJBIhCkc8AVUQqnI38Q3/rlQ2GlQNuf /sSMYtM+Pd26HZsBjP4IuFSZAVUbst+dM7nFI1E= X-Google-Smtp-Source: AK7set+WTDmAtQ1OxIjhNIu7im6EpE7UJI4S1qioH+zpNQQzPTQ+btAE1hDKDpob2x52qbp5+WC35A== X-Received: by 2002:a17:903:1103:b0:19c:da7f:a234 with SMTP id n3-20020a170903110300b0019cda7fa234mr2761342plh.67.1677860294025; Fri, 03 Mar 2023 08:18:14 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/29] lib/buildstats: handle tasks that never finished Date: Fri, 3 Mar 2023 06:17:22 -1000 Message-Id: <99941d6d0fac1ec046eddcc605ce67f139231b38.1677859897.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 ; Fri, 03 Mar 2023 16:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178013 From: Ross Burton If a task is aborted the buildstats file isn't complete, so calculate when the build finished and use that as a end time. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 23ebaec476dc46aebe5997f025661137f3e341bd) Signed-off-by: Steve Sakoman --- scripts/lib/buildstats.py | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/scripts/lib/buildstats.py b/scripts/lib/buildstats.py index 3b76286ba5..fa94c65539 100644 --- a/scripts/lib/buildstats.py +++ b/scripts/lib/buildstats.py @@ -79,8 +79,8 @@ class BSTask(dict): return self['rusage']['ru_oublock'] @classmethod - def from_file(cls, buildstat_file): - """Read buildstat text file""" + def from_file(cls, buildstat_file, fallback_end=0): + """Read buildstat text file. fallback_end is an optional end time for tasks that are not recorded as finishing.""" bs_task = cls() log.debug("Reading task buildstats from %s", buildstat_file) end_time = None @@ -108,7 +108,10 @@ class BSTask(dict): bs_task[ru_type][ru_key] = val elif key == 'Status': bs_task['status'] = val - if end_time is not None and start_time is not None: + # If the task didn't finish, fill in the fallback end time if specified + if start_time and not end_time and fallback_end: + end_time = fallback_end + if start_time and end_time: bs_task['elapsed_time'] = end_time - start_time else: raise BSError("{} looks like a invalid buildstats file".format(buildstat_file)) @@ -226,15 +229,33 @@ class BuildStats(dict): epoch = match.group('epoch') return name, epoch, version, revision + @staticmethod + def parse_top_build_stats(path): + """ + Parse the top-level build_stats file for build-wide start and duration. + """ + with open(path) as fobj: + for line in fobj.readlines(): + key, val = line.split(':', 1) + val = val.strip() + if key == 'Build Started': + start = float(val) + elif key == "Elapsed time": + elapsed = float(val.split()[0]) + return start, elapsed + @classmethod def from_dir(cls, path): """Load buildstats from a buildstats directory""" - if not os.path.isfile(os.path.join(path, 'build_stats')): + top_stats = os.path.join(path, 'build_stats') + if not os.path.isfile(top_stats): raise BSError("{} does not look like a buildstats directory".format(path)) log.debug("Reading buildstats directory %s", path) - buildstats = cls() + build_started, build_elapsed = buildstats.parse_top_build_stats(top_stats) + build_end = build_started + build_elapsed + subdirs = os.listdir(path) for dirname in subdirs: recipe_dir = os.path.join(path, dirname) @@ -244,7 +265,7 @@ class BuildStats(dict): bsrecipe = BSRecipe(name, epoch, version, revision) for task in os.listdir(recipe_dir): bsrecipe.tasks[task] = BSTask.from_file( - os.path.join(recipe_dir, task)) + os.path.join(recipe_dir, task), build_end) if name in buildstats: raise BSError("Cannot handle multiple versions of the same " "package ({})".format(name)) From patchwork Fri Mar 3 16:17:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20421 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 34251C7EE2F for ; Fri, 3 Mar 2023 16:18:17 +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.27634.1677860296563352748 for ; Fri, 03 Mar 2023 08:18:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wRbxncai; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id v11so3170412plz.8 for ; Fri, 03 Mar 2023 08:18:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860296; 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=4VqMDuy6K7SYU1JLyGXFmbIpGYqL16AVXwzwJR1Mycg=; b=wRbxncai2oBVpX9txwluk8ofTFSUZqdRC1/36qal7UwL6QMRGV4+iZRKtrntOTad1V jImUHEiTcGDR792LnPvErEQy2T4at+PriDr73g2WFUBf7aekDtrW/gYx5V4BBCopRS+X SDQC2vM+7cM0PcnaOjdHxrco9WLRWOIH56ExLwbaBnQqjwvowlpH8oOEKoV09k7qecqG N9mAYCGbh23rYISmmiyv0KtV/UDsnzX1iNxonA14/aFonPiOV6wVerNpHgPmwR1sOs4p mSwrYOLANpnZcljej35zINfxA3rJMtgOtgwyGcSg1JdIPeYECJBodqE58e8BF4Ey1i0e 5j1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860296; 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=4VqMDuy6K7SYU1JLyGXFmbIpGYqL16AVXwzwJR1Mycg=; b=K2sgqPdK6EeaNB7GWXIFDgV1oqhVQ/bZ9RCsTvIYpVTP5aryGqQbDLv5AyGnszNm3e jh8+8umxojBzitAidpKBDp8aMFLeGYf+CL5LUU4Qfx+CLoMopEP5L8LYRahGoJMydkeE pmUTowrBMg7i5+ptXi43U2Cr+B9s887utAS+JXAx61wTIBdyg/omu9hkKwJ01dPO9Bu/ tNTMyQnwUbESXVnYnMUDKvQODqd8gxXd67Nes88uXtl1bTelsLwRCxY3gfnW8xaqYYJN k1s5NXufZVCExhwujwvEwA+Bm6g+f9RbBVaCyM03bEfx4TIxcbpHPNGjGVFkCZ4ovps+ I9yQ== X-Gm-Message-State: AO0yUKVx82PL7DxLGdS9Er9GwUibmZLOIrRUH02cGzgI8hdis6yy1iyS /eEeEBgty+BZJJLzz0yyfuM6YrMsBHS581VskgA= X-Google-Smtp-Source: AK7set8VQ9zIXkM3jVGJxPRpLbu1VLtD0PvMF+8yDuGPRo3SQS2lNdtKsfD4hZg22FJ/0tGkCWO3GA== X-Received: by 2002:a17:902:cecb:b0:19a:6acc:1de2 with SMTP id d11-20020a170902cecb00b0019a6acc1de2mr2517549plg.35.1677860295653; Fri, 03 Mar 2023 08:18:15 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/29] kernel-yocto: fix kernel-meta data detection Date: Fri, 3 Mar 2023 06:17:23 -1000 Message-Id: <886714c382139dd2090296c6a08e687dd389f7dc.1677859897.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 ; Fri, 03 Mar 2023 16:18:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178014 From: Ulrich Ölmann Fixes: 7ef7af5c03ba ("kernel-yocto: restore kernel-meta data detection for SRC_URI elements") Signed-off-by: Ulrich Ölmann Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c77754f23e3fb49a62602a6c6a04d5525d1cf457) Signed-off-by: Steve Sakoman --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 82e792351f..4f8e391428 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -206,7 +206,7 @@ do_kernel_metadata() { # SRC_URI. If they were supplied, we convert them into include directives # for the update part of the process for f in ${feat_dirs}; do - if [ -d "${WORKDIR}/$f/meta" ]; then + if [ -d "${WORKDIR}/$f/kernel-meta" ]; then includes="$includes -I${WORKDIR}/$f/kernel-meta" elif [ -d "${WORKDIR}/../oe-local-files/$f" ]; then includes="$includes -I${WORKDIR}/../oe-local-files/$f" From patchwork Fri Mar 3 16:17:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20427 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 2A8D2C7EE2D for ; Fri, 3 Mar 2023 16:18:27 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web11.27636.1677860298348936804 for ; Fri, 03 Mar 2023 08:18:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qvl74+/y; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id kb15so3053178pjb.1 for ; Fri, 03 Mar 2023 08:18:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860297; 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=/OBXEO7V1nmKdV5zTFuJDeUaLqwk57LZzu4mfq8YEqM=; b=qvl74+/ypdV2Wu8dHQ+wrzVXyB47T0VkxFy9x/n9NVJrAEf2LFbPi/hR9y2l5PWJ1a jUlLa8OrGcEzkGomgD/cpJfGX9E6rXgmx7HKeRMaU4lxIFnyz/UsuYjFTj6NnczLRK0p PExtHffKGOPd8urj58ZLv7hSj1LOoSCeMthfzsHCCAMXQdb3jOXQ95rx0bFxb+UHLdbX i1kDWXxHLBazSIE7beRsStjfeSKd26bDna05Me9VXy/iXMYwIyQKB8w79LwLsNDIgqnG Vg5jc2k0zgwGyvd3uVYMZferloZp4jH/D4nX/qMsZoY94uB/fsg03had799s9rADSD2n PKXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860297; 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=/OBXEO7V1nmKdV5zTFuJDeUaLqwk57LZzu4mfq8YEqM=; b=jX/6lRsj+pckNIORATD2nafcVMRXoKC6ckULDm/njWNoTZuC1OLxkHzQiE+kDjncWY kilfYA8Ba8bVD49pUIx5ZuGz+8+rEmfGipYmE/UGpqwsMUVuMuqi7IL7wq2EIr8CUsVb qoNPnc3wM1923HvVgnOXh0oVljZh4nyMIYRyoI5v+Bk3tOCnA0lZpIj2Es7zT2mfsSfG jFDkpyeigMEBMR8GXAYBO3wDcI302fYeQKel6xJDnS5ia14BNN9VJ4+kX/8ZCPauBXC2 5o0WN6zCsGTlY5ZtPpDKX0KTArOSH625iqE7IXNXgPln5W2K0QOKqHUanTSi91sI3XDu jarQ== X-Gm-Message-State: AO0yUKWTBX7jFxnaSMD7bK73wDVJWRsziJbtSiA/VSxuGOi9aWxcBOe1 c4YsgRtCemZxHvYRRpBpUHG2YHFM2+z/YtMi14Y= X-Google-Smtp-Source: AK7set8aO8As4iOlBzvw3z3F5koVwkyBt7ujxn0vAXGxc0Hvh+yFR0p7zul3cUR0sPlfwnhC7NoXEw== X-Received: by 2002:a17:903:2288:b0:19a:9dab:3438 with SMTP id b8-20020a170903228800b0019a9dab3438mr2327700plh.2.1677860297312; Fri, 03 Mar 2023 08:18:17 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/29] libseccomp: fix for the ptest result format Date: Fri, 3 Mar 2023 06:17:24 -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 ; Fri, 03 Mar 2023 16:18:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178015 From: Narpat Mali The output of libseccomp ptest should follow a unified format as per this https://wiki.yoctoproject.org/wiki/Ptest Replaced the test results SUCCESS, FAILURE & SKIPPPED with PASS, FAIL & SKIP and printing the ptest result with the below format result: testname Signed-off-by: Narpat Mali Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 30d025a8641cfcce5412b5f021478777620b55f1) Signed-off-by: Steve Sakoman --- meta/recipes-support/libseccomp/files/run-ptest | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/libseccomp/files/run-ptest b/meta/recipes-support/libseccomp/files/run-ptest index 54b4a63cd2..63c79f09c4 100644 --- a/meta/recipes-support/libseccomp/files/run-ptest +++ b/meta/recipes-support/libseccomp/files/run-ptest @@ -1,4 +1,7 @@ #!/bin/sh cd tests +sed -i 's/SUCCESS/PASS/g; s/FAILURE/FAIL/g; s/SKIPPED/SKIP/g' regression +sed -i 's/"Test %s result: %s\\n" "$1" "$2"/"%s: %s\\n" "$2" "$1"/g' regression +sed -i 's/"Test %s result: %s %s\\n" "$1" "$2" "$3"/"%s: %s %s\\n" "$2" "$1" "$3"/g' regression ./regression -a From patchwork Fri Mar 3 16:17:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20425 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 208B8C7EE2F for ; Fri, 3 Mar 2023 16:18:27 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.27592.1677860299935788879 for ; Fri, 03 Mar 2023 08:18:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=LLbSsITm; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id me6-20020a17090b17c600b0023816b0c7ceso6660323pjb.2 for ; Fri, 03 Mar 2023 08:18:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860299; 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=x71DFzhhSm4+JuGsgdS0QsmScltUHu+REDnOgwQsvys=; b=LLbSsITm45ewt3BGIC2roDhv6lGb+MCHejnQ8r45E0ir96ke3qRAYKjfEy8i3Df4lE a/LUKNtL/Yucb53nY+qVAhx4sT92gAIaPamNo6cJLybV21TEnk+mQpHAe9gTI+g9NaOd CU6jsiZjOzTfkSabClQ9d1l0K2clnjbA3SRU1y4CtlmAkLqTH33/E8N2/jemI12NDlDB 7c5IR1+VFvURvCTzWVfcvMfODUp6FFRAnoa26ZNJB9mcxqDGGAN4Bdy0kXCoU7iQ2bPL dbZkccZ2shXqUkSwnuTGn8jzLn2zjpdmYOlacHvthIAv3feRzWU22BMx7q0gvGmVuX9D 2E1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860299; 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=x71DFzhhSm4+JuGsgdS0QsmScltUHu+REDnOgwQsvys=; b=FpOtfiqjwtezSIeHuTdTdL8yu8PTh7jfJYj3PGe3Ad+SJtNfluWj42NmTjEwKBsapL KBA5SXDds+1fml+CVEw1ok/0TkD6o4NOzakR4bN1IO6ATrKAw6afq2zqIPc8Aho3d8oE 6agJ48xq8vV8/qvGOuMNgsa371y7vO4JRkqWpRKJdpt++NQDWelEHLWLgZCjpCmtc9vT mJsgrheW//GPU64fV2KYIyQSA5F7+0ZzEcnqy71heFhIKrWo/bU9fJ/F36NOvdpIt/59 Myr5sotaPODNdR7n62OnMR69FbhmFnDf/2kGks5kD7zxE604FBuMKoQhuLbs3WT9clHz Gk0g== X-Gm-Message-State: AO0yUKXsuulJclERW9q5VHIBy7OgKZu+sTE13cmCjUxpNHi4qqUhRVFJ zblDy3t2Ea9mmiZdLSKmXVSXmv3oyDqylOVd5ME= X-Google-Smtp-Source: AK7set+hwY8QH9utpsIr6ofDx3qd4BjNwuHy9iiNoTJ05XzfwMVh2h3r1AqxcR593ZXOb3QqSNMV1Q== X-Received: by 2002:a17:902:d2c5:b0:19e:6969:b142 with SMTP id n5-20020a170902d2c500b0019e6969b142mr2983917plc.3.1677860298967; Fri, 03 Mar 2023 08:18:18 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 27/29] oeqa ssh.py: fix hangs in run() Date: Fri, 3 Mar 2023 06:17:25 -1000 Message-Id: <875a1cc6cecf28c0f5ffbbac6627af3e6dfd30d6.1677859897.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 ; Fri, 03 Mar 2023 16:18:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178016 From: Mikko Rapeli When qemu machine hangs, the ssh commands done by tests are not timing out. do_testimage() task has last logs like this: DEBUG: time: 1673531086.3155053, endtime: 1673531686.315502 The test process is stuck for hours, or for ever if the executing command or test case did not set a timeout correctly. The default 300 second timeout is not working when target hangs. Note that timeout is really a "inactive timeout" since data returned by the process will reset the timeout. Make the process stdout non-blocking so read() will always return right away using os.set_blocking() available in python 3.5 and later. Then change from python codec reader to plain read() and make the ssh subprocess stdout non-blocking. Even with select() making sure the file had input to be read, the codec reader was trying to find more stuff and blocking for ever when process hangs. While at it, add a small timeout to read data in larger chunks if possible. This avoids reading data one or few characters at a time and makes the debug logs more readable. close() the stdout file in all cases after read loop is complete. Then make sure to wait or kill the ssh subprocess in all cases. Just reading the output stream and receiving EOF there does not mean that the process exited, and wait() needs a timeout if the process is hanging. In the end kill the process and return the return value and captured output utf-8 encoded, just like before these changes. This fixes ssh run() related deadlocks when a qemu target hangs completely. Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni (cherry picked from commit 9c63970fce3a3d6029745252a6ec2bf9b9da862d) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/core/target/ssh.py | 39 ++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 48a463861d..4ab0cddb43 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -226,27 +226,33 @@ def SSHCall(command, logger, timeout=None, **opts): def run(): nonlocal output nonlocal process + output_raw = b'' starttime = time.time() process = subprocess.Popen(command, **options) if timeout: endtime = starttime + timeout eof = False + os.set_blocking(process.stdout.fileno(), False) while time.time() < endtime and not eof: - logger.debug('time: %s, endtime: %s' % (time.time(), endtime)) try: + logger.debug('Waiting for process output: time: %s, endtime: %s' % (time.time(), endtime)) if select.select([process.stdout], [], [], 5)[0] != []: - reader = codecs.getreader('utf-8')(process.stdout, 'ignore') - data = reader.read(1024, 4096) + # wait a bit for more data, tries to avoid reading single characters + time.sleep(0.2) + data = process.stdout.read() if not data: - process.stdout.close() eof = True else: - output += data - logger.debug('Partial data from SSH call:\n%s' % data) + output_raw += data + # ignore errors to capture as much as possible + logger.debug('Partial data from SSH call:\n%s' % data.decode('utf-8', errors='ignore')) endtime = time.time() + timeout except InterruptedError: + logger.debug('InterruptedError') continue + process.stdout.close() + # process hasn't returned yet if not eof: process.terminate() @@ -254,6 +260,7 @@ def SSHCall(command, logger, timeout=None, **opts): try: process.kill() except OSError: + logger.debug('OSError when killing process') pass endtime = time.time() - starttime lastline = ("\nProcess killed - no output for %d seconds. Total" @@ -262,8 +269,21 @@ def SSHCall(command, logger, timeout=None, **opts): output += lastline else: - output = process.communicate()[0].decode('utf-8', errors='ignore') - logger.debug('Data from SSH call:\n%s' % output.rstrip()) + output_raw = process.communicate()[0] + + output = output_raw.decode('utf-8', errors='ignore') + logger.debug('Data from SSH call:\n%s' % output.rstrip()) + + # timout or not, make sure process exits and is not hanging + if process.returncode == None: + try: + process.wait(timeout=5) + except TimeoutExpired: + try: + process.kill() + except OSError: + logger.debug('OSError') + pass options = { "stdout": subprocess.PIPE, @@ -292,4 +312,5 @@ def SSHCall(command, logger, timeout=None, **opts): process.kill() logger.debug('Something went wrong, killing SSH process') raise - return (process.wait(), output.rstrip()) + + return (process.returncode, output.rstrip()) From patchwork Fri Mar 3 16:17:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20424 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 20886C64EC4 for ; Fri, 3 Mar 2023 16:18:27 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.27637.1677860301704987727 for ; Fri, 03 Mar 2023 08:18:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jFLKrquU; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id x34so3082654pjj.0 for ; Fri, 03 Mar 2023 08:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860301; 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=2fr0oFBwmzYCw17JUxSodPNovrNCQ1/9rX9UIoADK20=; b=jFLKrquUkZodhnYM0F5PuxUA2G3BuvU+DSrboPiiY3oFg2ws+kSekXTJmj82L7MoKu bSz85dtj8zRFjTfc5Sok73pNo585J/4BRBkZNT2LXksDWJypqfIObgPHDNBRz30AHzJ3 2bH8gAs06XqYpiKZHK/F+OiHdhcMMwky+k+UaNd9un12W/zB8A/q1Qf9tXN/HvCsmxNZ TfB2vDcnpdu8h4CIDRq3TwYXM9mwFx5PvcsZlLJ6vZJ9aB13rU7lrUT0feH6suTQD5Hp ySkq6llrftKO1JLBz8Lq1W6VHqQpS8zzXF6mSNEWqunPgfaQZ1QYQcIZmJfIcSXLyhhv l7Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860301; 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=2fr0oFBwmzYCw17JUxSodPNovrNCQ1/9rX9UIoADK20=; b=c7Nq+P3TeLed/NHwbmJwZA38vghos0oPzgEPV3dN/XXIFw93vAjdx+4g52EAg2TH/L mFO0FAA+ffnPRfDeTaqP8vSjW0CkiemuKaR+I6qRNfQn267OIzaNKyV4hJi5iwKKDJtY VlvvAJ/LefGLtf+ZCE7VUDTt2cdluiKLrrmYjouf/3ZaefrEojabwnc1rnArcz80+huI 16YD9eI6KAzfNUKwPWvT5kKsbtc9NObng3+RQjBKK/3a9xMx8xFWtEQSHnzMdG1SD05O 15MzC7bS/MkLtmfFTukLaqPKhXQ5Ju6lV57W8WxoXt7O/+nIWx07S9pTOnoPZpX8ecg6 Tb5A== X-Gm-Message-State: AO0yUKU545ye9XanzGGv16uptHFEjiJXYkdbql7CTH1YpG947KBVlLbU WwSYOxsGfRxIBLHHJSIwx1/gfi/oUuUZg9qYeEE= X-Google-Smtp-Source: AK7set8Wc23n4dYW5hSc/qYcBIt7REl0PvBXZKL8FeQxCV7mqPoWWELED4Ug632pq8eUsG/unCdHmg== X-Received: by 2002:a17:903:441:b0:19e:7d5b:90fd with SMTP id iw1-20020a170903044100b0019e7d5b90fdmr2289577plb.41.1677860300665; Fri, 03 Mar 2023 08:18:20 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 28/29] runqemu: kill qemu if it hangs Date: Fri, 3 Mar 2023 06:17:26 -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 ; Fri, 03 Mar 2023 16:18:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178017 From: Mikko Rapeli qemu doesn't always behave well and can hang too. kill it with force if it was still alive. Move clean up commands into cleanup() function. Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni (cherry picked from commit 079c2935d2f585ce49e1c7daab2155fcf0094c48) Signed-off-by: Steve Sakoman --- scripts/runqemu | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 0cce8bb96a..5a98abfffe 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -211,7 +211,7 @@ class BaseConfig(object): self.mac_slirp = "52:54:00:12:35:" # pid of the actual qemu process self.qemu_environ = os.environ.copy() - self.qemupid = None + self.qemuprocess = None # avoid cleanup twice self.cleaned = False # Files to cleanup after run @@ -1512,7 +1512,7 @@ class BaseConfig(object): for descriptor in self.portlocks.values(): pass_fds.append(descriptor.fileno()) process = subprocess.Popen(cmds, stderr=subprocess.PIPE, pass_fds=pass_fds, env=self.qemu_environ) - self.qemupid = process.pid + self.qemuprocess = process retcode = process.wait() if retcode: if retcode == -signal.SIGTERM: @@ -1528,6 +1528,15 @@ class BaseConfig(object): signal.signal(signal.SIGTERM, signal.SIG_IGN) logger.info("Cleaning up") + + if self.qemuprocess: + try: + # give it some time to shut down, ignore return values and output + self.qemuprocess.send_signal(signal.SIGTERM) + self.qemuprocess.communicate(timeout=5) + except subprocess.TimeoutExpired: + self.qemuprocess.kill() + with open('/proc/uptime', 'r') as f: uptime_seconds = f.readline().split()[0] logger.info('Host uptime: %s\n' % uptime_seconds) @@ -1555,6 +1564,9 @@ class BaseConfig(object): else: shutil.rmtree(ent) + # Deliberately ignore the return code of 'tput smam'. + subprocess.call(["tput", "smam"]) + self.cleaned = True def run_bitbake_env(self, mach=None): @@ -1631,12 +1643,8 @@ def main(): subprocess.check_call([renice, str(os.getpid())]) def sigterm_handler(signum, frame): - logger.info("SIGTERM received") - if config.qemupid: - os.kill(config.qemupid, signal.SIGTERM) + logger.info("Received signal: %s" % (signum)) config.cleanup() - # Deliberately ignore the return code of 'tput smam'. - subprocess.call(["tput", "smam"]) signal.signal(signal.SIGTERM, sigterm_handler) config.check_args() @@ -1658,8 +1666,6 @@ def main(): return 1 finally: config.cleanup() - # Deliberately ignore the return code of 'tput smam'. - subprocess.call(["tput", "smam"]) if __name__ == "__main__": sys.exit(main()) From patchwork Fri Mar 3 16:17:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 20426 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 2FE0DC7EE32 for ; Fri, 3 Mar 2023 16:18:27 +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.27556.1677860266661907687 for ; Fri, 03 Mar 2023 08:18:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=o9ycjaGE; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id m20-20020a17090ab79400b00239d8e182efso6620275pjr.5 for ; Fri, 03 Mar 2023 08:18:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1677860302; 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=eXTeQqtSXgrzFWaokOzJPOP5+fWaNs0RET6ns/kdRcw=; b=o9ycjaGEBp3B5wOIJodXzplvoyIl+IhXi/GA1+OG0+NiNWytCK499cC+3QKg9Jofh7 l/Oxxx4OnKq7CF07WkyVBgsaz+5s890CqT5xgc/N/ZmIN1XRz0JDhv1xvc7CTMlBXM8Y 1zsaKFTsaRFwKuRqy/tJ+geMLoJ9xskOts4Y6r3PiAYyWds0L02YS4YwKocFkcRXc8gV n/OtYO4pS/sXiypHk/F37l/miWimGgpRuOxfXZI8OVwr/Hqetg9ut5P7jllUbC+aEQop ChXUClwmSHPy6BJlU6J5gqb85tkZT9MZyuxbksV24yQm1u0QAItZJLVVEJZ2s8cwwwgK 033Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677860302; 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=eXTeQqtSXgrzFWaokOzJPOP5+fWaNs0RET6ns/kdRcw=; b=XHGFDVkZmqZV426wI3t9t5kkNq3V4ICthBn4n58eIZv/i8tQd3sj4ISo+9Ddt7o8he qwZWBx3OkwRBggmyw5SW7e71JUs6eRQlKk0Ru7C2rAvKQxSDhJpMfRdUx6hF9zE16C5C mEcYoH5oVT2tdJTdv5s3xg6P2Borg3q6xTe7q18d7O7DjwNyO6yYfwHCxDoL/NKOye1J jV9lADeVveb78z3n6WBmPRP37bCFZA1d+7ANUS9SW9db9n97SvfxCj7kXTmQAbl9g+Lv Uo1tOYgJx03c4pJJ1viWPYHMguQijGEvNsynjfqCqOPjr4l3wjP+YeNbMk1kBHFypGUP o9PQ== X-Gm-Message-State: AO0yUKU/OKrnpsYRNn6yV251XUu0OeNWs9UF6PCrgKfwXDFARKMhEL53 /AfkXte/TYjo6/yQh+5s6U/4QG0dZ/+8qEuTf2g= X-Google-Smtp-Source: AK7set9BCJ21L800YqQWYiMqnK2viEMia0PGCJZaK81VrMFvLrWb3KW8XlH35sQfxdLZ4ITHbF5y7w== X-Received: by 2002:a17:902:720b:b0:19c:cf89:b7ee with SMTP id ba11-20020a170902720b00b0019ccf89b7eemr2051026plb.69.1677860302326; Fri, 03 Mar 2023 08:18:22 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id ko4-20020a17090307c400b00186b7443082sm1702474plb.195.2023.03.03.08.18.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:18:22 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 29/29] nghttp2: never build python bindings Date: Fri, 3 Mar 2023 06:17:27 -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 ; Fri, 03 Mar 2023 16:18:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178018 From: Joe Slater This has already been done for oe-core/master. Signed-off-by: Joe Slater Signed-off-by: Steve Sakoman --- meta/recipes-support/nghttp2/nghttp2_1.47.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb index 58ce08084d..becacd4502 100644 --- a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb +++ b/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb @@ -19,6 +19,10 @@ PACKAGECONFIG[manpages] = "" # first place EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF" +# Do not let configure try to decide this. +# +EXTRA_OECMAKE += "-DENABLE_PYTHON_BINDINGS=OFF" + PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server" RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})"