From patchwork Tue Jul 4 15:29:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26859 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 C0FE7C001B0 for ; Tue, 4 Jul 2023 15:29:49 +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.61379.1688484583046233873 for ; Tue, 04 Jul 2023 08:29:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=jZNeK/Ia; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1b8a8154f9cso4076505ad.1 for ; Tue, 04 Jul 2023 08:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484582; x=1691076582; 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=PPu5xo7ptthdWhNN0ML6dcxMqiE6t5iCy4IHWncj0rQ=; b=jZNeK/IaQ+MBUVP9gIOf/iv1vnqS0WCNdTmGLMsKFn4z2coGu6e0+a1v+jF01ZrjyM we9Tl1xCtENEa73p6tsTfYzpWeiYqZgbOqIraV2r82jLD/6zpXhVgRQHFs3ONzLSA+LD KD2zoKuXRDduDYPt7IDM3jYQDuVHYoewH5lzjdiSncN06xvv/LlZLFZQd4A43LOr5S6p WmaELfBmbdu9l5zdD8h8FdqtEhxFDX8tnhrzpZf2au5YN3EiqjBsd/NX/nrejZ1EoJY4 60AiYxthnEYfJ5iZHLKSiHN4+mwyGRfHTbupM2iU6JNqTyPotufXZBhCEcwwNe+klQdH xpzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484582; x=1691076582; 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=PPu5xo7ptthdWhNN0ML6dcxMqiE6t5iCy4IHWncj0rQ=; b=GGkZe3Qm2I86FlZlXguMXqDe58Du//FL6ECdenLpHzW/OnMr7rYU4Y7Wa/mEw8SxBg 8zjqPRAlO14Hq43HM7ItUVylpjwieW8wqOzJhPPheeVZF+3arNXm5g/7vV6jg9QiBKjU K4J2vX7WswUWhOMD2KXIX/hPx4sAV778dePziG+pZniGN2KF5ImA6CU7u3ODY6Bnww4/ 9y/F7mQncdvqwafKMfbkNYlLWaWoRZHO6PWzKjS1t86KQsX/+XTUSQ7Z2FxlF9RKU27V 7odmanJ3EKqEjhffsYuGLiG44HhzlmQ7gMn9vj2/zQ3ImK/jq7aegWwJYYtEDSn5AwoK Hgxg== X-Gm-Message-State: ABy/qLauyVgl4rpdYGaInQfv04DSflgoegOPCUv5YLOcAyb8yV5eDBDG nU2jKJL4fmUBoIAv0G+Yqyn6YS8jiC7rFcCAmDap0w== X-Google-Smtp-Source: APBJJlEEbovtoqWOao6svBmL8kYlw3JqXFoxFxSXRIWR3lPs5ZBFVC9QGMJi8f6lqbCOMmmL6de7rg== X-Received: by 2002:a17:902:f54f:b0:1b8:7265:aa0 with SMTP id h15-20020a170902f54f00b001b872650aa0mr19372966plf.2.1688484581843; Tue, 04 Jul 2023 08:29:41 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 01/30] perl: Fix CVE-2023-31484 & CVE-2023-31486 Date: Tue, 4 Jul 2023 05:29:03 -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 ; Tue, 04 Jul 2023 15:29:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183836 From: Soumya CPAN.pm before 2.35 does not verify TLS certificates when downloading distributions over HTTPS. HTTP::Tiny before 0.083, a Perl core module since 5.13.9 and available standalone on CPAN, has an insecure default TLS configuration where users must opt in to verify certificates. References: https://nvd.nist.gov/vuln/detail/CVE-2023-31484 https://nvd.nist.gov/vuln/detail/CVE-2023-31486 Upstream patches: https://github.com/andk/cpanpm/commit/9c98370287f4e709924aee7c58ef21c85289a7f0 https://github.com/chansen/p5-http-tiny/commit/77f557ef84698efeb6eed04e4a9704eaf85b741d https://github.com/chansen/p5-http-tiny/commit/a22785783b17cbaa28afaee4a024d81a1903701d Signed-off-by: Soumya Signed-off-by: Steve Sakoman --- .../perl/files/CVE-2023-31484.patch | 29 +++ .../perl/files/CVE-2023-31486-0001.patch | 217 ++++++++++++++++++ .../perl/files/CVE-2023-31486-0002.patch | 30 +++ meta/recipes-devtools/perl/perl_5.36.0.bb | 3 + 4 files changed, 279 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/CVE-2023-31484.patch create mode 100644 meta/recipes-devtools/perl/files/CVE-2023-31486-0001.patch create mode 100644 meta/recipes-devtools/perl/files/CVE-2023-31486-0002.patch diff --git a/meta/recipes-devtools/perl/files/CVE-2023-31484.patch b/meta/recipes-devtools/perl/files/CVE-2023-31484.patch new file mode 100644 index 0000000000..1f7cbd0da1 --- /dev/null +++ b/meta/recipes-devtools/perl/files/CVE-2023-31484.patch @@ -0,0 +1,29 @@ +From a625ec2cc3a0b6116c1f8b831d3480deb621c245 Mon Sep 17 00:00:00 2001 +From: Stig Palmquist +Date: Tue, 28 Feb 2023 11:54:06 +0100 +Subject: [PATCH] Add verify_SSL=>1 to HTTP::Tiny to verify https server + identity + +Upstream-Status: Backport [https://github.com/andk/cpanpm/commit/9c98370287f4e709924aee7c58ef21c85289a7f0] + +CVE: CVE-2023-31484 + +Signed-off-by: Soumya +--- + cpan/CPAN/lib/CPAN/HTTP/Client.pm | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cpan/CPAN/lib/CPAN/HTTP/Client.pm b/cpan/CPAN/lib/CPAN/HTTP/Client.pm +index 4fc792c..a616fee 100644 +--- a/cpan/CPAN/lib/CPAN/HTTP/Client.pm ++++ b/cpan/CPAN/lib/CPAN/HTTP/Client.pm +@@ -32,6 +32,7 @@ sub mirror { + + my $want_proxy = $self->_want_proxy($uri); + my $http = HTTP::Tiny->new( ++ verify_SSL => 1, + $want_proxy ? (proxy => $self->{proxy}) : () + ); + +-- +2.40.0 diff --git a/meta/recipes-devtools/perl/files/CVE-2023-31486-0001.patch b/meta/recipes-devtools/perl/files/CVE-2023-31486-0001.patch new file mode 100644 index 0000000000..e2a2216a0d --- /dev/null +++ b/meta/recipes-devtools/perl/files/CVE-2023-31486-0001.patch @@ -0,0 +1,217 @@ +From e1ca8defeff496000fc96600ebfca7250065c1f1 Mon Sep 17 00:00:00 2001 +From: Stig Palmquist +Date: Thu, 29 Jun 2023 14:36:05 +0000 +Subject: [PATCH] Change verify_SSL default to 1, add ENV var to enable + insecure default + +- Changes the `verify_SSL` default parameter from `0` to `1` + + Based on patch by Dominic Hargreaves: + https://salsa.debian.org/perl-team/interpreter/perl/-/commit/1490431e40e22052f75a0b3449f1f53cbd27ba92 + + Fixes CVE-2023-31486 + +- Add check for `$ENV{PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT}` that + enables the previous insecure default behaviour if set to `1`. + + This provides a workaround for users who encounter problems with the + new `verify_SSL` default. + + Example to disable certificate checks: + ``` + $ PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT=1 ./script.pl + ``` + +- Updates to documentation: + - Describe changing the verify_SSL value + - Describe the escape-hatch environment variable + - Remove rationale for not enabling verify_SSL + - Add missing certificate search paths + - Replace "SSL" with "TLS/SSL" where appropriate + - Use "machine-in-the-middle" instead of "man-in-the-middle" + +Upstream-Status: Backport [https://github.com/chansen/p5-http-tiny/commit/77f557ef84698efeb6eed04e4a9704eaf85b741d] + +Signed-off-by: Soumya +--- + cpan/HTTP-Tiny/lib/HTTP/Tiny.pm | 86 ++++++++++++++++++++++----------- + 1 file changed, 57 insertions(+), 29 deletions(-) + +diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +index 83ca06d..5f6ced8 100644 +--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm ++++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +@@ -40,10 +40,14 @@ sub _croak { require Carp; Carp::croak(@_) } + #pod * C — Request timeout in seconds (default is 60) If a socket open, + #pod read or write takes longer than the timeout, the request response status code + #pod will be 599. +-#pod * C — A boolean that indicates whether to validate the SSL +-#pod certificate of an C — connection (default is false) ++#pod * C — A boolean that indicates whether to validate the TLS/SSL ++#pod certificate of an C — connection (default is true). Changed from false ++#pod to true in version 0.083. + #pod * C — A hashref of C — options to pass through to + #pod L ++#pod * C<$ENV{PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT}> - Changes the default ++#pod certificate verification behavior to not check server identity if set to 1. ++#pod Only effective if C is not set. Added in version 0.083. + #pod + #pod An accessor/mutator method exists for each attribute. + #pod +@@ -111,11 +115,17 @@ sub timeout { + sub new { + my($class, %args) = @_; + ++ # Support lower case verify_ssl argument, but only if verify_SSL is not ++ # true. ++ if ( exists $args{verify_ssl} ) { ++ $args{verify_SSL} ||= $args{verify_ssl}; ++ } ++ + my $self = { + max_redirect => 5, + timeout => defined $args{timeout} ? $args{timeout} : 60, + keep_alive => 1, +- verify_SSL => $args{verify_SSL} || $args{verify_ssl} || 0, # no verification by default ++ verify_SSL => defined $args{verify_SSL} ? $args{verify_SSL} : _verify_SSL_default(), + no_proxy => $ENV{no_proxy}, + }; + +@@ -134,6 +144,13 @@ sub new { + return $self; + } + ++sub _verify_SSL_default { ++ my ($self) = @_; ++ # Check if insecure default certificate verification behaviour has been ++ # changed by the user by setting PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT=1 ++ return (($ENV{PERL_HTTP_TINY_INSECURE_BY_DEFAULT} || '') eq '1') ? 0 : 1; ++} ++ + sub _set_proxies { + my ($self) = @_; + +@@ -1055,7 +1072,7 @@ sub new { + timeout => 60, + max_line_size => 16384, + max_header_lines => 64, +- verify_SSL => 0, ++ verify_SSL => HTTP::Tiny::_verify_SSL_default(), + SSL_options => {}, + %args + }, $class; +@@ -2043,11 +2060,11 @@ proxy + timeout + verify_SSL + +-=head1 SSL SUPPORT ++=head1 TLS/SSL SUPPORT + + Direct C connections are supported only if L 1.56 or + greater and L 1.49 or greater are installed. An error will occur +-if new enough versions of these modules are not installed or if the SSL ++if new enough versions of these modules are not installed or if the TLS + encryption fails. You can also use C utility function + that returns boolean to see if the required modules are installed. + +@@ -2055,7 +2072,7 @@ An C connection may be made via an C proxy that supports the CONNEC + command (i.e. RFC 2817). You may not proxy C via a proxy that itself + requires C to communicate. + +-SSL provides two distinct capabilities: ++TLS/SSL provides two distinct capabilities: + + =over 4 + +@@ -2069,24 +2086,17 @@ Verification of server identity + + =back + +-B. +- +-Server identity verification is controversial and potentially tricky because it +-depends on a (usually paid) third-party Certificate Authority (CA) trust model +-to validate a certificate as legitimate. This discriminates against servers +-with self-signed certificates or certificates signed by free, community-driven +-CA's such as L. ++B. + +-By default, HTTP::Tiny does not make any assumptions about your trust model, +-threat level or risk tolerance. It just aims to give you an encrypted channel +-when you need one. ++This was changed in version 0.083 due to security concerns. The previous default ++behavior can be enabled by setting C<$ENV{PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT}> ++to 1. + +-Setting the C attribute to a true value will make HTTP::Tiny verify +-that an SSL connection has a valid SSL certificate corresponding to the host +-name of the connection and that the SSL certificate has been verified by a CA. +-Assuming you trust the CA, this will protect against a L. If you are +-concerned about security, you should enable this option. ++Verification is done by checking that that the TLS/SSL connection has a valid ++certificate corresponding to the host name of the connection and that the ++certificate has been verified by a CA. Assuming you trust the CA, this will ++protect against L. + + Certificate verification requires a file containing trusted CA certificates. + +@@ -2094,9 +2104,7 @@ If the environment variable C is present, HTTP::Tiny + will try to find a CA certificate file in that location. + + If the L module is installed, HTTP::Tiny will use the CA file +-included with it as a source of trusted CA's. (This means you trust Mozilla, +-the author of Mozilla::CA, the CPAN mirror where you got Mozilla::CA, the +-toolchain used to install it, and your operating system security, right?) ++included with it as a source of trusted CA's. + + If that module is not available, then HTTP::Tiny will search several + system-specific default locations for a CA certificate file: +@@ -2115,13 +2123,33 @@ system-specific default locations for a CA certificate file: + + /etc/ssl/ca-bundle.pem + ++=item * ++ ++/etc/openssl/certs/ca-certificates.crt ++ ++=item * ++ ++/etc/ssl/cert.pem ++ ++=item * ++ ++/usr/local/share/certs/ca-root-nss.crt ++ ++=item * ++ ++/etc/pki/tls/cacert.pem ++ ++=item * ++ ++/etc/certs/ca-certificates.crt ++ + =back + + An error will be occur if C is true and no CA certificate file + is available. + +-If you desire complete control over SSL connections, the C attribute +-lets you provide a hash reference that will be passed through to ++If you desire complete control over TLS/SSL connections, the C ++attribute lets you provide a hash reference that will be passed through to + C, overriding any options set by HTTP::Tiny. For + example, to provide your own trusted CA file: + +@@ -2131,7 +2159,7 @@ example, to provide your own trusted CA file: + + The C attribute could also be used for such things as providing a + client certificate for authentication to a server or controlling the choice of +-cipher used for the SSL connection. See L documentation for ++cipher used for the TLS/SSL connection. See L documentation for + details. + + =head1 PROXY SUPPORT +-- +2.40.0 diff --git a/meta/recipes-devtools/perl/files/CVE-2023-31486-0002.patch b/meta/recipes-devtools/perl/files/CVE-2023-31486-0002.patch new file mode 100644 index 0000000000..e41e140cf9 --- /dev/null +++ b/meta/recipes-devtools/perl/files/CVE-2023-31486-0002.patch @@ -0,0 +1,30 @@ +commit a22785783b17cbaa28afaee4a024d81a1903701d +From: Stig Palmquist +Date: Sun Jun 18 11:36:05 2023 +0200 + + Fix incorrect env var name for verify_SSL default + + The variable to override the verify_SSL default differed slightly in the + documentation from what was checked for in the code. + + This commit makes the code use `PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT` + as documented, instead of `PERL_HTTP_TINY_INSECURE_BY_DEFAULT` which was + missing `SSL_` + +Upstream-Status: Backport [https://github.com/chansen/p5-http-tiny/commit/a22785783b17cbaa28afaee4a024d81a1903701d] + +Signed-off-by: Soumya +--- +diff --git a/lib/HTTP/Tiny.pm b/lib/HTTP/Tiny.pm +index bf455b6..7240b65 100644 +--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm ++++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +@@ -149,7 +149,7 @@ sub _verify_SSL_default { + my ($self) = @_; + # Check if insecure default certificate verification behaviour has been + # changed by the user by setting PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT=1 +- return (($ENV{PERL_HTTP_TINY_INSECURE_BY_DEFAULT} || '') eq '1') ? 0 : 1; ++ return (($ENV{PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT} || '') eq '1') ? 0 : 1; + } + + sub _set_proxies { diff --git a/meta/recipes-devtools/perl/perl_5.36.0.bb b/meta/recipes-devtools/perl/perl_5.36.0.bb index b8dba00f18..c3ca28ed23 100644 --- a/meta/recipes-devtools/perl/perl_5.36.0.bb +++ b/meta/recipes-devtools/perl/perl_5.36.0.bb @@ -18,6 +18,9 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://determinism.patch \ file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \ file://0001-Fix-build-with-gcc-12.patch \ + file://CVE-2023-31484.patch \ + file://CVE-2023-31486-0001.patch \ + file://CVE-2023-31486-0002.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ From patchwork Tue Jul 4 15:29: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: 26858 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 BB7CCEB64D9 for ; Tue, 4 Jul 2023 15:29:49 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.61381.1688484584694160213 for ; Tue, 04 Jul 2023 08:29:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=EjYCXT/v; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-55af0a816e4so2919535a12.1 for ; Tue, 04 Jul 2023 08:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484584; x=1691076584; 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=4S9yMhh3yemlWaWnNna2OnEf9WEsLzkLKlhWhfjwxxQ=; b=EjYCXT/vNCHj4u1HeyoZO2f04ZeH8srRy5D6n/j4Lbzoosl1W/5XTciyyMykA3Y9B2 fchDB63hjjBU6pRTuEDEbfU5lm9onIqvRR7gb+KLR63TEt1qA0bbXrn1T8OtS5shp+Ol UYje0ZcinD2rvSWnmZNVH8CP11tShe82ft4RWc2CJaCZUAt5gNL9tMutpuTY1W9jNHn/ wxaBlAZhXkM7aArPHTSvLnoE9otqeTFEmi4cXlvEC+8E/aPOfmMJ1cQ0yf1OLaVfYjHd gjV4QU2QmIL1UwtG7Lnr8QiEyD6hNU4eyEhTyZf2Jv+2aF5bE1GrTI/H8E0p/zOTsH9U f0sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484584; x=1691076584; 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=4S9yMhh3yemlWaWnNna2OnEf9WEsLzkLKlhWhfjwxxQ=; b=AVPqOp+2V4k/X891G8CpTnjCWroUYbD/+b4gMwsneu8q1RcPyiSBsTlWEWuqTGYI1I USL9UfKnPE20+m5fEdf5XhmEenXOuj1x88scCEuisUBTNQChXyqTIOjH3F+R5pzh6ixw ADyMcBWd0ZQKXjlur4+bV24/HKX/Avh1tBUYpKeZ1/D0wcywGNP+u8Qg/V+DxtMMRSPk +fsqW44j2uOYcIEyrjwWVEaN2IL04Fgx8CbFeDLbWJGx6Od3aHKCqixU1u/uLhY4Br7M DdCIiRNAiGba/CxvAoc17LKWyPouhdJLIigcohkYKP2tXTXNXtAUOySwqvDCjQcZ/QvX SI3A== X-Gm-Message-State: ABy/qLZ4/s2JgxWzZF2q4cn3iodNqR45wH6TumUVz2iK2e8X6uxsDYF9 inWhBPSBVx0+XeU6ViJotdtX89URN55hcQKDd86Vaw== X-Google-Smtp-Source: APBJJlEkoaA7FndkNb6llCpaA7fDi4cYMKvYd7FaB5tUqHHBrvvyeO7Po1yxQeci8axB2tl53ESxog== X-Received: by 2002:a05:6a20:1611:b0:12e:65f8:10dd with SMTP id l17-20020a056a20161100b0012e65f810ddmr7480658pzj.53.1688484583688; Tue, 04 Jul 2023 08:29:43 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 02/30] gawk: upgrade 5.2.1 -> 5.2.2 Date: Tue, 4 Jul 2023 05:29:04 -1000 Message-Id: <3ace3af1e57b701308ab397c6ac45a6fa703ed40.1688484463.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 ; Tue, 04 Jul 2023 15:29:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183837 From: Alexander Kanavin This is a bug fix release. Changes from 5.2.1 to 5.2.2 --------------------------- 1. Infrastructure upgrades: makeinfo 7.0.1 must be used to format the manual. As a result, the manual can also now be formatted with LaTeX by running it through `makeinfo --latex'. 2. Gawk no longer builds an x86_64 executable on M1 macOS systems. This means that PMA is unavailable on those systems. 3. Gawk will now diagnose if a heap file was created with a different setting of -M/--bignum than in the current invocation and exit with a fatal message if so. 4. Gawk no longer "leaks" its free list of NODEs in the heap file, resulting in much more efficient usage of persistent storage. 5. PROCINFO["pma"] exists if the PMA allocator is compiled into gawk. Its value is the PMA version. 6. The time extension is no longer deprecated. The strptime() function from gawkextlib's timex extension has been added to it. 7. Better information is passed to input parsers for when they want to decide whether or not to take control of a file. In particular, the readdir extension is simplified for Windows because of this. 8. The various PNG files are now installed for Info and HTML. The images files now have gawk_ prefixed names to avoid any conflicts with other installed PNG file names. 9. As usual, there have been several minor code cleanups and bug fixes. See the ChangeLog for details. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 8504a35f1fe222d256241ff00c05b63e24e9adcb) Signed-off-by: Steve Sakoman --- meta/recipes-extended/gawk/{gawk_5.2.1.bb => gawk_5.2.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/gawk/{gawk_5.2.1.bb => gawk_5.2.2.bb} (97%) diff --git a/meta/recipes-extended/gawk/gawk_5.2.1.bb b/meta/recipes-extended/gawk/gawk_5.2.2.bb similarity index 97% rename from meta/recipes-extended/gawk/gawk_5.2.1.bb rename to meta/recipes-extended/gawk/gawk_5.2.2.bb index 768c8eb364..3c18b6911a 100644 --- a/meta/recipes-extended/gawk/gawk_5.2.1.bb +++ b/meta/recipes-extended/gawk/gawk_5.2.2.bb @@ -19,7 +19,7 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "529e7c8c6acf21ff3a6183f4d763c632810908989c24675c77995d51ac37b79c" +SRC_URI[sha256sum] = "945aef7ccff101f20b22a10802bc005e994ab2b8ea3e724cc1a197c62f41f650" inherit autotools gettext texinfo update-alternatives From patchwork Tue Jul 4 15:29: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: 26862 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 D3F34EB64DD for ; Tue, 4 Jul 2023 15:29:49 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web10.61464.1688484586933588552 for ; Tue, 04 Jul 2023 08:29:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=iVrQrGgX; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-55ba895d457so1068704a12.0 for ; Tue, 04 Jul 2023 08:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484586; x=1691076586; 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=LEma7shBOqWSbEhWAkwBCV5UOfz/UbWcXjw/I0oOHdY=; b=iVrQrGgX3BgQPabfH/WauVqBPlU7I+wuBkLC/pDMG2YQX4KJ/k8tuHxnrPceyqV8sY BIJpSPksrZnDVU3hKcfOtM41MctJeSt4PdApCtN/IFyYzWyBI8WBn49CwhvDE2k14oRb h61SI1Vo+GQdJbMc4N6tNFH54LGJ69EcC8Leo/GL6cvw4Fw31NosKoHbDrsyu9fWZcTT Yv5oWq6t9E5bisAAxwbNZI5aigGVSIZrKKQIN+Yne7H7NlvRGCDFChOy1C3+waSRwbM2 5WDfyH9lcaC3IcbpHiEATQ3U9TeVsETtbEfxLanGL/f6eGvx/lOu0ib6H4+5JdJfc0A3 ZhuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484586; x=1691076586; 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=LEma7shBOqWSbEhWAkwBCV5UOfz/UbWcXjw/I0oOHdY=; b=TPwkf5iLrVRDclUQ0u6+pgOgouRr5QtmqVKVIbKizIGTsNL0jaAYDVS6NZbhapi5gy KOoPBI0I8qDc429NoAhHzqInTEiyxZSa5o2wSp8iMKGMZiTKs/9RL7WUXH6tG5r5XaDG GZRp8WEYPTSCrzIsFsI/qbBRIL/nFGgGsGjsuMR2cRlV4PXG1pn4pFGUYr1rngkEhy8E I1qSjvFhfCn+I//jwADnDo4Pv2lp6kkS/Ocs5YitSeJHVNICjcLWm81u2YJRf/mORokC wIryHFg5+dfyTSuSjrPDPrDPpShVKwU1+9EcFZFycyRvUzuVxKfyg8oYageSy+bAxtBR a8VA== X-Gm-Message-State: AC+VfDwX0PUsMZHrTu6zkci+fi+8cnGoSocycbT4Fl8awkZh/kKXeKxV lqwto05ry5qizUtiQkNsm35lqwHAoRTQ3hTtLH6/9A== X-Google-Smtp-Source: ACHHUZ43CRPwsTETJF97yqm1Mb0SPLm34eXpdVg2zLe84j4SlMN+c8DmjDR/d52rxlRrK4rGPSPcQg== X-Received: by 2002:a05:6a20:8e14:b0:12b:5cc3:13c6 with SMTP id y20-20020a056a208e1400b0012b5cc313c6mr14707416pzj.19.1688484585935; Tue, 04 Jul 2023 08:29:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 03/30] gnupg: upgrade 2.4.0 -> 2.4.2 Date: Tue, 4 Jul 2023 05:29:05 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Jul 2023 15:29:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183838 From: Alexander Kanavin Stable version update Noteworthy changes in version 2.4.2 =================================== * gpg: Print a warning if no more encryption subkeys are left over after changing the expiration date. [rGef2c3d50fa] * gpg: Fix searching for the ADSK key when adding an ADSK. [T6504] * gpgsm: Speed up key listings on Windows. [rG08ff55bd44] * gpgsm: Reduce the number of "failed to open policy file" diagnostics. [rG68613a6a9d] * agent: Make updating of private key files more robust and track display S/N. [T6135] * keyboxd: Avoid longish delays on Windows when listing keys. [rG6944aefa3c] * gpgtar: Emit extra status lines to help GPGME. [T6497] * w32: Avoid using the VirtualStore. [T6403] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit c9eddfded59819a2a375b6f5518bf2c3184237d2) Signed-off-by: Steve Sakoman --- ...e-a-custom-value-for-the-location-of-.patch | 6 +++--- .../recipes-support/gnupg/gnupg/relocate.patch | 18 +++++++++--------- .../gnupg/{gnupg_2.4.0.bb => gnupg_2.4.2.bb} | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) rename meta/recipes-support/gnupg/{gnupg_2.4.0.bb => gnupg_2.4.2.bb} (97%) diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index 0cd4c45907..81aeaf5d3a 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From 346a6b17a07b658954db65f814461b59824d9fcd Mon Sep 17 00:00:00 2001 +From 8b9e3d286e87bc978ec6bb9cfd790d8d253b79c3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 099c6a8..e8cf408 100644 +index a547401..60bc2c5 100644 --- a/configure.ac +++ b/configure.ac -@@ -1935,7 +1935,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1922,7 +1922,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 071dd93ff5..f7dd12fbcc 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From b1117adeb476304ce2792814516a5b7cd44d0d38 Mon Sep 17 00:00:00 2001 +From c4ddea8e6070d1df51058aac08088e27c37e7e73 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 67bbde8..7f360ba 100644 +index 286685f..212a945 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -1171,7 +1171,7 @@ gnupg_socketdir (void) +@@ -1213,7 +1213,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -26,7 +26,7 @@ index 67bbde8..7f360ba 100644 gpgrt_annotate_leaked_object (name); } -@@ -1203,7 +1203,7 @@ gnupg_sysconfdir (void) +@@ -1245,7 +1245,7 @@ gnupg_sysconfdir (void) if (dir) return dir; else @@ -35,7 +35,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1239,7 +1239,7 @@ gnupg_bindir (void) +@@ -1281,7 +1281,7 @@ gnupg_bindir (void) return name; } else @@ -44,7 +44,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1266,7 +1266,7 @@ gnupg_libexecdir (void) +@@ -1308,7 +1308,7 @@ gnupg_libexecdir (void) return name; } else @@ -53,7 +53,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1296,7 +1296,7 @@ gnupg_libdir (void) +@@ -1338,7 +1338,7 @@ gnupg_libdir (void) return name; } else @@ -62,7 +62,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1327,7 +1327,7 @@ gnupg_datadir (void) +@@ -1369,7 +1369,7 @@ gnupg_datadir (void) return name; } else @@ -71,7 +71,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1359,7 +1359,7 @@ gnupg_localedir (void) +@@ -1401,7 +1401,7 @@ gnupg_localedir (void) return name; } else diff --git a/meta/recipes-support/gnupg/gnupg_2.4.0.bb b/meta/recipes-support/gnupg/gnupg_2.4.2.bb similarity index 97% rename from meta/recipes-support/gnupg/gnupg_2.4.0.bb rename to meta/recipes-support/gnupg/gnupg_2.4.2.bb index 900aa8ad73..580782037e 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.0.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.2.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483" +SRC_URI[sha256sum] = "97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ From patchwork Tue Jul 4 15:29: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: 26860 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 CE2B3C001B1 for ; Tue, 4 Jul 2023 15:29:49 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.61386.1688484588942016936 for ; Tue, 04 Jul 2023 08:29:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=UWDDvdm2; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1b8918dadbdso12840565ad.1 for ; Tue, 04 Jul 2023 08:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484588; x=1691076588; 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=cWWShG9nAKZIWpVw7KA9nyvXL+pqyKt4gjS1DRKiBkc=; b=UWDDvdm25Onh/Jnz/MTitNhz5F0+z6cgc49EIl9FIoSPA5aKCTTpJUiUh4bhFho4/c m7HlyJC4qSt6eKHkeMi6nvdgmJO6+O8PbueWKMCl1EkxgYSi0AxMu1gdcblNg55b1WTh nLTAbF5t5ufcIz34szicYR3/IdRJWwL1Hq4dgX06/P1TO0YRq1+cgIoWRzC2djK3b7LL fey9ad9Gbv8UcHMU1QaFR0Ttm3nBfnNrD3bsN2mSmDRNv8g18xLyHC7p2cF85PilWgfi Hibi2jAoQfa5ldKYqbO1GBviLUdMuUY+4ybioyRJ7X59t/pKvZMFFzvdo7fayIyW6k56 HlpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484588; x=1691076588; 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=cWWShG9nAKZIWpVw7KA9nyvXL+pqyKt4gjS1DRKiBkc=; b=aEMmtgJ/etyGykup2N3s8DdnmF8Gez/rVT8+JPYfwKYcyV/dayLmiBKOxt1BBU5lW9 FHB48NlPqNEgXj3WXdl4k3QNN8iMy5D8P3HE2KJziUqAYVl1hVTuqOleoUhgaby96eIy vV6DFZY+uJAHkb97uYcS76+CCTbGCCVAshFPk2rhY9coYiQBhqtZKzBkFqMy+8t48Gf4 BOEz4ZMSNYlw420uDi6SNq8XfTxVrnHNr2/p6jbZRfgCVxL6ROs+gX9RyTRC/03V0eGt Gzrk+ErbBOzapiNTLrXjvBPP5uTmigiFpRmNhaKDs7TRd7V3kwnAqSmg6Hqo1MxPPN5B V0ag== X-Gm-Message-State: ABy/qLbHQetNq7FWofHcMdTRUILQ6YZAtu9T/cDgSOufEBoX5SIVvFcH C37s95sNjtgrLI7MmLqjtfiun1zM7QfCsXVxxlz+Lw== X-Google-Smtp-Source: APBJJlF1x3rCL/rF9VJ5u6kpCHaWC72DuyQbffLIxOeKGqEPJxd4koou4oPnANReL0zCDFhY0El84w== X-Received: by 2002:a17:902:e845:b0:1b0:6c10:6836 with SMTP id t5-20020a170902e84500b001b06c106836mr13096668plg.33.1688484588106; Tue, 04 Jul 2023 08:29:48 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:47 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 04/30] libx11: upgrade 1.8.4 -> 1.8.5 Date: Tue, 4 Jul 2023 05:29: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 ; Tue, 04 Jul 2023 15:29:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183839 From: Alexander Kanavin Bug fix release * autoconf & libtool updates (!187, !188) * Restore missing text in XSetScreenSaver man page (#187, !203) * Update am_ET.UTF-8 compose keys to use dead-vowel symbols, in coordination with xkeyboard-config 2.39 (!205) * Assorted updates to en_US.UTF-8 compose keys (!189, !195, !196, !198, !199, !200, !201, !207, !208, !209) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 4e931f490854100c2504ce771d5c920e3a62efdd) Signed-off-by: Steve Sakoman --- .../xorg-lib/{libx11_1.8.4.bb => libx11_1.8.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xorg-lib/{libx11_1.8.4.bb => libx11_1.8.5.bb} (92%) diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.5.bb similarity index 92% rename from meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb rename to meta/recipes-graphics/xorg-lib/libx11_1.8.5.bb index 9058c1844e..cf2e29471a 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.5.bb @@ -24,7 +24,7 @@ XORG_PN = "libX11" SRC_URI += "file://disable_tests.patch" -SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518" +SRC_URI[sha256sum] = "e362c6f03c793171becd1ce2078c64789504c7d7ff48ee40a76ff76b59f6b561" inherit gettext From patchwork Tue Jul 4 15:29: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: 26866 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 961C8EB64D9 for ; Tue, 4 Jul 2023 15:29:59 +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.61468.1688484590775670243 for ; Tue, 04 Jul 2023 08:29:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=fN7OzN8N; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b7f2239bfdso45156805ad.1 for ; Tue, 04 Jul 2023 08:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484590; x=1691076590; 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=DW7Wu7mxAK+eXexbz9GTusNt/WCsgIZSbqYMWzY1VWE=; b=fN7OzN8NnJWbMbZmLuEF+ER3UVKmOWU99vC2tNbExu6K3ATpiZNNWC5SCfcEzCf/fR efrATDdIsF6NaikaONMoSnea+MkU+i7p+iGFp5RaDZ+AHjfos6Hyp6fCQJfREjvJ2XPI e6IdpqkgbYB7y+rVik/+ew2oGKhXOdseJBTCqKa3eaqGSCvuPtQbx3a9wkPxFWxPUOiC 3FDn8GbGhITV3XIvhLytm98DG/1PL9n0uRnYNLVlt2FOTwoxF7ITRJaCcm9iqzrwGHrK REMXi5Rqtcak6UNRMM1/+a7YBZoKfHIoWM0pgrq6Jt+ml2AjU64KBNe/V28TsRlcOt7w mM4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484590; x=1691076590; 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=DW7Wu7mxAK+eXexbz9GTusNt/WCsgIZSbqYMWzY1VWE=; b=ZHWMD0VYOmorq3tTKL3KIScRbxdsTUpl9gJaIgDsWIz7Ezjrw8CaIa5HHZ9ynsMRGT PEuvQ7jMoeAS9pPBEG8LQZKkVisZQq4KjQS0ZVgsYfkthTJATjx0b9cpbGdhcm+x4GB9 Sve9akW6v7MYj3GNhwjgGdmonfAnYTjRR0qrrTQ0TPY3OTl/v0mROxwQXRbFpW09Js5q 7+25N7FX8x2bLFAMENNRsX8G/VWDfYd2MNfgsCUeiGlw/FsucM+VlUkLFaX2mRPT4GjN QCsknYoTUkT+hVddlLKdO2Vtqd0tWLF1coGzVcFKVKV6O99/U21oKdQBKJvbWWebiaB0 JvHg== X-Gm-Message-State: ABy/qLYMbZfI94QZ+ZSKyGCgPGsm59dIxdM9G7S2tS9Aco9ETEfLvdpL ejC4ppaGPi3cEA3cbpMWHbD2G2gcypgu6BD5CTp7rA== X-Google-Smtp-Source: APBJJlHEbVqh5vln+3vOuyj7Nkt+JNN8aWihoDuOXAv4EpfsAQswW8bO8L4SDWq7qEB4SIFP7SPfFA== X-Received: by 2002:a17:903:248:b0:1b6:9b38:6004 with SMTP id j8-20020a170903024800b001b69b386004mr15560710plh.22.1688484589868; Tue, 04 Jul 2023 08:29:49 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 05/30] linux-firmware: upgrade 20230404 -> 20230515 Date: Tue, 4 Jul 2023 05:29:07 -1000 Message-Id: <0903f615b89c8aecf660d1cbd8161e6ba0b354bc.1688484463.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 ; Tue, 04 Jul 2023 15:29:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183840 From: Alexander Kanavin License-Update: additional firmwares Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 64603f602d00999220fe5bafeed996ddcb56d36b) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20230404.bb => linux-firmware_20230515.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20230404.bb => linux-firmware_20230515.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb index 7412c022ba..3470131294 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230515.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 = "0782deea054d4b1b7f10c92c3a245da4" +WHENCE_CHKSUM = "a0997fc7a9af4e46d96529d6ef13b58a" # 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] = "c3f9ad2bb5311cce2490f37a8052f836703d6936aabd840246b6576f1f71f607" +SRC_URI[sha256sum] = "8b1acfa16f1ee94732a6acb50d9d6c835cf53af11068bd89ed207bbe04a1e951" inherit allarch From patchwork Tue Jul 4 15:29:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26864 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 A1E2CC001B1 for ; Tue, 4 Jul 2023 15:29:59 +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.web10.61472.1688484592910936190 for ; Tue, 04 Jul 2023 08:29:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=G+Kfveld; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1b852785a65so36692775ad.0 for ; Tue, 04 Jul 2023 08:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484592; x=1691076592; 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=7P2sWadhYM0aUSdfgRYnDSq7/4tz3nejCI8tsCxr970=; b=G+Kfveld3jMnjNCSAu5xOdGSzyHNtYiSen66EWEXAuK7e7omLQofoIb++GmJcZ7gcs LFEzW1FUZPyCFStximJLqnSNlfjDFuIIOXUZKf+ye6HBgEQ4OYtYuwkieG9+oLr5/Jep 68eGOAe3d0k22QZAmS1kA0DmqF1jVmHLMrUeMq9hgUI2DevktcedFL+qY+EyiqtMHMe+ AkfMm91igTg2mt6ZmXRgWySt3+WtaWkb2dACp9oFBPVGBthxWSASpIoXyM0IX4mI/t9+ WL05T3xYwgGq/HGPNnN6TAvbhLxkyOcu9SMOx+H8RqS7ZPZ0KHVZjUaTAHxe+jWPunMB UY4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484592; x=1691076592; 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=7P2sWadhYM0aUSdfgRYnDSq7/4tz3nejCI8tsCxr970=; b=YL2mXgQFRG1+0K+OaM2NDkIqNkUC8757I291miE1ilhkyram3ND1uKUmddsYGu3z95 R7xvuHGM9dKk+et1lUm9WIOt5oJp3Q13OFzmxpKXAEGL9udYIl9gCdpbFfUFxdflXFE0 TSU4Y4z1oN3Xh2OdMP7/fyO27BtkB5AmeX97DuVSFmBNWRRYy7qmlV70U2ftjrlYCR/M 2MeR9P+Psj71TTeOsApwLVu0Xs56gu0XJlCxEp28G+q7FsdrdXp7XSr9ww6B07Oq+/nm 9r5glTWuqABwDeknk/Y03VRSkshe+V1ce0rFxvRyOfhPyhrFbnV+WTlFWoi69ifUsd9S XozA== X-Gm-Message-State: AC+VfDy0g4phdVuEtwAvomCEFvP5oVUowGB1qzYpPfS6x2gybyyAI9iT 4CRUFGrv9gYOhkSg2X3XF3wr2eJ3q+RvkUAaiKpaEQ== X-Google-Smtp-Source: ACHHUZ5cubII6Ycx/VCOqDJvEjZU3Ylkc7Pdd7nlvhJegQvLKLDnCRfKsZ2MuNvge4eZsZ3Bjz+uiQ== X-Received: by 2002:a17:902:cecb:b0:1b7:dfbd:4dd3 with SMTP id d11-20020a170902cecb00b001b7dfbd4dd3mr30347640plg.9.1688484591710; Tue, 04 Jul 2023 08:29:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 06/30] serf: upgrade 1.3.9 -> 1.3.10 Date: Tue, 4 Jul 2023 05:29:08 -1000 Message-Id: <17a46eee905f0ecfdbebb014533848dc7e906ec7.1688484463.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 ; Tue, 04 Jul 2023 15:29:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183841 From: Alexander Kanavin Apache Serf 1.3.10 [2023-05-31, from tags/1.3.10, r1910048] Support for OpenSSL 3 (r1901937, ...) Fix issue #171: Win32: Running tests fails with "no OPENSSL_Applink" error Fix issue #194: Win32: Linking error when building against OpenSSL 1.1+ Fix issue #198: OpenSSL BIO control method incorrectly handles unknown requests Fix issue #202: SSL tests are not passing with OpenSSL 3 Fix error handling when reading the outgoing request body (r1804534, ...) Fix handling of invalid chunk lengths in the dechunk bucket (r1804005, ...) Fix an endless loop in the deflate bucket with truncated input (r1805301) Fix BIO control handlers to support BIO_CTRL_EOF (r1902208) Fix a CRT mismatch issue caused by using certain OpenSSL functions (r1909252) Build changes to support VS2017, VS2019 and VS2022 (r1712131, ...) Build changes to support Python 3 (r1875933) As serf is undead, we need to reassess all the remaining patches. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 775cbcc876edcb6c339f342a3253f5afcf6ef163) Signed-off-by: Steve Sakoman --- ...print-in-the-scons-file-to-unbreak-b.patch | 29 ------------------- ...sl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 28 ------------------ ...11083-fix-building-with-scons-3.0.0-.patch | 29 ------------------- ...ories.without.sandbox-install.prefix.patch | 2 +- .../serf/{serf_1.3.9.bb => serf_1.3.10.bb} | 6 +--- 5 files changed, 2 insertions(+), 92 deletions(-) delete mode 100644 meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch delete mode 100644 meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch delete mode 100644 meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch rename meta/recipes-support/serf/{serf_1.3.9.bb => serf_1.3.10.bb} (78%) diff --git a/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch b/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch deleted file mode 100644 index 4a5832ac1a..0000000000 --- a/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 99f6e1b0d68281b63218d6adfe68cd9e331ac5be Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 3 Sep 2018 10:50:08 -0700 -Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building - with most recent scons version. - -* SConstruct Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python - 3.0 and 2.7. - -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1809132&r2=1811083&diff_format=h] -Signed-off-by: Khem Raj ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 1670459..18a45fa 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -184,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) - - unknown = opts.UnknownVariables() - if unknown: -- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) -+ print('Warning: Used unknown variables:', ', '.join(unknown.keys())) - - apr = str(env['APR']) - apu = str(env['APU']) diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch deleted file mode 100644 index 91ccc8a474..0000000000 --- a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2f45711a66ff99886b6e4a5708e2db01a63e5af4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 10 Sep 2021 11:05:10 +0200 -Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC - -Upstream removed it in -https://github.com/openssl/openssl/pull/16004 - -Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019] -Signed-off-by: Alexander Kanavin ---- - buckets/ssl_buckets.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c -index b01e535..9801f87 100644 ---- a/buckets/ssl_buckets.c -+++ b/buckets/ssl_buckets.c -@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey) - return 0; - } - else { -- printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err), -- ERR_GET_FUNC(err), -+ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err), - ERR_GET_REASON(err)); - PKCS12_free(p12); - bio_meth_free(biom); diff --git a/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch b/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch deleted file mode 100644 index 02fa9e3a06..0000000000 --- a/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 565211fd082ef653ca9c44a345350fc1451f5a0f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 3 Sep 2018 11:12:38 -0700 -Subject: [PATCH] Follow-up to r1811083 fix building with scons 3.0.0 and - Python3 - -* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid - TypeError: cannot use a string pattern on a bytes-like object - -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1811088&r2=1814604] -Signed-off-by: Khem Raj ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 877731e..7678bb1 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -169,7 +169,7 @@ env.Append(BUILDERS = { - match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' - 'SERF_MINOR_VERSION ([0-9]+).*' - 'SERF_PATCH_VERSION ([0-9]+)', -- env.File('serf.h').get_contents(), -+ env.File('serf.h').get_contents().decode('utf-8'), - re.DOTALL) - MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] - env.Append(MAJOR=str(MAJOR)) diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 4105868a7e..91640d6044 100644 --- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch @@ -31,7 +31,7 @@ ERROR: scons install execution failed. and the installed paths (including the paths inside libserf*.pc) look correct -Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019] +Upstream-Status: Pending Signed-off-by: Martin Jansa diff --git a/meta/recipes-support/serf/serf_1.3.9.bb b/meta/recipes-support/serf/serf_1.3.10.bb similarity index 78% rename from meta/recipes-support/serf/serf_1.3.9.bb rename to meta/recipes-support/serf/serf_1.3.10.bb index 669f42b8e7..c6b51452aa 100644 --- a/meta/recipes-support/serf/serf_1.3.9.bb +++ b/meta/recipes-support/serf/serf_1.3.10.bb @@ -7,16 +7,12 @@ HOMEPAGE = "http://serf.apache.org/" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://norpath.patch \ file://env.patch \ - file://0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch \ file://0002-SConstruct-Fix-path-quoting-for-.def-generator.patch \ file://0003-gen_def.patch \ - file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \ file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \ - file://0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch \ " -SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57" -SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc" +SRC_URI[sha256sum] = "be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" From patchwork Tue Jul 4 15:29: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: 26865 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 961FEEB64DA for ; Tue, 4 Jul 2023 15:29:59 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.61473.1688484594493789186 for ; Tue, 04 Jul 2023 08:29:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=1rxwB+9f; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b7ef3e74edso28850285ad.0 for ; Tue, 04 Jul 2023 08:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484593; x=1691076593; 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=qtE7jsUZSs9D78CcVXdR2erAkRuyDRSBgWpiweAdIu4=; b=1rxwB+9fNEfgB5KUJ3pq1dHO8bbaXkYDhcQvYyNxOiAniiLCwKymiAMbIe7tAjr/Bs LpDgiZT/RSFhu/5FkdXBbrRm/5QgR9xPYUbdkywxd34w7TzURSOYJFfRXA8S/oCJrMGn 8D+apUVP+wwoLroK2trgjQu0ByjqGWzS24Y8mG0DzJdMOchKtajxNsrnTmcKPC71MSgL iaABqUy6AOmxMMJ9V8UNJwo3uD57y0lrQZGbgezPPDsOHeOqergqumFsQ8OUqFX0FnYA ftc1xI3QhdqqdWq/CbyeAWOHHWsc/tuwE4mnimnr41j9RU+xwLa4AIKDtQiqc8lcVGOO jHbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484593; x=1691076593; 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=qtE7jsUZSs9D78CcVXdR2erAkRuyDRSBgWpiweAdIu4=; b=iMKvsKtA4OCUMWPse+k+yc2w9Pw7vULxQs2Nt7mJaZm+wLA65DeWWTrf/dPsjWSzVV 3zEGByMhI4aVkxqfYkV73wT+tBdMzhfMw3Sky+eBOjOs04PFAS8xyDl+XqUihYVVxx/9 HlRQhZys/c7+nxruDsG0W9lSkWcG4YhEIiNJw8cjtk+0VXrhl5VGfUMyk+g2o/nn7GvF nijn2Opt7egcXA3/EmX14cvoNforUgecj6/79cThAMSI9jBD1+tdYzHRrykmFgJN9rZG 7f7DkutcsKztHhmyjb8D4jGzn7qEwKQ4fSViAhqJBVK0FtqcnojGC+XPZSb+/QnRjVU9 3l0g== X-Gm-Message-State: ABy/qLZAVVQStWafT//hvjn9N6gUhgjzT0bNCCoMYX2gjzFDbWFPFxQD f1EesTyvG7lftQ2yAPBdrrvvwLTrpDS1LVrZZbwivA== X-Google-Smtp-Source: APBJJlGH6vfaDtGShhiExUUr0j+K9paZwmawIfujTH44jijCsvNkrs0+YAn4yRbG25WiSGqE5rySHg== X-Received: by 2002:a17:903:2446:b0:1b8:a684:f73f with SMTP id l6-20020a170903244600b001b8a684f73fmr1466138pls.68.1688484593578; Tue, 04 Jul 2023 08:29:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 07/30] wget: upgrade 1.21.3 -> 1.21.4 Date: Tue, 4 Jul 2023 05:29:09 -1000 Message-Id: <4e7ec4bef86c79b4221a800ace700c58ce033de1.1688484463.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 ; Tue, 04 Jul 2023 15:29:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183842 From: Alexander Kanavin Stable version release Noteworthy changes in release 1.21.4 (2023-05-11) ** Document --retry-on-host-error in help text ** Increase read buffer size to 64k. This should speed up downloads on gigabit and faster connections ** Update deprecated option '--html-extension' to '--adjust-extension' in documentation ** Update gnulib compatibility layer. Fixes HSTS test failures on i686. (Thanks to Andreas Enge for ponting it out) License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 67ec2d5bab891cb92af9ca32304a4927daf51ed0) Signed-off-by: Steve Sakoman --- meta/recipes-extended/wget/wget.inc | 2 +- meta/recipes-extended/wget/{wget_1.21.3.bb => wget_1.21.4.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/wget/{wget_1.21.3.bb => wget_1.21.4.bb} (60%) diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index d31756dbc8..51926e7296 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -7,7 +7,7 @@ FTP sites" HOMEPAGE = "https://www.gnu.org/software/wget/" SECTION = "console/network" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" +LIC_FILES_CHKSUM = "file://COPYING;md5=6f65012d1daf98cb09b386cfb68df26b" inherit autotools gettext texinfo update-alternatives pkgconfig diff --git a/meta/recipes-extended/wget/wget_1.21.3.bb b/meta/recipes-extended/wget/wget_1.21.4.bb similarity index 60% rename from meta/recipes-extended/wget/wget_1.21.3.bb rename to meta/recipes-extended/wget/wget_1.21.4.bb index f176a1546c..1d31b0116d 100644 --- a/meta/recipes-extended/wget/wget_1.21.3.bb +++ b/meta/recipes-extended/wget/wget_1.21.4.bb @@ -2,6 +2,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ file://0002-improve-reproducibility.patch \ " -SRC_URI[sha256sum] = "5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5" +SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c" require wget.inc From patchwork Tue Jul 4 15:29: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: 26863 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 A17ACC001B0 for ; Tue, 4 Jul 2023 15:29:59 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web11.61392.1688484596327091182 for ; Tue, 04 Jul 2023 08:29:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=YF913fHN; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-51b4ef5378bso4193059a12.1 for ; Tue, 04 Jul 2023 08:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484595; x=1691076595; 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=Kt/XbxmG+DaKiq4QLpH7zUl/F8V/rDu/vF363Vfl95I=; b=YF913fHN9XQb+GgBqPqPQc7eXphqGNpRuTGZ92bhD348/mLJ57T/JHMtnVukhQ6Cov HpoeM1figWwINGg/c461xIr34lWMVJpbPiHgxPTDf4B6qdv84103J6+GVWiG6gFSCs/Q JdFmKRV5XBm+ApXFsDaWBZmFwCviRNjDVLI+2jksd9hLdjF9jjZWZVFxgE2SmLxFeZkn FAbwIWkSi1FQNZ57+5p5STswTjU//dhnf4duKPVoaO0ixmrweBetDe39YKlhTkGZW5IY l0p9U7zis5DF0M6Y1hiWSu0aftYP02GsMlmf7WI05jmG4ELeV5ghSStIWaj8aj+NpMs9 V9QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484595; x=1691076595; 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=Kt/XbxmG+DaKiq4QLpH7zUl/F8V/rDu/vF363Vfl95I=; b=L0AMM/tCGnnyhdV4x73h39TBvnYdeuYED4RMi2e3H8D38Rei5Jmv2DIrn/8UlTo5+A tOzvugHl7/AAbZEGw1GJDlQpmuG/rbutnePciEuaixaqhKnKaig0/ALfyinrfMP8AVSk p4xrPynIi+CMr5ZAN+Jpu8aL22YZFN42aEUSefGd773R7j2A6i3KtiWXbTqylAulDRH7 XIBy/MnH8j0x1mMrrbJ+rFi0lSYhkNp0r8lhionkLidJu0UY7n3tdywkx5nenjSg0fmD jpkx5KqNbcYo7pJ9FRuKedfmQwLOKGMyJflxj+f0N0IlFIRfRMBCD98QIZeitblqP7hW EtCw== X-Gm-Message-State: ABy/qLZohUngwfRZg8o/c66Ta2FG9Zae9s3b/e8MwYv1v9W40CBOrIga 9bTTc+eTcAMxAghmrL7KFigbvbtGBHBSkfptZKYTfg== X-Google-Smtp-Source: APBJJlHNcmix5VtR/3wE/8NymUor/cZ46AF7CVfyjCxHGxeaLCyWIWsxALVjfQ0YI6nP+/pyuVB66g== X-Received: by 2002:a05:6a20:9687:b0:129:bf86:6ebb with SMTP id hp7-20020a056a20968700b00129bf866ebbmr13098763pzc.59.1688484595378; Tue, 04 Jul 2023 08:29:55 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 08/30] wireless-regdb: upgrade 2023.02.13 -> 2023.05.03 Date: Tue, 4 Jul 2023 05:29:10 -1000 Message-Id: <77889442edaa7540c5c865ceb69dcdd972dd5fd7.1688484463.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 ; Tue, 04 Jul 2023 15:29:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183843 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 47438402fa430499864a4b1f1a13eaac66aa21c0) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2023.02.13.bb => wireless-regdb_2023.05.03.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2023.02.13.bb => wireless-regdb_2023.05.03.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb index ce60154f1e..cd3f52fc76 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.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] = "fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73" +SRC_URI[sha256sum] = "f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12" inherit bin_package allarch From patchwork Tue Jul 4 15:29: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: 26867 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 A3109EB64DD for ; Tue, 4 Jul 2023 15:29:59 +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.61395.1688484598751654893 for ; Tue, 04 Jul 2023 08:29:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=tzNiCgVi; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1b80b343178so31997615ad.0 for ; Tue, 04 Jul 2023 08:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484598; x=1691076598; 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=oMv/So2AUPFBKpOmMDPSvoc2k4/4kH6RBbd4/5zxe/U=; b=tzNiCgViBH8z5UfRDbPz09biTCuv63bz2dVpHAmDFyd3FBtWTf8JqfOhsmefNss3nH MV8oKUiBj9Ey0JJuYo24S/6ZWP3+oKQ1oEnPPlGqE+4R0Q46oZP+3Z1zgFKO+T3YODXV TaQxqrgiHNF9BqGK4qN7NGQRgdbw4ltFA/GiOA4ZTsiZww81JBzeyCEO9Mq4CDkTcY7T oz4A9hHMzgWejLKaJBo2uWzSqBaFChRNHPnCefdIEIl0baEfUU93Z6nZRK7SSERbr9UI dpJ/Uv6uDad/KLi6D5kOLgxCZK5Wa7gzgEr3H3iY63qB2TwYcPjhzp6l5R4XbBoQNtQU MOXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484598; x=1691076598; 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=oMv/So2AUPFBKpOmMDPSvoc2k4/4kH6RBbd4/5zxe/U=; b=LAfcB9XkqTgHG/kT1sjzcnN2AJTbw2zhLIg9ffqJluBkGm0jvQC/+atlQp+w7NMoln MBAhfpLEz7tnJCQbNRTfWDb6cgzWyUpUyxRMwc4uflbQssZlroffGkQ/0rp8WhbsU/DZ 4/Bz4tewluSfzBOFmY2j1TNvBVDxZ+OtNzBbM8kXDZ+GqEhAaPmH9NmDa7PQPcazv+ep hmf0WcKe+um2mBYIvA8TI0CCSFhCf4faJJBT837jzy2Dxrd8NmKuPBkgF191fj32vCBl tpZ1t4L4dODY1/YdB3AMPJjM0EJlTNO0V1+zu5tDGxqvI9tJPvRmP5SaSUuGNVfb/9Nk V7Ng== X-Gm-Message-State: ABy/qLahePtOHnPI6e50yKB1NNrS19eD3tRlC3Ki+g54guXeTkwvwCbi 8bU/3cPGLb+9d9UXphqXvhxifV1TZ0KYGV/5q54nlA== X-Google-Smtp-Source: APBJJlFqX1AHKC7fqih/w2bPnDWrStdGHBrRipVi+R9CS/WLz7n2cWdTJVqfO1VGoPBvmBa5qvA9gQ== X-Received: by 2002:a17:903:32ce:b0:1b8:9551:a38c with SMTP id i14-20020a17090332ce00b001b89551a38cmr6606266plr.22.1688484597404; Tue, 04 Jul 2023 08:29:57 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 09/30] gdb: upgrade 13.1 -> 13.2 Date: Tue, 4 Jul 2023 05:29:11 -1000 Message-Id: <900379776878c363ff7c802f6b740ee89661ea9c.1688484463.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 ; Tue, 04 Jul 2023 15:29:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183844 From: Alexander Kanavin Fixes: * PR testsuite/30158 (rustc testsuite fails with 13.1, apparently worked before with trunk 20230114 on i686-linux-gnu and powerpc64le-linux-gnu) * PR gdb/30214 (GDB 13.1 does not compile on FreeBSD 13.1) * PR gdb/30240 ((linux/aarch) thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed) * PR gdb/30249 ([13 regression] hookpost-extended-remote will not work) * PR exp/30271 (Addresses of static thread_local fields are badly calculated sometimes) * PR symtab/30357 (Segmentation fault for the 'start' command) * PR symtab/30369 ([gdb/symtab] False match issue in skip_prologue_using_linetable) * PR gdb/30423 (Build failures with clang 16) * PR build/30450 (Build failure (linux-low.cc:5393:45: error: expected ':' before ')' token) with musl-1.2.4) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit d10764916624f61d39cb9ea368359837156ad960) Signed-off-by: Steve Sakoman --- ...ian_13.1.bb => gdb-cross-canadian_13.2.bb} | 0 .../{gdb-cross_13.1.bb => gdb-cross_13.2.bb} | 0 meta/recipes-devtools/gdb/gdb.inc | 4 +- ...r-valid-inferior-thread-regcache-bef.patch | 286 ------------------ ...low.cc-Fix-a-typo-in-ternary-operato.patch | 24 -- .../gdb/{gdb_13.1.bb => gdb_13.2.bb} | 0 6 files changed, 1 insertion(+), 313 deletions(-) rename meta/recipes-devtools/gdb/{gdb-cross-canadian_13.1.bb => gdb-cross-canadian_13.2.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_13.1.bb => gdb-cross_13.2.bb} (100%) delete mode 100644 meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch rename meta/recipes-devtools/gdb/{gdb_13.1.bb => gdb_13.2.bb} (100%) diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_13.2.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_13.2.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_13.1.bb b/meta/recipes-devtools/gdb/gdb-cross_13.2.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_13.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_13.2.bb diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 8589de62ff..e986b1a1f9 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -13,10 +13,8 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ file://0006-resolve-restrict-keyword-conflict.patch \ file://0007-Fix-invalid-sigprocmask-call.patch \ file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ - file://0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch \ file://add-missing-ldflags.patch \ - file://0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch \ " -SRC_URI[sha256sum] = "115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0" +SRC_URI[sha256sum] = "fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a" TOOLCHAIN = "gcc" diff --git a/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch b/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch deleted file mode 100644 index 9adf4a4db5..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch +++ /dev/null @@ -1,286 +0,0 @@ -From b3eff3e15576229af9bae026c5c23ee694b90389 Mon Sep 17 00:00:00 2001 -From: Luis Machado -Date: Fri, 24 Mar 2023 07:58:38 +0000 -Subject: [PATCH] aarch64: Check for valid inferior thread/regcache before - reading pauth registers - -Upstream-Status: Backport -Signed-off-by: Ross Burton - -There were reports of gdb throwing internal errors when calling -inferior_thread ()/get_current_regcache () on a system with -Pointer Authentication enabled. - -In such cases, gdb produces the following backtrace, or a variation -of it (for gdb's with the non-address removal implemented only in -the aarch64-linux-tdep.c file). - -../../../repos/binutils-gdb/gdb/thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed. -A problem internal to GDB has been detected, -further debugging may prove unreliable. ------ Backtrace ----- -0xaaaae04a571f gdb_internal_backtrace_1 - ../../../repos/binutils-gdb/gdb/bt-utils.c:122 -0xaaaae04a57f3 _Z22gdb_internal_backtracev - ../../../repos/binutils-gdb/gdb/bt-utils.c:168 -0xaaaae0b52ccf internal_vproblem - ../../../repos/binutils-gdb/gdb/utils.c:401 -0xaaaae0b5310b _Z15internal_verrorPKciS0_St9__va_list - ../../../repos/binutils-gdb/gdb/utils.c:481 -0xaaaae0e24b8f _Z18internal_error_locPKciS0_z - ../../../repos/binutils-gdb/gdbsupport/errors.cc:58 -0xaaaae0a88983 _Z15inferior_threadv - ../../../repos/binutils-gdb/gdb/thread.c:86 -0xaaaae0956c87 _Z20get_current_regcachev - ../../../repos/binutils-gdb/gdb/regcache.c:428 -0xaaaae035223f aarch64_remove_non_address_bits - ../../../repos/binutils-gdb/gdb/aarch64-tdep.c:3572 -0xaaaae03e8abb _Z31gdbarch_remove_non_address_bitsP7gdbarchm - ../../../repos/binutils-gdb/gdb/gdbarch.c:3109 -0xaaaae0a692d7 memory_xfer_partial - ../../../repos/binutils-gdb/gdb/target.c:1620 -0xaaaae0a695e3 _Z19target_xfer_partialP10target_ops13target_objectPKcPhPKhmmPm - ../../../repos/binutils-gdb/gdb/target.c:1684 -0xaaaae0a69e9f target_read_partial - ../../../repos/binutils-gdb/gdb/target.c:1937 -0xaaaae0a69fdf _Z11target_readP10target_ops13target_objectPKcPhml - ../../../repos/binutils-gdb/gdb/target.c:1977 -0xaaaae0a69937 _Z18target_read_memorymPhl - ../../../repos/binutils-gdb/gdb/target.c:1773 -0xaaaae08be523 ps_xfer_memory - ../../../repos/binutils-gdb/gdb/proc-service.c:90 -0xaaaae08be6db ps_pdread - ../../../repos/binutils-gdb/gdb/proc-service.c:124 -0x40001ed7c3b3 _td_fetch_value - /build/glibc-RIFKjK/glibc-2.31/nptl_db/fetch-value.c:115 -0x40001ed791ef td_ta_map_lwp2thr - /build/glibc-RIFKjK/glibc-2.31/nptl_db/td_ta_map_lwp2thr.c:194 -0xaaaae07f4473 thread_from_lwp - ../../../repos/binutils-gdb/gdb/linux-thread-db.c:413 -0xaaaae07f6d6f _ZN16thread_db_target4waitE6ptid_tP17target_waitstatus10enum_flagsI16target_wait_flagE - ../../../repos/binutils-gdb/gdb/linux-thread-db.c:1420 -0xaaaae0a6b33b _Z11target_wait6ptid_tP17target_waitstatus10enum_flagsI16target_wait_flagE - ../../../repos/binutils-gdb/gdb/target.c:2586 -0xaaaae0789cf7 do_target_wait_1 - ../../../repos/binutils-gdb/gdb/infrun.c:3825 -0xaaaae0789e6f operator() - ../../../repos/binutils-gdb/gdb/infrun.c:3884 -0xaaaae078a167 do_target_wait - ../../../repos/binutils-gdb/gdb/infrun.c:3903 -0xaaaae078b0af _Z20fetch_inferior_eventv - ../../../repos/binutils-gdb/gdb/infrun.c:4314 -0xaaaae076652f _Z22inferior_event_handler19inferior_event_type - ../../../repos/binutils-gdb/gdb/inf-loop.c:41 -0xaaaae07dc68b handle_target_event - ../../../repos/binutils-gdb/gdb/linux-nat.c:4206 -0xaaaae0e25fbb handle_file_event - ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:573 -0xaaaae0e264f3 gdb_wait_for_event - ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:694 -0xaaaae0e24f9b _Z16gdb_do_one_eventi - ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:217 -0xaaaae080f033 start_event_loop - ../../../repos/binutils-gdb/gdb/main.c:411 -0xaaaae080f1b7 captured_command_loop - ../../../repos/binutils-gdb/gdb/main.c:475 -0xaaaae0810b97 captured_main - ../../../repos/binutils-gdb/gdb/main.c:1318 -0xaaaae0810c1b _Z8gdb_mainP18captured_main_args - ../../../repos/binutils-gdb/gdb/main.c:1337 -0xaaaae0338453 main - ../../../repos/binutils-gdb/gdb/gdb.c:32 ---------------------- -../../../repos/binutils-gdb/gdb/thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed. -A problem internal to GDB has been detected, -further debugging may prove unreliable. -Quit this debugging session? (y or n) - -We also see failures across the testsuite if the tests get executed on a target -that has native support for the pointer authentication feature. But -gdb.base/break.exp and gdb.base/access-mem-running.exp are two examples of -tests that run into errors and internal errors. - -This issue started after commit d88cb738e6a7a7179dfaff8af78d69250c852af1, which -enabled more broad use of pointer authentication masks to remove non-address -bits of pointers, but wasn't immediately detected because systems with native -support for pointer authentication are not that common yet. - -The above crash happens because gdb is in the middle of handling an event, -and do_target_wait_1 calls switch_to_inferior_no_thread, nullifying the -current thread. This means a call to inferior_thread () will assert, and -attempting to call get_current_regcache () will also call inferior_thread (), -resulting in an assertion as well. - -target_has_registers was one function that seemed useful for detecting these -types of situation where we don't have a register cache. The problem with that -is the inconsistent state of inferior_ptid, which is used by -target_has_registers. - -Despite the call to switch_to_no_thread in switch_to_inferior_no_thread from -do_target_wait_1 in the backtrace above clearing inferior_ptid, the call to -ps_xfer_memory sets inferior_ptid momentarily before reading memory: - -static ps_err_e -ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr, - gdb_byte *buf, size_t len, int write) -{ - scoped_restore_current_inferior restore_inferior; - set_current_inferior (ph->thread->inf); - - scoped_restore_current_program_space restore_current_progspace; - set_current_program_space (ph->thread->inf->pspace); - - scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); - inferior_ptid = ph->thread->ptid; - - CORE_ADDR core_addr = ps_addr_to_core_addr (addr); - - int ret; - if (write) - ret = target_write_memory (core_addr, buf, len); - else - ret = target_read_memory (core_addr, buf, len); - return (ret == 0 ? PS_OK : PS_ERR); -} - -Maybe this shouldn't happen, or maybe it is just an unfortunate state to be -in. But this prevents the use of target_has_registers to guard against the -lack of registers, since, although current_thread_ is still nullptr, -inferior_ptid is valid and is not null_ptid. - -There is another crash scenario after we kill a previously active inferior, in -which case the gdbarch will still say we support pointer authentication but we -will also have no current thread (inferior_thread () will assert etc). - -If the target has support for pointer authentication, gdb needs to use -a couple (or 4, for bare-metal) mask registers to mask off some bits of -pointers, and for that it needs to access the registers. - -At some points, like the one from the backtrace above, there is no active -thread/current regcache because gdb is in the middle of doing event handling -and switching between threads. - -Simon suggested the use of inferior_ptid to fetch the register cache, as -opposed to relying on the current register cache. Though we need to make sure -inferior_ptid is valid (not null_ptid), I think this works nicely. - -With inferior_ptid, we can do safety checks along the way, making sure we have -a thread to fetch a register cache from and checking if the thread is actually -stopped or running. - -The following patch implements this idea with safety checks to make sure we -don't run into assertions or errors. If any of the checks fail, we fallback to -using a default mask to remove non-address bits of a pointer. - -I discussed with Pedro the possibility of caching the mask register values -(which are per-process and can change mid-execution), but there isn't a good -spot to cache those values. Besides, the mask registers can change constantly -for bare-metal debugging when switching between exception levels. - -In some cases, it is just not possible to get access to these mask registers, -like the case where threads are running. In those cases, using a default mask -to remove the non-address bits should be enough. - -This can happen when we let threads run in the background and then we attempt -to access a memory address (now that gdb is capable of reading memory even -with threads running). Thus gdb will attempt to remove non-address bits -of that memory access, will attempt to access registers, running into errors. - -Regression-tested on aarch64-linux Ubuntu 20.04. ---- - gdb/aarch64-linux-tdep.c | 64 ++++++++++++++++++++++++++++++---------- - 1 file changed, 49 insertions(+), 15 deletions(-) - -diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c -index 20a041c599e..4b2915b8e99 100644 ---- a/gdb/aarch64-linux-tdep.c -+++ b/gdb/aarch64-linux-tdep.c -@@ -57,6 +57,9 @@ - #include "elf/common.h" - #include "elf/aarch64.h" - -+/* For inferior_ptid and current_inferior (). */ -+#include "inferior.h" -+ - /* Signal frame handling. - - +------------+ ^ -@@ -1986,29 +1989,60 @@ aarch64_linux_decode_memtag_section (struct gdbarch *gdbarch, - static CORE_ADDR - aarch64_remove_non_address_bits (struct gdbarch *gdbarch, CORE_ADDR pointer) - { -- aarch64_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); -- - /* By default, we assume TBI and discard the top 8 bits plus the VA range -- select bit (55). */ -+ select bit (55). Below we try to fetch information about pointer -+ authentication masks in order to make non-address removal more -+ precise. */ - CORE_ADDR mask = AARCH64_TOP_BITS_MASK; - -- if (tdep->has_pauth ()) -+ /* Check if we have an inferior first. If not, just use the default -+ mask. -+ -+ We use the inferior_ptid here because the pointer authentication masks -+ should be the same across threads of a process. Since we may not have -+ access to the current thread (gdb may have switched to no inferiors -+ momentarily), we use the inferior ptid. */ -+ if (inferior_ptid != null_ptid) - { -- /* Fetch the PAC masks. These masks are per-process, so we can just -- fetch data from whatever thread we have at the moment. -+ /* If we do have an inferior, attempt to fetch its thread's thread_info -+ struct. */ -+ thread_info *thread -+ = find_thread_ptid (current_inferior ()->process_target (), -+ inferior_ptid); - -- Also, we have both a code mask and a data mask. For now they are the -- same, but this may change in the future. */ -- struct regcache *regs = get_current_regcache (); -- CORE_ADDR cmask, dmask; -+ /* If the thread is running, we will not be able to fetch the mask -+ registers. */ -+ if (thread != nullptr && thread->state != THREAD_RUNNING) -+ { -+ /* Otherwise, fetch the register cache and the masks. */ -+ struct regcache *regs -+ = get_thread_regcache (current_inferior ()->process_target (), -+ inferior_ptid); -+ -+ /* Use the gdbarch from the register cache to check for pointer -+ authentication support, as it matches the features found in -+ that particular thread. */ -+ aarch64_gdbarch_tdep *tdep -+ = gdbarch_tdep (regs->arch ()); -+ -+ /* Is there pointer authentication support? */ -+ if (tdep->has_pauth ()) -+ { -+ /* We have both a code mask and a data mask. For now they are -+ the same, but this may change in the future. */ -+ CORE_ADDR cmask, dmask; - -- if (regs->cooked_read (tdep->pauth_reg_base, &dmask) != REG_VALID) -- dmask = mask; -+ if (regs->cooked_read (tdep->pauth_reg_base, &dmask) -+ != REG_VALID) -+ dmask = mask; - -- if (regs->cooked_read (tdep->pauth_reg_base + 1, &cmask) != REG_VALID) -- cmask = mask; -+ if (regs->cooked_read (tdep->pauth_reg_base + 1, &cmask) -+ != REG_VALID) -+ cmask = mask; - -- mask |= aarch64_mask_from_pac_registers (cmask, dmask); -+ mask |= aarch64_mask_from_pac_registers (cmask, dmask); -+ } -+ } - } - - return aarch64_remove_top_bits (pointer, mask); --- -2.34.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch b/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch deleted file mode 100644 index 32eba089bc..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9a85132c4ba7d37a5df146239b3ab1a5854ce478 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 22 Feb 2023 16:24:07 -0800 -Subject: [PATCH] gdbserver/linux-low.cc: Fix a typo in ternary operator - -Upstream-Status: Submitted [https://sourceware.org/pipermail/gdb-patches/2023-February/197298.html] -Signed-off-by: Khem Raj ---- - gdbserver/linux-low.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc -index 7e1de397893..95ec871d436 100644 ---- a/gdbserver/linux-low.cc -+++ b/gdbserver/linux-low.cc -@@ -5390,7 +5390,7 @@ proc_xfer_memory (CORE_ADDR memaddr, unsigned char *readbuf, - if (lseek (fd, memaddr, SEEK_SET) != -1) - bytes = (readbuf != nullptr - ? read (fd, readbuf, len) -- ? write (fd, writebuf, len)); -+ : write (fd, writebuf, len)); - #endif - - if (bytes < 0) diff --git a/meta/recipes-devtools/gdb/gdb_13.1.bb b/meta/recipes-devtools/gdb/gdb_13.2.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_13.1.bb rename to meta/recipes-devtools/gdb/gdb_13.2.bb From patchwork Tue Jul 4 15:29: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: 26869 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 95CF5EB64D9 for ; Tue, 4 Jul 2023 15:30:09 +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.61476.1688484600334088706 for ; Tue, 04 Jul 2023 08:30:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=K0ZzRKmT; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b82616c4ecso26070105ad.2 for ; Tue, 04 Jul 2023 08:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484599; x=1691076599; 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=lXQmPeCz6aa+GIKYV0YkOBe3WEjITb+XpcQvLwHkDcY=; b=K0ZzRKmTSyYD3V5nzZIA97qySSonu/tm5u11Lomhl+YpwmfMqjKb5Yfpi08CUIw5qn ZYmvsqhP96fH/uX0LpWgwDxuvkE2Wb/ndTANZ1BiugwnkhbAS1HdmEQl++YHaczMbiZg tJANTag5p0Fthn29vSQNlX42T40PVNvOV6zf4f6d4Bmp/sA2XNXuh+dgRa8886JZOkmH Ci+o1JdBJLXGzmy3VE9ARhXcCt6IHUnHTWz40VumgiVcQGvglyMuvqcqYkvSxIdyTe1e EyIT8vX93qS1Cz9nYC+lqg8MzziZkQ6vZIITwcHh0dnAzi5biR4dcKVucuaibt5A806K E/Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484599; x=1691076599; 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=lXQmPeCz6aa+GIKYV0YkOBe3WEjITb+XpcQvLwHkDcY=; b=FAraKsW8lxKO9VdZRRHeMaypBkePxCvcViXPa+cAhS0cRKxAnp7/kqJIQCPTmRQGGy Z3TdnDIs9LhNob8TbVpg0AYI4FZR8oxAQsYzBPCpMIBeYP7Az4TVcEIlMXqXs8rf1JcS 1cn5bDAH8ZHoO8k6nKzy196nykdYquZ9v1DEOxdS8sklqzYeXHe8Fxz6wszYptuOPfKg CpE52XscPoLLAUfBrS6CD9ItoSkLVjgtbdv8vsR6tAnlKTgn2XvSvM0/5yxuuV4lRL1U zcjspT8p2xAAQJkZzhKDpfCnD+f7AELur6CWzu6vUTaO7bapMnksfceWSzO/gwXPl8Fr jq0g== X-Gm-Message-State: ABy/qLYtasuYw5LooC5SwB5Avs5OJyRMMVRyZ/ivglLvMsIAjIFcMBXc bZM8aCnozaAQ49CnzVLLhtp50d73OsXf8y6KuaQT4A== X-Google-Smtp-Source: APBJJlE2XCfQo6W99NA0SJUsiTYBtOP6Bd7Nfm5Xw3RRQohfYDmRgXM68V51eYIQ3L1bwNd7M8nr8w== X-Received: by 2002:a17:902:da92:b0:1b8:1c1b:125a with SMTP id j18-20020a170902da9200b001b81c1b125amr11690115plx.2.1688484599398; Tue, 04 Jul 2023 08:29:59 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.29.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:29:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 10/30] rpcsvc-proto: Upgrade to 1.4.4 Date: Tue, 4 Jul 2023 05:29: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 ; Tue, 04 Jul 2023 15:30:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183845 From: Khem Raj Drop already upstreamed patch in 1.4.4 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit 1dddd4bf9bdb26069a1a0d4fcb8aeefd5761c620) Signed-off-by: Steve Sakoman --- .../rpcsvc-proto/rpcsvc-proto.bb | 5 +- ...FILE-macro-to-control-largefile-supp.patch | 80 ------------------- .../0001-Use-cross-compiled-rpcgen.patch | 11 +-- 3 files changed, 6 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb index 00919a3d70..20933153a3 100644 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb @@ -15,13 +15,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0daaf958d5531ab86169ec6e275e1517" SECTION = "libs" DEPENDS += "rpcsvc-proto-native" -PV = "1.4.3" +PV = "1.4.4" -SRCREV = "71e0a12c04d130a78674ac6309eefffa6ecee612" +SRCREV = "c65926005e50da02a4da3e26abc42eded36cd19d" SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \ file://0001-Use-cross-compiled-rpcgen.patch \ - file://0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch deleted file mode 100644 index f07866d55a..0000000000 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 6820c53c3952f78185beb59f767c372fc745dcf3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 11 Dec 2022 21:42:59 -0800 -Subject: [PATCH] Use AC_SYS_LARGEFILE macro to control largefile support - -The autoconf macro AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS=64 -where necessary to ensure that off_t and all interfaces using off_t -are 64bit, even on 32bit systems. - -replace stat64 by equivalent stat struct/func - -Upstream-Status: Accepted [https://github.com/thkukuk/rpcsvc-proto/pull/15] -Signed-off-by: Khem Raj ---- - configure.ac | 1 + - rpcgen/rpc_main.c | 16 +++++----------- - 2 files changed, 6 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bacc2fb..a9fc730 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,6 +8,7 @@ AC_PREFIX_DEFAULT(/usr) - AC_SUBST(PACKAGE) - AC_SUBST(VERSION) - -+AC_SYS_LARGEFILE - AC_PROG_CC - AC_GNU_SOURCE - AM_PROG_CC_C_O -diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c -index 277adc6..fd7dea9 100644 ---- a/rpcgen/rpc_main.c -+++ b/rpcgen/rpc_main.c -@@ -62,12 +62,6 @@ - #define EXTEND 1 /* alias for TRUE */ - #define DONT_EXTEND 0 /* alias for FALSE */ - --#ifdef __APPLE__ --# if __DARWIN_ONLY_64_BIT_INO_T --# define stat64 stat --# endif --#endif -- - struct commandline - { - int cflag; /* xdr C routines */ -@@ -337,9 +331,9 @@ clear_args (void) - static void - find_cpp (void) - { -- struct stat64 buf; -+ struct stat buf; - -- if (stat64 (CPP, &buf) == 0) -+ if (stat (CPP, &buf) == 0) - return; - - if (cppDefined) /* user specified cpp but it does not exist */ -@@ -1125,17 +1119,17 @@ putarg (int whereto, const char *cp) - static void - checkfiles (const char *infile, const char *outfile) - { -- struct stat64 buf; -+ struct stat buf; - - if (infile) /* infile ! = NULL */ -- if (stat64 (infile, &buf) < 0) -+ if (stat (infile, &buf) < 0) - { - perror (infile); - crash (); - } - if (outfile) - { -- if (stat64 (outfile, &buf) < 0) -+ if (stat (outfile, &buf) < 0) - return; /* file does not exist */ - else - { diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch index 208974004b..8e459b5634 100644 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch +++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch @@ -10,14 +10,11 @@ Signed-off-by: Khem Raj rpcsvc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/rpcsvc/Makefile.am -=================================================================== ---- git.orig/rpcsvc/Makefile.am -+++ git/rpcsvc/Makefile.am -@@ -12,5 +12,5 @@ nodist_rpcsvc_HEADERS = klm_prot.h nlm_p +--- a/rpcsvc/Makefile.am ++++ b/rpcsvc/Makefile.am +@@ -12,4 +12,4 @@ nodist_rpcsvc_HEADERS = klm_prot.h nlm_p nfs_prot.h rquota.h sm_inter.h - %.h: %.x + .x.h: - $(top_builddir)/rpcgen/rpcgen -h -o $@ $< + rpcgen -h -o $@ $< - From patchwork Tue Jul 4 15:29: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: 26871 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 960A5EB64DD for ; Tue, 4 Jul 2023 15:30:09 +0000 (UTC) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by mx.groups.io with SMTP id smtpd.web10.61478.1688484602514986347 for ; Tue, 04 Jul 2023 08:30:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=gw/3RFz1; spf=softfail (domain: sakoman.com, ip: 209.85.167.179, mailfrom: steve@sakoman.com) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3a1ebb85f99so4438546b6e.2 for ; Tue, 04 Jul 2023 08:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484601; x=1691076601; 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=DqPqKXtfJeK2NeJK+GEHC31yaQGT1leajxamhX6KXGo=; b=gw/3RFz1f9feE8nX1pZBEP/S/m4SdrJYBtKlp7r4ywsv65dA1LOpk9UPvnVuZn0Okw Io/nr6aaGZctdZi43D51hII30ncH7UHjCikY3ZNqwB/t/lXUxZtu68oHL0F0zj67LZn1 Z/8JLXdjgCXice/SwRIeRlI2LV8NqF7Fvw6VEAkv4Gv8ORMrKJeUbFYzc9VWyLaKH+jK 23znkFz3KtB9+IJ4WI0SVMzOlaBpv+zzIRHTC/qV0E6bYK59OLIgSJ9IjtWqg5ycuaJl +K25gyM5bP7QkZsCVvCCmeOFgFRbomgbEUZuy9pJKAXseZfIK0pmizQ8ODrbwhff+vCu pLlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484601; x=1691076601; 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=DqPqKXtfJeK2NeJK+GEHC31yaQGT1leajxamhX6KXGo=; b=OL0pmZVdbjtfSadO2PNlFESKOcJdrYLHFIBvhzXUOszjCP1juqae9FjIF7d49YC+Gi 2ZxrknqlG477zAGS8V01n3WtJPONlEO7WckFuH728p/XnuZybw7xSPiZ5ew3C01TRB9E GFjyU9fNoRHXni6eGSBdzqjI5ZHmxJRBPcEPqTYbGdqU/a+jiFYlhcLiXe0asd8+NeJX 7vmSQfk483Nw0S0FSlnhtC/4yqvH6iqckhGtHW1PePE+FEUfA8ug2Q93cXB0Y9DmtKYI DiwNgfy3tM7bxoKBoJZ+1OjOofQosVF8UArSHrmjBVJL8XOCrZKgGkTvP690iuiTikU7 +B8A== X-Gm-Message-State: AC+VfDylB30BsF5xJn9SR2NNOLSI0dfBp4VoNKtda/7ORrsx+/LIusrO GFvpkI/vo3dowt4YPznPsIH/ZbMwiVsFk2vW4O0caw== X-Google-Smtp-Source: ACHHUZ72euUcOCOsHspI4zNnwDgqi6kGMx026cfbjigirfHXiy7pIJFhqAHFuq2Qd/X6QxRldqTc7A== X-Received: by 2002:a05:6808:543:b0:3a3:7248:252a with SMTP id i3-20020a056808054300b003a37248252amr15359549oig.0.1688484601418; Tue, 04 Jul 2023 08:30:01 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 11/30] strace: Merge two similar patches Date: Tue, 4 Jul 2023 05:29:13 -1000 Message-Id: <6080138fd0c27db7029b5a76e69b8dc241ad8dc3.1688484463.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 ; Tue, 04 Jul 2023 15:30:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183846 From: Richard Purdie Both patches change the same paths to gawk, merge them together as we only need one patch for this. Signed-off-by: Richard Purdie (cherry picked from commit 79c0b18e29cad337640860f57683f0a170f6daab) Signed-off-by: Steve Sakoman --- ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 47 ------------------- .../strace/strace/update-gawk-paths.patch | 30 ++++++++++++ meta/recipes-devtools/strace/strace_6.2.bb | 1 - 3 files changed, 30 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch deleted file mode 100644 index 235e803641..0000000000 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Thu, 9 Feb 2017 01:27:49 -0800 -Subject: [PATCH] caps-abbrev.awk: fix gawk's path - -It should be /usr/bin/gawk as other scripts use in this package. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang - ---- - tests-m32/caps-abbrev.awk | 2 +- - tests-mx32/caps-abbrev.awk | 2 +- - tests/caps-abbrev.awk | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests-m32/caps-abbrev.awk -+++ b/tests-m32/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # -diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests-mx32/caps-abbrev.awk -+++ b/tests-mx32/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # -diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests/caps-abbrev.awk -+++ b/tests/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 0c683496ae..a16ede95c2 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -125,3 +125,33 @@ index dce78f5..573d9ea 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin # Copyright (c) 2016 Elvira Khabirova +diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests-m32/caps-abbrev.awk ++++ b/tests-m32/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # +diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests-mx32/caps-abbrev.awk ++++ b/tests-mx32/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # +diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests/caps-abbrev.awk ++++ b/tests/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # diff --git a/meta/recipes-devtools/strace/strace_6.2.bb b/meta/recipes-devtools/strace/strace_6.2.bb index 94eb81480b..c7f5b741b2 100644 --- a/meta/recipes-devtools/strace/strace_6.2.bb +++ b/meta/recipes-devtools/strace/strace_6.2.bb @@ -9,7 +9,6 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ - file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ file://skip-load.patch \ From patchwork Tue Jul 4 15:29: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: 26872 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 9E2EAEB64DA for ; Tue, 4 Jul 2023 15:30:09 +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.web11.61397.1688484604928277188 for ; Tue, 04 Jul 2023 08:30:05 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=lRuJizDv; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b8ad356fe4so117105ad.2 for ; Tue, 04 Jul 2023 08:30:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484604; x=1691076604; 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=zJgEyw2hMRAAkWpOMu8yyJn/CSGooMiGTR3iv2qxuiA=; b=lRuJizDvWigZ3ctqskuWi1Uydt0us5TsO32VYrtdbBKgHbLeJiXVXeQ2eHbZYbAwFc /CJMYGz6cERVe6cJ+a+0XbjlfesgFXDc0GpS87OmoIYppMlmToHhHm+mqXzVpp1hliBT 5fpkQQG3NcNELH0i2KdxfoLnTmt3KMWBANKRfwnd5FYj4Ptx8EdUzaBzdsA8blrfJcyK N7mkY12f27AW3ikLPxLZg4cr3iEvEQLLrdCLjUlxepaznMeb19lQ8u9P6uiDtUzDZk/E 6zboddLBmX2NgENEUzF+8m4pMN57piLyOhNv2UjxSkLLtP3y5IuTc3FMfjdZdT0r11BX uDaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484604; x=1691076604; 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=zJgEyw2hMRAAkWpOMu8yyJn/CSGooMiGTR3iv2qxuiA=; b=FmZeV3fM8tX4cqpC5Xdh6s2LXKPM5dOa/pR3SoHwRAPWG8X3/GzeBFqcEI6dpFrmlw zGmwI7QEXthW4Xu8hjKGKNaoS4Ua1ilZ6QRonAxRnP742DtpNm9b0xkiju/pPZ04saiN bzK9Zuqlc4cvYeI+pdue+IRsbdMguhQwpEgxK2oHwTUFidycqIDYKUuHz4HTWV4ec6HO pwy+tuJnmH/c+MK5xa06hs3q+JcdcIO+WurSI5ujoRy774UQ4UovZXbAqUkOK7140T/M jmSRaSRp2I2FWQBnyoPzFegTeq6IQ7Ra7C18ITbNCuc+2OMuc4qqDxMJADmmcb61axM8 djGg== X-Gm-Message-State: ABy/qLaa66jIOXZWldLJslwUQ86dcUjT62GqOEFlt9joB9m2NmiVx7ho nOZHt+a0Jc7ROG48TLDA/6HjSdsQuLQakLmWx0yUQw== X-Google-Smtp-Source: APBJJlETpxQZeKyMqgMeSwnC1Wzg+9JCW+pOto8o8pnD2JScfk+HmM2Wj8qiSo/qxbVEzNBh1znSZg== X-Received: by 2002:a17:902:ecd0:b0:1b1:ae33:30de with SMTP id a16-20020a170902ecd000b001b1ae3330demr13466200plh.13.1688484603681; Tue, 04 Jul 2023 08:30:03 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 12/30] strace: Update patches/tests with upstream fixes Date: Tue, 4 Jul 2023 05:29: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 ; Tue, 04 Jul 2023 15:30:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183847 From: Richard Purdie Replace the sockopt disable patch with a fix from upstream Signed-off-by: Richard Purdie (cherry picked from commit ac921989991c319ecad01bec37c4ccaa15a7b58f) Signed-off-by: Steve Sakoman --- ...b541b258baec9eba674b5d8dc30007a61542.patch | 50 +++++++++++++++++++ ...2f4494779e5c5f170ad10539bfc2dfafe967.patch | 50 +++++++++++++++++++ .../strace/strace/skip-sockopt-test.patch | 37 -------------- meta/recipes-devtools/strace/strace_6.2.bb | 3 +- 4 files changed, 102 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch create mode 100644 meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch delete mode 100644 meta/recipes-devtools/strace/strace/skip-sockopt-test.patch diff --git a/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch b/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch new file mode 100644 index 0000000000..b4c6ff99de --- /dev/null +++ b/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch @@ -0,0 +1,50 @@ +From 3bbfb541b258baec9eba674b5d8dc30007a61542 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Wed, 21 Jun 2023 08:00:00 +0000 +Subject: [PATCH] net: enhance getsockopt decoding + +When getsockopt syscall fails the kernel sometimes updates the optlen +argument, for example, NETLINK_LIST_MEMBERSHIPS updates it even if +optval is not writable. + +* src/net.c (SYS_FUNC(getsockopt)): Try to fetch and print optlen +argument on exiting syscall regardless of getsockopt exit status. + +Upstream-Status: Backport +--- + src/net.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/net.c b/src/net.c +index f68ccb947..7244b5e57 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -1038,7 +1038,7 @@ SYS_FUNC(getsockopt) + } else { + ulen = get_tcb_priv_ulong(tcp); + +- if (syserror(tcp) || umove(tcp, tcp->u_arg[4], &rlen) < 0) { ++ if (umove(tcp, tcp->u_arg[4], &rlen) < 0) { + /* optval */ + printaddr(tcp->u_arg[3]); + tprint_arg_next(); +@@ -1047,6 +1047,19 @@ SYS_FUNC(getsockopt) + tprint_indirect_begin(); + PRINT_VAL_D(ulen); + tprint_indirect_end(); ++ } else if (syserror(tcp)) { ++ /* optval */ ++ printaddr(tcp->u_arg[3]); ++ tprint_arg_next(); ++ ++ /* optlen */ ++ tprint_indirect_begin(); ++ if (ulen != rlen) { ++ PRINT_VAL_D(ulen); ++ tprint_value_changed(); ++ } ++ PRINT_VAL_D(rlen); ++ tprint_indirect_end(); + } else { + /* optval */ + print_getsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2], diff --git a/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch b/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch new file mode 100644 index 0000000000..a0843836c2 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch @@ -0,0 +1,50 @@ +From f31c2f4494779e5c5f170ad10539bfc2dfafe967 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Sat, 24 Jun 2023 08:00:00 +0000 +Subject: [PATCH] tests: update sockopt-sol_netlink test + +Update sockopt-sol_netlink test that started to fail, likely +due to recent linux kernel commit f4e4534850a9 ("net/netlink: fix +NETLINK_LIST_MEMBERSHIPS length report"). + +* tests/sockopt-sol_netlink.c (main): Always print changing optlen value +on exiting syscall. + +Reported-by: Alexander Gordeev +--- + tests/sockopt-sol_netlink.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +Upstream-Status: Backport + +diff --git a/tests/sockopt-sol_netlink.c b/tests/sockopt-sol_netlink.c +index 82b98adc23..1c33219ac5 100644 +--- a/tests/sockopt-sol_netlink.c ++++ b/tests/sockopt-sol_netlink.c +@@ -94,7 +94,10 @@ main(void) + printf("%p", val); + else + printf("[%d]", *val); +- printf(", [%d]) = %s\n", *len, errstr); ++ printf(", [%d", (int) sizeof(*val)); ++ if ((int) sizeof(*val) != *len) ++ printf(" => %d", *len); ++ printf("]) = %s\n", errstr); + + /* optlen larger than necessary - shortened */ + *len = sizeof(*val) + 1; +@@ -150,8 +153,12 @@ main(void) + /* optval EFAULT - print address */ + *len = sizeof(*val); + get_sockopt(fd, names[i].val, efault, len); +- printf("getsockopt(%d, SOL_NETLINK, %s, %p, [%d]) = %s\n", +- fd, names[i].str, efault, *len, errstr); ++ printf("getsockopt(%d, SOL_NETLINK, %s, %p", ++ fd, names[i].str, efault); ++ printf(", [%d", (int) sizeof(*val)); ++ if ((int) sizeof(*val) != *len) ++ printf(" => %d", *len); ++ printf("]) = %s\n", errstr); + + /* optlen EFAULT - print address */ + get_sockopt(fd, names[i].val, val, len + 1); diff --git a/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch b/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch deleted file mode 100644 index 5741bf8672..0000000000 --- a/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Inappropriate [avoid this test until fixed by upstream] - -Reported at https://github.com/strace/strace/issues/257 - -root@qemux86-64:/usr/lib/strace/ptest/tests# make sockopt-sol_netlink.gen.log -FAIL: sockopt-sol_netlink.gen.test - -#root@qemux86-64:/usr/lib/strace/ptest/tests# diff sockopt-sol_netlink.dir/exp sockopt-sol_netlink.dir/out -#--- sockopt-sol_netlink.dir/exp -#+++ sockopt-sol_netlink.dir/out -#@@ -86,11 +86,11 @@ - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, -1) = -1 EINVAL (Invalid argument) - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, 3) = 0 - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a803000, 4) = -1 EFAULT (Bad address) --getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [8]) = 0 -+getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [4 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [5 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, NULL, [0 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [], [3 => 8]) = 0 --getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [8]) = -1 EFAULT (Bad address) -+getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [4]) = -1 EFAULT (Bad address) - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a802ffc, 0x7fa18a7fd000) = -1 EFAULT (Bad address) - setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 4) = -1 ENOPROTOOPT (Protocol not available) - setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 5) = -1 ENOPROTOOPT (Protocol not available) - - - -Index: strace-6.3/tests/sockopt-sol_netlink.gen.test -=================================================================== ---- strace-6.3.orig/tests/sockopt-sol_netlink.gen.test -+++ strace-6.3/tests/sockopt-sol_netlink.gen.test -@@ -1,4 +1,5 @@ - #!/bin/sh -efu - # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (sockopt-sol_netlink -e trace=getsockopt,setsockopt); do not edit. - . "${srcdir=.}/init.sh" -+skip_ "Test failing after system upgrades, wait for upstream fixes" - run_strace_match_diff -e trace=getsockopt,setsockopt diff --git a/meta/recipes-devtools/strace/strace_6.2.bb b/meta/recipes-devtools/strace/strace_6.2.bb index c7f5b741b2..e7a34bbf66 100644 --- a/meta/recipes-devtools/strace/strace_6.2.bb +++ b/meta/recipes-devtools/strace/strace_6.2.bb @@ -14,7 +14,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://skip-load.patch \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ - file://skip-sockopt-test.patch \ + file://f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch \ + file://3bbfb541b258baec9eba674b5d8dc30007a61542.patch \ " SRC_URI[sha256sum] = "0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8" From patchwork Tue Jul 4 15:29: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: 26870 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 A3E36C001DB for ; Tue, 4 Jul 2023 15:30:09 +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.61483.1688484606591619371 for ; Tue, 04 Jul 2023 08:30:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=0eAl3MUE; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b8062c1ee1so45034725ad.3 for ; Tue, 04 Jul 2023 08:30:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484606; x=1691076606; 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=rL87S02wZsp/8GMzbcMiZlo51C9ya3ZjgQFfTr+hOy8=; b=0eAl3MUEnEethdICyMrT/Q7bp5OfW6qALQ0l5MMncVcfK9lnhljDFlH45uNyqt3cI/ 1UrYT9/01YmF6SJJaGKw0zf/qRStqGuJW+cKt9M3+K3VnzOPDGbwyVYuAD+2/4/XaEk3 5aMuDbTp62vOa4ole+3h4GoDAFy06OIERdaQrNuDFRaAhuz831JAxKp3v8qwJ1g3TNlk 2SeWrymqTtrN2dR8CDenCX353fggGqO+0xtDyLTV+Hc1ptR+baIfasU7kCdQl9pVYFE0 fGH2rKnQVyhVpjuv2pXh5WTuM9GlG2CaBtMwpsokn5JaI93gqwbAEmYxii7S34Q3a5mh lpNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484606; x=1691076606; 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=rL87S02wZsp/8GMzbcMiZlo51C9ya3ZjgQFfTr+hOy8=; b=gnH9NRfXv44fJQBaDNmm1A4jTdaUQ51qry53I8KEEbQOHNRYQ0PLwXCbSzdT412Sqh h1WGWEysP4V1+bW+M2J3g9NxlTokkNEQNqly2ObB+3LQuN834DJYtpVjVBhCJwufUK09 EAtQMTWTp+IJ3kwQ5q6sO8mlBBB+aKb6xf9LXjR/4b3adc/mICzCwUv2IpXlAALGP+gI aLD5H2ONhBPg2f83FR4s9o5DzY6l0EntgN7OtMdThFE7Pg0CTpIWw3arJDTn0TOzYv6o 5Xa55L2cqsMXhChWqKLmYbkWZqq5y7New3HnPU9HejBPcKuJULPUvOkQIQn8a8MY8ML+ zZhA== X-Gm-Message-State: ABy/qLbnPn+n4mYeb2gsTVCzL778fOHaPPq3qCtAMHEZfi2njQ54IPy8 1OpB8RLzZ88riLZaG3OVdnzi1oiCnx1DYWjYlmo9rA== X-Google-Smtp-Source: APBJJlFpE1ksn1iSjjNZjSTza6wPqYDNvca447nSDaC6y/TR4r74OGXq8fNo3yoAI6GPmB10T/lb+w== X-Received: by 2002:a17:903:2595:b0:1b8:a12e:d655 with SMTP id jb21-20020a170903259500b001b8a12ed655mr3956943plb.11.1688484605701; Tue, 04 Jul 2023 08:30:05 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 13/30] libxml2: Do not use lld linker when building with tests on rv64 Date: Tue, 4 Jul 2023 05:29:15 -1000 Message-Id: <23bcd0dbf3aeaff6b6914d347954bec22a133e23.1688484463.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 ; Tue, 04 Jul 2023 15:30:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183848 From: Khem Raj lld ends up with errors on some tests | riscv64-yoe-linux-ld.lld: error: section size decrease is too large Therefore do not use lld when building ptests Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit 154e81bb6b05b23c0c673b431cb7cee868421335) Signed-off-by: Steve Sakoman --- meta/recipes-core/libxml/libxml2_2.10.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/libxml/libxml2_2.10.4.bb b/meta/recipes-core/libxml/libxml2_2.10.4.bb index 288631504c..4f3b17093e 100644 --- a/meta/recipes-core/libxml/libxml2_2.10.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.10.4.bb @@ -40,6 +40,8 @@ inherit autotools pkgconfig binconfig-disabled ptest inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)} +LDFLAGS:append:riscv64 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd', '', d)}" + RDEPENDS:${PN}-ptest += "bash make locale-base-en-us ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" From patchwork Tue Jul 4 15:29: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: 26868 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 A3F4AC3DA40 for ; Tue, 4 Jul 2023 15:30:09 +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.61399.1688484608946842583 for ; Tue, 04 Jul 2023 08:30:09 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=nVyqRJDx; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1b7fef01fe4so32993735ad.0 for ; Tue, 04 Jul 2023 08:30:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484608; x=1691076608; 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=0z3MzzXfAqwCHLbsPdASimpSLgsW7RMIvnNJ1qzYi1o=; b=nVyqRJDxw/4ReRnSnN+h/AYt5MyO6Z0RcEaVtZ6BaVCQkcHUDvn9r6Qt6dKL+O7C0e /M1pPUTX/TlcFgHoDQ24NevqSpIJdyiixr92M+7HOarbshu2PPbFMry9S8aNqG6ENVls dFBMlF/Ye83sV/xwXn5Q0AzQTRgMK/9HCv9HJjTdfkm6njfrSTE1EccXC/4rBsqc8Kf9 +KLKsLavnyxOQ1aZ+oagSVFpPjiGMz7wMKXHB+MqJX3QQGsGdLlAC+yr2AyeQFHoeK7E SoPcC2qFzS6uEgJwh8BqsIAIR51hFvj0VbeevIVgpHUeckOVKpkvdMsMt5iq3jyhaLtC y8ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484608; x=1691076608; 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=0z3MzzXfAqwCHLbsPdASimpSLgsW7RMIvnNJ1qzYi1o=; b=db9RFHj8uquGJ0KzpM7nCeBYDHxMUJAhEd6doqjHm0GqMilYO9NDg2SqxdO+jjgPpH ZrynqISkV+xhaSRArPFR8IvWp50haRSty3YRE8HkbGCcmziwGsJKedtAFrx13QUVy+l9 zwxjwUvrUQxVg+bjUXabH/T5rNTpZvnjXC24hMEDfdV+HEYLQ2pkTvQPwUr0yDvIJEVR JDfRHnII2JxhGhe+IytILxICOiWdwBjZa722QcikmPkDGCFTEVUEVrln/UQVUDJjC1Kb JsCBzcQtNO8smX+RA4JTR21azP+84rtfwtZYk9w0helRPLTl9YHxROcqm2k1Xq88ROg5 fe7A== X-Gm-Message-State: ABy/qLbilWRb2aUvZVdXaMPS7yhMtiHhd6HsdA9qQkiFPMiypu1S3ves WdSMyFnc0IUl/UjbOd1ghKS11tlM77SyupMIkbsBRQ== X-Google-Smtp-Source: APBJJlHAWvSeHVNbp3VuoZKmWpak1JutMudBza2twsznwinI64Nk1/Z3X2yAFDLmz/7njnyuRVhqeQ== X-Received: by 2002:a17:902:c409:b0:1b8:6cae:4400 with SMTP id k9-20020a170902c40900b001b86cae4400mr11071962plk.37.1688484607765; Tue, 04 Jul 2023 08:30:07 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 14/30] bitbake.conf: add unzstd in HOSTTOOLS Date: Tue, 4 Jul 2023 05:29:16 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Jul 2023 15:30:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183849 From: Alberto Planas rpm2cpio.sh can make calls to unzstd to uncompress the RPM payload that conform the cpio file. zstd is already part of HOSTTOOLS, as a link to the system installed zstd. This patch add unzstd in HOSTOOLS list as a non-optional binary, so is available to rpm2cpio.sh when it is required. Signed-off-by: Alberto Planas Signed-off-by: Richard Purdie (cherry picked from commit bff58d337890e804d33d7decbaa46065a4d3bba4) Signed-off-by: Steve Sakoman --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 52ef64b50a..f679a49eb0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -529,7 +529,7 @@ HOSTTOOLS += " \ python3 pzstd ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ sha1sum sha224sum sha256sum sha384sum sha512sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ - uniq wc wget which xargs zstd \ + uniq unzstd wc wget which xargs zstd \ " # Tools needed to run testimage runtime image testing From patchwork Tue Jul 4 15:29: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: 26873 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 90759EB64DA for ; Tue, 4 Jul 2023 15:30:19 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.61488.1688484610874961772 for ; Tue, 04 Jul 2023 08:30:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=5TZBBIqG; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-66c729f5618so4630940b3a.1 for ; Tue, 04 Jul 2023 08:30:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484610; x=1691076610; 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=sgLKd3BHo8Wc2WdwhaqKy/RILI8VtkYm1tfFQ8kKnlQ=; b=5TZBBIqGj1VnDnyRE3298Coco+UsN2DcPxpRp2M6T9Xmz8rNdKyuoLFA8oB5oSS4ox rrueJ5fNBLIRVHOX9Wluo+c9GNqDmAyZO2eUDHQPj1YAfpMAQ0ST/DlzdStGVAfieiMp G0xd/Q/kY2ErPcIRnbl1YDJIHg++Jqh9im+RlPuLVLDpm9QzkvVNLWYuUWlOTfHutqSF Tiue4J9cgPuamYfT5P9avderp/TxIUbLpPKlc87j58HC9Rgds7c2CBIrO0aRa1at+tnD zFYsARwm/qVYnZ6+1ViS456ADMepApy3W18lrp2t3zsnk9JZwZX5cNncZRBO92qDzFvu VtOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484610; x=1691076610; 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=sgLKd3BHo8Wc2WdwhaqKy/RILI8VtkYm1tfFQ8kKnlQ=; b=SBD+NPxBZQzdE416aA00uenB0LcQ2LnedwpmSxl0iKBuxWucuTyZSSNc0zTEwsVrau CTHqe4fQgRRgL3q2O0HzBcaJxQtYREV3omlsiGh883uhJwD4sJX8J4HWAYgOdChlrUUo B/r+GVW44UTm8hEYix6yxBF2f0tpS9BhujxKfN1dY+UD4gEiBAWpORuFBcVURbZ9+DXD G0yRq5TD9hNw4RUdWPBionOvV2j1+KYz/6Xvi5RcVK8MipLGrxKJrTfPkNUcAIMoBFON uKDcH2zYT1FymZP/rWWhT0SDikswFjIswjWb+ORYxbIZUVVbq7LYox+nb4ZBrlsqdDNM w3Og== X-Gm-Message-State: AC+VfDwZrd1Zr68ANiQtfyUU/6I7uKgXvdcIQuC/DDPSAfIo756p62Iw sb9yLgviZ2k/efZDaTdRBZBuoNtK4+4dmLrUpjPwgg== X-Google-Smtp-Source: ACHHUZ5yK+HzktL548FQZDFREYYdt1n5wSt2Zuip0HC3xFDrZYZpeZyVgCpCaPXNwhShI2FAooDtrg== X-Received: by 2002:a05:6a20:559:b0:10d:6dc6:32c8 with SMTP id 25-20020a056a20055900b0010d6dc632c8mr14055941pzq.32.1688484609720; Tue, 04 Jul 2023 08:30:09 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 15/30] sdk.py: error out when moving file fails Date: Tue, 4 Jul 2023 05:29:17 -1000 Message-Id: <3a195a2da81755c2a030b5b0354ef177d826bdb2.1688484463.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 ; Tue, 04 Jul 2023 15:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183850 From: Chen Qi Instead of printing an error message and continuing, we should just error out when moving file fails. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit 12aecd9da94b5f27041982c661e8bab316d365d4) Signed-off-by: Steve Sakoman --- meta/lib/oe/sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 81fcf15371..3dc3672210 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -70,7 +70,7 @@ class Sdk(object, metaclass=ABCMeta): #FIXME: using umbrella exc catching because bb.utils method raises it except Exception as e: bb.debug(1, "printing the stack trace\n %s" %traceback.format_exc()) - bb.error("unable to place %s in final SDK location" % sourcefile) + bb.fatal("unable to place %s in final SDK location" % sourcefile) def mkdirhier(self, dirpath): try: From patchwork Tue Jul 4 15:29: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: 26875 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 95CA0C3DA40 for ; Tue, 4 Jul 2023 15:30:19 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web10.61491.1688484612708843091 for ; Tue, 04 Jul 2023 08:30:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Op7jf3Kv; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-55b12286476so2781871a12.1 for ; Tue, 04 Jul 2023 08:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484612; x=1691076612; 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=h0NGNVgfgHaydLSRHJAXSUSDZl1A5YpYsuvSn5rU4Gc=; b=Op7jf3KviUVKS1WLkIjk3dQjY6jsvwpAWx3HUwUPZYXLRMsVfEQXxkwLwomIiwNtdM QxKEhfVFurOC1gPJPb9tAAH2Olul3Ov0mI3dV32NMJzMgFa+8r6cGqm3g+kVfRVDCnt/ gMcq3MgkxLs+BBSR1DAUIjR/TH0Y6IP2/vh48OMC4FteVrJFQLAoX/I8i0ip0IHPjx26 4NX17T0lsB/mFbC2Df7gdkSVTnfmBHfteDrT0x044wU87Tb24+GD6fkfYdCuvPrKV0hL QNAslLCmVDNCBd6+Svuteu3f9jex3L+1JY/nocikbDxyCXQa9EnzzODbu3GY6ysjy5Es PHMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484612; x=1691076612; 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=h0NGNVgfgHaydLSRHJAXSUSDZl1A5YpYsuvSn5rU4Gc=; b=QmIcA/4jZ0DJ/oN0V0dA6LvHz6+/2wtCZBimd9YRXvDrAWjvnSEuWIb6YWxzjkvNNU tdevGoe9SAyNn1mcdst22w40HzdiRWMTMHHlZqOAWRfr5qUC5tUop0A+9BvttinpxOL1 IF/qiHI1NWnrY4WKOVBHnrHmIzLYO/o97LcTwxuw5iia36U7v3gzrDjpcCX8HSNnUcPf cvCaDeOq4Z2y+ZXhvGH8MDoreAx357ZF54In/UQWhl0byQsY+JZkxrnldA8I2pW2TpVT InsYdhZKmFvn2hM6SNNnBLbERz3xJDKswxmXA6YlqSsCytQbisEn/KjUO4bEwxUNfWf7 AvTw== X-Gm-Message-State: AC+VfDxblwAFL3vk20Vmwh1VURnBmjIR4c/w1p6eawrFPeMD4UFPo4uu 1UNSHUkhb4hSdCgZ2xdh18i+eGUBi59FNwGKt16HUg== X-Google-Smtp-Source: ACHHUZ4ler0oAndVpU4iqZQd3gozKev6tc4MrD6Krt03vhJpI6stiTM3ZfjMwkAVWcPC33T37vzTgg== X-Received: by 2002:a05:6a20:96c5:b0:126:9539:ec30 with SMTP id hq5-20020a056a2096c500b001269539ec30mr10185522pzc.19.1688484611723; Tue, 04 Jul 2023 08:30:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 16/30] sdk.py: fix moving dnf contents Date: Tue, 4 Jul 2023 05:29:18 -1000 Message-Id: <313f009e346a5aa10a09d65706c12ceefddaf59d.1688484463.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 ; Tue, 04 Jul 2023 15:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183851 From: Chen Qi The dnf contents should be moved to /etc/dnf/xxx instead of just /etc. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit 74b78d160a985e98f869c777847ab798e419dd2d) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/rpm/sdk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager/rpm/sdk.py b/meta/lib/oe/package_manager/rpm/sdk.py index 0726a18b91..85df6e949c 100644 --- a/meta/lib/oe/package_manager/rpm/sdk.py +++ b/meta/lib/oe/package_manager/rpm/sdk.py @@ -112,5 +112,6 @@ class PkgSdk(Sdk): for f in glob.glob(os.path.join(self.sdk_output, "etc", "rpm*")): self.movefile(f, native_sysconf_dir) for f in glob.glob(os.path.join(self.sdk_output, "etc", "dnf", "*")): - self.movefile(f, native_sysconf_dir) + self.mkdirhier(native_sysconf_dir + "/dnf") + self.movefile(f, native_sysconf_dir + "/dnf") self.remove(os.path.join(self.sdk_output, "etc"), True) From patchwork Tue Jul 4 15:29: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: 26877 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 95BE8EB64DD for ; Tue, 4 Jul 2023 15:30:19 +0000 (UTC) Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by mx.groups.io with SMTP id smtpd.web10.61493.1688484614828806854 for ; Tue, 04 Jul 2023 08:30:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=vDG5RBtO; spf=softfail (domain: sakoman.com, ip: 209.85.210.45, mailfrom: steve@sakoman.com) Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-6b73b839025so4750381a34.1 for ; Tue, 04 Jul 2023 08:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484613; x=1691076613; 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=25untzWNkgHLcfCscIKyrHI4tFG3+kU85i7fqN7uYxI=; b=vDG5RBtOGuKLO3M2eEwMQIpFlnD+1ty+rl+9ClkBHE5Iejg+PbSoOpGJrzMfPVOfin tso0njqPfMrSY2riLj3ex4LVehUkgk1Tz4wmIH1bxSMIGsKbciTMoVcTB4XvfgXpaeI9 1hZIWVaBx0UKN41GGWPZNhU+yf19cVEgx3ZT6wHrs0EjP9xOxDlLjAcG7FcWKoObWMRe pdrNO/w1z3aRj1AdHGv1KMTwTCr8Q2JQc78leuldKbd+9xEsk3R8PhbZznldkvytf0ze 0x2jZZvmtqlbl8JSvr6V1FS9NHxr9gPbclrP9QnmqTN20eCM3QtwtitZmiBOBvle7xgo yFJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484613; x=1691076613; 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=25untzWNkgHLcfCscIKyrHI4tFG3+kU85i7fqN7uYxI=; b=k+IKPmM+yUBzIkA1Zx8q15xfq/va+Mr8efPJlta+OJISwGkUP0Evq0EeO5xDXuWXOa AiI0yMZQaBYa1RJ5fNcGjY35k6wB3AOYNo8vHN85lYueht0Zhs12HKRix3BOfTi05ETa ydNV7+l7kLZcCz6AnkullqgWjVIhO1NsQ6oEOBJSrhmUvkUdShU7+DMu0alokdatMfjX P/AhKB+TeweEXqv7Tr8/HvkOFlBVkwM1BjYE4+PtTrc8jCc6nnMCKOsK1NACCb84PgBP HW58MYtNliRAs0lF6UgacyDQMCLE5289Gnb3ZjaUX4WtaV4U9OVZ2jTIDPD3ewIdlx/C SLyA== X-Gm-Message-State: ABy/qLYoVzeux427uG/xquph/Kqml8HKrB+TfiSUwFKRYBZFxVB2dgsk lqIarZ3+bLwN/e9aNSWDdqdx6KTzkKnYvEdBPRQMIw== X-Google-Smtp-Source: APBJJlFJsiJcurc9haSNFSai6ZmDwigAZmHeFzYbWWuGD0KWqFd0jt2ny5qjXN0mEVllVHhHEUnpnQ== X-Received: by 2002:a05:6359:baa:b0:12b:c378:b090 with SMTP id gf42-20020a0563590baa00b0012bc378b090mr8760430rwb.26.1688484613604; Tue, 04 Jul 2023 08:30:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 17/30] rpm: write macros under libdir Date: Tue, 4 Jul 2023 05:29:19 -1000 Message-Id: <2a13a671910cad68ab962ce369b9ed60a9bf7eea.1688484463.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 ; Tue, 04 Jul 2023 15:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183852 From: Chen Qi If we create a macros file under etc/, the populate_sdk task would fail if 'package-management' is in SDKIMAGE_FEATURES and nativesdk-rpm-build is installed.. The error message is like below: unable to place /.../sdk/image/etc/rpm in final SDK location This is because it's trying to move the etc/rpm dictory into the host sysroot but the /etc/rpm has already exists. To solve this problem, avoid creating /etc/rpm/macros for nativesdk-rpm-build, use ${libdir}/macros instead. In this way, the macros file is hold in nativesdk-rpm. As nativesdk-rpm-build depends on nativesdk-rpm, the 'rpmbuild' command inside SDK can still correctly find find-debuginfo binary. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit 5fde0eadf16d34d88a599009013913fe55d89283) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/rpm/rpm_4.18.1.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.18.1.bb index 6da2edddf3..83537d4761 100644 --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.18.1.bb @@ -134,8 +134,8 @@ do_install:append:class-target() { do_install:append:class-nativesdk() { rm -rf ${D}${SDKPATHNATIVE}/var # Ensure find-debuginfo is located correctly inside SDK - mkdir -p ${D}${SDKPATHNATIVE}/etc/rpm - echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${SDKPATHNATIVE}/etc/rpm/macros + mkdir -p ${D}${libdir}/rpm + echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${libdir}/rpm/macros } do_install:append () { @@ -173,7 +173,6 @@ FILES:${PN}-build = "\ ${libdir}/rpm/macros.p* \ ${libdir}/rpm/fileattrs/* \ " -FILES:${PN}-build:append:class-nativesdk = " ${SDKPATHNATIVE}/etc/rpm/macros" FILES:${PN}-sign = "\ ${bindir}/rpmsign \ From patchwork Tue Jul 4 15:29: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: 26874 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 9EEF6EB64D9 for ; Tue, 4 Jul 2023 15:30:19 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.61495.1688484616422248233 for ; Tue, 04 Jul 2023 08:30:16 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=MDtlUJFg; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1b852785a65so36696185ad.0 for ; Tue, 04 Jul 2023 08:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484615; x=1691076615; 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=31wEcdS+KxdwOOzdtu2gxIQLfZxce3SaVWl9h5rsM/M=; b=MDtlUJFgo9oCymbrct/aAwTDzzW+gIJyYdzclezpY9N7U/DCumdDhqGIrClkuN3A0/ pOpDeSxcQ+pHdG7o+He8v2F6HpiQGu0iM5BYwnFMJJ5onTaTEBBB8AePl4MEmhhnL84A lED5U7S2f3pz/izIhjCL2xJ+cy4OICvhOfPFnpK56/iXTSaPLCE3EpIgyHc2RxA3Niun GGi575g9RW+QqoCVytRC4TE2xTVrJT4RpaAbSKeDVnsbkVet3Sp3gdnHNPEJQz2KYj4v xw5m36/6musZItdN4E4wpB5g4G4gt1V8bDGt4Kuhac2Q1F6hyGzbJQVwYq1u9CNFGeqf gztw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484615; x=1691076615; 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=31wEcdS+KxdwOOzdtu2gxIQLfZxce3SaVWl9h5rsM/M=; b=VjtihcNmRqj3NcBrO3aO9//Om86oQ0ruEagDOg1NW6fC6xPSdp4Xm0PQhinEeU9VzD VZS/az7I+YsxKBdSrQNqEp4cmRX5lW0m6t9yxdhTaKVzxnokQm8MaG+UxVjGHgbd+iBH KSU7USyLhbDkA/tIuM+n7TTumWVx+RmBOIaKQdv0GP7C180MSxxJQas4k3qlpjaMaOhH rr8Rf9B9vg0yyRmxUlJfuGBP7mLiajISGyRohk68ANeqASeLUsi/Qqf3mRKCM2YeJBAx qYcJkgrSK+FI/uPpe/Mx4C9TQFYA9TiayAxVAE7SFn8ehLT8kFbmdMSUvtOXc6il3SEV TKtQ== X-Gm-Message-State: ABy/qLZqvp4zlZJgEhFcUt06zwFs4zxAcA6lOyBXq4uqakp1gQfq6PZ/ jFs0tJbMCV7ExnAONL4r59uGbJWfKK0heOP4DTZvGQ== X-Google-Smtp-Source: APBJJlGE7+gJLCvVXrH4EVYWRUyiGCgvbNlFEfbMPiApRwmXEUajkHIcZVBt1vAUxE/TntJJnvb/PA== X-Received: by 2002:a17:903:2304:b0:1b6:b703:36f8 with SMTP id d4-20020a170903230400b001b6b70336f8mr22696516plh.25.1688484615521; Tue, 04 Jul 2023 08:30:15 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 18/30] glib-networking: use correct error code in ptest Date: Tue, 4 Jul 2023 05:29:20 -1000 Message-Id: <669bb92fde575d3f9674b87044575873c3506df5.1688484463.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 ; Tue, 04 Jul 2023 15:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183853 From: Trevor Gamblin The eagain patch is currently using G_IO_ERROR_BUSY as part of the check to retry when the simul_read_thread test fails during ptests, but the actual error code is 27, which corresponds to G_IO_ERROR_WOULD_BLOCK. Change the check so that it looks for the right code. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie (cherry picked from commit 8574fb1371e2d83c1c7ee58067c50319a62a22ea) Signed-off-by: Steve Sakoman --- meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch index ac6592ffef..ee5b6a7beb 100644 --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch @@ -21,7 +21,7 @@ Index: glib-networking-2.74.0/tls/tests/connection.c MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread), NULL, &error); + -+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY)) ++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) + continue; + g_assert_no_error (error); From patchwork Tue Jul 4 15:29:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26876 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 A47A7C001B0 for ; Tue, 4 Jul 2023 15:30:19 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.61498.1688484618312748896 for ; Tue, 04 Jul 2023 08:30:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=IxnXHmf1; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1b80b3431d2so28683585ad.1 for ; Tue, 04 Jul 2023 08:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484617; x=1691076617; 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=HQoX4jnlKMqDN1+3FnRytSOGorI0NkoIf62u74otw5A=; b=IxnXHmf1cwGcqCKzURq41/wWE1aRE0e8LK2xP0Y8TXP4QpWPGwnjMbNGTMK/ivvPIC RXrt6Ue9VsRQJ6PlBGrM5Sy02Z84i/Cp4Q8DP3AEqIpiq/MJuA6V43w1Hxdz/B7/P0Kd +7H+fg3Lyzqut/OmTNXK0FtZrlNRwm2SEOZhje1GINXwDSBLLIip+bm3wYz1HqDhiH0I r7xyYgEJzQDkdH7Hu99Wd6AjGHUPSdL6JYvVrxGXisA/GDFjPBiFaobEda4x6yuMaZgD bC9a7jrlfBEo+uMt6Xsm0eM/SIzSOYsgydGTcLQw/LZ5KNNjdSbvVq0kbYcfQh4aN7lW N45g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484617; x=1691076617; 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=HQoX4jnlKMqDN1+3FnRytSOGorI0NkoIf62u74otw5A=; b=cHFuZc/41vWSBv4KBjTX3ynPe700X/Nv83BXCJzDCc/Z8A3S6ScqXXhRlq1qLs14W6 /Q+CbWFeUZuUaj7RbiuPzkA741qFMIhyHAyQ4b+nH+q8SC/RZ4Y/0Q4rVlFOdzg9LFy6 Pt7EAQMmhPSxngY4246iTOmA6vDOfAxuh5zpRiJ/4+uxvrDSSnRzr8GJyf/Foqn3aXYZ C0zMsBZ8/S7nxu6L4isZhEfDVfVxvfdWEQR8546WGLJ3Ek9q/ZkoWJTgporo+jsT1+h9 ciMqxR+7evUAYUieWJQbF/3ThvnveSXVX9PCmJ8KnQEqxKQ5AyYKODT1bjQuo+gFNYgV d1Ug== X-Gm-Message-State: ABy/qLbVLMI75cpQCUKM2czBgMkhGphwNLomg6VAfJFV1qHK89Xms+vp myodidpEQvWEJTAAVtaTd0PQlhYnTA2avCpAk+6kSw== X-Google-Smtp-Source: APBJJlH0LlfYravw9smEreBtwkfQ30x7PGL2Fcm8uExhHiDn98+6Eqfj6pzeiOe0Eeskgl0wLg3b7Q== X-Received: by 2002:a17:902:e852:b0:1b8:d4c:70b with SMTP id t18-20020a170902e85200b001b80d4c070bmr13704369plg.7.1688484617372; Tue, 04 Jul 2023 08:30:17 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 19/30] python3-bcrypt: Use BFD linker when building tests Date: Tue, 4 Jul 2023 05:29:21 -1000 Message-Id: <353b9c765218ed631fc14a406fcdfe1c36a8237b.1688484463.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 ; Tue, 04 Jul 2023 15:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183854 From: Khem Raj Some of the tests use symbols from libpython3 e.g. PyBytes_FromStringAndSize but does not add it to linker cmdline, its perhaps cargo which should be fixed for that, this however is not something we can fix in OE. So switch to using bfd linker explicitly when building with ptests Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit b4392ebb512fa48168a48fbff3e9140a8e1b7ec4) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb b/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb index 9f5b81330b..42d5d4dfce 100644 --- a/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb +++ b/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" HOMEPAGE = "https://pypi.org/project/bcrypt/" DEPENDS += "${PYTHON_PN}-cffi-native" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' -fuse-ld=bfd', '', d)}" SRC_URI[sha256sum] = "27d375903ac8261cfe4047f6709d16f7d18d39b1ec92aaf72af989552a650ebd" From patchwork Tue Jul 4 15:29: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: 26879 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 A2235C001B0 for ; Tue, 4 Jul 2023 15:30:29 +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.61502.1688484620507996669 for ; Tue, 04 Jul 2023 08:30:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=nSXbjelA; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b890e2b9b7so12880145ad.3 for ; Tue, 04 Jul 2023 08:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484619; x=1691076619; 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=N0yc151HJsOhnIaw58909l95PAN7dKUawIEYTp9yVs0=; b=nSXbjelAd9Bt8KtB4tTlkvYCI/90puB35VcfPd16GEx+aIx92jD22/MQZLPHsdbm4A CJImtkU8nFWwRpcVCG2iF5NprtczKdAAH4yrlpmewUoJl5Hsh+uh7SxyO97l2iVnL4R7 Vebl1Lv9OR3x52ij+6DVywgnIwhzo0eRga+RPZpqatyPukfrYPDFbQkwDsAL0gT4sv4b ug+8DA+gEKilpEpbRkiqBo/op6k/whd349Heag2/G2aQWl7ucJrI9a6bBR4nkXEES18N FFzl2kKSP0spFPl1HtkdouWOW95uWxxhhQmeHcmDh0tvlAT5vbv2iWmdOYm9YbS1VhKV 6LIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484619; x=1691076619; 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=N0yc151HJsOhnIaw58909l95PAN7dKUawIEYTp9yVs0=; b=LsoYslJPKvk71pEYx/zlaRQOnaEGmhKInmgPQlMWxS6TCrw8gknKDRsMTks3FRPlsS YMxTa6+FhNVYH5bteEdpdOixbm+0PS9uIXmzrPC0tFgzjmXC6q81/dn6P7UK3orTMtB4 4/JetTtn4YgQJFnksLQRpLIu0LDte2lfiNBT8OBC5xqCcocEyU8YALOnYhXzMHLnyii1 AVKSMl9D2Aez1O64q/aWtH22JNRS8uV0z0M9bUsVhBAUN7D3gQnmrauKV80LgdgvqU7c 5q+tAdDshSwd6spvKGUwKXQlOu2ob2mQJaWTmtxt3WjYFW8UZqcCJYHVSddyu7FSoHy5 3obw== X-Gm-Message-State: ABy/qLY8QGAVMsgTM7QFrKa/LNS1XbLGHWCBxArzluP71gCgLA5HufYJ guopbtXfcUtcY4oeFBzTg8hsWkNwLDm07r7lb9tMSw== X-Google-Smtp-Source: APBJJlHvEpXdoUJfDmLGuYsfcx/MciKDqutRttpckhlWzKPN6C+R62ux3rbZUhZItqbWjMYEwTPBhQ== X-Received: by 2002:a17:902:e74f:b0:1b8:7618:5414 with SMTP id p15-20020a170902e74f00b001b876185414mr11858536plf.60.1688484619541; Tue, 04 Jul 2023 08:30:19 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 20/30] zip: fix configure check by using _Static_assert Date: Tue, 4 Jul 2023 05:29:22 -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 ; Tue, 04 Jul 2023 15:30:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183855 From: Chen Qi It's incorrect to run a cross-compiled program on build machine to check if some feature is available or not. As these two checks in zip are basically just checking the size, we can use _Static_assert and sizeof to do such check at compile time. Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit dda778d855b1838ae3004a9af310724b913490b4) Signed-off-by: Steve Sakoman --- ...se-_Static_assert-to-do-correct-dete.patch | 96 +++++++++++++++++++ meta/recipes-extended/zip/zip_3.0.bb | 1 + 2 files changed, 97 insertions(+) create mode 100644 meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch diff --git a/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch b/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch new file mode 100644 index 0000000000..106f246a7c --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch @@ -0,0 +1,96 @@ +From 9916fc6f1f93f3e092e3c6937c30dc8137c26d34 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Thu, 15 Jun 2023 18:31:26 +0800 +Subject: [PATCH] unix/configure: use _Static_assert to do correct detection + +We're doing cross compilation, running a cross-compiled problem +on host to detemine feature is not correct. Use _Static_assert +to do the detection correctly. + +Upstream-Status: Inactive-Upstream + +Signed-off-by: Chen Qi +--- + unix/configure | 42 ++++++++++++------------------------------ + 1 file changed, 12 insertions(+), 30 deletions(-) + +diff --git a/unix/configure b/unix/configure +index f2b3d02..f917086 100644 +--- a/unix/configure ++++ b/unix/configure +@@ -361,6 +361,10 @@ cat > conftest.c << _EOF_ + #include + #include + #include ++ ++_Static_assert(sizeof((struct stat){0}.st_uid) == 2, "sizeof st_uid is not 16 bit"); ++_Static_assert(sizeof((struct stat){0}.st_gid) == 2, "sizeof st_gid is not 16 bit"); ++ + int main() + { + struct stat s; +@@ -385,21 +389,7 @@ if [ $? -ne 0 ]; then + echo -- UID/GID test failed on compile - disabling old 16-bit UID/GID support + CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" + else +-# run it +- ./conftest +- r=$? +- if [ $r -eq 1 ]; then +- echo -- UID not 2 bytes - disabling old 16-bit UID/GID support +- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" +- elif [ $r -eq 2 ]; then +- echo -- GID not 2 bytes - disabling old 16-bit UID/GID support +- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" +- elif [ $r -eq 3 ]; then +- echo -- 16-bit UIDs and GIDs - keeping old 16-bit UID/GID support +- else +- echo -- test failed - conftest returned $r - disabling old 16-bit UID/GID support +- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" +- fi ++ echo -- 16-bit UIDs and GIDs - keeping old 16-bit UID/GID support + fi + + +@@ -417,6 +407,10 @@ cat > conftest.c << _EOF_ + #include + #include + #include ++ ++_Static_assert(sizeof(off_t) < 8, "sizeof off_t < 8 failed"); ++_Static_assert(sizeof((struct stat){0}.st_size) < 8, "sizeof st_size < 8 failed"); ++ + int main() + { + off_t offset; +@@ -436,24 +430,12 @@ _EOF_ + # compile it + $CC -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then +- echo -- no Large File Support ++ echo -- yes we have Large File Support! ++ CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT" + else +-# run it +- ./conftest +- r=$? +- if [ $r -eq 1 ]; then +- echo -- no Large File Support - no 64-bit off_t +- elif [ $r -eq 2 ]; then +- echo -- no Large File Support - no 64-bit stat +- elif [ $r -eq 3 ]; then +- echo -- yes we have Large File Support! +- CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT" +- else +- echo -- no Large File Support - conftest returned $r +- fi ++ echo -- no Large File Support + fi + +- + # Check for wide char for Unicode support + # Added 11/24/2005 EG + +-- +2.34.1 + diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index 1930a40140..802877285f 100644 --- a/meta/recipes-extended/zip/zip_3.0.bb +++ b/meta/recipes-extended/zip/zip_3.0.bb @@ -19,6 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar. file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ file://0001-configure-Specify-correct-function-signatures-and-de.patch \ file://0002-unix.c-Do-not-redefine-DIR-as-FILE.patch \ + file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Tue Jul 4 15:29:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26878 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 9842FEB64DA for ; Tue, 4 Jul 2023 15:30:29 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.61503.1688484622541403683 for ; Tue, 04 Jul 2023 08:30:22 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Su12x0fE; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b89bda02ebso14210955ad.0 for ; Tue, 04 Jul 2023 08:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484621; x=1691076621; 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=qxGrnfH06KXoWz+onbYlTYRgFuk4xkg0UDDotLmbAbc=; b=Su12x0fENx67kbP5CvVu3ggc9oEJMPQzf/1daZlkKO9NDQw21hv3rremHezKON1uXG oL4IGlIt5QBuv+Ayw+oRvwaiTyLB2KZ5t/31nSkIyLM9QFqHAxoC24BvCV/iw2jYHmGV nzn0mDlV0LXcOgrs1wM7iDWzBexylE8VJz+3rnohVmU7xdkECKOuHKMbROCkasX0f/be 3F7gRSjBbkpcY/j01/87QF1gHCZzd9fk7pSjlrNaaifMPHlOEJ3AJFDmJ+LvSpjsb3qv oTBbeO+TLCpQXnKoFXCXOOeF8hSSlX6ZAeNACadVQzJwGueJLfGrZfis5vlIC1ufpwHx lICA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484621; x=1691076621; 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=qxGrnfH06KXoWz+onbYlTYRgFuk4xkg0UDDotLmbAbc=; b=NEzHuda5cCI44nMBOlA7D1J7oUDVhbcQCcxWdg+cq18Nn4HyyKJSahbSnu4dmFFXJD Jl9nUcUVZeZo653l2yCmoTUejTnfs3zfgMfV7jDZlsq6cSP0AbkKgUNA6AsNJOtIa426 6bV2GQJJ3Hlpvq3b80SKuYrs/W7c41IwbnREHDZvvj1L6aqVeAi6//4L8yCftU1UNSlG 99TeggvV07fu4qnozOhbwuxkiMmbqWVBitI0tHa0r+Z/l/nT6GFopEqPmvqIeV3pJeWn zibMpvCbXIHxIIc876QCU5Hwa5D8Nrg/U9y+x9sb4MQn1e9qojR11oVeyOWrLpTUV9dk Wcpw== X-Gm-Message-State: ABy/qLYqfv/WyjB4Iep1UVBuIOJK8Dyu2VqgYEass2fs51q28+IBtOWM 91TufAy0b0yghQuRAD0kOuH37uPdtr0OZ1yG9G3LXQ== X-Google-Smtp-Source: APBJJlHiFkTLlwbLLSGD9hG+M6FSn7rleYgU1ADZriXvEgS8FyAMXbs7qMGz6J0n7VQX+gXBjn7Wdg== X-Received: by 2002:a17:902:9a8c:b0:1b8:4f92:565e with SMTP id w12-20020a1709029a8c00b001b84f92565emr12271896plp.21.1688484621538; Tue, 04 Jul 2023 08:30:21 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 21/30] zip: remove unnecessary LARGE_FILE_SUPPORT CLFAGS Date: Tue, 4 Jul 2023 05:29:23 -1000 Message-Id: <0efe5f77027b902b276c925ed09caf5062f51170.1688484463.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 ; Tue, 04 Jul 2023 15:30:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183856 From: Chen Qi As the zip's configure has been updated to use compile-time check, it now can do the check correctly, thus no need to pass LARGE_FILE_SUPPORT to CFLAGS. Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 601f45bc4e6c563ebf16e724d56519a128815034) Signed-off-by: Steve Sakoman --- meta/recipes-extended/zip/zip_3.0.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index 802877285f..82153131b4 100644 --- a/meta/recipes-extended/zip/zip_3.0.bb +++ b/meta/recipes-extended/zip/zip_3.0.bb @@ -32,9 +32,6 @@ CVE_CHECK_IGNORE += "CVE-2018-13410" # Not for zip but for smart contract implementation for it CVE_CHECK_IGNORE += "CVE-2018-13684" -# Enable largefile support -CFLAGS += "-DLARGE_FILE_SUPPORT" - # zip.inc sets CFLAGS, but what Makefile actually uses is # CFLAGS_NOOPT. It will also force -O3 optimization, overriding # whatever we set. From patchwork Tue Jul 4 15:29: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: 26880 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 95DDEEB64D9 for ; Tue, 4 Jul 2023 15:30:29 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.61415.1688484624662111778 for ; Tue, 04 Jul 2023 08:30:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=li+kC+38; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b8054180acso45882045ad.1 for ; Tue, 04 Jul 2023 08:30:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484624; x=1691076624; 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=uR2VR55AhsCo6nnJWpoCBdlRJELBeRpnfVLzJZMzOIk=; b=li+kC+386cB6BbNALVkLKVSTST2+TY1rasL6cMtrg254PqhzvJ8thZhhi3yau7+Y63 IGx30qmhi/B9sxtjaf94GbYNWil/jKRQ6XIm0LWKSdXtp9Tk9F16jCoSkygO5KwaZU/6 l0tO4Pg+zsIOe/6pcOXUxEV1bMzuD74cTdAS5oUnCrv27fnB8c+PKcrj4omTbkLvLyOe 3XnO0xfApUkei+LyKSDY8KvhcoUuaC1uvbptrbfGUxHCrkGyfuMb9hACvO+rJoPLOtj+ 773w2IRICxpvdU3FsSzQfW37Ct8PKwZwZlvTMNPLRJgLu5yBEr/QK9ny6NGsShVz2xmX qmbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484624; x=1691076624; 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=uR2VR55AhsCo6nnJWpoCBdlRJELBeRpnfVLzJZMzOIk=; b=Eqe6Vdfd63gSly6nIBqA6Uq3Mealorqep5Rhlkyoh2gLJrzwiPIhv6WDCfRAwq/n+S vDstvDxrKqFVxFm+HEgk0vPue4PoBNMQiiYj5LwbBLT/aW1xgR8N1n6/Wvd1sTlnqRzZ VKJgYMPumruAIV3U8b7LDOE/djNNnV7chUUhcemvbQwuWk8TwqexMUE4NkUFa0KV3O68 VELQsAwOqjfyO8/1C0/B53BxbI5MymFp7laJC+Jn++uln/pfZQgvs12rcqaojSx/qzO9 EFT0iZ7LbC7N9iXMChL0oai9phMS+BKJ4k3QpYo482SY/AF5K25lN/UrF8JarJB3uBBC a3Mg== X-Gm-Message-State: ABy/qLZ7nN4ic2mH3x3o0FnvSVMrriOCHU8Os0M47u9VJ2joUaEFLQ/z 5v0ihoJv+rKw5HUL8YEtmq8RomgENQ+MtVUNM7Tt+Q== X-Google-Smtp-Source: APBJJlFBl7Ht4apLwLYGeJFGHx0TjfweQc1QYY2vHNUr69DB9uKpqUZYLey2+ZTeDeGErWu6DZw3HQ== X-Received: by 2002:a17:902:ecd2:b0:1b5:5fd2:4d6e with SMTP id a18-20020a170902ecd200b001b55fd24d6emr16559673plh.58.1688484623777; Tue, 04 Jul 2023 08:30:23 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 22/30] unzip: fix configure check for cross compilation Date: Tue, 4 Jul 2023 05:29: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 ; Tue, 04 Jul 2023 15:30:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183857 From: Chen Qi The original configure runs a generated binary to determine features. This is not correct for cross compilation. So change the runtime tests into compile-time tests to fix the issue. Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit b9aca339b59238988c48b90ea5019bfc939ba4b3) Signed-off-by: Steve Sakoman --- ...-fix-detection-for-cross-compilation.patch | 103 ++++++++++++++++++ meta/recipes-extended/unzip/unzip_6.0.bb | 1 + 2 files changed, 104 insertions(+) create mode 100644 meta/recipes-extended/unzip/unzip/0001-unix-configure-fix-detection-for-cross-compilation.patch diff --git a/meta/recipes-extended/unzip/unzip/0001-unix-configure-fix-detection-for-cross-compilation.patch b/meta/recipes-extended/unzip/unzip/0001-unix-configure-fix-detection-for-cross-compilation.patch new file mode 100644 index 0000000000..2fa7f481b7 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/0001-unix-configure-fix-detection-for-cross-compilation.patch @@ -0,0 +1,103 @@ +From 5cbf901b5c3b6a7d1d0ed91b6df4194bb6d25a40 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Thu, 15 Jun 2023 07:14:17 -0700 +Subject: [PATCH] unix/configure: fix detection for cross compilation + +We're doing cross compilation, running a cross-compiled problem +on host to detemine feature is not correct. So we change runtime +check into compile-time check to detect the features. + +Upstream-Status: Inactive-Upstream + +Signed-off-by: Chen Qi +--- + unix/configure | 44 +++++++++++++++----------------------------- + 1 file changed, 15 insertions(+), 29 deletions(-) + +diff --git a/unix/configure b/unix/configure +index 8fd82dd..68dee98 100755 +--- a/unix/configure ++++ b/unix/configure +@@ -259,6 +259,10 @@ cat > conftest.c << _EOF_ + #include + #include + #include ++ ++_Static_assert(sizeof(off_t) < 8, "sizeof off_t < 8 failed"); ++_Static_assert(sizeof((struct stat){0}.st_size) < 8, "sizeof st_size < 8 failed"); ++ + int main() + { + off_t offset; +@@ -278,21 +282,10 @@ _EOF_ + # compile it + $CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then +- echo -- no Large File Support ++ echo -- yes we have Large File Support! ++ CFLAGSR="${CFLAGSR} -DLARGE_FILE_SUPPORT" + else +-# run it +- ./conftest +- r=$? +- if [ $r -eq 1 ]; then +- echo -- no Large File Support - no 64-bit off_t +- elif [ $r -eq 2 ]; then +- echo -- no Large File Support - no 64-bit stat +- elif [ $r -eq 3 ]; then +- echo -- yes we have Large File Support! +- CFLAGSR="${CFLAGSR} -DLARGE_FILE_SUPPORT" +- else +- echo -- no Large File Support - conftest returned $r +- fi ++ echo -- no Large File Support + fi + + # Added 11/24/2005 EG +@@ -302,6 +295,11 @@ cat > conftest.c << _EOF_ + #include + #include + #include ++ ++#ifndef __STDC_ISO_10646__ ++#error "__STDC_ISO_10646__ not defined ++#endif ++ + int main() + { + size_t wsize; +@@ -327,19 +325,8 @@ if [ $? -ne 0 ]; then + echo "-- no Unicode (wchar_t) support" + else + # have wide char support +-# run it +- ./conftest +- r=$? +- if [ $r -eq 0 ]; then +- echo -- no Unicode wchar_t support - wchar_t allocation error +- elif [ $r -eq 1 ]; then +- echo -- no Unicode support - wchar_t encoding unspecified +- elif [ $r -eq 2 ]; then +- echo -- have wchar_t with known UCS encoding - enabling Unicode support! +- CFLAGSR="${CFLAGSR} -DUNICODE_SUPPORT -DUNICODE_WCHAR" +- else +- echo "-- no Unicode (wchar_t) support - conftest returned $r" +- fi ++ echo -- have wchar_t with known UCS encoding - enabling Unicode support! ++ CFLAGSR="${CFLAGSR} -DUNICODE_SUPPORT -DUNICODE_WCHAR" + fi + + echo "Check for setlocale support (needed for UNICODE Native check)" +@@ -418,8 +405,7 @@ temp_link="link_$$" + echo "int main() { lchmod(\"${temp_file}\", 0666); }" \ + ) > conftest.c + ln -s "${temp_link}" "${temp_file}" && \ +- $CC $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null && \ +- ./conftest ++ $CC -Werror=implicit-function-declaration $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null + [ $? -ne 0 ] && CFLAGSR="${CFLAGSR} -DNO_LCHMOD" + rm -f "${temp_file}" + +-- +2.34.1 + diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index a4d10c30aa..391e5cd22a 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -32,6 +32,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://CVE-2022-0529.patch \ file://CVE-2022-0530.patch \ file://0001-configure-Add-correct-system-headers-and-prototypes-.patch \ + file://0001-unix-configure-fix-detection-for-cross-compilation.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Tue Jul 4 15:29: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: 26882 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 A43B4C001B1 for ; Tue, 4 Jul 2023 15:30:29 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.61417.1688484626633178671 for ; Tue, 04 Jul 2023 08:30:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=J7ibGLGP; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5577905ef38so2152128a12.0 for ; Tue, 04 Jul 2023 08:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484626; x=1691076626; 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=wsXKyp4mGxb6HNutz1FHTLMQZfScifZPNeZZmbZTWlI=; b=J7ibGLGPDfXQ7HHtlgSLKB5DcxVPFapxI8vtRJkTHrV6k1N3TP/r0uv4GASW8FM+se aDi7LoCVwbzI32V05bueVaL3Ugwr83SzJcZ2HnrqR8KslfcVsswQpVcbzPV1ufViX+1o ynpHD89JjhO+j6lDgxINbBOJEBAtgVkl1i6ntFsABWxMRtZ0woNEftkTUebPvZoOdrgM HOGXtw+WkZ/GjSj9N5/KeKkrPpQMCVaR1JwERqNOjDqLCwNz7niDL00Ve5iBzwfJ/P5h lKFzSBNGH5mvI3FXrLLFhaNPnBJvHupekbUGbS/vHP9M6pjqpOabDCJX9Y+Ls67vaMBY QWeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484626; x=1691076626; 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=wsXKyp4mGxb6HNutz1FHTLMQZfScifZPNeZZmbZTWlI=; b=K49eLt8u29Rv6AJ50gwjbyOavsn0OTiFSDCqzsIz1BzOWVOdHsZXczaFISmYpLwMEF liGwUDeivGmTXf0RW0Fa311Sk0QgRvyTcdhh3yu9sIDZ9DboxICPgvA2+UFL8BhsDyHa uNQ8wXcbagaUYuuPOCsjlwpMz+NkzdIhAFXDOawsQaqghDGXm/BT0aENX73I6rLB7Tnx nxPte6mj/mv8UhAzJU174jCzilyfaynpW3+LF3RoIG4PXc4aO4R4dwh3BMaB3n4yG82p Teeijm/+9HNS+irtLAWesJVMghxcOitCjgFEjlU1eAOjQup8CyTG+0adCfEgRwBepgqB ZhBg== X-Gm-Message-State: AC+VfDyMNPjlqGwQs8YkfQ/BDfm28O9G2w12eM90/jvyliFPFKrt0VkD X1VoskW1AR5+bo5KZBn0bZK0WHU6vwfa0PB79Ybcag== X-Google-Smtp-Source: ACHHUZ6a5cUw2Kjqwpc3iWhULKRiQg5+pmYM8SRyF5cfqUFMdYDShdnQi3sAjVAi46RoThmnDKZVzw== X-Received: by 2002:a05:6a20:3d08:b0:11a:efaa:eb43 with SMTP id y8-20020a056a203d0800b0011aefaaeb43mr14614580pzi.3.1688484625711; Tue, 04 Jul 2023 08:30:25 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 23/30] unzip: remove hardcoded LARGE_FILE_SUPPORT Date: Tue, 4 Jul 2023 05:29:25 -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 ; Tue, 04 Jul 2023 15:30:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183858 From: Chen Qi Now that unzip's configure can correctly do the detection even in case of cross compilation, there's no need to use this hardcoded LARGE_FILE_SUPPORT flag. Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit dca7d1ce696e97ff4213dd63981f901dfd43ade2) Signed-off-by: Steve Sakoman --- meta/recipes-extended/unzip/unzip_6.0.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index 391e5cd22a..3051e9b5bc 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -47,9 +47,6 @@ UPSTREAM_CHECK_REGEX = "unzip(?P(?!552).+)\.tgz" S = "${WORKDIR}/unzip60" -# Enable largefile support -CFLAGS += "-DLARGE_FILE_SUPPORT" - # Makefile uses CF_NOOPT instead of CFLAGS. We lifted the values from # Makefile and add CFLAGS. Optimization will be overriden by unzip # configure to be -O3. From patchwork Tue Jul 4 15:29: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: 26881 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 A4401C3DA40 for ; Tue, 4 Jul 2023 15:30:29 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.61508.1688484628341870265 for ; Tue, 04 Jul 2023 08:30:28 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=QQROtSFt; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b8a462e0b0so5563955ad.3 for ; Tue, 04 Jul 2023 08:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484627; x=1691076627; 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=8Uj+ogtp5VQwciraph6wuLYaxBa+mFhUOhtXk/2kwWU=; b=QQROtSFtMSpP10Ijz4EMjNJT7a1ZFhqfCMZEP9QtOtf7R+cV78tdu81ZcbW5E3S2Wt IL2xb+cwRRx8ekT0iel8eSvcvhMwdajfxC4jtFKJwTYZkv8Kj22nQYS9P8A5v1X0Po4K QSNAYogJ5J2zN+JWRj5PmwLf0iKeM4cAHRcV0fJbKmgTGH/Rn2Fxp8QAfUndxDnIuHAq UQr3Y4wcQRl4pk/lzjWxMlYGWpRT//h9f1f/0VIGf7w8iYxG9AtzTe8I1z0m+g+UL07k 8+FIvaVTszRT9chA0lYaUVIXbi+AZ4o9pJZLGkNjlJt97IZKLiMhdxG56db+X0YO+OR6 m+Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484627; x=1691076627; 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=8Uj+ogtp5VQwciraph6wuLYaxBa+mFhUOhtXk/2kwWU=; b=LKcvaDrPYUYCmMGF/ZyAJqIKuDb2I/CmDyRigaQJPtttdq4GqdJIeLOpXGlumjRthz 17e063zniAf75OjD2wz0ERCHCUo9ubs/xlHfsCCpNVMKLT7t99uhH67KgilpuK/R8d0v YHhPZphL4OdnDL/oOxP6iamR5v4Bp0vIiWX5KJw9Zm+GDknnA/XAFYrXwqQY9006kT0a reab/8FYuM9Q3etr9O9ikEYYaWXSFtoKNbPbH4N1/FEpwTlABSZdESoAPlcWfxSJx7tE UyGa8UmdtLpvyEbMTbt5oxa0MsuHcVD9A1DFIArY6ptQzraQz+XPwBYbQMMGbbkVSeRZ DO7w== X-Gm-Message-State: ABy/qLYO4HU6nH/DvAPsL7IU7An6CQYHK6tGkh1dSNTyyysiqzFxN30J ZP10d2K4jmCrgHFv1K2I5INQsVT5Y0BpXd383NtLOw== X-Google-Smtp-Source: APBJJlHm99jX2UpwgBQcuwRbsd5z6dDia6yMuBuAtkG3GexzXgOsQB1kJwBjD1wh49mtByrFVgzH9Q== X-Received: by 2002:a17:902:e80d:b0:1b8:9ba6:b221 with SMTP id u13-20020a170902e80d00b001b89ba6b221mr4289250plg.21.1688484627524; Tue, 04 Jul 2023 08:30:27 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:27 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 24/30] sysfsutils: fetch a supported fork from github Date: Tue, 4 Jul 2023 05:29:26 -1000 Message-Id: <0bf67fadffa24c00452acb25c58c1eb5648fe4c4.1688484463.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 ; Tue, 04 Jul 2023 15:30:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183859 From: Alexander Kanavin Debian does the same: https://packages.debian.org/source/sid/sysfsutils Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 504b2f590cb94b217c5f48090cfb71a749bd5ac8) Signed-off-by: Steve Sakoman --- meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb index c90a02f131..fd72cf4165 100644 --- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb +++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb @@ -10,18 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \ file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e" PR = "r5" -SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \ +SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=master \ file://sysfsutils-2.0.0-class-dup.patch \ file://obsolete_automake_macros.patch \ file://separatebuild.patch" -SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc" -SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a" +SRCREV = "0d5456e1c9d969cdad6accef2ae2d4881d5db085" -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/linux-diag/files/sysfsutils/" -UPSTREAM_CHECK_REGEX = "/sysfsutils/(?P(\d+[\.\-_]*)+)/" - -S = "${WORKDIR}/sysfsutils-${PV}" +S = "${WORKDIR}/git" inherit autotools From patchwork Tue Jul 4 15:29: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: 26884 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 9437CEB64DD for ; Tue, 4 Jul 2023 15:30:39 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.61421.1688484630257375245 for ; Tue, 04 Jul 2023 08:30:30 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=HcZsIqN9; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-666e3b15370so3106483b3a.0 for ; Tue, 04 Jul 2023 08:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484629; x=1691076629; 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=BKsM2AMIGLc4BVItOwtW0lZZ23SfvgpZD0Z8BiH+lNw=; b=HcZsIqN9Wg6NcR3+sW3omwpDXW440zKaTdRetjQeAte2PQOSYw0IQNlAvORZlOIT9Y 45GYiYaBvuxOBS8tx42Ptfd8ZjrSlTzapYeZXl/Sy4uhQT9ff53KQ/mwV5Vv1uxtHLdG cb5GVztCgVfEeyxp6tHlDEuSmAUNdHTHtg0wUxoxOahH8JinanHvXoc6KrlJ8SCFJFii dcjgBSNqMo6J26cFF3lJ6k1ADlYAMrc0Vaq4U57OI5H1YVqApRoVZe2JSaRpiuhP42hy eJjeq1s4/z7rPTY5Ev1hPmD2OY10gitcoSM0D3O8ogIgXyv+JGJ4vEWWTDh360A+hYCa PwYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484629; x=1691076629; 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=BKsM2AMIGLc4BVItOwtW0lZZ23SfvgpZD0Z8BiH+lNw=; b=GnaKUT84WXytM/aA0myiZcwnut0+WNwPJCumDgXq3TIS9/82i934tWnuGecT4EZSnl matbznNPXg+PfI4ajBkPDuOl8W+G1tWx5lrAR1H5x7fA8v3nSdL2dpSz4q4456MDxOB2 spIyWGHHEqf9WASWrd/+iTvcLGOX7+xdbOB+WmwIXT5y6YC052F2OD5xB9GzPNyxHgSD AjlleU90Ql2VD9Nk1H80zDXwDHhti9/DQKoCClyH3ULbwBCGcs/OmJ+1QDOnBslL1u9Z SVNqSYkIPbiIe2zZi2zwepRxJSXvau+AuUCpN3MnWyBS0zyNDiJwSMp9bICqFdNVGwHx g5ZQ== X-Gm-Message-State: ABy/qLZ6Zt9AXACixt8ZIq6ETSKQOULbb0cTCi2+4+t1wnHOBJdfq3KZ SbJ6y0sXqzjigtPsmyLFkyrwn1TQ6naZK4Oi+LgaTg== X-Google-Smtp-Source: APBJJlFEVU0vgIcL9U3bTz8jM8AxEjumzbGtKAT8YPxLvi+48HMFOuiLodK54I3YN0RYJpZMHidaFQ== X-Received: by 2002:a05:6a20:3d1d:b0:12d:f1ac:e2cd with SMTP id y29-20020a056a203d1d00b0012df1ace2cdmr10636591pzi.32.1688484629368; Tue, 04 Jul 2023 08:30:29 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 25/30] logrotate: Do not create logrotate.status file Date: Tue, 4 Jul 2023 05:29: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 ; Tue, 04 Jul 2023 15:30:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183860 From: Jermain Horsman The first time logrotate runs it reports an error: error: state file /var/lib/logrotate.status is world-readable and thus can be locked from other unprivileged users. Skipping lock acquisition... This check was added with https://github.com/logrotate/logrotate/commit/1f76a381e2caa0603ae3dbc51ed0f1aa0d6658b9 This error is only reported once as logrotate removes the world-readable permissions if this happens. Since logrotate creates this file if it does not exist, there should be no need to install it in the first place. Signed-off-by: Jermain Horsman Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 8169cd2d18f1569e4357f082adbef492710e8c36) Signed-off-by: Steve Sakoman --- meta/recipes-extended/logrotate/logrotate_3.21.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-extended/logrotate/logrotate_3.21.0.bb b/meta/recipes-extended/logrotate/logrotate_3.21.0.bb index 4e4ea10628..44d86a8f8d 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.21.0.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.21.0.bb @@ -64,7 +64,6 @@ do_install(){ install -p -m 644 ${S}/examples/logrotate.conf ${D}${sysconfdir}/logrotate.conf install -p -m 644 ${S}/examples/btmp ${D}${sysconfdir}/logrotate.d/btmp install -p -m 644 ${S}/examples/wtmp ${D}${sysconfdir}/logrotate.d/wtmp - touch ${D}${localstatedir}/lib/logrotate.status if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} From patchwork Tue Jul 4 15:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26885 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 945CBC3DA41 for ; Tue, 4 Jul 2023 15:30:39 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.61422.1688484632057194575 for ; Tue, 04 Jul 2023 08:30:32 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=msUdfCSk; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b8033987baso34788735ad.0 for ; Tue, 04 Jul 2023 08:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484631; x=1691076631; 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=6ZEskjxZEWz+9NjJT891NltNwB4YYMSpK/s/QQrCIQs=; b=msUdfCSkqzHvWLKzFnQM0y/M8ot8Q8vPqYxJHAJeVloTK9KNDikUAQUeTjT3R4c0v7 31qSsaTY3sfISypX4QChj42kOPtnk8aMSTu9VIRsGL71Uj/6eBEuE2KoHGn3SYPZGVUJ OFdST2ale4gvkeOx8beg5CERI8cwisNPFU1HZ3tlYuXrY94fW5MC7sJ8VRabHfOuYX0g CF4PL6+qJQC+psHfuXNWV2BuMzMfQop/HZA/hDFUlp2kNBUlW2k+9kLEj1TnwZAcxXlf X/XQDnBvP0vC8imDCjbszELBI07mKjcvFlMsnTCuuBdMbMN9C/Vt/vo0/61RMWE87GSZ Gc8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484631; x=1691076631; 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=6ZEskjxZEWz+9NjJT891NltNwB4YYMSpK/s/QQrCIQs=; b=MkU02h0fkmYQHZTBJQeM+RksjPyYFGUlwee6D8Aa5qLr7jDhZoRvSrZjOD5ntq8Ci+ K2r7Q1AeO5zi2zob1CsmygtI5MFSiV8euaMyMIzeKa523rkcJdm8ykc5hsk8mc2u7Y7C oLu7l9ajZT/R0kPPV2dDxdgV8hcDhOIBL4MvypGVTdKiNbVm26CNZFtCJrFhJKa5/FGU fGY4H77wFDWdy7G2uwTx/32cpwkRKr96gN0oyjAyybFB+Ho62ESkb+N73iHyK2MfpkbM P+jUJwBFEhj+ssa6hE1ePJxC73F4JfMp/7zHyNh1rDqOYovOkvBFPCz4q9ytukBo4FrF 8zDA== X-Gm-Message-State: AC+VfDzSdWXYqVFGVK7cz/zwnZNd+95dObNU1PJEi53Ur2ChvOIp3cvw hYLLkldju/vLYwZ2OPAjT0KHSM8x/Jp1akkEcgYoAQ== X-Google-Smtp-Source: ACHHUZ7+r3I4pDsKeo4aiZtL4DFY44GSOrGLn1rgg46Tc61Ip0uED+Rmx0ac32nE7I8pv39frNXI6g== X-Received: by 2002:a17:902:e748:b0:1b6:6b03:10e7 with SMTP id p8-20020a170902e74800b001b66b0310e7mr27839639plf.5.1688484631213; Tue, 04 Jul 2023 08:30:31 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 26/30] ptest-runner: Pull in sync fix to improve log warnings Date: Tue, 4 Jul 2023 05:29:28 -1000 Message-Id: <0c484c5aa054f4a8f7794bba18b1d0d168dbb941.1688484463.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 ; Tue, 04 Jul 2023 15:30:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183861 From: Richard Purdie Pulls in: utils: Ensure buffers are flushed after child exits We currently wait for the child to exit but we don't flush the buffers. This can mean the output ends up out of sync and the END: line isn't at the end of the logs. We've recently seen a lot of issues related to this on the autobuilder. Add in a flush call for all fds to ensure buffers are in sync. This does appear to improve warnings on the autobuilder now we started detecting the issue. Signed-off-by: Richard Purdie (cherry picked from commit f051de5d5da7e9a2f4137013e24589b594ff6d35) Signed-off-by: Steve Sakoman --- meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb index ff5629c6f9..67dd887c24 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "bcb82804daa8f725b6add259dcef2067e61a75aa" +SRCREV = "ea2a9cc159ad5f64ee75781d55101d7c340e0303" PV .= "+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \ From patchwork Tue Jul 4 15:29:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26883 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 917D9EB64DA for ; Tue, 4 Jul 2023 15:30:39 +0000 (UTC) Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by mx.groups.io with SMTP id smtpd.web10.61512.1688484634619702453 for ; Tue, 04 Jul 2023 08:30:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=5YMXlbUX; spf=softfail (domain: sakoman.com, ip: 209.85.167.172, mailfrom: steve@sakoman.com) Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3a04cb10465so4016567b6e.3 for ; Tue, 04 Jul 2023 08:30:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484633; x=1691076633; 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=LzBAMLNg60PNzVxQEEqjEt8mwrs6+qt9fcv4Yn1FHEg=; b=5YMXlbUXC7V+ocGI/c2Q5bIOVS2de2hvb4r3Hgtjezg4Vqqf/W+Uy/9SB+uoH/a9kA tch+loPpKiIpCYt/V3QPtB/pc+qYHq1gDAQeyJY2GhKf1cX4BB5GuRnLMHSDt9G2kUbl eM2mea10F6VKChMco3vzDlhnpAKBvAcOUSdekr3yjfWHgmDEUga7Zmatr+sZE7l9Pgeg TBG31Vm454GRQ60YdIkxBMrErk+UUK9rXwCaAOnXrAXdC1xmVQHzSEiAJCpIcMRpE94W ydRkhOt85MoG5AFPVSryMa37AJnejPmsbyYNoqjVEsAWKAmaxkC0CJz53Pp8VZJjb1sM DuBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484633; x=1691076633; 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=LzBAMLNg60PNzVxQEEqjEt8mwrs6+qt9fcv4Yn1FHEg=; b=BpYxdCK+QYpM4vxvte2/IhxImCLOOspQtAkT3hrhFK19B/VkScVpuP0uSI4H1SC0+h fP1VSlvTKVdZbOPkZZ/dC8C3p3kD1SqxjeP9tWFrlbw6d2IGYSyG/h/Isb3AUAjTXgmr LzUkCgRLwhQnY65E+OcLWvKk6YPSr/3ELKa7g0WU1c0/niP7Mb8dY0CGRASK+XJVIbz6 jVWQknPgmGSp2JXNrNbFtRbPunU/d5wLwzyyzd6IEY+/Z6UDW7S+RipTqfOL4/db+NLx UPGZ7fJtmlnUZoKBn3Fkz2cweTkz6CyrDlGH8AZoOlintxPQLgP2BDNNjXdrdau599i/ K/sQ== X-Gm-Message-State: AC+VfDzkkIXfxjFmjreUVEQO4ZfkKWuZ3V3hZyIMnsSSrVoEc9l2iw8I PyUmOVrJh4cCw2ozwZcNXzFoCBrg0zwNOme76xW5NQ== X-Google-Smtp-Source: ACHHUZ4KL58rkCcmQAL4CJqoj3Bzu29yvAicv+6utJsrOE64fUfDUWZbWxXLYzm2C48QgXUWWd0WGQ== X-Received: by 2002:a05:6808:1390:b0:3a1:e12b:2f80 with SMTP id c16-20020a056808139000b003a1e12b2f80mr16665804oiw.35.1688484633538; Tue, 04 Jul 2023 08:30:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 27/30] ptest-runner: Ensure data writes don't race Date: Tue, 4 Jul 2023 05:29:29 -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 ; Tue, 04 Jul 2023 15:30:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183862 From: Richard Purdie Currently the code can race as there is a read/write thread handling the stdio but there is no guarantee that when the process exits, the thread has handled all the data. This results in output where "END:" isn't actually at the end of the logs but somewhere in the middle of the output. Update to a revision with this fix. Signed-off-by: Richard Purdie (cherry picked from commit 6608ee551ed7e8864cdeabfb09832621313d3191) Signed-off-by: Steve Sakoman --- meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb index 67dd887c24..9a9b8ec260 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "ea2a9cc159ad5f64ee75781d55101d7c340e0303" +SRCREV = "a6c7dcda520402adb62a31b8b1c7686c5b8a4875" PV .= "+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \ From patchwork Tue Jul 4 15:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26887 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 A2034C001B0 for ; Tue, 4 Jul 2023 15:30:39 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.61513.1688484636411469692 for ; Tue, 04 Jul 2023 08:30:36 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=kcfsPKxz; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1b7ffab7ff1so32829215ad.2 for ; Tue, 04 Jul 2023 08:30:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484635; x=1691076635; 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=5BsJc3z6/txgi8FfvedjFf7ehmncQaHxt7B3b+7BnSs=; b=kcfsPKxznqxMZcPD+zHgLw8xe3r/vkjT7siITzR1zkvqhZOj8ib3jQSSKM7/vrSUEX /2ixqigOVuJHiMdbffudIabZEqkaH5i0zH8l1PLsUyQFwlRpF1bZlZZHEssTZA00U5oq n1KMD3wJksiZ18ZouPJiYk7KE+5TUQ7oh2EQJhzVqCl+4bsT5v7qudrOyksNXWGgHiQ9 0xWCDuf/j6NA6YxGpsfpCN539qUDVFq2kA49GdSMtYpwQ575456bkTs5KAVmXDwtjDH3 Y7mqUOC6l+Q61HmUyJtLr8rwxGgW1OViyHvJ20mH6exBNeBJMUBEDPCvESzJTEuH9XTR Ed5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484635; x=1691076635; 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=5BsJc3z6/txgi8FfvedjFf7ehmncQaHxt7B3b+7BnSs=; b=MxIIUE3aH9DI3qfLHasqvEPJbE1AmX+JHR5B3BQYEjnv2j+WTb4zry1s+N+xLASe0p KquQGC0IDhURzqsNLwjyEsicFi393J2suEXU1tdbZi/skJg0YqeaN4Owfb1FW1yPoXUD QWpe8FT3M1XgPPWsSXWhyI+54h6e4I7rziVcrBuNjsUCIeSuliF40jhvUjTdzB9nrZEm vqNhTWc8RsqQr8H/EU6ruTXIwfwR09m+r1HZ9gErvFuli0W/lOW7VFXPGH/ZTIjqjqPS mYgyZr6aNWllUyZY5k8aH1hD3TY3ohotb453AUUK+A5Jmw8xIp4QgndqmlnoNM4471Ny n3TQ== X-Gm-Message-State: ABy/qLYo3FcKdX9tnsWIsxRxxfIIq9syhHik5YEBU82/3WPwTp1RdSLQ M16eufUhUCTMHlhFDaYndBLX/BI03NiuYpEwJvjkwg== X-Google-Smtp-Source: APBJJlFqM7c5AG1VC2KV7gzcuL6bCLQUZb8ygaCUqmP6Uk06hj8RTSk/pkOF21UgXpeVNb3QZjPHRw== X-Received: by 2002:a17:902:e80d:b0:1b8:a7f0:fd95 with SMTP id u13-20020a170902e80d00b001b8a7f0fd95mr1123620plg.57.1688484635522; Tue, 04 Jul 2023 08:30:35 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:35 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 28/30] ptest-runner: Pull in "runner: Remove threads and mutexes" fix Date: Tue, 4 Jul 2023 05:29:30 -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 ; Tue, 04 Jul 2023 15:30:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183863 From: Richard Purdie This fix simplifies the code to drop the pthread and mutexs which should address some of the buffering issues we were seeing in some test case failures. Signed-off-by: Richard Purdie (cherry picked from commit bffa6d381d7ea0a6aad19d61cd973c82aadef070) Signed-off-by: Steve Sakoman --- meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb index 9a9b8ec260..6f3104499f 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "a6c7dcda520402adb62a31b8b1c7686c5b8a4875" +SRCREV = "8259375d306a8129f6c5d8528314496fc6ae1ca3" PV .= "+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \ From patchwork Tue Jul 4 15:29:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26886 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 A1306C001B1 for ; Tue, 4 Jul 2023 15:30:39 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.61514.1688484638463043571 for ; Tue, 04 Jul 2023 08:30:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=yHwgTJj7; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b89cb535afso9595675ad.2 for ; Tue, 04 Jul 2023 08:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484637; x=1691076637; 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=xt7TMU2QHSIOjTeb8ri3HgQEDv5ZUBo9wtOTcagfS7I=; b=yHwgTJj75BwpInEoV6GmQaG44EIY+13XLhl9i1ceeAed+7lVmvgzhRzuI9f8Qis2RV GK4mN5W5bPrBFOFxVAtFSQ9Cp5Bhw6UC6WxFkfj09Hj2l/QuaiMeScv3uLEs5ewBOYUs Z8X458YKIybsirCW0FPe5zwnE6EvXJB+EA4A6H/0XhyDkVcGJkh+WEVoJ5jPEnlPuO4g ogcTIio5oYT1K56RbIP6tkZdiJ5KbzKwddtQmdMTxHdemo04GLb7j41MnmvPJJ45gdmd SdbTkU1xAUGbub/WNis7/FCudjGOtlJoFBEsrdn3NCuXv+upGjWuz8eUtlUgxU0qiXfx x/fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484637; x=1691076637; 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=xt7TMU2QHSIOjTeb8ri3HgQEDv5ZUBo9wtOTcagfS7I=; b=fdPuihAOvHsZsjnmtagIBrcIm0pjM4yhvPHu9l9lSQjoZCt53inD4Yx4FYsBbxZEdT ljMQsi8dpPtzhzDv3RqJMdogp6NGxKen4jNnjSQEmDhYYJXhWdTXBLviSFqqsxKr1kDZ 2VDqC48vrjNkPibUT1N/kttfm2OXRtybw7wIqd2+g0tDhicmuyMCXuKhnpPi7PcwxGkn ihV1Vsoe0/eEi5g8t4rCqscBC2ZUgqUhQFMEdEr7cbH/n301Eic9B4BHRUz1k/n9Nsmh PXJxEiBtY5ua1KHF1EWQfqRPTXANT46V/djFXu9BQxlI5+9Wv/WHKqkBRjhHjdMoA2MF uc1w== X-Gm-Message-State: ABy/qLbPuO+sngtM5Og0Kik8HEzyi9LKmyXns6WLIqg36xi19tBmjHEp iFodtsgIpD7wwSliM193KmBrHmswPqDeTJrrk+I86A== X-Google-Smtp-Source: APBJJlHMfkHH25DLwwV0K9/9EhfH7Bdp28cKK+QEXeEDiYvJ40OZFtBocR/hGVgA0U/ALHh5KpjO0Q== X-Received: by 2002:a17:902:c94d:b0:1b8:64a9:ea60 with SMTP id i13-20020a170902c94d00b001b864a9ea60mr11529508pla.53.1688484637566; Tue, 04 Jul 2023 08:30:37 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 29/30] dnf: only write the log lock to root for native dnf Date: Tue, 4 Jul 2023 05:29:31 -1000 Message-Id: <207cc7acef40f92b5de306aa6f035258c0eec828.1688484463.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 ; Tue, 04 Jul 2023 15:30:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183864 From: Changqing Li From commit 742a1b7124, log_lock.pid is writen to root, but following file is not changed, which will make it never deleted, and an unexpected file exist in root dir after boot target. $ tail -n 1 etc/tmpfiles.d/dnf.conf r /var/log/log_lock.pid Besides, root dir may be read-only, so it is better still keep the log_lock.pid under /var/log, only write the log lock to root for native dnf for fixing issue mentioned in 742a1b7124 Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- meta/recipes-devtools/dnf/dnf_4.14.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/dnf/dnf_4.14.0.bb b/meta/recipes-devtools/dnf/dnf_4.14.0.bb index 62df8c4ace..95007c9c4b 100644 --- a/meta/recipes-devtools/dnf/dnf_4.14.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.14.0.bb @@ -15,9 +15,10 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ file://0001-set-python-path-for-completion_helper.patch \ - file://0001-dnf-write-the-log-lock-to-root.patch \ " +SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" + SRCREV = "e50875b3f5790f70720bdb670e1dd2bf4d828744" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" From patchwork Tue Jul 4 15:29:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 26888 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 8FACCEB64D9 for ; Tue, 4 Jul 2023 15:30:49 +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.web10.61517.1688484640382976057 for ; Tue, 04 Jul 2023 08:30:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Fv0wtvjP; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1b8062c1ee1so45038295ad.3 for ; Tue, 04 Jul 2023 08:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688484639; x=1691076639; 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=vD8W0Ei+buv/3UoGvu0p/oo1/+LvkPCP6vc7YgP4urE=; b=Fv0wtvjPDp/7bKF8CkOTbvh9bANTjpulSQlQmrK9Ah6zETBiOt58uh9jG9O/AG/IHj Qb0j9omKhxPYVDUjFGzpSfE6ciwz2OoezqnDDB7wc7cC6rH1f6jG2/wz9g+TdJphXLbh l/0AQF2ZdV4bb90Mtslb9OlWvAvK5ptwi6dYjvVFyh7Us/MvpYaRqwCvEJ8sKRiLKKb5 lDFgtTCt/uzPwi4VEjdvNrcFnFBYDKscrCJBURjxWoNkZuMAmberMa1lZWgnwMwM5Vzw XHv4d8NK9Ze7FCag3mfEkfaIs/8gfrtNlxmAU4AXOZUxzZEaSSp6ApzgQjRxrpdgU5QS bUUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688484639; x=1691076639; 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=vD8W0Ei+buv/3UoGvu0p/oo1/+LvkPCP6vc7YgP4urE=; b=HC8XJzKmoZNOwyMbVaXqy1qxVoN9C/obhYMeOi99PAC/0IVh69JCjI1uZoLirfBqBe yYb5v0kg2GTb9o/0QQhfQwHhHI1V48gQVAERAlIm0IrIkhi1BzzUR3A+ca9cSjgqfEwx VAwEBt+hCY8p9v3UWD0O2cFu+JDPjNVW2aZKbRSmmLc0Zt79aO23hCe/4IOlUkI0k5Tx 3w/mYQNXZhY5EJh/8EQc0JWANF+jvrf4/mpk9oyebQVCrIk3w+gpPBtdg3wx44lLFcsJ ltSDgiRDNDNMYEze1EFHEbSepWgf782LH2Q++u05a+KXVNppdfU56o4/64oNKtyhw/+p 9hAA== X-Gm-Message-State: ABy/qLbYV11YJ/DXHJm801vNapgZYuxSHbWrtsWFcF6iJmsinth8C2gk fVczaMF420rzX1EwnQdTmJ0I7M5BBYXpOJGxQYAW8A== X-Google-Smtp-Source: APBJJlEmGE1qJ5RLglvo1mgorKQrGEcCM0Fjgkk+RaLBDoa5ZqtHufh2mQi+CRISA/uMMSW0VyMveA== X-Received: by 2002:a17:902:ee41:b0:1b3:d608:899a with SMTP id 1-20020a170902ee4100b001b3d608899amr12788326plo.68.1688484639505; Tue, 04 Jul 2023 08:30:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id y22-20020a1709029b9600b001ac40488620sm17332041plp.92.2023.07.04.08.30.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:30:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 30/30] rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock Date: Tue, 4 Jul 2023 05:29:32 -1000 Message-Id: <595fbe4c9ad25e52e88d7bcf1d1864fe5ec324a5.1688484463.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 ; Tue, 04 Jul 2023 15:30:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183865 From: Changqing Li Remove log_lock.pid which maybe created during do_rootfs. In commit [dnf: only write the log lock to root for native dnf], native dnf changed to write log lock to root, and target dnf still use /var/log, so log_lock.pid need to be removed post do_rootfs. Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- meta/classes-recipe/rootfs-postcommands.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass index 690fa976aa..7538c8b0b5 100644 --- a/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/meta/classes-recipe/rootfs-postcommands.bbclass @@ -49,6 +49,8 @@ ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "overlayfs", "overlayfs_qa_check; overlayfs_postprocess;", "", d)}' +ROOTFS_POSTPROCESS_COMMAND += 'remove_unused_dnf_log_lock;' + inherit image-artifact-names # Sort the user and group entries in /etc by ID in order to make the content @@ -276,6 +278,11 @@ empty_var_volatile () { fi } +remove_unused_dnf_log_lock() { + if [ -e ${IMAGE_ROOTFS}/log_lock.pid ]; then + rm -rf ${IMAGE_ROOTFS}/log_lock.pid + fi +} # Turn any symbolic /sbin/init link into a file remove_init_link () { if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then