From patchwork Sun Feb 12 21:10: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: 19425 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 D53F0C636D4 for ; Sun, 12 Feb 2023 21:10:57 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.20814.1676236251420016690 for ; Sun, 12 Feb 2023 13:10:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qaBfl3vK; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id w14-20020a17090a5e0e00b00233d3b9650eso2599983pjf.4 for ; Sun, 12 Feb 2023 13:10:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=QCNdshzFivQ9qSjBg5DLDipYnp4m/fFAcC4jt5tJmUU=; b=qaBfl3vKxkbo/eMNyw6pmboc7MAXDWpz1Od15cuaxKYpbs354B8XWb2qof/5yuTxG4 l+LRf/v8zEw3U4soVFYFcFa8jSqRuCcEkiXb4ZYZDqLYsQ6jkqmvuljf9LqF1KQG7elV yGk8iPhHAdVDVMxg2U4b3e1mwmsHq6cWP6+URMCLDOTi5oHjWl9sY3Z6CmZ/p+iPFFpg 1jrRCEwL7ilHObCZ2F7S4bgZYOvVNtrvx4YSiTE/Lr5uS/G0QATKVM/CEcgXpdbLC+i4 Wiy7FFFVdefxf5EY5LTFHmJ5rV2uXwt1tMGc0THl4KRR0wRsDXbJyiUQyQf3bHwDRvc+ +NZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=QCNdshzFivQ9qSjBg5DLDipYnp4m/fFAcC4jt5tJmUU=; b=kUWcT4foS6MNLr51//n6swoYN8SdbBr2l8UG8zx3lwOg9tGIceO/Mm/fFezJOE2v4M 049Vtt83Lw8t6ISjuACC6OL8sOzZZmzoZUKhmZs9SF3xmBxEX6cys66gle0FglQIEdx4 amfY6w0hGRv6UC7hgX7R+gfAngzv3N3FexOkGGzo9MdLbnpyIfxLMZeIdf72bgu9EM/F wNyhEp9KbklvdGan7IFMJvU66j9X+RY6pVAgVI+JMFxIGy21QbQ6ldlgV3WVXT+lmfTT P/pEVEtF7fm4a04w7xN4XtTRRYi+J9FOsItV1rtj2jvjfgwJWnu5LV7B+7NNtE4s6Td3 6HKQ== X-Gm-Message-State: AO0yUKWDfSqr/K7vPll9Fbxfsiez/E/m3qPk0IPMuz4HmtOxEA8BUd+Z cHUroIhLSwNU1xSEVqtsiu7+KuAGIlcvnK6/3YI= X-Google-Smtp-Source: AK7set9xV130V20SuphgcEX+MUCZamusn6bZgOrUs01jNF0VcGUBk4hI+GUyUBbHwe3jfXcrz4WJOg== X-Received: by 2002:a17:903:26cd:b0:19a:9055:6658 with SMTP id jg13-20020a17090326cd00b0019a90556658mr3807839plb.18.1676236250210; Sun, 12 Feb 2023 13:10:50 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.10.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:10:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/27] python3-certifi: fix for CVE-2022-23491 Date: Sun, 12 Feb 2023 11:10:17 -1000 Message-Id: <8ee4adb8675c690962e5820669098a95f74c07c7.1676236110.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 ; Sun, 12 Feb 2023 21:10:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177045 From: Narpat Mali Certifi is a curated collection of Root Certificates for validating the trustworthiness of SSL certificates while verifying the identity of TLS hosts. Certifi 2022.12.07 removes root certificates from "TrustCor" from the root store. These are in the process of being removed from Mozilla's trust store. TrustCor's root certificates are being removed pursuant to an investigation prompted by media reporting that TrustCor's ownership also operated a business that produced spyware. Conclusions of Mozilla's investigation can be found in the linked google group discussion. Reference: https://nvd.nist.gov/vuln/detail/CVE-2022-23491 Signed-off-by: Narpat Mali Signed-off-by: Steve Sakoman --- .../python3-certifi/CVE-2022-23491.patch | 230 ++++++++++++++++++ .../python/python3-certifi_2021.10.8.bb | 2 + 2 files changed, 232 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-certifi/CVE-2022-23491.patch diff --git a/meta/recipes-devtools/python/python3-certifi/CVE-2022-23491.patch b/meta/recipes-devtools/python/python3-certifi/CVE-2022-23491.patch new file mode 100644 index 0000000000..94ca254549 --- /dev/null +++ b/meta/recipes-devtools/python/python3-certifi/CVE-2022-23491.patch @@ -0,0 +1,230 @@ +From 167413eefa9482a7777b3ccdcc70e511ef5fcc2b Mon Sep 17 00:00:00 2001 +From: Narpat Mali +Date: Thu, 2 Feb 2023 12:57:06 +0000 +Subject: [PATCH] Certifi is a curated collection of Root Certificates for + validating the trustworthiness of SSL certificates while verifying the + identity of TLS hosts. Certifi 2022.12.07 removes root certificates from + "TrustCor" from the root store. These are in the process of being removed + from Mozilla's trust store. TrustCor's root certificates are being removed + pursuant to an investigation prompted by media reporting that TrustCor's + ownership also operated a business that produced spyware. Conclusions of + Mozilla's investigation can be found in the linked google group discussion. + +CVE: CVE-2022-23491 + +Upstream-Status: Backport [https://github.com/certifi/python-certifi/commit/9e9e840925d7b8e76c76fdac1fab7e6e88c1c3b8] + +Signed-off-by: Narpat Mali +--- + certifi/cacert.pem | 181 --------------------------------------------- + 1 file changed, 181 deletions(-) + +diff --git a/certifi/cacert.pem b/certifi/cacert.pem +index 6d0ccc0..6bae3e4 100644 +--- a/certifi/cacert.pem ++++ b/certifi/cacert.pem +@@ -694,37 +694,6 @@ BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB + ZQ== + -----END CERTIFICATE----- + +-# Issuer: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C. +-# Subject: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C. +-# Label: "Network Solutions Certificate Authority" +-# Serial: 116697915152937497490437556386812487904 +-# MD5 Fingerprint: d3:f3:a6:16:c0:fa:6b:1d:59:b1:2d:96:4d:0e:11:2e +-# SHA1 Fingerprint: 74:f8:a3:c3:ef:e7:b3:90:06:4b:83:90:3c:21:64:60:20:e5:df:ce +-# SHA256 Fingerprint: 15:f0:ba:00:a3:ac:7a:f3:ac:88:4c:07:2b:10:11:a0:77:bd:77:c0:97:f4:01:64:b2:f8:59:8a:bd:83:86:0c +------BEGIN CERTIFICATE----- +-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi +-MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu +-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp +-dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV +-UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO +-ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG +-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz +-c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP +-OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl +-mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF +-BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4 +-qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw +-gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB +-BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu +-bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp +-dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8 +-6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/ +-h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH +-/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv +-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN +-pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey +------END CERTIFICATE----- +- + # Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited + # Subject: CN=COMODO ECC Certification Authority O=COMODO CA Limited + # Label: "COMODO ECC Certification Authority" +@@ -2385,46 +2354,6 @@ KoZIzj0EAwMDaAAwZQIxAOVpEslu28YxuglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg + xwy8p2Fp8fc74SrL+SvzZpA3 + -----END CERTIFICATE----- + +-# Issuer: CN=Staat der Nederlanden EV Root CA O=Staat der Nederlanden +-# Subject: CN=Staat der Nederlanden EV Root CA O=Staat der Nederlanden +-# Label: "Staat der Nederlanden EV Root CA" +-# Serial: 10000013 +-# MD5 Fingerprint: fc:06:af:7b:e8:1a:f1:9a:b4:e8:d2:70:1f:c0:f5:ba +-# SHA1 Fingerprint: 76:e2:7e:c1:4f:db:82:c1:c0:a6:75:b5:05:be:3d:29:b4:ed:db:bb +-# SHA256 Fingerprint: 4d:24:91:41:4c:fe:95:67:46:ec:4c:ef:a6:cf:6f:72:e2:8a:13:29:43:2f:9d:8a:90:7a:c4:cb:5d:ad:c1:5a +------BEGIN CERTIFICATE----- +-MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJO +-TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFh +-dCBkZXIgTmVkZXJsYW5kZW4gRVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0y +-MjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIg +-TmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRlcmxhbmRlbiBFViBS +-b290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkkSzrS +-M4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nC +-UiY4iKTWO0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3d +-Z//BYY1jTw+bbRcwJu+r0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46p +-rfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13l +-pJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gVXJrm0w912fxBmJc+qiXb +-j5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr08C+eKxC +-KFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS +-/ZbV0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0X +-cgOPvZuM5l5Tnrmd74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH +-1vI4gnPah1vlPNOePqc7nvQDs/nxfRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrP +-px9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB +-/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwaivsnuL8wbqg7 +-MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI +-eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u +-2dfOWBfoqSmuc0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHS +-v4ilf0X8rLiltTMMgsT7B/Zq5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTC +-wPTxGfARKbalGAKb12NMcIxHowNDXLldRqANb/9Zjr7dn3LDWyvfjFvO5QxGbJKy +-CqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tNf1zuacpzEPuKqf2e +-vTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi5Dp6 +-Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIa +-Gl6I6lD4WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeL +-eG9QgkRQP2YGiqtDhFZKDyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8 +-FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGyeUN51q1veieQA6TqJIc/2b3Z6fJfUEkc +-7uzXLg== +------END CERTIFICATE----- +- + # Issuer: CN=IdenTrust Commercial Root CA 1 O=IdenTrust + # Subject: CN=IdenTrust Commercial Root CA 1 O=IdenTrust + # Label: "IdenTrust Commercial Root CA 1" +@@ -3032,116 +2961,6 @@ T8p+ck0LcIymSLumoRT2+1hEmRSuqguTaaApJUqlyyvdimYHFngVV3Eb7PVHhPOe + MTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g== + -----END CERTIFICATE----- + +-# Issuer: CN=TrustCor RootCert CA-1 O=TrustCor Systems S. de R.L. OU=TrustCor Certificate Authority +-# Subject: CN=TrustCor RootCert CA-1 O=TrustCor Systems S. de R.L. OU=TrustCor Certificate Authority +-# Label: "TrustCor RootCert CA-1" +-# Serial: 15752444095811006489 +-# MD5 Fingerprint: 6e:85:f1:dc:1a:00:d3:22:d5:b2:b2:ac:6b:37:05:45 +-# SHA1 Fingerprint: ff:bd:cd:e7:82:c8:43:5e:3c:6f:26:86:5c:ca:a8:3a:45:5b:c3:0a +-# SHA256 Fingerprint: d4:0e:9c:86:cd:8f:e4:68:c1:77:69:59:f4:9e:a7:74:fa:54:86:84:b6:c4:06:f3:90:92:61:f4:dc:e2:57:5c +------BEGIN CERTIFICATE----- +-MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD +-VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk +-MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U +-cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29y +-IFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkxMjMxMTcyMzE2WjCB +-pDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFuYW1h +-IENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUG +-A1UECwweVHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZU +-cnVzdENvciBSb290Q2VydCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +-CgKCAQEAv463leLCJhJrMxnHQFgKq1mqjQCj/IDHUHuO1CAmujIS2CNUSSUQIpid +-RtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4pQa81QBeCQryJ3pS/C3V +-seq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0JEsq1pme +-9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CV +-EY4hgLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorW +-hnAbJN7+KIor0Gqw/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/ +-DeOxCbeKyKsZn3MzUOcwHwYDVR0jBBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcw +-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD +-ggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5mDo4Nvu7Zp5I +-/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf +-ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZ +-yonnMlo2HD6CqFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djts +-L1Ac59v2Z3kf9YKVmgenFK+P3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdN +-zl/HHk484IkzlQsPpTLWPFp5LBk= +------END CERTIFICATE----- +- +-# Issuer: CN=TrustCor RootCert CA-2 O=TrustCor Systems S. de R.L. OU=TrustCor Certificate Authority +-# Subject: CN=TrustCor RootCert CA-2 O=TrustCor Systems S. de R.L. OU=TrustCor Certificate Authority +-# Label: "TrustCor RootCert CA-2" +-# Serial: 2711694510199101698 +-# MD5 Fingerprint: a2:e1:f8:18:0b:ba:45:d5:c7:41:2a:bb:37:52:45:64 +-# SHA1 Fingerprint: b8:be:6d:cb:56:f1:55:b9:63:d4:12:ca:4e:06:34:c7:94:b2:1c:c0 +-# SHA256 Fingerprint: 07:53:e9:40:37:8c:1b:d5:e3:83:6e:39:5d:ae:a5:cb:83:9e:50:46:f1:bd:0e:ae:19:51:cf:10:fe:c7:c9:65 +------BEGIN CERTIFICATE----- +-MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNV +-BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw +-IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy +-dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEfMB0GA1UEAwwWVHJ1c3RDb3Ig +-Um9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEyMzExNzI2MzlaMIGk +-MQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEg +-Q2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYD +-VQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRy +-dXN0Q29yIFJvb3RDZXJ0IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK +-AoICAQCnIG7CKqJiJJWQdsg4foDSq8GbZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+ +-QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9NkRvRUqdw6VC0xK5mC8tkq +-1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1oYxOdqHp +-2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nK +-DOObXUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hape +-az6LMvYHL1cEksr1/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF +-3wP+TfSvPd9cW436cOGlfifHhi5qjxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88 +-oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQPeSghYA2FFn3XVDjxklb9tTNM +-g9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+CtgrKAmrhQhJ8Z3 +-mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh +-8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAd +-BgNVHQ4EFgQU2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6U +-nrybPZx9mCAZ5YwwYrIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYw +-DQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/hOsh80QA9z+LqBrWyOrsGS2h60COX +-dKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnpkpfbsEZC89NiqpX+ +-MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv2wnL +-/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RX +-CI/hOWB3S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYa +-ZH9bDTMJBzN7Bj8RpFxwPIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW +-2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dvDDqPys/cA8GiCcjl/YBeyGBCARsaU1q7 +-N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYURpFHmygk71dSTlxCnKr3 +-Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANExdqtvArB +-As8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp +-5KeXRKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu +-1uwJ +------END CERTIFICATE----- +- +-# Issuer: CN=TrustCor ECA-1 O=TrustCor Systems S. de R.L. OU=TrustCor Certificate Authority +-# Subject: CN=TrustCor ECA-1 O=TrustCor Systems S. de R.L. OU=TrustCor Certificate Authority +-# Label: "TrustCor ECA-1" +-# Serial: 9548242946988625984 +-# MD5 Fingerprint: 27:92:23:1d:0a:f5:40:7c:e9:e6:6b:9d:d8:f5:e7:6c +-# SHA1 Fingerprint: 58:d1:df:95:95:67:6b:63:c0:f0:5b:1c:17:4d:8b:84:0b:c8:78:bd +-# SHA256 Fingerprint: 5a:88:5d:b1:9c:01:d9:12:c5:75:93:88:93:8c:af:bb:df:03:1a:b2:d4:8e:91:ee:15:58:9b:42:97:1d:03:9c +------BEGIN CERTIFICATE----- +-MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD +-VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk +-MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U +-cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDlRydXN0Q29y +-IEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3MjgwN1owgZwxCzAJBgNV +-BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw +-IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy +-dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3Ig +-RUNBLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb +-3w9U73NjKYKtR8aja+3+XzP4Q1HpGjORMRegdMTUpwHmspI+ap3tDvl0mEDTPwOA +-BoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23xFUfJ3zSCNV2HykVh0A5 +-3ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmcp0yJF4Ou +-owReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/ +-wZ0+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZF +-ZtS6mFjBAgMBAAGjYzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAf +-BgNVHSMEGDAWgBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/ +-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEABT41XBVwm8nHc2Fv +-civUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u/ukZMjgDfxT2 +-AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F +-hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50 +-soIipX1TH0XsJ5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BI +-WJZpTdwHjFGTot+fDz2LYLSCjaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1Wi +-tJ/X5g== +------END CERTIFICATE----- +- + # Issuer: CN=SSL.com Root Certification Authority RSA O=SSL Corporation + # Subject: CN=SSL.com Root Certification Authority RSA O=SSL Corporation + # Label: "SSL.com Root Certification Authority RSA" +-- +2.34.1 + diff --git a/meta/recipes-devtools/python/python3-certifi_2021.10.8.bb b/meta/recipes-devtools/python/python3-certifi_2021.10.8.bb index 4c376da897..57bd59ba44 100644 --- a/meta/recipes-devtools/python/python3-certifi_2021.10.8.bb +++ b/meta/recipes-devtools/python/python3-certifi_2021.10.8.bb @@ -7,6 +7,8 @@ HOMEPAGE = " http://certifi.io/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=67da0714c3f9471067b729eca6c9fbe8" +SRC_URI += "file://CVE-2022-23491.patch" + SRC_URI[sha256sum] = "78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872" inherit pypi setuptools3 From patchwork Sun Feb 12 21:10: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: 19423 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 D3DB6C05027 for ; Sun, 12 Feb 2023 21:10:57 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.20814.1676236251420016690 for ; Sun, 12 Feb 2023 13:10:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lqqt7PVq; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id w14-20020a17090a5e0e00b00233d3b9650eso2600004pjf.4 for ; Sun, 12 Feb 2023 13:10:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=5sUt1wOVbwFBzqvGKOUrLNYtB4N1FrMR186IKWokqUU=; b=lqqt7PVqemUyh3CFImVwdQwC6nTBcz1JiJLU/axDbR1i9R1mK3bHEgrcPR2hwoQTuD MZoOy4rEV9VzT79GQCkZjEH38RIgfmisPboeMeyWazj1tRtkOGag2y0Q+zO3YHlUk9ko rxFsg+yb5otSAK4RDHh21o4rX7+5uBFYau6JrkQvm02DagzGR2IqTRjNFsiZg1MNseiC VtVuOKWGtuYKRNMN0BDZ9H6yxubnliJqyjPb2vySn/6QEyQMdtzyAqEjkxSoK3YKUq7V jRofw8K5MOoxBVbMVezhsuxEpbA3wzUscPeYHeD2qJO4zCadc81Wa0+sAZTLkpWNNWBF E0MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=5sUt1wOVbwFBzqvGKOUrLNYtB4N1FrMR186IKWokqUU=; b=yePC53ujNatY+QIcEEVwiO/hvlksBmuAO5TL4MWBjv60ev0wcERqJHfdTon4CGyUhn VViEweLXsaTdpuL1ifLBuh+lOaPrrpcUtCI4Kxq0X4EFJkyrnXfE4s6h5QT0YM5lmAhn +pE1+GF2aNY1hOuKn5ZXYMNRbVmbWGMbg0EWU66Ys2xmp9Nrb5y7CmwHoPjCBJn/lpti vE/GJ0vITVfEnSnroGWaeNqHXuq52UOGX5VC+UUMohMHr+2ovg6lqSGw/gl/laHiuB6l ZXEbldD8PpD+Es80l+MJFpsNDkTauqyf4X4cI10u1f7xAcxrsXAMqdSrUjJZsf5+oRKT 8gyA== X-Gm-Message-State: AO0yUKXJUWXe3QkRiuy5aP293jYhsG6ZeF500BeoBhSRBENaE8wGeJAt PXJKUVapQWxQcUZJCDD96DXEO/Ac95zp8BiY3Zk= X-Google-Smtp-Source: AK7set+s5hhCXdaN1AfTmKODBjw5F9lx6lvtS+4HRBj0G/s+WEbjhqHccBfPWuX54pVvn7PPlcXFhQ== X-Received: by 2002:a17:902:e5c9:b0:19a:9864:2887 with SMTP id u9-20020a170902e5c900b0019a98642887mr3452849plf.7.1676236252251; Sun, 12 Feb 2023 13:10:52 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.10.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:10:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/27] python3-pytest: depend on python3-tomli instead of python3-toml Date: Sun, 12 Feb 2023 11:10:18 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 12 Feb 2023 21:10:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177046 From: Arnout Vandecappelle Since version 7.0.0 [1], pytest switched from the toml package to the tomli package for parsing pyproject.toml configuration files [2]. This change is not immediately noticable during tests, because the toml/tomli module is only important if a pyproject.toml is actually present in a project. [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-0-0rc1-2021-12-06 [2] https://github.com/pytest-dev/pytest/issues/8789 Signed-off-by: Arnout Vandecappelle Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3-pytest_7.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-pytest_7.1.1.bb b/meta/recipes-devtools/python/python3-pytest_7.1.1.bb index 1cb2fb01c0..90a4787c17 100644 --- a/meta/recipes-devtools/python/python3-pytest_7.1.1.bb +++ b/meta/recipes-devtools/python/python3-pytest_7.1.1.bb @@ -26,7 +26,7 @@ RDEPENDS:${PN}:class-target += " \ ${PYTHON_PN}-py \ ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-six \ - ${PYTHON_PN}-toml \ + ${PYTHON_PN}-tomli \ ${PYTHON_PN}-wcwidth \ " From patchwork Sun Feb 12 21:10: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: 19429 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 9FC9CC636D3 for ; Sun, 12 Feb 2023 21:11:07 +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.20817.1676236257901958271 for ; Sun, 12 Feb 2023 13:10:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uGPcn0yl; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d8so10409068plr.10 for ; Sun, 12 Feb 2023 13:10:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=Pb6L2zUM4dGkvcid1OEm8ljXAA9i/TD30taQzJyIQGU=; b=uGPcn0ylXVuclqFQ+CeoEEGA8qH8iE5RwVMI1XKp8OHKKbcQiAZl359HzrYZRWGTpF qjA412c1kExBBQRdH16G24M2ay0rTk5kjn6PnrYOXRicxdGxB96d1DyADg7C1iZgyZEe 10oh6khILqgs8YzchrSTpIAYrmWuM890mmT/hJGpTnMxk0uK6Zz0aI8vPX040biNCXTQ CnFpAFuBKr2ycGvm2LeMDbiZoVfEmGcATscC2uf6LBaKv5F72LWhDc2PAgNeglGmcyOl D4lppAHze5t1k2Uwk0S1ET4V/NcoI3/i+kdc4ZHg/b7QDM28iv99aBfpBm1djZ56U2LR +rQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Pb6L2zUM4dGkvcid1OEm8ljXAA9i/TD30taQzJyIQGU=; b=q7Rd/IgcymTYGgbzy9gne+iY+Qwq/viSDBg6VMXh56PSLmyvTjPEjwKHIgkcXBz3xm PuV41TgiW4+prBsj+OQOK+G1uN+18UHhS22qw3vSvSSkba0+uutuOjkHu7/DpjLuRC7V tTo1OyO23VD395nz5p2l2oB+F6ipmVONgI0IWX43qvphL/w/ZnZDXnPf5wRgfyperL4v nSfaqLG1vDIWuDbjReGtAJDGcAoHDYJnEqIGmt3yticupWcFvqP3cfiiepu7NOxQ4ieA UI/6Kc1VkJYHVtwwQwpihcb/W2MlhYKG3YlGfjX8927eSfg3E7nK2xUSD+I7pg3RBY2X 2ViQ== X-Gm-Message-State: AO0yUKXYmXx8YN4NGdToSDJb+7VvCigfYuBIj2T/WIF4IKxy0UBQXheN yNvLcmSW2DSmzMPmO+bOc1KXfW9ljaiphp5cB5Y= X-Google-Smtp-Source: AK7set9i11liS4o1F4m9+ko8vP88yZ/NlS4ssYAnHFUpPUXbDzyKQRtb/NfjCaz5U/czSqW6+bVHZw== X-Received: by 2002:a17:902:e2c5:b0:19a:95ab:6b46 with SMTP id l5-20020a170902e2c500b0019a95ab6b46mr3133449plc.3.1676236256974; Sun, 12 Feb 2023 13:10:56 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.10.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:10:56 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/27] git: upgrade to 2.35.6 Date: Sun, 12 Feb 2023 11:10:19 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 12 Feb 2023 21:11:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177047 From: Chee Yang Lee upgrade include fix for CVE-2022-23521 and CVE-2022-41903 Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/{git_2.35.5.bb => git_2.35.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/git/{git_2.35.5.bb => git_2.35.6.bb} (98%) diff --git a/meta/recipes-devtools/git/git_2.35.5.bb b/meta/recipes-devtools/git/git_2.35.6.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.35.5.bb rename to meta/recipes-devtools/git/git_2.35.6.bb index be4e3ca1d3..016b743ece 100644 --- a/meta/recipes-devtools/git/git_2.35.5.bb +++ b/meta/recipes-devtools/git/git_2.35.6.bb @@ -165,4 +165,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "2cca63fe7bebb5b4bf8efea7b46b12bb89c16ff9711b6b6d845928501d00d0a3" +SRC_URI[tarball.sha256sum] = "6bd51e0487028543ba40fe3d5b33bd124526a7f7109824aa7f022e79edf93bd1" From patchwork Sun Feb 12 21:10: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: 19428 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 B35DFC64ED6 for ; Sun, 12 Feb 2023 21:11:07 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.20819.1676236259860303775 for ; Sun, 12 Feb 2023 13:10:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=g3yp0l+4; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id mg23so3587662pjb.0 for ; Sun, 12 Feb 2023 13:10:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=A8Nw+q0U125JrLIZKMFeGqakva17ZqZN8HT+PT1xrps=; b=g3yp0l+4F0OVMiQyhZWf6bLFyjB/AYlcIo1ZldGt4+2nPf/J3QzSn08LCnS9cCfEDu c67rElNMSmzxM6R7ILh+olPtwDZ2Pl7kVv7n6SNmcGyJuXgX+DKLCXQUmkmW3WyQLsDK aTxHQ7/D+SvXFg4cTxxvnU0KNG7WDLslSQZP/hsRXCeBdYRf/Xr/JdJdUCqQh/giDx/q 1dIHcisB8G6cyD6xHTjAsiP38sJfrNV447YMKM80UER6luBnqk8qbACBhskXmJz9xbqv 9HMbvBubL5J/iU1iHY53Px394CNklm3/eKAWW/BaQvcm8Fr3TBNEu/sjOlfpedUqFCbb 6qIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=A8Nw+q0U125JrLIZKMFeGqakva17ZqZN8HT+PT1xrps=; b=uC20hQSmY85Nh3BS1AxdleSs5RsTYFWj3NKXCucIgP7fzqlzvMjbMhq8rgbTQrYio5 1N13l+1OKUX7xCr2sWxIafhkCxjle2olMkPkO8sXXssqCbf4gx8v06iIF4tfRL5t+dj5 vyQRHrQ4t4EnapsmubyRy+bDVUe0+sHIEMCt96b8e0mHwPt9lsD7ALPlzMxRON8mqgYC wu+NodsXP5b95FLflJ/WVQCra4iwujlXw8AcVGD0dW0w8muIAYRd6BUQ+s/4zV5xZqsi oCZMcPtSWGND3QnEI+y7xq4FEyGPsfVpdnxXtPVWyKWNgBo0aXWyYtSnWJ7kvlSwPzfe zKMQ== X-Gm-Message-State: AO0yUKXGuk5vlNRdvtQb9UuA/Fw1CU8mB0WDjYiMl/WzlSuDTlA+dU1q Vkbcr+eFT6IL3fx4FgKOGkuXRhBiUK+bfaJ2MXo= X-Google-Smtp-Source: AK7set9Yhm7h7lRfwUmkfM5LbpJNJmWT3cqjQI+ySqYwFwg7h9AHsk85SY6ah5fRcsSHhDPy4UGJIw== X-Received: by 2002:a17:903:110e:b0:199:10d2:b9da with SMTP id n14-20020a170903110e00b0019910d2b9damr27352473plh.58.1676236258907; Sun, 12 Feb 2023 13:10:58 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.10.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:10:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/27] git: ignore CVE-2022-41953 Date: Sun, 12 Feb 2023 11:10:20 -1000 Message-Id: <72438f0a54296a12cfd770c5c67b1e038f019dee.1676236110.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 ; Sun, 12 Feb 2023 21:11:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177048 From: Ross Burton This is specific to Git-for-Windows. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit c8849af809e0213d43e18e5d01067eeeb61b330d) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git_2.35.6.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/git/git_2.35.6.bb b/meta/recipes-devtools/git/git_2.35.6.bb index 016b743ece..0bb4a6a021 100644 --- a/meta/recipes-devtools/git/git_2.35.6.bb +++ b/meta/recipes-devtools/git/git_2.35.6.bb @@ -31,6 +31,8 @@ CVE_PRODUCT = "git-scm:git" # in mirrored git repos. Most OE users wouldn't build the docs and # we don't see this as a major issue for our general users/usecases. CVE_CHECK_IGNORE += "CVE-2022-24975" +# This is specific to Git-for-Windows +CVE_CHECK_IGNORE += "CVE-2022-41953" PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = "" From patchwork Sun Feb 12 21:10: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: 19430 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 B2C97C636D7 for ; Sun, 12 Feb 2023 21:11:07 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.21034.1676236261865181292 for ; Sun, 12 Feb 2023 13:11:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wAEiwOfD; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id z14-20020a17090abd8e00b00233bb9d6bdcso5189656pjr.4 for ; Sun, 12 Feb 2023 13:11:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=gACT8Kqq78INsNEdr5CStBfAmzgT0wPt94Z1IJ+AQ48=; b=wAEiwOfD3tOT/XIsZn1AKaLdN4cOdTB/41APyS6sk2E0h4tyeYAKFAITdv5jYdIR2n vr/vSE77GdHKa9MFIkoe29XNgrXY7iKhTh+u+QRlqozNVMoa//YCrbl8GvohoO7a+2Ht jj8bR3brouwKBKC2NQKcWDFz4LvF84KB9ws2P8GH1vBN7Ullfi02m+V3QczfeEKjkSXZ LAp6+aA2wJjYHAi3YdAuo+MM5eOIzJlM04/7HgtX/STiUuBrFdebDINmFIkYzCGtyhIH OOn6uHhaWI5UCigqQbUpHGyjn9hBwbhSfbFZMrSgmQoLdThYkYKkcQs576KkccKcvPDs l3kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=gACT8Kqq78INsNEdr5CStBfAmzgT0wPt94Z1IJ+AQ48=; b=CcEHrEpaSoJSs4QwWFjF32G8XOHR+Bwh21sqSKSIFpDMyGh6zO9A2k6JNgwtJxpWHm CntbVQ52R0737jUCeC8fXEyPpkbHY1fQsJHdZ61spCREtwZHnWK149ZxTTCtTEhmPQvU K9rEz4N6cEy5AhPkrLnhlLtXKUFpk0JUlwoGwN+V8YFpnG+fDa4AmCnTNz6txMvgMyJ3 XfpJAOTzdGxsdWxZzqfN9WwA+uu/bj7iA3nNxCtDhBu3BKBm5FuliOBZ9oZIgE059pe5 HAriOehy9j+5V01W6fisquc0I8yYGLLOCR2WNomtnmOvvwdleUCDRceoJMbpX985jqAI C1RQ== X-Gm-Message-State: AO0yUKW6SIEx8YIGcHV8dKSumFmMhhatw35qAkbYxe9vMMGtYRhRWiIy tevxnXg8IzqYDEDh6CsGsXO1h+4DhI/tGF4ihoc= X-Google-Smtp-Source: AK7set+sTBjVZWVENwM8hyf0hNpvq+xg0WGk5LzDlzTM2YyP+hQxOjn7drZ2gr27/Ff0HTQ7ZbZz/g== X-Received: by 2002:a17:903:283:b0:19a:96d8:8a37 with SMTP id j3-20020a170903028300b0019a96d88a37mr4070494plr.16.1676236260782; Sun, 12 Feb 2023 13:11:00 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.10.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/27] linux-yocto/5.15: update to v5.15.89 Date: Sun, 12 Feb 2023 11:10:21 -1000 Message-Id: <413a290b1a848bec1af67ba5e3343ce806f8b452.1676236110.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 ; Sun, 12 Feb 2023 21:11:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177049 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 3bcc86eb3ed9 Linux 5.15.89 37c18ef49ec3 pinctrl: amd: Add dynamic debugging for active GPIOs a5841b81adfa Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" 7ec9a45fc4ee block: handle bio_split_to_limits() NULL return ba86db02d408 io_uring/io-wq: only free worker if it was allocated for creation bb135bcc9499 io_uring/io-wq: free worker if task_work creation is canceled 63c2fa09b856 scsi: mpt3sas: Remove scsi_dma_map() error messages e2ea55564229 efi: fix NULL-deref in init error path 94b6cf84db42 arm64: cmpxchg_double*: hazard against entire exchange variable 3891fa4982b9 arm64: atomics: remove LL/SC trampolines 61e86339af2a arm64: atomics: format whitespace consistently ed4629d1e968 io_uring: lock overflowing for IOPOLL fbf501514182 KVM: x86: Do not return host topology information from KVM_GET_SUPPORTED_CPUID ee16841134be Documentation: KVM: add API issues section b8f3b3cffb4a mm: Always release pages to the buddy allocator in memblock_free_late(). d2dc110deabe platform/surface: aggregator: Add missing call to ssam_request_sync_free() cfd5978411ed igc: Fix PPS delta between two synchronized end-points 0bf52601ced1 perf build: Properly guard libbpf includes 205f35eee7be net/mlx5e: Don't support encap rules with gbp option 0526fc9330fe net/mlx5: Fix ptp max frequency adjustment range 9e2c38827cdc net/sched: act_mpls: Fix warning during failed attribute validation e3bb44beafde tools/nolibc: fix the O_* fcntl/open macro definitions for riscv 1e6ec75bb3b5 tools/nolibc: restore mips branch ordering in the _start block bd0431a66c39 tools/nolibc: Remove .global _start from the entry point code a77c54f5b50c tools/nolibc/arch: mark the _start symbol as weak da51e086d154 tools/nolibc/arch: split arch-specific code into individual files 8591e788bea3 tools/nolibc/types: split syscall-specific definitions into their own files 4fceecdeaa8a tools/nolibc/std: move the standard type definitions to std.h 1792136f228e tools/nolibc: use pselect6 on RISCV 487386a49e01 tools/nolibc: x86-64: Use `mov $60,%eax` instead of `mov $60,%rax` 27af4f2260cd tools/nolibc: x86: Remove `r8`, `r9` and `r10` from the clobber list a60b24192b1f af_unix: selftest: Fix the size of the parameter to connect() 39ae73e58111 nfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame() f6003784b1f6 hvc/xen: lock console list traversal 79c58b74244d octeontx2-af: Fix LMAC config in cgx_lmac_rx_tx_enable 303d06288122 tipc: fix unexpected link reset due to discovery messages e79d0f97cc6e ALSA: usb-audio: Relax hw constraints for implicit fb sync c9557906bd3b ALSA: usb-audio: Make sure to stop endpoints before closing EPs 83e758105bc8 ASoC: wm8904: fix wrong outputs volume after power reactivation 7c26d218729b scsi: ufs: core: WLUN suspend SSU/enter hibern8 fail recovery 513fdf0b8e20 scsi: ufs: Stop using the clock scaling lock in the error handler 13259b60b71b scsi: mpi3mr: Refer CONFIG_SCSI_MPI3MR in Makefile 470f6a9175f1 regulator: da9211: Use irq handler when ready 24107ad469df x86/resctrl: Fix task CLOSID/RMID update race cd3da505fb35 EDAC/device: Fix period calculation in edac_device_reset_delay_period() ab0d02c53a60 x86/boot: Avoid using Intel mnemonics in AT&T syntax asm a90d339f1f66 powerpc/imc-pmu: Fix use of mutex in IRQs disabled section 511cf17b2447 netfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function. b22faa21b623 sched/core: Fix use-after-free bug in dup_user_cpus_ptr() d766ccadbe85 iommu/mediatek-v1: Fix an error handling path in mtk_iommu_v1_probe() c929a230c844 iommu/iova: Fix alloc iova overflows issue 4b51aa263ae4 usb: ulpi: defer ulpi_register on ulpi_read_id timeout 9a8bf443f6a2 bus: mhi: host: Fix race between channel preparation and M0 event 456e3794e08a ipv6: raw: Deduct extension header length in rawv6_push_pending_frames 4c93422a54cd ixgbe: fix pci device refcount leak e97da5d97a97 platform/x86: sony-laptop: Don't turn off 0x153 keyboard backlight during probe f3b1e04daf86 dt-bindings: msm/dsi: Don't require vcca-supply on 14nm PHY 52a5f596c6cc dt-bindings: msm/dsi: Don't require vdds-supply on 10nm PHY 984ad875db80 drm/msm/dp: do not complete dp_aux_cmd_fifo_tx() if irq is not for aux transfer 92ae83665e9e platform/x86: ideapad-laptop: Add Legion 5 15ARH05 DMI id to set_fn_lock_led_list[] e38b5f81dfa8 dt-bindings: msm: dsi-phy-28nm: Add missing qcom, dsi-phy-regulator-ldo-mode bb32ab40cb7f dt-bindings: msm: dsi-controller-main: Fix description of core clock 3fb8d10beef9 dt-bindings: msm: dsi-controller-main: Fix power-domain constraint dc5b651cad66 drm/msm/adreno: Make adreno quirks not overwrite each other 757d665ee1fe dt-bindings: msm: dsi-controller-main: Fix operating-points-v2 constraint c90cf47d309a platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting 25b5f693bc2d platform/surface: aggregator: Ignore command messages not intended for us ee7b8ce2cc28 platform/x86: dell-privacy: Only register SW_CAMERA_LENS_COVER if present e0072068adaf cifs: Fix uninitialized memory read for smb311 posix symlink create f3495b5e9e68 net/mlx5e: Set action fwd flag when parsing tc action goto 1a8431cc202a drm/i915/gt: Reset twice 011ecdbcd520 drm/virtio: Fix GEM handle creation UAF 798dfeeae33d s390/percpu: add READ_ONCE() to arch_this_cpu_to_op_simple() a400593eb373 s390/cpum_sf: add READ_ONCE() semantics to compare and swap loops d4fa65960a9d ASoC: qcom: lpass-cpu: Fix fallback SD line index handling 8400b91c11db s390/kexec: fix ipl report address for kdump c07e0babd1df perf auxtrace: Fix address filter duplicate symbol selection e81d82da619a net: stmmac: add aux timestamps fifo clearance wait 44167b74a8a3 docs: Fix the docs build with Sphinx 6.0 24176bf2a145 efi: tpm: Avoid READ_ONCE() for accessing the event log 01b966b14c6e selftests: kvm: Fix a compile error in selftests/kvm/rseq_test.c c773ebe11c39 KVM: arm64: nvhe: Fix build with profile optimization c1d6a72fc810 KVM: arm64: Fix S1PTW handling on RO memslots e04e6cd8830f ALSA: hda/realtek: Enable mute/micmute LEDs on HP Spectre x360 13-aw0xxx b983c9a9714e ALSA: hda/realtek - Turn on power early 9ab3696881ca ALSA: control-led: use strscpy in set_led_id() a8acfe2c6fb9 netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits 90bb4f8f399f Linux 5.15.88 cbd3e6d5e516 ALSA: hda - Enable headset mic on another Dell laptop with ALC3254 b98dee474642 ALSA: hda/hdmi: Add a HP device 0x8715 to force connect list 26350c21bc5e ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF dadd0dcaa67d net/ulp: prevent ULP without clone op from entering the LISTEN status 04941c1d5bb5 net: sched: disallow noqueue for qdisc classes 068b51219362 serial: fixup backport of "serial: Deassert Transmit Enable on probe in driver-specific way" 46aa1557581f selftests/vm/pkeys: Add a regression test for setting PKRU through ptrace 3c1940c54922 x86/fpu: Emulate XRSTOR's behavior if the xfeatures PKRU bit is not set 3f1c81426a9f x86/fpu: Allow PKRU to be (once again) written by ptrace. b29773d6b0bb x86/fpu: Add a pkru argument to copy_uabi_to_xstate() 9813c5fc22bc x86/fpu: Add a pkru argument to copy_uabi_from_kernel_to_xstate(). fea26e83a196 x86/fpu: Take task_struct* in copy_sigframe_from_user_to_xstate() d4d152017e1d parisc: Align parisc MADV_XXX constants with all other architectures Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 6398ae4f5c5d07500ffdf0ae1bc0ecf80b63dbca) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index d4f5b1cb20..fe945f970b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "62705725902924fafa34c7bcb4c18f2e3b7d473c" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine ?= "24b6f990294dadd1dad56030bb4f044f1cc550bc" +SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.89" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index a0af388e73..e3c5a3db22 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.89" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "6d10c8fe87e2037c751157ca8677588fa6e0f214" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine ?= "a615c596debf26252bbba9d03ac9eb30ed4d2819" +SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index a3895dde78..1154b0aa57 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "7463f1ff9674e97fa6bed05983d4828a219994d9" -SRCREV_machine:qemuarm64 ?= "09ebb2096efb9e23a1e2c47bf1926dbae0e3f051" -SRCREV_machine:qemumips ?= "a7058de4f88d9a7a3b3253a31bba703eaf6f78ea" -SRCREV_machine:qemuppc ?= "e43b0b8b142f689bc2e2297a5ca221fb0f802eb5" -SRCREV_machine:qemuriscv64 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemuriscv32 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemux86 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemux86-64 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemumips64 ?= "75a87ddede429ee1070118f54d38183ee4c81b59" -SRCREV_machine ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine:qemuarm ?= "d624f7bdbfcfc826f4482e860698d4b7eb9bdbbe" +SRCREV_machine:qemuarm64 ?= "2c4a0624a2de2f262d8c86729e5fa15fc1e57fcc" +SRCREV_machine:qemumips ?= "99b36760d2ae2c97b9a300f2a9baf70f4d6aee8d" +SRCREV_machine:qemuppc ?= "7e2d97348966a55d5c4fcfd5bff9b2959becf2c8" +SRCREV_machine:qemuriscv64 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_machine:qemuriscv32 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_machine:qemux86 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_machine:qemux86-64 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_machine:qemumips64 ?= "574cd19f6aa1dc13e1b32d6197516f9859666d99" +SRCREV_machine ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "d57287729e229188e7d07ef0117fe927664e08cb" +SRCREV_machine:class-devupstream ?= "3bcc86eb3ed952c22ceecce8932dde72ea01f8cc" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.89" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Sun Feb 12 21:10: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: 19431 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 B4788C64EC7 for ; Sun, 12 Feb 2023 21:11:07 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.20821.1676236264093488643 for ; Sun, 12 Feb 2023 13:11:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uB8cbPri; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id be8so11624218plb.7 for ; Sun, 12 Feb 2023 13:11:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=0JMSy1ROvI83z3EkALuhXXIFsZ58dgYvYtU0zXQceiw=; b=uB8cbPriKRifsumqellTlpq7ZnXLDCQxj4A78+4b/x8U4an7hpo/6waVMRLIoV27Vd iXqtIKwEKLaLqYP7pi8cSsZ9GuhfIRUwfG+7OS4IDS7ii2zmDeFFons7GEz8F+8wgVtq 6GrV9DwM0cxbPWq7c0FaMq0niz28gcAlAQ3LaILF0feOvyjbhp3XI18Dao+nClzjId6N E5+D7TcE5i8QXec9BTqWFOT5O1S6gr93BqBK+b2aELlxeT/fOlvQt2Z3m/4Bg8rVsWoK 00WJrwEQ4AFaSzLXnqSVxI+ylMKyt3c6bpwb2pwKRZD8JF13oqyIEITa8dD2ZSNzYvvg /FGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=0JMSy1ROvI83z3EkALuhXXIFsZ58dgYvYtU0zXQceiw=; b=6R0QiPV1W4rhwJ0fwVyDFf+ROnXvWOJqzEwiU3WOnkN7JxqziptmW2/4dVovwiGKki dphu/1GgxUyYHDuA4r1hwGJbTS0mf4E1XdYwXP8Du+4cOM6KeJGVWhJbyGYSehGVzDPj uOz8xL8/3zi5D1uaBKk6a9cZvwO7xFy69LLU/ZN87+cxsooHmBTbFIfsi7iS4cvIY6LH MuYMZ1Sk/eFpY13DbWRmgSTJ7vBG3dzM+mbRQjSPMP+Ae6fPn5vKTS4pw2Ud87lARzgp 6bKFu6eXpW6vdSeyyayAXPb4JPAzGgjMxfQsycSyQixFTFiDTQVyv7MfApZZVpgaVvkv VZCQ== X-Gm-Message-State: AO0yUKWBObTlrsLrx+9YCn7+Pj0t5B7WLBkCYk9LFkxXlzWAmS6dKpyg lGJ7+ClhuCVKyMa15SwSNpAs6SJogmHL8zvDGBo= X-Google-Smtp-Source: AK7set8Q7owQ6Vcmp86FXkM7vIpuUxHTmghC1RABm03UYVFBRtDjo8IAKvH+kXiuXODWJXwZd5Ym6Q== X-Received: by 2002:a17:902:dacd:b0:198:9683:9f0a with SMTP id q13-20020a170902dacd00b0019896839f0amr28408324plx.30.1676236262745; Sun, 12 Feb 2023 13:11:02 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:02 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/27] linux-yocto/5.15: update to v5.15.91 Date: Sun, 12 Feb 2023 11:10:22 -1000 Message-Id: <420863a6eb5f6aac1d6ddd0271ac8b7bfb46b465.1676236110.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 ; Sun, 12 Feb 2023 21:11:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177050 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 9cf4111cdf94 Linux 5.15.91 14cc13e433e1 perf/x86/amd: fix potential integer overflow on shift of a int 033636b32258 netfilter: conntrack: unify established states for SCTP paths 0b08201158f1 x86/i8259: Mark legacy PIC interrupts with IRQ_LEVEL b57740036792 block: fix and cleanup bio_check_ro 1d152437e46f kbuild: Allow kernel installation packaging to override pkg-config a1964688582d cpufreq: governor: Use kobject release() method to free dbs_data 7c513ced0dec cpufreq: Move to_gov_attr_set() to cpufreq.h cf7a08622d2b Revert "Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode" 53c5d61198c1 tools: gpio: fix -c option of gpio-event-mon a7d1a303ff0f treewide: fix up files incorrectly marked executable 046fe53907c5 net: mdio-mux-meson-g12a: force internal PHY off on mux switch 86bdccde7842 net/tg3: resolve deadlock in tg3_reset_task() during EEH 4364bf79d829 thermal: intel: int340x: Add locking to int340x_thermal_get_trip_type() e69c3a0d9d3d net: mctp: mark socks as dead on unhash, prevent re-add 954cc215cd7a net: ravb: Fix possible hang if RIS2_QFF1 happen 0f7218bf0a00 net: ravb: Fix lack of register setting after system resumed for Gen3 3db4ca2938eb ravb: Rename "no_ptp_cfg_active" and "ptp_cfg_active" variables 621f296f11cf gpio: mxc: Unlock on error path in mxc_flip_edge() 071a8392869f nvme: fix passthrough csi check 614471b7f7cd riscv/kprobe: Fix instruction simulation of JALR 3391bd42351b sctp: fail if no bound addresses can be used for a given scope b0784860e145 net/sched: sch_taprio: do not schedule in taprio_reset() d2d3ab1b1de3 netrom: Fix use-after-free of a listening socket. 9df5ab02c65e netfilter: conntrack: fix vtag checks for ABORT/SHUTDOWN_COMPLETE ca3cf947760d ipv4: prevent potential spectre v1 gadget in fib_metrics_match() d50e7348b44f ipv4: prevent potential spectre v1 gadget in ip_metrics_convert() ead06e3449f2 netlink: annotate data races around sk_state c4eb423c6b9b netlink: annotate data races around dst_portid and dst_group fac9b69a9370 netlink: annotate data races around nlk->portid 8a13595600f7 netfilter: nft_set_rbtree: skip elements in transaction from garbage collection 2bf1435fa19d netfilter: nft_set_rbtree: Switch to node list walk for overlap detection e481654426b6 drm/i915/selftest: fix intel_selftest_modify_policy argument types 66689a72ba73 net: fix UaF in netns ops registration error path 41b74e95f297 netlink: prevent potential spectre v1 gadgets 2f29d780bd69 i2c: designware: use casting of u64 in clock multiplication to avoid overflow b03f7ed9af6e scsi: ufs: core: Fix devfreq deadlocks 858d7e9218e1 net: mana: Fix IRQ name - add PCI and queue number bff5243bd326 EDAC/qcom: Do not pass llcc_driv_data as edac_device_ctl_info's pvt_info 5eedf4568d34 EDAC/device: Respect any driver-supplied workqueue polling value 4b7dfd0a6811 ARM: 9280/1: mm: fix warning on phys_addr_t to void pointer assignment 7807871f28f8 ipv6: fix reachability confirmation with proxy_ndp f9a22f6fa187 thermal: intel: int340x: Protect trip temperature from concurrent updates 036093c08d83 KVM: arm64: GICv4.1: Fix race with doorbell on VPE activation/deactivation c56683c0623e KVM: x86/vmx: Do not skip segment attributes if unusable bit is set e91308e63710 ovl: fail on invalid uid/gid mapping at copy up 33a9657d67a4 ksmbd: limit pdu length size according to connection status 8d83a758ee21 ksmbd: downgrade ndr version error message to debug 87a7f38a9058 ksmbd: do not sign response to session request for guest login 4210c3555db4 ksmbd: add max connections parameter cc6742b160fa ksmbd: add smbd max io size parameter 3c8a5648a591 i2c: mv64xxx: Add atomic_xfer method to driver e619ab4fb3e9 i2c: mv64xxx: Remove shutdown method from driver 4b83bc6f87ee cifs: Fix oops due to uncleared server->smbd_conn in reconnect 89042d3d8542 ftrace/scripts: Update the instructions for ftrace-bisect.sh 592ba7116fa6 trace_events_hist: add check for return value of 'create_hist_field' b0af180514ed tracing: Make sure trace_printk() can output as soon as it can be used 91135d723388 module: Don't wait for GOING modules 85ee9919add9 KVM: SVM: fix tsc scaling cache logic f0227eca972c scsi: hpsa: Fix allocation size for scsi_host_alloc() e5af9a458a13 drm/amdgpu: complete gfxoff allow signal during suspend without delay 62b9e9f92109 Bluetooth: hci_sync: cancel cmd_timer if hci_open failed 21998acd31fb exit: Use READ_ONCE() for all oops/warn limit reads e82b1598eb2c docs: Fix path paste-o for /sys/kernel/warn_count 1c51698ad6f6 panic: Expose "warn_count" to sysfs 0691ddae56cd panic: Introduce warn_limit 7b98914a6c26 panic: Consolidate open-coded panic_on_warn checks fc636b136272 exit: Allow oops_limit to be disabled 339f8a8e5211 exit: Expose "oops_count" to sysfs f80fb0001f11 exit: Put an upper limit on how often we can oops 2857ce7f475f panic: Separate sysctl logic from CONFIG_SMP e156d4dcb036 ia64: make IA64_MCA_RECOVERY bool instead of tristate 9024f772248e csky: Fix function name in csky_alignment() and die() 2ea497d153da h8300: Fix build errors from do_exit() to make_task_dead() transition a452ca0228bb hexagon: Fix function name in die() 3b39f47474a2 objtool: Add a missing comma to avoid string concatenation 39a26d872178 exit: Add and use make_task_dead. b5c1acaa43b6 kasan: no need to unset panic_on_warn in end_report() b5c967dc6822 ubsan: no need to unset panic_on_warn in ubsan_epilogue() e4cd2100324e panic: unset panic_on_warn inside panic() 191f1f1f6a42 kernel/panic: move panic sysctls to its own file 654f6e851271 sysctl: add a new register_sysctl_init() interface 3aa991cde94b fs: reiserfs: remove useless new_opts in reiserfs_remount d830531f8fff x86: ACPI: cstate: Optimize C3 entry on AMD CPUs 1f5476223100 drm/i915: Remove unused variable 6e1012709320 Revert "selftests/bpf: check null propagation only neither reg is PTR_TO_BTF_ID" 619ee31b9641 drm/i915: Allow switching away via vga-switcheroo if uninitialized ea435ba9eb85 firmware: coreboot: Check size of table entry and use flex-array a4e70bcf2e87 lockref: stop doing cpu_relax in the cmpxchg loop b0ee61f5eeab platform/x86: asus-nb-wmi: Add alternate mapping for KEY_SCREENLOCK e8d2f7f56691 platform/x86: touchscreen_dmi: Add info for the CSL Panther Tab HD 2e0a8bacbe1d r8152: add vendor/device ID pair for Microsoft Devkit d4b717e34dac scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id e15750aa28a6 KVM: s390: interrupt: use READ_ONCE() before cmpxchg() 9300c65207f3 spi: spidev: remove debug messages that access spidev->spi without locking 48ff5d381298 ASoC: fsl-asoc-card: Fix naming of AC'97 CODEC widgets 5001ffb31d63 ASoC: fsl_ssi: Rename AC'97 streams to avoid collisions with AC'97 CODEC b76120e20683 cpufreq: armada-37xx: stop using 0 as NULL pointer eda26fa8560d perf/x86/intel/uncore: Add Emerald Rapids 544f9d4e9d8a perf/x86/msr: Add Emerald Rapids b1eb964d785f s390: expicitly align _edata and _end symbols on page boundary fb45ec279b00 s390/debug: add _ASM_S390_ prefix to header guard cd488abed97e drm: Add orientation quirk for Lenovo ideapad D330-10IGL ff7ab370b855 net: usb: cdc_ether: add support for Thales Cinterion PLS62-W modem d6935084e444 ASoC: fsl_micfil: Correct the number of steps on SX controls ac07316b2d57 cpufreq: Add SM6375 to cpufreq-dt-platdev blocklist f0e6dcae1491 kcsan: test: don't put the expect array on the stack c51c0b37543a cpufreq: Add Tegra234 to cpufreq-dt-platdev blocklist 28e4e8ca9e95 scsi: iscsi: Fix multiple iSCSI session unbind events sent to userspace 14b1df2004fe tcp: fix rate_app_limited to default to 1 120b8e527e07 net: stmmac: enable all safety features by default a7d736cc3c6c thermal: core: call put_device() only after device_register() fails ed08f958e481 thermal/core: fix error code in __thermal_cooling_device_register() 108a6f91e276 thermal: Validate new state in cur_state_store() bd0ea77edf46 thermal/core: Rename 'trips' to 'num_trips' 521c6ebd4f6e thermal/core: Remove duplicate information when an error occurs 6504afa2632a net: dsa: microchip: ksz9477: port map correction in ALU table entry register 18346db1854a selftests/net: toeplitz: fix race on tpacket_v3 block close caa28c7c83e3 driver core: Fix test_async_probe_init saves device in wrong array 89c62cee5d4d w1: fix WARNING after calling w1_process() 3d0eafe413a7 w1: fix deadloop in __w1_remove_master_device() 7701a4bd45c1 device property: fix of node refcount leak in fwnode_graph_get_next_endpoint() ed0d8f731e0b ptdma: pt_core_execute_cmd() should use spinlock 29e9c67bf327 octeontx2-pf: Fix the use of GFP_KERNEL in atomic context on rt 03bff5819ad3 tcp: avoid the lookup process failing to get sk in ehash table 5bd69d2ea897 nvme-pci: fix timeout request state check 39178dfe8677 drm/amd/display: fix issues with driver unload 9a5a537e1444 phy: phy-can-transceiver: Skip warning if no "max-bitrate" 4095065b59bc dmaengine: xilinx_dma: call of_node_put() when breaking out of for_each_child_of_node() 5bd3c1c1bce1 cifs: fix potential deadlock in cache_refresh_path() 1a2a47b85cab HID: betop: check shape of output reports b2a730974373 l2tp: prevent lockdep issue in l2tp_tunnel_register() edf0e509cedd virtio-net: correctly enable callback during start_xmit d3401c7624ec net: macb: fix PTP TX timestamp failure due to packet padding 71c601965532 dmaengine: Fix double increment of client_count in dma_chan_get() 1e7919f0b156 drm/panfrost: fix GENERIC_ATOMIC64 dependency a1b3e50e2140 net: mlx5: eliminate anonymous module_init & module_exit 09e3fb6f53bc net/mlx5: E-switch, Fix setting of reserved fields on MODIFY_SCHEDULING_ELEMENT 01a6e108101f net: ipa: disable ipa interrupt during suspend 98aec50ff7f6 Bluetooth: Fix possible deadlock in rfcomm_sk_state_change 0e59f60b74cd usb: gadget: f_fs: Ensure ep0req is dequeued before free_request ae8e136bcaae usb: gadget: f_fs: Prevent race during ffs_ep0_queue_wait f25cd2b731d7 HID: revert CHERRY_MOUSE_000C quirk 39483511fd59 pinctrl: rockchip: fix mux route data for rk3568 1dae88a0b4df net: stmmac: fix invalid call to mdiobus_get_phy() 6716838bf801 HID: check empty report_list in bigben_probe() 2b4956825436 HID: check empty report_list in hid_validate_values() ad67de330d83 net: mdio: validate parameter addr in mdiobus_get_phy() 486912937933 net: usb: sr9700: Handle negative len 2827c4eb429d octeontx2-pf: Avoid use of GFP_KERNEL in atomic context 77e8ed776cdb l2tp: close all race conditions in l2tp_tunnel_register() af22d2c0b47f l2tp: convert l2tp_tunnel_list to idr 22c7d45ca3d7 l2tp: Don't sleep and disable BH under writer-side sk_callback_lock 87d9205d9a57 l2tp: Serialize access to sk_user_data with sk_callback_lock c53acbf2facf net/sched: sch_taprio: fix possible use-after-free 40516d042b65 net: stmmac: Fix queue statistics reading 620aa67f8059 pinctrl: rockchip: fix reading pull type on rk3568 ddca674af1ba pinctrl/rockchip: add error handling for pull/drive register getters 259ab8fb8c7e pinctrl/rockchip: Use temporary variable for struct device 8cbf932c5c40 wifi: rndis_wlan: Prevent buffer overflow in rndis_query_oid f792d26e5ce7 gpio: mxc: Always set GPIOs used as interrupt source to INPUT mode 8335f877efe7 gpio: mxc: Protect GPIO irqchip RMW with bgpio spinlock fb4fb3d267c9 gpio: use raw spinlock for gpio chip shadowed data 52e3eebfe670 sch_htb: Avoid grafting on htb_destroy_class_offload when destroying htb 8232e5a84d25 net: enetc: avoid deadlock in enetc_tx_onestep_tstamp() 95347e41cac6 net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs 7f129927feaf net: nfc: Fix use-after-free in local_cleanup() 397aaac88469 phy: rockchip-inno-usb2: Fix missing clk_disable_unprepare() in rockchip_usb2phy_power_on() 01bdcc73dbe7 bpf: Fix pointer-leak due to insufficient speculative store bypass mitigation 261e2f12b653 amd-xgbe: Delay AN timeout during KR training a8cf4af5441f amd-xgbe: TX Flow Ctrl Registers are h/w ver dependent 8e897cb67421 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60 0a27dcd53430 NFSD: fix use-after-free in nfsd4_ssc_setup_dul() 24af570c99b4 phy: ti: fix Kconfig warning and operator precedence 631fc3668539 arm64: dts: qcom: msm8992-libra: Fix the memory map dda20ffec8fb arm64: dts: qcom: msm8992-libra: Add CPU regulators 37ba5e929349 arm64: dts: qcom: msm8992: Don't use sfpb mutex bab87524f6d4 PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe() b7a479c76481 affs: initialize fsdata in affs_truncate() 623d1116898e IB/hfi1: Remove user expected buffer invalidate race 47d5fc0dcd57 IB/hfi1: Immediately remove invalid memory from hardware 85caef2cfd1d IB/hfi1: Fix expected receive setup error exit issues cb193984d424 IB/hfi1: Reserve user expected TIDs 891ddfae39f1 IB/hfi1: Reject a zero-length user expected buffer 362c9489720b RDMA/core: Fix ib block iterator counter overflow e26c571c3b0d tomoyo: fix broken dependency on *.conf.default 7dfe83ecc341 firmware: arm_scmi: Harden shared memory access in fetch_notification a653dbb70cce firmware: arm_scmi: Harden shared memory access in fetch_response caffa7fed139 EDAC/highbank: Fix memory leak in highbank_mc_probe() 95de286200b2 reset: uniphier-glue: Fix possible null-ptr-deref 4773a8cf9a53 reset: uniphier-glue: Use reset_control_bulk API 7b33accc8ff9 soc: imx8m: Fix incorrect check for of_clk_get_by_name() f07427f8d9c6 arm64: dts: imx8mm-venice-gw7901: fix USB2 controller OC polarity c4cb73febe35 HID: intel_ish-hid: Add check for ishtp_dma_tx_map 25f97c9883bf ARM: imx: add missing of_node_put() 3e9d79ded9d6 arm64: dts: imx8mm-beacon: Fix ecspi2 pinmux 538135076191 ARM: dts: imx6qdl-gw560x: Remove incorrect 'uart-has-rtscts' 0e4bba1656a4 ARM: dts: imx7d-pico: Use 'clock-frequency' 108cf4c6d510 ARM: dts: imx6ul-pico-dwarf: Use 'clock-frequency' 207c9e64edba arm64: dts: imx8mp-phycore-som: Remove invalid PMIC property 7ce380fe7574 dmaengine: ti: k3-udma: Do conditional decrement of UDMA_CHAN_RT_PEER_BCNT_REG edba9b7a7037 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe() e66f6949da63 memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe() eda11ab55614 memory: tegra: Remove clients SID override programming aabd5ba7e9b0 Linux 5.15.90 4b6f8263e931 io_uring/rw: remove leftover debug statement b10acfcd61b2 io_uring/rw: ensure kiocb_end_write() is always called 124fb13cc757 io_uring: fix double poll leak on repolling e944f1e37b97 io_uring: Clean up a false-positive warning from GCC 9.3.0 940e8922c1f5 mm/khugepaged: fix collapse_pte_mapped_thp() to allow anon_vma e83cc8a780e6 soc: qcom: apr: Make qcom,protection-domain optional again 982c8b1e95c0 Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()" 40a4797e08ec block: mq-deadline: Rename deadline_is_seq_writes() 3abf10b4c473 net/mlx5: fix missing mutex_unlock in mlx5_fw_fatal_reporter_err_work() 1aab00aa4192 net/ulp: use consistent error code when blocking ULP 2e4c95a404f3 io_uring/net: fix fast_iov assignment in io_setup_async_msg() 311b298a3337 io_uring: io_kiocb_update_pos() should not touch file for non -1 offset 487a086595b5 tracing: Use alignof__(struct {type b;}) instead of offsetof() 430443f8565e x86/fpu: Use _Alignof to avoid undefined behavior in TYPE_ALIGN f114717dfa74 Revert "drm/amdgpu: make display pinning more flexible (v2)" 7a993c1be595 efi: rt-wrapper: Add missing include de2af657cab9 arm64: efi: Execute runtime services from a dedicated stack 9cca110cf8bb fs/ntfs3: Fix attr_punch_hole() null pointer derenference d4d112e5c458 drm/amdgpu: drop experimental flag on aldebaran c82fa690da7c drm/amd/display: Fix COLOR_SPACE_YCBCR2020_TYPE matrix 88c33752248e drm/amd/display: Calculate output_color_space after pixel encoding adjustment 87e605b16111 drm/amd/display: Fix set scaling doesn's work 8687b8cdc3a3 drm/i915/display: Check source height is > 0 5d961791663d drm/i915: re-disable RC6p on Sandy Bridge e9a7ec188b26 mei: me: add meteor lake point M DID eb0421d90f91 gsmi: fix null-deref in gsmi_get_variable b8d99cda526b serial: atmel: fix incorrect baudrate setup b85498385afc serial: amba-pl011: fix high priority character transmission in rs486 mode 0f150134dd79 dmaengine: idxd: Let probe fail when workqueue cannot be enabled 1e8c127c2e81 dmaengine: tegra210-adma: fix global intr clear 473e2281f712 dmaengine: lgm: Move DT parsing after initialization 73337724cbd8 serial: pch_uart: Pass correct sg to dma_unmap_sg() 4307a41cbc44 dt-bindings: phy: g12a-usb3-pcie-phy: fix compatible string documentation c9d55f564a69 dt-bindings: phy: g12a-usb2-phy: fix compatible string documentation 78aa45bb7a42 usb-storage: apply IGNORE_UAS only for HIKSEMI MD202 on RTL9210 a69c8dfb85b4 usb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate() 1ab67e87b178 usb: gadget: g_webcam: Send color matching descriptor per frame b08167d8f07c usb: typec: altmodes/displayport: Fix pin assignment calculation 7fb1322e7a8c usb: typec: altmodes/displayport: Add pin assignment helper 59f9ee379640 usb: typec: tcpm: Fix altmode re-registration causes sysfs create fail a1c8a5c2f8aa usb: host: ehci-fsl: Fix module alias f073d10cd5a7 usb: cdns3: remove fetched trb from cache before dequeuing 73f4bde9730f USB: serial: cp210x: add SCALANCE LPE-9000 device id a2e075f40122 USB: gadgetfs: Fix race between mounting and unmounting 2da67bff29ab tty: fix possible null-ptr-defer in spk_ttyio_release cb53a3366eb2 tty: serial: qcom-geni-serial: fix slab-out-of-bounds on RX FIFO buffer f322dd2e4a1c staging: mt7621-dts: change some node hex addresses to lower case 6508788b2c3b bpf: restore the ebpf program ID for BPF_AUDIT_UNLOAD and PERF_BPF_EVENT_PROG_UNLOAD 7b122c33bd31 riscv: dts: sifive: fu740: fix size of pcie 32bit memory 701f9c3da692 thunderbolt: Use correct function to calculate maximum USB3 link rate 5b1b03a3d3e4 cifs: do not include page data when checking signature 64287cd456a2 btrfs: fix race between quota rescan and disable leading to NULL pointer deref f2e0e1615d65 btrfs: do not abort transaction on failure to write log tree when syncing log f653abe6195c mmc: sdhci-esdhc-imx: correct the tuning start tap and step setting 9881436f01ce mmc: sunxi-mmc: Fix clock refcount imbalance during unbind 33bd0db750fc ACPI: PRM: Check whether EFI runtime is available 87e1ee6058e5 comedi: adv_pci1760: Fix PWM instruction handling b5d24a8e4a61 usb: core: hub: disable autosuspend for TI TUSB8041 61a0890cb95a misc: fastrpc: Fix use-after-free race condition for maps 1b7b7bb400dd misc: fastrpc: Don't remove map on creater_process and device_release e7e41fcf909f USB: misc: iowarrior: fix up header size for USB_DEVICE_ID_CODEMERCS_IOW100 f3de34d90d90 staging: vchiq_arm: fix enum vchiq_status return types 16d09c4bc99b USB: serial: option: add Quectel EM05CN modem 34d769f0c607 USB: serial: option: add Quectel EM05CN (SG) modem 768d56ed2411 USB: serial: option: add Quectel EC200U modem 829916f069a7 USB: serial: option: add Quectel EM05-G (RS) modem eb8808f769c6 USB: serial: option: add Quectel EM05-G (CS) modem 6e0430db195e USB: serial: option: add Quectel EM05-G (GR) modem f01aefe374d3 prlimit: do_prlimit needs to have a speculation check 418e2c756d65 xhci: Detect lpm incapable xHC USB3 roothub ports from ACPI tables 10cb7d53be5f usb: acpi: add helper to check port lpm capability using acpi _DSM 1818e2a97dab xhci: Add a flag to disable USB3 lpm on a xhci root port level. 8911ff796336 xhci: Add update_hub_device override for PCI xHCI hosts c462ac871f49 xhci: Fix null pointer dereference when host dies f39c813af0b6 usb: xhci: Check endpoint is valid before dereferencing it 0f175cebc46c xhci-pci: set the dma max_seg_size 89a410dbd0f1 io_uring/rw: defer fsnotify calls to task context 05d69b372b3b io_uring: do not recalculate ppos unnecessarily ff8a070253d9 io_uring: update kiocb->ki_pos at execution time b7958caf415b io_uring: remove duplicated calls to io_kiocb_ppos 86e2d6901a37 io_uring: ensure that cached task references are always put on exit 30b90689344b io_uring: fix async accept on O_NONBLOCK sockets a79b13f24967 io_uring: allow re-poll if we made progress 3c1a3d02690f io_uring: support MSG_WAITALL for IORING_OP_SEND(MSG) 390b8816317f io_uring: add flag for disabling provided buffer recycling 9b7b0f2116d5 io_uring: ensure recv and recvmsg handle MSG_WAITALL correctly cdc68e714d0b io_uring: improve send/recv error handling ccf06b5a981c io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups 77baf39227c0 eventfd: provide a eventfd_signal_mask() helper a2d8ff00a7b0 eventpoll: add EPOLL_URING_WAKE poll wakeup flag a9aa4aa7a5b2 io_uring: don't gate task_work run on TIF_NOTIFY_SIGNAL bd9a23a4bb8a hugetlb: unshare some PMDs when splitting VMAs 393d9e3ed10c drm/amd: Delay removal of the firmware framebuffer 865e244e06c7 drm/amdgpu: disable runtime pm on several sienna cichlid cards(v2) 560373fb1e9a ALSA: hda/realtek: fix mute/micmute LEDs don't work for a HP platform 26264260a80b ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook 1026756321bd efi: fix userspace infinite retry read efivars after EFI runtime services page fault 45627a1a6450 nilfs2: fix general protection fault in nilfs_btree_insert() 350d66d9e730 zonefs: Detect append writes at invalid locations 5054d001ffaf Add exception protection processing for vd in axi_chan_handle_err function a12fd43bd175 wifi: mac80211: sdata can be NULL during AMPDU start f96a6c009ed9 wifi: brcmfmac: fix regression for Broadcom PCIe wifi devices 908d1742b6e6 Bluetooth: hci_qca: Fix driver shutdown on closed serdev 7530fbc05ff5 fbdev: omapfb: avoid stack overflow warning e1df7f0b27c2 perf/x86/rapl: Treat Tigerlake like Icelake 2c129e868992 f2fs: let's avoid panic if extent_tree is not created 58bac7440251 x86/asm: Fix an assembler warning with current binutils fdb4a70bb768 btrfs: always report error in run_one_delayed_ref() f641067ea2af RDMA/srp: Move large values to a new enum for gcc13 793f8ac21874 r8169: move rtl_wol_enable_rx() and rtl_prepare_power_down() dc072762f900 net/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats 308d24d87599 vduse: Validate vq_num in vduse_validate_config() 8e1eb926a093 virtio_pci: modify ENOENT to EINVAL 64a6f3689d0d tools/virtio: initialize spinlocks in vring_test.c 95fc28a8e921 selftests/bpf: check null propagation only neither reg is PTR_TO_BTF_ID d4a9d2944f2e pNFS/filelayout: Fix coalescing test for single DS 6a3319af6b36 btrfs: fix trace event name typo for FLUSH_DELAYED_REFS Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 60c0f2100303bce62711c05efe9c8b775a804045) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index fe945f970b..8d299ca059 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "24b6f990294dadd1dad56030bb4f044f1cc550bc" -SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" +SRCREV_machine ?= "0567deb52d2f2c3cd3046f56ca3fb97a151cf6ec" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.89" +LINUX_VERSION ?= "5.15.91" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index e3c5a3db22..400ef75cc2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.89" +LINUX_VERSION ?= "5.15.91" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "a615c596debf26252bbba9d03ac9eb30ed4d2819" -SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" +SRCREV_machine ?= "01c387906b52214892aaea0664b3b4ead35fe484" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 1154b0aa57..60c088b9fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "d624f7bdbfcfc826f4482e860698d4b7eb9bdbbe" -SRCREV_machine:qemuarm64 ?= "2c4a0624a2de2f262d8c86729e5fa15fc1e57fcc" -SRCREV_machine:qemumips ?= "99b36760d2ae2c97b9a300f2a9baf70f4d6aee8d" -SRCREV_machine:qemuppc ?= "7e2d97348966a55d5c4fcfd5bff9b2959becf2c8" -SRCREV_machine:qemuriscv64 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_machine:qemuriscv32 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_machine:qemux86 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_machine:qemux86-64 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_machine:qemumips64 ?= "574cd19f6aa1dc13e1b32d6197516f9859666d99" -SRCREV_machine ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" +SRCREV_machine:qemuarm ?= "9c525056e4d5c3852fff6058bd7f6a648a3b645e" +SRCREV_machine:qemuarm64 ?= "30e3bff02675a3d10bd04c51f52f4a6b17b94d01" +SRCREV_machine:qemumips ?= "0dda96ab67034ee0f1db18c04fed33d2a4e2fec1" +SRCREV_machine:qemuppc ?= "43c8d401cf8092c19e47935c5667dacf754885d4" +SRCREV_machine:qemuriscv64 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemuriscv32 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemux86 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemux86-64 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemumips64 ?= "26e3543c62c04852896adc70584b1eaa59f15fad" +SRCREV_machine ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "3bcc86eb3ed952c22ceecce8932dde72ea01f8cc" +SRCREV_machine:class-devupstream ?= "9cf4111cdf9420fa99792ae16c8de23242bb2e0b" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.89" +LINUX_VERSION ?= "5.15.91" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Sun Feb 12 21:10: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: 19426 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 9D02CC05027 for ; Sun, 12 Feb 2023 21:11:07 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.20819.1676236259860303775 for ; Sun, 12 Feb 2023 13:11:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tuEiVK3a; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id mg23so3587873pjb.0 for ; Sun, 12 Feb 2023 13:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=uhKzQrFS5rBfhZl9uoOgWnO++9JD66YqLBWDH5xhS7g=; b=tuEiVK3auyOOqMmiei+Y8mkirJtOF3H334RSkStQ6mK2YCoq347lPmbOyn9vebV72O zbPK2mFHwV/MxVUH+sgqU2KfAyqZz4PLVVC9xiyDby69CZ3S3v1mKGpc6fPDZ1Pie43j NPj62kHH5qx1JiSkY3MCCOkRePFOJyCL0+1O64JT8D0FR+J07gwgQrG6TkwziT23U1/g Ezl+DyBDgB3Q8ySwKGCSk3iZPCtdS0o8dh/e+0egCHUa0eNqoktgJyscHIa4kKXLblUW kILLvELFi8EY7tUtIJ6SWqz+Vep510zyWllbpfDbq2wRUCbyAgxZ8ocmQpKBXwQpQHAV xFGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=uhKzQrFS5rBfhZl9uoOgWnO++9JD66YqLBWDH5xhS7g=; b=sMUx8XmcFo0nLXv0GJq80YdXW43AJMfIYj7OLS9sANb733Tf3fMOpVGm323I2kLSo3 SH8jEIqI30JXsI8+F5eoyf7NSk1eLKuzVjZHY+4Hy0WdyPrrpndD9CFIGiYZjDswYTqt s5UXkw6MGI2ru/Iu40XMzHru5zmb6lo9OtksEHz3MDHipDXqzNDR6GNYzt5j2Cx4Gmdj u++C6Vw5HTDAwrPABKX1KpcGA3jipJncKTJG1CvAggUctlF7v5E55LDW8Mys5x3BSUDm dab4HT3f0jboJXZx0At1+Wohk3JKiLt2zyayyoTQd/xYT/1qm4vInTNd8RC5Xd4VS6NA Azqw== X-Gm-Message-State: AO0yUKXAyVysTYhTnD+lZkppNKTd/XqwWwnWaJkUOc1pAyq26S5wzsFD IioXMUIi0gOgcvazOCXREb9c9sjKuHI2iPwiH8Y= X-Google-Smtp-Source: AK7set9r/RiqYlgqvXZqCJEBJhv2OwzqeTU5g7N8O7yfFxY7syrfDSn0wEIM0R/Qtqw01LfTC8Y9jg== X-Received: by 2002:a17:902:da84:b0:196:8c85:8aaa with SMTP id j4-20020a170902da8400b001968c858aaamr25378403plx.6.1676236264627; Sun, 12 Feb 2023 13:11:04 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:04 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/27] vulkan-samples: branch rename master -> main Date: Sun, 12 Feb 2023 11:10:23 -1000 Message-Id: <986af8c9ae9d2cab0bc0376757f40b096448ae2a.1676236110.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 ; Sun, 12 Feb 2023 21:11:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177051 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 74bf535ca5cbcfb38c18775ece863d53dd216008) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 3ad16490ce..ffb8d88ee6 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" -SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https;lfs=0 \ +SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \ file://debugfix.patch \ " From patchwork Sun Feb 12 21:10: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: 19427 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 9DE5BC636D4 for ; Sun, 12 Feb 2023 21:11:07 +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.21039.1676236267366923079 for ; Sun, 12 Feb 2023 13:11:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Tl/PF/nI; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id b5so11631235plz.5 for ; Sun, 12 Feb 2023 13:11:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=9HhoXqTm7NGsxvfx09idKWjJvv/BZS5wYSkFr02DAQA=; b=Tl/PF/nI6oSnkwfaQ5UMc38O6/cjddfOt3oeWwg5n3WTcp4NuGljqaO5wU6IHXXH9l QKR3VbY+4wjv61kBY4SEO6g9m+MBtGzz5lQmXS9gCjO61xtpVNjoqh5xqjnsNfgrLOyt 2av/rbGfoJtUTKeiCl4+VLUyC8R6Zbioap+g0BcEJypsMgsD8TosRE8iG4Conhiey1BT JTWaTsrLx4Zmhb4o+uQ0fWlwm8UFUtBO1PyYQMY6QiU32kU6DXTztErmxdZ1hcuXHsCH ohNjqmScqM5Eyk2M7fn0t1KTiYaBtSDdycMZYZYdSFWWZX4uyDe5duV0Fa0+E6fm1ZDy 2c9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=9HhoXqTm7NGsxvfx09idKWjJvv/BZS5wYSkFr02DAQA=; b=4GLnR5xPmoO+Ktc1ebNZurSYGCr3OVgBw8AE0fURpR2/PEWZ8yU+jxCEcT97Y9TiHu GXN0xaoc+rYo7vHK5IaorE0hpFCz4MWCgaybSR84ULTFwbNiwI6F6VAWN1h4aZr2cSbT fgx3GLk5MNX2s+pbqYNUj/iDN4s1z13lfLD24uwo7g1Td1nSIjGj2/VAlyIBnhAzUTkL Xj49uK6ntDNJboRNmCnb5XnaB8DbIsBmmMPvJsyKHOZsIEX8ddIIySaA5SYNVRMAImwu 2eukjyWOXhIq5gMt4PpEzMds1IB1CodJSLpWvY58E3QRf4F+bfFMIybI1oZGOgaV6oyI WknQ== X-Gm-Message-State: AO0yUKW7G6ma8HvGC5qsMi34+s/8wMSPE2m89pTbE2kNQs6sdeP0rwt+ 1AV9BcHzJ6zyswbWVUqpV3kUmjOEh2Jc24jErQI= X-Google-Smtp-Source: AK7set+mIcJZKFC1t9PPdNI6w2Wya0V/NN0XrCICyKHbqdDNy0XYFTIkP7gcv66M7peIu1eLuzuVKQ== X-Received: by 2002:a17:902:da8b:b0:199:38a:afd8 with SMTP id j11-20020a170902da8b00b00199038aafd8mr27013040plx.19.1676236266466; Sun, 12 Feb 2023 13:11:06 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/27] buildtools-tarball: set pkg-config search path Date: Sun, 12 Feb 2023 11:10:24 -1000 Message-Id: <9a110453f6b4b2c2d86af4ae20860037796a284d.1676236110.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 ; Sun, 12 Feb 2023 21:11:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177052 From: Ross Burton The buildtools-tarball includes a native sysroot with .pc files, and in the case of buildtools-extended-tarball a pkg-config binary too. If we're using the host pkg-config then it doesn't know to search in the native sysroot. If we're using our pkg-config then it searches in the build-time prefix and not the actual SDK installation location. Neither of these are correct, so set PKG_CONFIG_LIBDIR to search: - The native sysroot - The host pkg-config's default search path, if present - Falling back to /usr/lib/pkgconfig, if not In an ideal world this would be handled by the generic toolchain script, but that is slightly more involved. [ YOCTO #15007 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 8f768a3f4c7ff477e994d60800e5a1b83891615a) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/buildtools-tarball.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index de399173ba..34f7773398 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -75,6 +75,9 @@ create_sdk_files:append () { echo 'export REQUESTS_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script echo 'export CURL_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script fi + echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script + echo 'export PKG_CONFIG_LIBDIR=${SDKPATHNATIVE}/${libdir}/pkgconfig:${SDKPATHNATIVE}/${datadir}/pkgconfig:${HOST_PKG_PATH:-/usr/lib/pkgconfig:/usr/share/pkgconfig}' >>$script + echo 'unset HOST_PKG_PATH' toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} From patchwork Sun Feb 12 21:10: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: 19432 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 738A5C636D7 for ; Sun, 12 Feb 2023 21:11:13 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.21040.1676236269127637805 for ; Sun, 12 Feb 2023 13:11:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=FPggSeUi; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id bx22so10136597pjb.3 for ; Sun, 12 Feb 2023 13:11:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=AgAfpkQNqOJLtH47c74CM9wyFZJo+Fo3fzgcj/IUiww=; b=FPggSeUis03qgYnRf96mz8dQdzpW3BAvXAKBLIxa1ARDjWqL4OT87moCS++kPtDNVJ 3q0rIfDRCcZcG1eLcdsSMslm1GL9uriPhKd9gbfxuTN13W9F+xOuwfyfgrHQdLJracpR BTb/RXIC4vU4SZ9NsHWMKjfR0ymkwUJLqrd8uzGV2+v65dM+EYZ6O7+xOl/h51A93btC +TYqTxpgF0TTWGUUq+OW/3s/3wIvQravHqxaMFKkRElhWmvzxfmJaMxW/biB9x6WrSGo 09KwrywsXqSdIiVtxyZO+UtXFMiATWLC1QuX4vYsVgd9Va/Lo4u3unbPj7YDwCcgf2oO enPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=AgAfpkQNqOJLtH47c74CM9wyFZJo+Fo3fzgcj/IUiww=; b=sp2khTYPPwsHJcyFHKS0mKKd6wars5Z5zBeMPoiHAz88I/ucj01D2PrlBo3E1Lponl F+GtPu3NbEt9pU553wc8kBoIYyqVQpgeCRuXp+m+uPOlPP1fjUVwWBn8fQCsrx4h/+mA GUaM80USjvZdxl9EaBBMywP/jTuAaDgKHl0/d88S4lPUbL/nymH6mqdUr6kNBRiTFnzs B+UmRukjGYkAB7knoWmtHpV1fBr7mpHN8r0dqwIlKFRmdv1ff/O94w6tOxlIILpawxuA UcbI5Ax5+P7HBdZjHCNvEvkjC4BDhH8uiVJu+mVWnvpoMu2qwxRIWqVoAHBOT6jSyGSr +2sw== X-Gm-Message-State: AO0yUKXyKdnBE4Wq0rcW48h7ikSkFU+WY11qIH7OW5alNR4ERYMpCNPc xB4IeL7pv/aEN/7qH4tZoRqAVg1lyFzsQwf4nQo= X-Google-Smtp-Source: AK7set88MmaBgFNJUskyDm9MzksI7dLwHRIOk3/MlZDYE2bW6FYArMx41aaetQ6yy+KHCr6tFY4ZXw== X-Received: by 2002:a17:902:d2d1:b0:19a:6ca0:d06 with SMTP id n17-20020a170902d2d100b0019a6ca00d06mr12457789plc.37.1676236268250; Sun, 12 Feb 2023 13:11:08 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:07 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/27] kernel/linux-kernel-base: Fix kernel build artefact determinism issues Date: Sun, 12 Feb 2023 11:10:25 -1000 Message-Id: <4c302827365903b99a517651c2a14661ce78f79b.1676236110.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 ; Sun, 12 Feb 2023 21:11:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177053 From: Richard Purdie With the 6.1 kernel we've seen reproducibility/determinism issues where the kernel seems to rebuild headers referencing the hostname or local user. kernel-devsrc building after the kernel seemed to trigger it in some cases. Moving the definitions to the bbclass used by all the kernel recipe code including kernel-devsrc seems to be the best way to ensure this doesn't happen. Signed-off-by: Richard Purdie (cherry picked from commit 60681baa97daf4f3856453c34d6be08b6771a81b) Signed-off-by: Steve Sakoman --- meta/classes/kernel.bbclass | 3 --- meta/classes/linux-kernel-base.bbclass | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 54b006550d..df740af41d 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -204,9 +204,6 @@ PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-firmware-.*" export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" -export KBUILD_BUILD_VERSION = "1" -export KBUILD_BUILD_USER ?= "oe-user" -export KBUILD_BUILD_HOST ?= "oe-host" KERNEL_RELEASE ?= "${KERNEL_VERSION}" diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass index ba59222c24..73a6fe36d9 100644 --- a/meta/classes/linux-kernel-base.bbclass +++ b/meta/classes/linux-kernel-base.bbclass @@ -37,5 +37,9 @@ def linux_module_packages(s, d): suffix = "" return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) +export KBUILD_BUILD_VERSION = "1" +export KBUILD_BUILD_USER ?= "oe-user" +export KBUILD_BUILD_HOST ?= "oe-host" + # that's all From patchwork Sun Feb 12 21:10: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: 19433 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 73871C636D4 for ; Sun, 12 Feb 2023 21:11:13 +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.20817.1676236257901958271 for ; Sun, 12 Feb 2023 13:11:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=8QFyM43k; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d8so10409346plr.10 for ; Sun, 12 Feb 2023 13:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=JbWErJl5H9I7MHyubojrULiWuIOf187SSG7ccEMMjfA=; b=8QFyM43kZafdi70gUE0xCSI//EAMPEdZx0BHqIisT1l+ge2GC5hVKfEsaoUCav30rI 9DqGWDR78jf2gvKXmHUmC6ejZznz/vnHqxFJ99z9gVWl+zm8dZkrhyBzChod7wIOpkWL 8HYNWhH/x0QGqYCP2P/wduFSEOGV3VePbBG0fw+vFrJl+y6d/9n92ZSWfT3NYV+V2gbw p+wLVGgLsuB/VUsrAdMbqc0okE0ONUW/6zzBv8hHbotljTEbbL39Yp7qPz9uHB/X/UpT Nma1XN6cVawxBL2L02hyYXBSN60mDxPrQdIu8oorkVTTQ4pevyCYh2Q8Mr9Mfeakw7Hu o0Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=JbWErJl5H9I7MHyubojrULiWuIOf187SSG7ccEMMjfA=; b=W6rCZB9xrsi7pShoPREEg5b5rgx5A7XLrwb6tvUnu22gqT2mocpONgNYHjOML3HWga Z9lIIh/U3TVaj7TcA4bHsNTA+U605JKMpAMq7w08mlFHIFwXOtqfHutnglpPc4pdWfGN gARMJ/OiQaHZytnq+TMic0PsADqBoqmkqesiWMa2PNz58N2OlVsB8gxKmCrOQXizA4f0 WsMWa8QqKvOtP7ZjRsX//eMhoydbsW9InxiEP3+nBr/I4ATfEOQojnVFiGbAFkxrraYk HGqam4x+QoZUnGe64mYb7VTSXUtYSmkjp1sAyCcY+z8/DX1VTo2cJ1Bco7y49MdAWoZ6 Nydw== X-Gm-Message-State: AO0yUKUGTOsr5jXdmFEQFmtW6yLLdAIUHyIvD2OP8Wc5XVsimOog1WVz YxZsU506JUNDoiXtoof+jIETS67Rc1K2vJe+UYU= X-Google-Smtp-Source: AK7set+tFe6rT4W99SjtdAuOESZYNEzKmr/olB+QALABa99j0lHsm5GnMXH9dHncgQMIDWYwMhrwtA== X-Received: by 2002:a17:902:d10a:b0:19a:82d4:b2a6 with SMTP id w10-20020a170902d10a00b0019a82d4b2a6mr4659978plw.18.1676236269962; Sun, 12 Feb 2023 13:11:09 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/27] classes/fs-uuid: Fix command output decoding issue Date: Sun, 12 Feb 2023 11:10:26 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 12 Feb 2023 21:11:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177054 From: Pawel Zalewski The default return value from subprocess.check_output is an encoded byte. The applied fix will decode the value to a string. Signed-off-by: Pawel Zalewski Signed-off-by: Alexandre Belloni (cherry picked from commit 046769fa952a511865c416b80d10af6287147fb7) Signed-off-by: Steve Sakoman --- meta/classes/fs-uuid.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/fs-uuid.bbclass b/meta/classes/fs-uuid.bbclass index 9b53dfba7a..731ea575bd 100644 --- a/meta/classes/fs-uuid.bbclass +++ b/meta/classes/fs-uuid.bbclass @@ -4,7 +4,7 @@ def get_rootfs_uuid(d): import subprocess rootfs = d.getVar('ROOTFS') - output = subprocess.check_output(['tune2fs', '-l', rootfs]) + output = subprocess.check_output(['tune2fs', '-l', rootfs], text=True) for line in output.split('\n'): if line.startswith('Filesystem UUID:'): uuid = line.split()[-1] From patchwork Sun Feb 12 21:16: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: 19450 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 81A8EC636D3 for ; Sun, 12 Feb 2023 21:16:43 +0000 (UTC) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.groups.io with SMTP id smtpd.web11.133.1676236598355155462 for ; Sun, 12 Feb 2023 13:16:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=V3YCjO9C; spf=softfail (domain: sakoman.com, ip: 209.85.208.53, mailfrom: steve@sakoman.com) Received: by mail-ed1-f53.google.com with SMTP id bt8so4717841edb.12 for ; Sun, 12 Feb 2023 13:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=eNuAc9u+BCeqzflweBnMDeAQqwO4++GvCPkqU/pFC5U=; b=V3YCjO9CnUDTHxvLZwzb0gNCQcoO70NEpe90UvcJboGwfzTKB5NtyUysbmwMVnq+qf jsW3sM/SjIv92jzgoG3zXi0UkzsPUu2MvC7XUWbM036ZOHx2weSYq2GEPr6AdjJZnTqi +poTFEkW2B01mLqyYTsSEinKzcI/0t9yUoHlZ5z4VjGBlv7iMR3AuKB5L8/bNAFez0Dh 2DYBpehFx34YU6oa3nhB0/xdp3mA5NcVKW5rqgVPFi/ONr6CcsYodSpHXBncrQojdpjH BI9J1qESVq36aB6oJQpRqKBFp4SW+/bEJjc/saZ4LZWd8aNJe25GyNDJhdQRZqv8VVBl mdfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eNuAc9u+BCeqzflweBnMDeAQqwO4++GvCPkqU/pFC5U=; b=qi23QcSRBbaY/mP+eTagMu9vHHzV5Q7fDsvKEhoXDHvmQFW17OHrvOgJkoYkvnktjU /vd2svlperLGR1jaHdOAqq+vT3BK2xp0mBArcGFHGXTsiskLlm8SMMaC/1qjtecnep+Z 0eSTqrGOuHhatMYQkwExVvSglXt2Via8gsyo356liASs9DGmiOTiD8pOYPtYr1FsH77I hs886ge9EeqZH/FONl1VufwLQHTJuofdChgfoOe1a4uxTv76uANtU51Plq3I+BaUka5z Rd0xXA4u1DibYnm5IBM75Isph8tV6XZKWo2O9z2Aiqew+ifazxpWdwWPuv8lSMnQ5f2A oKWg== X-Gm-Message-State: AO0yUKXU7uOR5685UNl21mU22D5XvRJf6408YOd9g9jOFIMr8FXu6I+A uHlHBEB+H5KFCfZwikgt4DuCpwBVKTjMXIVCFMpPDDHwZMjuckjv X-Google-Smtp-Source: AK7set8qdI7y9xAFeaD0MtxZT3i+5zEFKYhZufQUE7Uy1i9543Fko35q0FxOO7wjJzt+GjGczOyBwZ2TMqu4JZEWEOI= X-Received: by 2002:a50:9f6a:0:b0:4ac:20b:96b0 with SMTP id b97-20020a509f6a000000b004ac020b96b0mr2687302edf.3.1676236596352; Sun, 12 Feb 2023 13:16:36 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Steve Sakoman Date: Sun, 12 Feb 2023 11:16:25 -1000 Message-ID: Subject: Fwd: [OE-core][kirkstone 11/27] gdk-pixbuf: do not use tools from gdk-pixbuf-native when building tests To: Patches and discussions about the oe-core layer 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 ; Sun, 12 Feb 2023 21:16:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177071 From: Alexander Kanavin The patch that allows to do so has not been accepted upstream, and wasn't correctly working as it was running a native executable (gdk-pixbuf-query-loaders) with target .so plugins. On the other hand, out of 20+ (currently 23) tests only three require running binaries at build time to produce special test-specific input data: cve-2015-4491 pixbuf-pixdata pixbuf-resource So let's simply omit these from the build: this can be done with a far less invasive patch which has a chance of being accepted upstream. gdk-pixbuf-print-mime-types is no longer installed (the replaced patch was doing that). Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 0d926508e75095eb446699b612729d0243eacc91) Signed-off-by: Steve Sakoman --- .../0001-Add-use_prebuilt_tools-option.patch | 173 ------------------ ...w-a-subset-of-tests-in-cross-compile.patch | 66 +++++++ .../gdk-pixbuf/gdk-pixbuf_2.42.10.bb | 17 +- 3 files changed, 68 insertions(+), 188 deletions(-) delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b" @@ -46,14 +45,6 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" EXTRA_OEMESON = "-Dman=false" -EXTRA_OEMESON:append:class-target = " \ - -Duse_prebuilt_tools=true \ -" - -EXTRA_OEMESON:append:class-nativesdk = " \ - -Duse_prebuilt_tools=true \ -" - PACKAGES =+ "${PN}-xlib" # For GIO image type sniffing @@ -115,10 +106,6 @@ do_install:append:class-native() { XDG_DATA_DIRS=${STAGING_DATADIR} \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \ - XDG_DATA_DIRS=${STAGING_DATADIR} \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ XDG_DATA_DIRS=${STAGING_DATADIR} \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ -- 2.34.1 diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch deleted file mode 100644 index 02cc9a2a70..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch +++ /dev/null @@ -1,173 +0,0 @@ -From f81b60ebcbbfd9548c8aa1e388662c429068d1e3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sat, 8 May 2021 21:58:54 +0200 -Subject: [PATCH] Add use_prebuilt_tools option - -This allows using the gdk-pixbuf tools from the host to -build and install tests in a cross-compile scenarion. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/119] -Signed-off-by: Alexander Kanavin - ---- - gdk-pixbuf/meson.build | 11 +++++++++-- - meson.build | 6 +++--- - meson_options.txt | 4 ++++ - tests/meson.build | 16 ++++++++-------- - thumbnailer/meson.build | 24 ++++++++++++++++++------ - 5 files changed, 42 insertions(+), 19 deletions(-) - -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index 54ff9dd..2e321cf 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin - include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags, - install: true) -- meson.override_find_program(bin_name, bin) -+ if not get_option('use_prebuilt_tools') -+ meson.override_find_program(bin_name, bin) -+ endif - - # Used in tests - set_variable(bin_name.underscorify(), bin) - endforeach - --if not meson.is_cross_build() -+if get_option('use_prebuilt_tools') -+ gdk_pixbuf_query_loaders = find_program('gdk-pixbuf-query-loaders', required: true) -+ gdk_pixbuf_pixdata = find_program('gdk-pixbuf-pixdata', required: true) -+endif -+ -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - # The 'loaders.cache' used for testing, so we don't accidentally - # load the installed cache; we always build it by default - loaders_cache = custom_target('loaders.cache', -diff --git a/meson.build b/meson.build -index 813bd43..a93e6f7 100644 ---- a/meson.build -+++ b/meson.build -@@ -369,18 +369,18 @@ subdir('gdk-pixbuf') - # i18n - subdir('po') - --if not meson.is_cross_build() -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - if get_option('tests') - subdir('tests') - endif -- subdir('thumbnailer') - endif -+subdir('thumbnailer') - - # Documentation - build_docs = get_option('gtk_doc') or get_option('docs') - subdir('docs') - --if not meson.is_cross_build() -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - meson.add_install_script('build-aux/post-install.py', - gdk_pixbuf_bindir, - gdk_pixbuf_libdir, -diff --git a/meson_options.txt b/meson_options.txt -index d198d99..1c899e9 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -53,4 +53,8 @@ option('gio_sniffing', - description: 'Perform file type detection using GIO (Unused on MacOS and Windows)', - type: 'boolean', - value: true) -+option('use_prebuilt_tools', -+ description: 'Use prebuilt gdk-pixbuf tools from the host for cross-compilation', -+ type: 'boolean', -+ value: false) - -diff --git a/tests/meson.build b/tests/meson.build -index 28c2525..d97c02d 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -5,6 +5,12 @@ - # $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with - # this problem: See https://github.com/mesonbuild/meson/issues/8266. - if enabled_loaders.contains('png') and host_system != 'windows' -+ -+ resources_deps = [loaders_cache,] -+ if not get_option('use_prebuilt_tools') -+ resources_deps += [gdk_pixbuf_pixdata,] -+ endif -+ - # Resources; we cannot use gnome.compile_resources() here, because we need to - # override the environment in order to use the utilities we just built instead - # of the system ones -@@ -21,10 +27,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: resources_deps, - ) - - resources_h = custom_target('resources.h', -@@ -40,10 +43,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: resources_deps, - ) - no_resources = false - else -diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build -index b6a206d..9336c21 100644 ---- a/thumbnailer/meson.build -+++ b/thumbnailer/meson.build -@@ -6,13 +6,29 @@ bin = executable('gdk-pixbuf-thumbnailer', - ], - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], - install: true) --meson.override_find_program('gdk-pixbuf-thumbnailer', bin) -+if not get_option('use_prebuilt_tools') -+ meson.override_find_program('gdk-pixbuf-thumbnailer', bin) -+endif - - gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', - 'gdk-pixbuf-print-mime-types.c', -+ install: true, - c_args: common_cflags, - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) - -+if get_option('use_prebuilt_tools') -+ gdk_pixbuf_print_mime_types = find_program('gdk-pixbuf-print-mime-types', required: true) -+endif -+ -+thumbnailer_deps = [loaders_cache,] -+ -+if not get_option('use_prebuilt_tools') -+ thumbnailer_deps += [ -+ gdk_pixbuf_print_mime_types, -+ gdk_pixbuf_pixdata, -+ ] -+endif -+ - custom_target('thumbnailer', - input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', - output: 'gdk-pixbuf-thumbnailer.thumbnailer', -@@ -25,10 +41,6 @@ custom_target('thumbnailer', - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_print_mime_types, -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: thumbnailer_deps, - install: true, - install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch new file mode 100644 index 0000000000..7250fa3f62 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch @@ -0,0 +1,66 @@ +From 9d3b374e75692da3d1d05344a1693c85a3098f47 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 26 Jan 2023 20:29:46 +0100 +Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile + settings + +There is no need to completely disable tests: most of them +do not require running target executables at build time, +and so can be built and installed. + +This requires inserting a couple of specific guards around +items that do require running target executables. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/150] +Signed-off-by: Alexander Kanavin +--- + meson.build | 6 +++--- + tests/meson.build | 10 ++++++---- + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 8a16c8f..7c8b20f 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,10 +369,10 @@ subdir('gdk-pixbuf') + # i18n + subdir('po') + ++if get_option('tests') ++ subdir('tests') ++endif + if not meson.is_cross_build() +- if get_option('tests') +- subdir('tests') +- endif + subdir('thumbnailer') + endif + +diff --git a/tests/meson.build b/tests/meson.build +index 28c2525..c45e765 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -4,7 +4,7 @@ + # gdk-pixbuf-pixdata from build directory because it needs all DLL locations in + # $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with + # this problem: See https://github.com/mesonbuild/meson/issues/8266. +-if enabled_loaders.contains('png') and host_system != 'windows' ++if enabled_loaders.contains('png') and host_system != 'windows' and not meson.is_cross_build() + # Resources; we cannot use gnome.compile_resources() here, because we need to + # override the environment in order to use the utilities we just built instead + # of the system ones +@@ -166,9 +166,11 @@ endif + test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] + test_args = [ '-k' ] + test_env = environment() +-test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +-test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +-test_env.set('GDK_PIXBUF_MODULE_FILE', loaders_cache.full_path()) ++if not meson.is_cross_build() ++ test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) ++ test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) ++ test_env.set('GDK_PIXBUF_MODULE_FILE', loaders_cache.full_path()) ++endif + + foreach test_name, test_data: installed_tests + test_sources = [ test_name + '.c', 'test-common.c' ] diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb index aa44515fbb..cca89a9059 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb @@ -12,15 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" -DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info" -DEPENDS:remove:class-native = "gdk-pixbuf-native" +DEPENDS = "glib-2.0 shared-mime-info" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://fatal-loader.patch \ - file://0001-Add-use_prebuilt_tools-option.patch \ + file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ " From patchwork Sun Feb 12 21:10: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: 19435 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 5CFE1C636D3 for ; Sun, 12 Feb 2023 21:11:23 +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.3.1676236274818413688 for ; Sun, 12 Feb 2023 13:11:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5/Eximu+; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id h4so3794019pll.9 for ; Sun, 12 Feb 2023 13:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=kXUxri+vOw2JKOk1Z8QFuQBKa9cVXhpv+ggtJVSGxo8=; b=5/Eximu+zpePg40HA+lSNnYg1gS1EDjUXSyDDvrccce27q7HW1btWrYC9hPe2gCf0v jKmUaR//fKYE7gkusP76Mry27CB1lbUM36sBh+L79Tc249NirGuDbkHgrDqxNFS4edPf ZEjsW0B2vNV4CBX8ndOPoorei21FVLF5pnaZpBJoRIOmyYAFiLbj0ripjTNx2OZDepdv V+KQ1VhORcpKWmMLH4DQPDEfQAz9gSvfjByq3/I8xmvQm9lRZUQc9eAn7tJP7+mWkz2Y PdzsQJBfr5UDUQx6PgmtFji9x9z5S36c9OXGs4y8wtb3451NQdfQT83VFY1v4eSKg/os oPIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=kXUxri+vOw2JKOk1Z8QFuQBKa9cVXhpv+ggtJVSGxo8=; b=ihuLfkAR5Ik1Tz4J/i78o81Q2SvOT3xvrN0gy9r6+roHrBSzE74ccGhoqc/feLoz4k +x75RYAgS9ImdOts1SP2pTTJS51EJjB8XevxhLBzy+QL/JEMM9UFcePBxMt4i9X0TWK/ o+kzt/+QSeiAKnikFrw33yeDphsIiQYNpexRISNkgoh/ZVOi2vnDVBhEua9u7KEjUV6B zqRo7ZipL68PDMfCN0CXc7e3829bdC4GfB2Oha/PmE6dzH/HR9iaItLoBnPFSVr47xnP RX9XjOJtLUiCIWAF0P/q4QkXV9h4+GKqU26E59bFmTcIGC44kRpeq61CVCXi/hV9YQrt HY7A== X-Gm-Message-State: AO0yUKVaXIwbofgHFklPJcX/BsZhXVK5YTM/jnFQ07STCvwMCf4idA7m 4rRv0kCk4njQk9QhUdN2ZPtlne0OqKQszfnYr60= X-Google-Smtp-Source: AK7set8aHRmQ3k/G71LHwjsJ1k2V8juuWC7/d6O7IUV0w4DTxZ5BRDgtoi4AjIbMSpak3mJfO+euMA== X-Received: by 2002:a17:903:283:b0:19a:9880:1750 with SMTP id j3-20020a170903028300b0019a98801750mr3161157plr.53.1676236273787; Sun, 12 Feb 2023 13:11:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/27] make-mod-scripts: Ensure kernel build output is deterministic Date: Sun, 12 Feb 2023 11:10:28 -1000 Message-Id: <5fbe4dd7dc45f8f219d5c7cd30b50928b69af26d.1676236110.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 ; Sun, 12 Feb 2023 21:11:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177055 From: Richard Purdie The definitions in linux-kernel-base are needed to ensure the generated headers are consistent. This was a small step that was missing from the previous changes to linux-kernel-base as both kernel-devsrc and make-mod-scripts need this information defined consistently. Signed-off-by: Richard Purdie (cherry picked from commit 0d79d4883f924cef0d0ba361506ad75d441b9721) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb index 0e420a25d9..f6f47cfff5 100644 --- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://www.yoctoproject.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -inherit kernel-arch +inherit kernel-arch linux-kernel-base inherit pkgconfig PACKAGE_ARCH = "${MACHINE_ARCH}" From patchwork Sun Feb 12 21:10: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: 19438 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 62BB3C05027 for ; Sun, 12 Feb 2023 21:11:23 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.21044.1676236276686690773 for ; Sun, 12 Feb 2023 13:11:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CdiTFMTr; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id e10-20020a17090a630a00b0022bedd66e6dso15054857pjj.1 for ; Sun, 12 Feb 2023 13:11:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=roCA43hWp7GVnEXR3Gw/JyT2ZLCnTQn+FVuzMiH7H+Q=; b=CdiTFMTre60r+xuU7WcXaENewTKhySTHJxajJqr/hoJeMPstuzJ9UUxbwn253++3Ka 7HrSZ3Ab9l8NzuYeDFkodKU83Eb7v9KgXponCvb7Xgbx2mB0MO3jZ/BzB3cGHbjPiDIR wL/Qx7/hVgYNs8WlTlxpRC3s68gMQngmhHmGHGYbb7fZKkpj6xzJU2uWawN2ZWkLlyPT H8MlBqH6TNPolIz1Bw8QpK91oJSwq9kqeKDgVqh3Zr88f/TcRdhaWovz5KR2zE1K5J70 DDmfA0BVkgXH0fPI6TX/FmdZTRI8oUaI4dttT+RjgcqdZJ4mHaOhv1wLTYQC5t7wxbms VuKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=roCA43hWp7GVnEXR3Gw/JyT2ZLCnTQn+FVuzMiH7H+Q=; b=v6d+gM7mgnxCfz95YEvH+FF12a+rgpCdWwL1t4gdmN1RMEiKqNgBsmNId03ox+FWtK yrraaKvddqa/pZsVMraEL9h/QFse/6sKMuifaRJK5ACGsX4kOSOSmMR52b4/a5cMG5U6 DYxK842AdS4TyBZZpVtk62OM/yxrkypBRLqnKuRazk6nJ/FuWp+fLGgRNgddSYrc2TCq igCxNcWlDh0wkWZKKAUKed7budddUcnmulQhSpqRfIH+G8c2RXOy6h8LyYaGSFBN2B1G dSjmqwk6HCuQ7jKv+xZnzboK1VCrGF+/oOUwetgH4r/uEBk15q9/Hjn9mi9N2mkmGFXa lv8Q== X-Gm-Message-State: AO0yUKUnl/9kyP+84ZqOqIhY9W91Z/wi4un8/sXYHAsLbH3YfzOMaie9 HMqlRdQM9VppU+nsnTNs689fo+7m+rSitXcDjzM= X-Google-Smtp-Source: AK7set/ad8KT0P1XsCZnTE2OfiDSvnz2g+Gv/R1VZhwFx+S3/U7s6S+87WsyXSuNCllyvRGU37S6dw== X-Received: by 2002:a17:902:d512:b0:198:9e29:cc4f with SMTP id b18-20020a170902d51200b001989e29cc4fmr26019346plg.43.1676236275652; Sun, 12 Feb 2023 13:11:15 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/27] scons: Pass MAXLINELENGTH to scons invocation Date: Sun, 12 Feb 2023 11:10: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 ; Sun, 12 Feb 2023 21:11:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177056 From: Khem Raj This helps in overcoming a problem when using scons with ccache enabled. When commands get longer, then it resorts to using response files to do the operations e.g. @/tmp/tmp96j6icra.lnk when this response file is inboked by compiler it works ok, however, this does not when ccache is used to invoke the complilation. We see errors e.g. ccache @/tmp/tmppsyij_0v.lnk ccache: error: execute_noreturn of @/tmp/tmppsyij_0v.lnk failed: No such file or directory Using MAXLINELENGTH setting ensures that we can use ARG_MAX to extend the length of commandline and hence avoid using response files. This issue is also reported in mongodb [1] [1] https://jira.mongodb.org/browse/SERVER-38389 Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni (cherry picked from commit 29558f6218f4676b459f2c78f82d245339d51c8c) Signed-off-by: Steve Sakoman --- meta/classes/scons.bbclass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass index 80f8382107..72422d8884 100644 --- a/meta/classes/scons.bbclass +++ b/meta/classes/scons.bbclass @@ -3,11 +3,12 @@ inherit python3native DEPENDS += "python3-scons-native" EXTRA_OESCONS ?= "" - +# This value below is derived from $(getconf ARG_MAX) +SCONS_MAXLINELENGTH ?= "2097152" do_configure() { if [ -n "${CONFIGURESTAMPFILE}" -a "${S}" = "${B}" ]; then if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean PREFIX=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} prefix=${prefix} ${EXTRA_OESCONS} fi mkdir -p `dirname ${CONFIGURESTAMPFILE}` @@ -16,13 +17,17 @@ do_configure() { } scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} || \ die "scons build execution failed." } scons_do_install() { - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} install || \ die "scons install execution failed." } +do_configure[vardepsexclude] = "SCONS_MAXLINELENGTH" +do_compile[vardepsexclude] = "SCONS_MAXLINELENGTH" +do_install[vardepsexclude] = "SCONS_MAXLINELENGTH" + EXPORT_FUNCTIONS do_compile do_install From patchwork Sun Feb 12 21:10: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: 19437 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 6CD12C64ED6 for ; Sun, 12 Feb 2023 21:11:23 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.6.1676236278486361097 for ; Sun, 12 Feb 2023 13:11:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2ER40/Uf; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id e17so2771582plg.12 for ; Sun, 12 Feb 2023 13:11:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=U1kyxxXCrFZdLP77nhHHbxg9vlb0U+Vb4alYasQtHnI=; b=2ER40/Ufsomm0MNsFzgYAH21TaYRSABaxE1K0epootFRZB0KyybS2LTVyVIEYO2+A4 VL/AQ+BkAHui+QbakQQAL9mziFNB2lEQ+2gKbJZaShbvaoUJ0rBz4V4Kv1vBHXq+ydaE 7S3xSeeDBqhmknqRYz4/x57fPCCouTwQE0+cyJNnjEWMijk+qEPK/pfTySy/u7fK2k86 waMGNaq4n/LikLl7W8jkTCJZj/FrpULgL0U74VgsAozpUIP79d3/D4V3V/5g/pODpnoc DaBpjVl0UDrOfhztR27NftELRd/+7omW2hmzqy3iCrhoawzN7Z5yYoVuBW7wxKawGv/T ys0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=U1kyxxXCrFZdLP77nhHHbxg9vlb0U+Vb4alYasQtHnI=; b=Pt5nsxEgvIJl6y27MDBTa9qtSWJj8OaG+hUAIcswNlJu7Ee1fgWJyMVGtd+u5RoQ1G wAnDYwDBY4tUZQBgg5TeqhaMmwbwKbMOGYCtbmT1l6EeHaVAFBHG0KiivlQo6D33nuym H8amO4BuXSSQsuu/QLNuBfOOTGN537pqs6RcZZx+JweZwUHuVzsImM9sXkx47bJHWNjD 2ypkx6c/xzmtyhze0TIctzZ61/o5lt2r+w6W7MTYvlsGiv1aFP9tqN1xUf0ZruzWzEdg 5gG468gSO/PutMSJ699mJ5/2G9tgVvU5jiorFIDHDgWhtDuAKtxkhBWgJWFA9AcuLdis 4AEQ== X-Gm-Message-State: AO0yUKUymJtvghuaa2GEN/L/j7WTZCN75rckBEcszIIdiFWX2REbWBIP m6uhMvah+b/YapWnhb+S/m6z/38bEP6qz7kBcTg= X-Google-Smtp-Source: AK7set83zKfHO8QkpPA08hH9SpY+/o5Q8s+K7DziXGUggcdQ5vTYjdqN1io8mJaloY3J4Pej5VtU2Q== X-Received: by 2002:a17:902:ced0:b0:196:725c:6ea with SMTP id d16-20020a170902ced000b00196725c06eamr27302360plg.19.1676236277577; Sun, 12 Feb 2023 13:11:17 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/27] scons.bbclass: Make MAXLINELENGTH overridable Date: Sun, 12 Feb 2023 11:10: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 ; Sun, 12 Feb 2023 21:11:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177057 From: Khem Raj older scons do not support MAXLINELENGTH and some packages still may be using older scons, these recipes can clear SCONS_MAXLINELENGTH in them and get going. Set SCONS_MAXLINELENGTH = "" in such recipes. Signed-off-by: Khem Raj Cc: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 34de57d12c0a752f66c962d29e5335c1035db066) Signed-off-by: Steve Sakoman --- meta/classes/scons.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass index 72422d8884..ffe43bb7c9 100644 --- a/meta/classes/scons.bbclass +++ b/meta/classes/scons.bbclass @@ -4,11 +4,12 @@ DEPENDS += "python3-scons-native" EXTRA_OESCONS ?= "" # This value below is derived from $(getconf ARG_MAX) -SCONS_MAXLINELENGTH ?= "2097152" +SCONS_MAXLINELENGTH ?= "MAXLINELENGTH=2097152" +EXTRA_OESCONS:append = " ${SCONS_MAXLINELENGTH}" do_configure() { if [ -n "${CONFIGURESTAMPFILE}" -a "${S}" = "${B}" ]; then if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean PREFIX=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} prefix=${prefix} ${EXTRA_OESCONS} + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} fi mkdir -p `dirname ${CONFIGURESTAMPFILE}` @@ -17,12 +18,12 @@ do_configure() { } scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} || \ + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ die "scons build execution failed." } scons_do_install() { - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} install || \ + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ die "scons install execution failed." } From patchwork Sun Feb 12 21:10: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: 19436 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 6B7ACC64EC7 for ; Sun, 12 Feb 2023 21:11:23 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web10.2.1676236280377481403 for ; Sun, 12 Feb 2023 13:11:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0bir3cYF; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id v6-20020a17090ad58600b00229eec90a7fso12486114pju.0 for ; Sun, 12 Feb 2023 13:11:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=wPb5dBa2Rw1itzSLGdqm+dZZF6rSyVcypavMOe2iOoY=; b=0bir3cYFRqyE4ME8yuVVvrZCSQK+9/J1Fhqaic1FWyO0xn77e3ZJTz7HEfjMjURQhl 6DDmLyji0nVlSGiObnkWyQAkpFifAZXMHrAK8RLJL8pE2oDpqYMCGqh5cnvDifnF7+1q tVv+BdQnsaPh3DTHnG9tYrJDM4lADNFI978Yj7MdSlTdKtNcioImogBZAaMLhurybyef bcv2Md6Ws+0kbOwDwJd3kvLNXaHyaOe5R95k7b8aLqN32rD9z1wgViONF31TJJcRa2uR gMqh0oDdHk/abi7vrDyETG/c+Yq75q1mDqxkqz0IZPA0HRlhCyt9HPKEV2A08ssO8k36 XlHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=wPb5dBa2Rw1itzSLGdqm+dZZF6rSyVcypavMOe2iOoY=; b=mNklhEtbkVPQ6ybOgMekUtK1cbtvURxdaZVe3myumTGQHQEZnPoqFnv2oro9a99Xuy 10BhyNuV6fB5UxJ0+TVarMt5xJKhRrTW5c4+OnSwoA463NxAd7xfa1ap/oenXYdZgmN8 6iRHYRnCXhSn6B2v9IHQC3dINrGQ02fgEvFvK2Q9KlMNzSxzXV5IhAZfWJoky0x9HzRS sM63RlFhhs/dtyJHmYqhxLY8z2Mo7fuEuPGNvYZN7QrJE/jBNcMzCsWzhyohNHS5ACAb K9k4dW6FCwIT8xZ2VeLgYEi9ey1v6TZeqNccRZ4aw/LqwpDxtzKYv9f56tsglTUe5IxA bZTA== X-Gm-Message-State: AO0yUKXVqiMbcv0DnbLsXM1ygLMfXdEskhUhXY2sCGEzCe3d0pssTLIP JaKbsONUQDAdIRD6sj6Jazz5xn+Ms0j8oTp0uT0= X-Google-Smtp-Source: AK7set95U5EyHdj3p+zGOsddCvpXqGWnYja+VaJC4yMv69N7kTGJ19limTQWH/o8fr+WXwvdq4xCjw== X-Received: by 2002:a17:903:22cb:b0:19a:5958:15e7 with SMTP id y11-20020a17090322cb00b0019a595815e7mr15127159plg.15.1676236279471; Sun, 12 Feb 2023 13:11:19 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:19 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/27] oeqa/qemurunner: do not use Popen.poll() when terminating runqemu with a signal Date: Sun, 12 Feb 2023 11:10:31 -1000 Message-Id: <88e7bac0f06d4f12cd6f078d37e4e9975871860f.1676236110.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 ; Sun, 12 Feb 2023 21:11:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177058 From: Alexander Kanavin This does not actually guarantee that the child runqemu process has completely exited: poll() may return prematurely while the SIGTERM handler in runqemu is still running. This thwarts the rest of the processing, and may terminate the handler before it completes. Use Popen.communicate() instead: this is what python documentation recommends as well: https://docs.python.org/3/library/subprocess.html#subprocess.Popen.communicate Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit cd3e55606c427287f37585c5d7cde936471e52f4) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/qemurunner.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index c19164e6e7..9a99859388 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -532,10 +532,13 @@ class QemuRunner: except OSError as e: if e.errno != errno.ESRCH: raise - endtime = time.time() + self.runqemutime - while self.runqemu.poll() is None and time.time() < endtime: - time.sleep(1) - if self.runqemu.poll() is None: + try: + outs, errs = self.runqemu.communicate(timeout = self.runqemutime) + if outs: + self.logger.info("Output from runqemu:\n%s", outs.decode("utf-8")) + if errs: + self.logger.info("Stderr from runqemu:\n%s", errs.decode("utf-8")) + except TimeoutExpired: self.logger.debug("Sending SIGKILL to runqemu") os.killpg(os.getpgid(self.runqemu.pid), signal.SIGKILL) if not self.runqemu.stdout.closed: From patchwork Sun Feb 12 21:10: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: 19434 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 5D1C7C636D4 for ; Sun, 12 Feb 2023 21:11:23 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web11.7.1676236282335627071 for ; Sun, 12 Feb 2023 13:11:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=elZRfbK5; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id o13so10162682pjg.2 for ; Sun, 12 Feb 2023 13:11:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=UV7N3NZ6ITdFRvDzmXkzwLWyuj1XW76o5WhYJBdJCX0=; b=elZRfbK5trjEX9KNuc01SIHKzyvgihBiNM0SWBiR4dY/+GCB3x03gpay7wbLVv4VTh lrjmocnmIIbKjEP1eSRRXBHR3JtdXdl4YQPz3xvWqW9o2+77jPWglhlFWA28Xn8fFcJb QCdg9zwXMCG37mA//ObY5Sx0pAxp4tPl7aBnvGoykt/2JSKXBC/uJpCL7kME4rAKW0uz 38WpJY2mTLaflxeeKo4mihK9eVF5YImOZCOnhw/ey6c4LkKjAVwDjt3TRVIcRz9moI53 kYb/SBUCZM/zCJsvjybcQeaE+sBb6R8YgbGcvjLHNEeql8T6ItU5dVNlcJl2XNVk1dAH x2EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=UV7N3NZ6ITdFRvDzmXkzwLWyuj1XW76o5WhYJBdJCX0=; b=QIGPAHm4P6XTtL52bSHAkV/2YtR9HNjfi+IQ+tvFk1pbVQVfwhP8dILmCxDkrfnn5l kFzph//uysJMD/e5uCBjQHlB+y9DhCJTH3H2K2aci443TgbW6DQzU6AnwRN89Yin8a0I 3NrMTUb+RZs8NMXll4vCrKG/IubM/uuExHNBxVQw++LMSGlDyzOT8uI010RN7AxFVsTZ fIHfNqi5LW+eggTdJmogFilimbMyQ0lxqWZ6WiKgUcgYcXUtoBqt1nCJ+81qlmtWOjfW obtMSDnahY2EmqdEbABveVqrlZ8q70D1IAMteOGC6SJ3I1LZ49lOFLFknAJElYb38rjN RGbA== X-Gm-Message-State: AO0yUKWMqY7oewILdF+K5jMIYj6dwa/AiUBYDTqzADefHtnSVgLvlEEF DLhu5ILz4ZwF8TRlX9NQ5JAIkyKVoRu06tKNXnE= X-Google-Smtp-Source: AK7set+iuK2ZMxDXY04Vbs56JK4pysj+eDKBPGS45N+69lAgJrlRKTtm3rhNrl1x9da4aaeAZ3/1Sg== X-Received: by 2002:a17:902:d40a:b0:19a:8284:83a2 with SMTP id b10-20020a170902d40a00b0019a828483a2mr4396281ple.10.1676236281285; Sun, 12 Feb 2023 13:11:21 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/27] sdkext/cases/devtool: pass a logger to HTTPService Date: Sun, 12 Feb 2023 11:10:32 -1000 Message-Id: <032b0a834b7b1583d3d2bd4ac55414583ce8dfdc.1676236110.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 ; Sun, 12 Feb 2023 21:11:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177059 From: Ross Burton Pass our logger to the HTTPService instance so we can see the requests and any errors. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 3485df2ff61143aac03d92300b7bac4e5d6b2427) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/sdkext/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py index a5c6a76e02..5ffb732556 100644 --- a/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/meta/lib/oeqa/sdkext/cases/devtool.py @@ -112,7 +112,7 @@ class SdkUpdateTest(OESDKExtTestCase): cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir) subprocess.check_output(cmd, shell=True) - self.http_service = HTTPService(self.publish_dir) + self.http_service = HTTPService(self.publish_dir, logger=self.logger) self.http_service.start() self.http_url = "http://127.0.0.1:%d" % self.http_service.port From patchwork Sun Feb 12 21:10:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19439 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 55A18C636D3 for ; Sun, 12 Feb 2023 21:11:33 +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.5.1676236284015063975 for ; Sun, 12 Feb 2023 13:11:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=sMEfbluc; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id be8so11624670plb.7 for ; Sun, 12 Feb 2023 13:11:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=2hLCzRFOCaQnrOi3mt5GZWtY+0kV1jxmls3JOybjl38=; b=sMEfblucM1LOLWvDbi9IgaNwTDjqbWyv+DMTOi0pWhTQ9sefhmtLXE3Xi/dc6GcJQi i5PfAgrMWpHAVFuCEPcn7CTkGhUMYF3sUO79kTEKTS12U3uJojltMZTOe/bPznJPbIQu kya34EmUsvqDzWp/vGOijexyG/rGoKJRlyNxul591bBBGmRgk2tx9xx27y16dphl0g2O 9We6dgmR2+ouUdgb670OO8Yy5KXShn373aVoREhqNEAzZHwGUVR8gXz/rTP7VkKuDmCB hg2udx3ELQHIm94hJK2kwTbg8Mq2EeZzS777//SN+YUtJZr0EGGSwMrKelz0nonmx8Xk 0J5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=2hLCzRFOCaQnrOi3mt5GZWtY+0kV1jxmls3JOybjl38=; b=IeOsGKcyzZQquiZI0J3HSYjDMm+T8SdhtJTcNpQ9QGLz7Z/cPafVTjCWsToLKhTU4E rEJ0Brh4YojGDQYJ1PUmh9yM7qctk9BQYrORuVu2kb9oMbi/j3cru/TXWsXTm/3Zww/o mSKM6RpmRg1miHFkO8YUrBf9QagJybpu9qwzqkteTbjyjd2XqKqR9XTFlUWNTnq5gdyC VeLGip62SMLA+iSqY9TwjkTxpy1XTPTABMAmbaAjGAFhd4w5t5CPegqzNCYZ0mGj+UrV sFKSkO9dxGO7fBUh5YN3XrhBMQKjmkC3kXIENZvkgNfe3oNG2uP+zTs2f1lnbfLdNwto 806w== X-Gm-Message-State: AO0yUKWFKxZ2nttJJL2RIQYw4uPsWiPv7b80g48qgkvaksIJVX0XrEGw 8qk7ipE+Sk0dMf4TCbC4e2lxfQFTqjRwnQDVF8I= X-Google-Smtp-Source: AK7set8Lo8sNdiiLJ16sCVxy0G7so8VwbjfCGk/xD/+VaeIoWTsdF299s0lA72QU+yWlcXh1JYuImg== X-Received: by 2002:a17:902:f1d3:b0:19a:5a0a:85b with SMTP id e19-20020a170902f1d300b0019a5a0a085bmr9961561plc.66.1676236283098; Sun, 12 Feb 2023 13:11:23 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:22 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/27] httpserver: add error handler that write to the logger Date: Sun, 12 Feb 2023 11:10:33 -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 ; Sun, 12 Feb 2023 21:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177060 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit a4bcca3123685f410fc99e5cc23f2b8f39fd0a63) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/httpserver.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oeqa/utils/httpserver.py b/meta/lib/oeqa/utils/httpserver.py index 58d3c3b3f8..0d602e2dfa 100644 --- a/meta/lib/oeqa/utils/httpserver.py +++ b/meta/lib/oeqa/utils/httpserver.py @@ -38,6 +38,12 @@ class HTTPService(object): self.port = self.server.server_port self.process = multiprocessing.Process(target=self.server.server_start, args=[self.root_dir, self.logger]) + def handle_error(self, request, client_address): + import traceback + exception = traceback.format_exc() + self.logger.warn("Exception when handling %s: %s" % (request, exception)) + self.server.handle_error = handle_error + # The signal handler from testimage.bbclass can cause deadlocks here # if the HTTPServer is terminated before it can restore the standard #signal behaviour From patchwork Sun Feb 12 21:10:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19442 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 5D8CCC64EC7 for ; Sun, 12 Feb 2023 21:11:33 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.12.1676236285844440022 for ; Sun, 12 Feb 2023 13:11:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fQxGFww9; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id r8so11655441pls.2 for ; Sun, 12 Feb 2023 13:11:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=6i6eZCL8RavwT0KUjsYSTI3wF2IM70XBV6UpD52Cqmc=; b=fQxGFww9wE+z/9TwoLSMaZCJSS457koUfXn8GTnWelnxLQUDf8w68iaM6c+KVJLyTe f/C+BGPF/DSwmEkCYkkwPnAkJ8LkNPjg2s880Y9so4gDiS+nuOHOiXgceizLEFBqAg+e 31duqcLHDGWJr6oIscxI7FZHUVg31rtmZw2bfLQODYtsQNxzQHDoMc72XOv01Lj2o9Np P7JdPfLPgELwyb2zN+s+eQ2XvaOwdwr41LWcP57j675b9bDEYxJfBHTk+KVgeTb9215q SF0ESCqLDz9cExYSdQQiSJOyBiQhyPQFVRbnUUh1YMJfH+Fu2fkC/GX10cq8C5/GrFI6 PO4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=6i6eZCL8RavwT0KUjsYSTI3wF2IM70XBV6UpD52Cqmc=; b=0FGiTEu5T9qicNVjZc6D3adnKqMJM9TAI0EYMfDIOuf0fuQZbazujaOGnbKmEM3+Q+ wnaT4ny5to6vNbRRaV9yF30fe7hxp0TyqVi5guROceOh66Q6AalcP0XV2dEtQFjwTpUr yWiDUdTc7fZgCC4wfLSD0+nGb3IkHWxMKiubQtDvZVjbDEUz6F2xD+C6dZDVLrxr4xlr eKJBvbD8Cn++4xb2zaNWrnE7aFZm5BkBtE6ZoENVaZPnZS9X4Xdg/2vMt8aoZkhU0HdS 44z0215r3A09uaAT4t1kUWXqOcNTG/fIGZnmaz3x66JeHTTy7oNibIrvJvlKxDfD2fKY eENQ== X-Gm-Message-State: AO0yUKVR5Tpqh2XrlBhtCHT690k3C7niuEsBveAt5/Yy3fNZlLn7kDLi 4Zy4AL/w0YvRah+rh7CL83jp8uaqyvSg8N4DUTY= X-Google-Smtp-Source: AK7set+n75NKpZHwcJ7pVaNHeUmQEWRwZlnkIy1GDr19NFWKgY8NrlHMYuGa9lj7Sj44WpQrijfvCA== X-Received: by 2002:a17:903:22c1:b0:19a:586c:92be with SMTP id y1-20020a17090322c100b0019a586c92bemr14802133plg.45.1676236284901; Sun, 12 Feb 2023 13:11:24 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:24 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/27] glslang: branch rename master -> main Date: Sun, 12 Feb 2023 11:10:34 -1000 Message-Id: <04b7643cda2c6d82b017767a537e53ce69a7703a.1676236110.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 ; Sun, 12 Feb 2023 21:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177061 From: Mingli Yu Branch name is changed from master to main. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie (cherry picked from commit 65ee4c1067ee5d73c198eed8ed2f1c9a60d5df96) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/glslang/glslang_1.3.204.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/glslang/glslang_1.3.204.1.bb b/meta/recipes-graphics/glslang/glslang_1.3.204.1.bb index 2af406212f..ff08f251cd 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.204.1.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.204.1.bb @@ -9,7 +9,7 @@ LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exc LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" SRCREV = "2742e959347ae2fac58acd0d022c92a0ff1f24bf" -SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ file://0001-generate-glslang-pkg-config.patch" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" From patchwork Sun Feb 12 21:10:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19443 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 61589C05027 for ; Sun, 12 Feb 2023 21:11:33 +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.6.1676236287926145052 for ; Sun, 12 Feb 2023 13:11:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ynaU8BAB; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id k13so11689134plg.0 for ; Sun, 12 Feb 2023 13:11:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=72pEbpC1kHBfsl4sLniQvvNoPWpZ/4I/F4wTdYGaWCU=; b=ynaU8BABHU9h8DmDuibNvUYTFoIWAkiVCI7Tnb65RuxWaVYSx4AxwKHHgIHs5dNaI+ EhiSM3+kSxdLftnSMReQiKXq3s+01SWvLZ2UYfR7nVy3Nb1wctNtIoVGGTKQwXhfu2v8 wCZUVxOZp+HHBeLlgfC2l1TqLblAuDpJwIft1VGA2PYInrQvvan66jHcmU5v2ZgQkQSg I6wqGjW0VgDwVmUE9nc9Jf6a/FGP/4TV9sY+s8zrQ0K7ysT5ajo70dNQRLGA/hB41ajX spKLPc91okIjr712jMxceIOCsFLQP8//agYDl+xI9USqvcsXus7BjVo8/WLV3rZzL1Ri kC4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=72pEbpC1kHBfsl4sLniQvvNoPWpZ/4I/F4wTdYGaWCU=; b=H6dMuUyQf1UQjBs0PFAkb7t0MVXPDvl3C6OLPv4ClAC3lA/1/gYApOrJNcf9oZ7urT zZ/sMh3XbtHj8Eydht3CE6M/v+JRq9zYE8+o/cEwyjdcgeFOkmRYfZx2hIMFvASW8GGD XqWTR2xW3b38YKrMH7hj/gMqrhexQ50F7fMFwmj2zYAiREiJ1TWGjqC5jNyjai+cJiTl EkPShjN23AGq+wLWElwrz6ssqNzNTJDdNNEvtWQhRyl9pWcoJ2FbOCXLHytDJ5RCjS0L XF5BlxfNMugpsx2ee8xAwtLSoCqEWJtl+Srd0adWA0rWNVWFfa0Ws2sO3XF5D4WPfldW e6Rg== X-Gm-Message-State: AO0yUKVbHtotyq/4EtxN5uaivlVQvt/oyxmKMcxLhaNuldlECMTkQH23 VtoXC5CIBfCbSLs4ldkoxKBlvUtGaqq1O1IZihY= X-Google-Smtp-Source: AK7set8eN806SXq81aIUVzra5JvcO3ee+Ld4fLtzB+nqYMugbFFzjOBIcvG/lf6Oe46+o6PYBXmcLQ== X-Received: by 2002:a17:903:1207:b0:196:89bc:7100 with SMTP id l7-20020a170903120700b0019689bc7100mr27388890plh.16.1676236286776; Sun, 12 Feb 2023 13:11:26 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:26 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/27] meta: remove True option to getVar and getVarFlag calls (again) Date: Sun, 12 Feb 2023 11:10:35 -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 ; Sun, 12 Feb 2023 21:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177062 From: Martin Jansa * True is default since 2016 and most layers were already updated not to pass this parameter where not necessary, e.g. oe-core was updated couple times, first in: https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f Updated with the same regexp as later oe-core update: https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba with small modification to replace not only d.getVar, but also data.getVar as in e.g.: e.data.getVar('ERR_REPORT_USERNAME', True) and for getVarFlag: sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' \ -i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \ | cut -d':' -f1 \ | sort -u) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 26c74fd10614582e177437608908eb43688ab510) Signed-off-by: Steve Sakoman (cherry picked from commit 24a86d0c55ee89ae0dc77975e1d0ee02898d2289) Signed-off-by: Steve Sakoman --- meta/classes/image.bbclass | 2 +- meta/classes/license_image.bbclass | 2 +- meta/lib/oe/package_manager/deb/__init__.py | 8 ++++---- meta/recipes-devtools/go/go_1.17.13.bb | 4 ++-- meta/recipes-devtools/rust/rust-common.inc | 2 +- meta/recipes-devtools/rust/rust.inc | 20 ++++++++++---------- scripts/contrib/image-manifest | 2 +- scripts/lib/devtool/menuconfig.py | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c424c4c41d..aa14ea2316 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -440,7 +440,7 @@ python () { localdata.delVar('DATE') localdata.delVar('TMPDIR') localdata.delVar('IMAGE_VERSION_SUFFIX') - vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split() + vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude') or '').split() for dep in vardepsexclude: localdata.delVar(dep) diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 3213ea758e..1c06a02951 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -229,7 +229,7 @@ def get_deployed_dependencies(d): deploy = {} # Get all the dependencies for the current task (rootfs). taskdata = d.getVar("BB_TASKDEPDATA", False) - pn = d.getVar("PN", True) + pn = d.getVar("PN") depends = list(set([dep[0] for dep in list(taskdata.values()) if not dep[0].endswith("-native") and not dep[0] == pn])) diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py index 86ddb130ad..910f217b62 100644 --- a/meta/lib/oe/package_manager/deb/__init__.py +++ b/meta/lib/oe/package_manager/deb/__init__.py @@ -80,15 +80,15 @@ class DpkgIndexer(Indexer): return oe.utils.multiprocess_launch(create_index, index_cmds, self.d) - if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': - signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) + if self.d.getVar('PACKAGE_FEED_SIGN') == '1': + signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND')) else: signer = None if signer: for f in index_sign_files: signer.detach_sign(f, - self.d.getVar('PACKAGE_FEED_GPG_NAME', True), - self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), + self.d.getVar('PACKAGE_FEED_GPG_NAME'), + self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE'), output_suffix="gpg", use_sha256=True) diff --git a/meta/recipes-devtools/go/go_1.17.13.bb b/meta/recipes-devtools/go/go_1.17.13.bb index 34dc89bb0c..bb57c1c48a 100644 --- a/meta/recipes-devtools/go/go_1.17.13.bb +++ b/meta/recipes-devtools/go/go_1.17.13.bb @@ -11,7 +11,7 @@ export CXX_FOR_TARGET = "g++" # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its # variants. python() { - if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): - d.appendVar('INSANE_SKIP:%s' % d.getVar('PN',True), " textrel") + if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'): + d.appendVar('INSANE_SKIP:%s' % d.getVar('PN'), " textrel") } diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index ef70c48d0f..db0bd8fc1b 100644 --- a/meta/recipes-devtools/rust/rust-common.inc +++ b/meta/recipes-devtools/rust/rust-common.inc @@ -109,7 +109,7 @@ def llvm_features_from_target_fpu(d): # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float # ABI. There is no option for hard. - fpu = d.getVar('TARGET_FPU', True) + fpu = d.getVar('TARGET_FPU') return ["+soft-float"] if fpu == "soft" else [] def llvm_features(d): diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index f39228e3c0..008b2ce4a4 100644 --- a/meta/recipes-devtools/rust/rust.inc +++ b/meta/recipes-devtools/rust/rust.inc @@ -79,7 +79,7 @@ python do_configure() { config = configparser.RawConfigParser() # [target.ARCH-poky-linux] - target_section = "target.{}".format(d.getVar('TARGET_SYS', True)) + target_section = "target.{}".format(d.getVar('TARGET_SYS')) config.add_section(target_section) llvm_config = d.expand("${YOCTO_ALTERNATE_EXE_PATH}") @@ -90,7 +90,7 @@ python do_configure() { # If we don't do this rust-native will compile it's own llvm for BUILD. # [target.${BUILD_ARCH}-unknown-linux-gnu] - target_section = "target.{}".format(d.getVar('SNAPSHOT_BUILD_SYS', True)) + target_section = "target.{}".format(d.getVar('SNAPSHOT_BUILD_SYS')) config.add_section(target_section) config.set(target_section, "llvm-config", e(llvm_config)) @@ -124,26 +124,26 @@ python do_configure() { config.set("build", "vendor", e(True)) if not "targets" in locals(): - targets = [d.getVar("TARGET_SYS", True)] + targets = [d.getVar("TARGET_SYS")] config.set("build", "target", e(targets)) if not "hosts" in locals(): - hosts = [d.getVar("HOST_SYS", True)] + hosts = [d.getVar("HOST_SYS")] config.set("build", "host", e(hosts)) # We can't use BUILD_SYS since that is something the rust snapshot knows # nothing about when trying to build some stage0 tools (like fabricate) - config.set("build", "build", e(d.getVar("SNAPSHOT_BUILD_SYS", True))) + config.set("build", "build", e(d.getVar("SNAPSHOT_BUILD_SYS"))) # [install] config.add_section("install") # ./x.py install doesn't have any notion of "destdir" # but we can prepend ${D} to all the directories instead - config.set("install", "prefix", e(d.getVar("D", True) + d.getVar("prefix", True))) - config.set("install", "bindir", e(d.getVar("D", True) + d.getVar("bindir", True))) - config.set("install", "libdir", e(d.getVar("D", True) + d.getVar("libdir", True))) - config.set("install", "datadir", e(d.getVar("D", True) + d.getVar("datadir", True))) - config.set("install", "mandir", e(d.getVar("D", True) + d.getVar("mandir", True))) + config.set("install", "prefix", e(d.getVar("D") + d.getVar("prefix"))) + config.set("install", "bindir", e(d.getVar("D") + d.getVar("bindir"))) + config.set("install", "libdir", e(d.getVar("D") + d.getVar("libdir"))) + config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir"))) + config.set("install", "mandir", e(d.getVar("D") + d.getVar("mandir"))) with open("config.toml", "w") as f: f.write('changelog-seen = 2\n\n') diff --git a/scripts/contrib/image-manifest b/scripts/contrib/image-manifest index 3c07a73a4e..4d65a99258 100755 --- a/scripts/contrib/image-manifest +++ b/scripts/contrib/image-manifest @@ -392,7 +392,7 @@ def export_manifest_info(args): for key in rd.getVarFlags('PACKAGECONFIG').keys(): if key == 'doc': continue - rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key, True) + rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key) if config['patches'] == 'yes': patches = oe.recipeutils.get_recipe_patches(rd) diff --git a/scripts/lib/devtool/menuconfig.py b/scripts/lib/devtool/menuconfig.py index 95384c5333..ff9227035d 100644 --- a/scripts/lib/devtool/menuconfig.py +++ b/scripts/lib/devtool/menuconfig.py @@ -43,7 +43,7 @@ def menuconfig(args, config, basepath, workspace): return 1 check_workspace_recipe(workspace, args.component) - pn = rd.getVar('PN', True) + pn = rd.getVar('PN') if not rd.getVarFlag('do_menuconfig','task'): raise DevtoolError("This recipe does not support menuconfig option") From patchwork Sun Feb 12 21:10:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19441 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 6B131C636D7 for ; Sun, 12 Feb 2023 21:11:33 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web10.9.1676236289508796784 for ; Sun, 12 Feb 2023 13:11:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=TxS/H/es; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id mg23so3588404pjb.0 for ; Sun, 12 Feb 2023 13:11:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=hYBoWNdc8/psr6Xix8xH2gCwPRSpJtODm2Xux9v7bNU=; b=TxS/H/esckiw8RnvJcQbOx0T3PBqkdnwxffBkYlxQpwThY9YY+cFq1beeCz2JyjhYq 623jI6LaBbStM+XF59IRuKoc8QbzJBSDIG+g8Di+EsScCsoR938tNgjXWiowLEBDSfXc 5fTQbSSX/g4gu1lZsV6Mwe4+OnzqZWaIZUXgR6/wEwaIHMA6TY9N4xnQhCR6tG1DBIGl Us7osuYmCaiuvTdlfH5XJ9BjElrXw3Lw09jpkHU9Ld6FAYwct27T/+eG+I3y/VCMzOnP CFfEr37p4DkuIwpDwz42qLYbjKlvJZa8bXQXJo/1GScK0Wbwo0HBoqFq+jn+7/MkHAEt GRtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=hYBoWNdc8/psr6Xix8xH2gCwPRSpJtODm2Xux9v7bNU=; b=KRtp0WIQW0vT9/9y+UHEuVWIi8j1VZ0edWe1xICfaF8MOCEF55B6EYqpYc1UGrt9kk vck8/cSn61FccBIPz/5vpHKc77DPmsHILQVUpS3De03dOb1nSHgdWEXbGpFgKpkT5Bj5 jupxNYylAR9vdK2wForsnY91X4d/7DcEz1DwZMBGT4rGd8/nMwezI6glSzPQudfxNLAX SbdWvGUOfuZ4NCEY+VELP9OgvYLdHAOYzxzcX0Q6YxYxzFquWKEnjjW/wLlg6qwBUkEG wZNO3PDyvxIyTBlM0eK8mZAq8e5JuF/wvq6RgB0+10PlHQIZrl6Mj8ttuDe/iPKPSZVg 6O0g== X-Gm-Message-State: AO0yUKUx9tNHA9756dQjD9BIY19yWKMrNyKK97JyRc0BxPc9Pstb2O24 TFkJuED4eOb/C3IhGJXYGmgTqxg0mg0VIVXd7t8= X-Google-Smtp-Source: AK7set+7GGh/jWwenSs9o2b80ML/eRkPgFZP5mljNn4fjxlJdKStSCl9FnQuo04TtS6JSnorcqyabA== X-Received: by 2002:a17:903:1ca:b0:19a:98c9:8cea with SMTP id e10-20020a17090301ca00b0019a98c98ceamr3117499plh.39.1676236288542; Sun, 12 Feb 2023 13:11:28 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:28 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/27] apt: fix do_package_qa failure Date: Sun, 12 Feb 2023 11:10:36 -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 ; Sun, 12 Feb 2023 21:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177063 From: Changqing Li bitbake nativesdk-apt failed with error: ERROR: nativesdk-apt-2.4.5-r0 do_package_qa: QA Issue: nativesdk-apt installs files in /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/var/volatile, but it is expected to be empty [empty-dirs] an empty dir apt is installed under /var/log/, fix the failure by removing the empty dir apt as what we have done for target. apt will create it when it does not exist. Signed-off-by: Changqing Li Signed-off-by: Richard Purdie (cherry picked from commit 5b035a59d7915da784f1e6678ee130f30d7ceb8a) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/apt/apt_2.4.5.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/apt/apt_2.4.5.bb b/meta/recipes-devtools/apt/apt_2.4.5.bb index b5ada2ef55..9ebcdfd527 100644 --- a/meta/recipes-devtools/apt/apt_2.4.5.bb +++ b/meta/recipes-devtools/apt/apt_2.4.5.bb @@ -117,6 +117,7 @@ do_install:append:class-native() { do_install:append:class-nativesdk() { customize_apt_conf_sample + rm -rf ${D}${localstatedir}/log } do_install:append:class-target() { From patchwork Sun Feb 12 21:10:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19440 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 5D87AC636D4 for ; Sun, 12 Feb 2023 21:11:33 +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.6.1676236287926145052 for ; Sun, 12 Feb 2023 13:11:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=u6s+gemX; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id k13so11689205plg.0 for ; Sun, 12 Feb 2023 13:11:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=NGHfctV/Bdyv6rnC0wDqtqPLuPVM9staiSFEH1XzJC4=; b=u6s+gemXlJFzto8HB//WTTqUB4XubgdXaOxPf/vD/G5Xt/l8Hoj4hnz5se4UcdxeSU ijCQRkXZzvkgq36Eg0nfov6PaZFznOogRBtAWjliNqWYL7+MzSx2Br3X1fDCzK/tWbKL aWMG/1Sp5uV6vMO97M9vMUFVKoBUO6dp/ozxMz/fK4JusDOBZL9FTwQkao7997yD7BlG sW4YLPsZOdtgk0O2cDG1KxvQ30tsD5PS+G5ov+KNR4Ra6uFxlIKdUu94l+xlXMvF/ys5 Iuz8fiCH4lp1rJP3tPuPI9JdCqV03ShEYnR7KV2diLlBv/S/GCYlZuGfCBfwujKfoNZN 8XGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=NGHfctV/Bdyv6rnC0wDqtqPLuPVM9staiSFEH1XzJC4=; b=2Pd3CiL/x3aIr991aKADyczMBKhsBSQ8WgR/9pAySDOg9J0qgW97BEXa1E4zZkOTda 2dTPZkkycrMRMXjbqrEnRGG6zM2okZQHb4+l7WnHl9eHlJgorlBzh9xzksx6+K3/+qFW ft0wrwUTdFJWeVK7qL6Py2yC3eG/CnviFPsMDXnhSK1o2URQAiVuQGl1X1mlI3i9E4OO LdXIXjPzZ9146G53JXdK7pk/Gw+6bhSiJjS+wxCnWGfLqnTq9uyNY2e7Yn5r3soedq/o lUlFb37chQTlqvMCS0vcegS9K3EmF949Tv3yFzZTn5ubwnH4ER1w4+AdNdWvstEthEJ1 r89Q== X-Gm-Message-State: AO0yUKXD99UR2ORzHL7eC8TZJf+c4hgqmgemz/aXjZdFRoZyZJgb4a5H SkqTFwIxvZweLW4VeYSOonrKWnza9dAgtRRZ2LM= X-Google-Smtp-Source: AK7set+qAjYsfiaWQdNJE5Pu1tNkoPoeAEB4oTrvQuAsGf2Nho8X3zk4ASijLEsYMuxxPEq83eg7ng== X-Received: by 2002:a17:903:246:b0:198:ff11:2600 with SMTP id j6-20020a170903024600b00198ff112600mr26260970plh.2.1676236290395; Sun, 12 Feb 2023 13:11:30 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:30 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/27] oeqa/selftest/locales: Add selftest for locale generation/presence Date: Sun, 12 Feb 2023 11:10:37 -1000 Message-Id: <7b7a03a5cd8a5c14918f56e4dc00629d0a109a2e.1676236110.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 ; Sun, 12 Feb 2023 21:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177064 From: Louis Rannou [YOCTO #9070] Add a new selftest to validate locale generation. This selftest builds a complete target with GLIBC_GENERATE_LOCALES, IMAGE_LINGUAS, ENABLE_BINARY_LOCALE_GENERATION set. Signed-off-by: Louis Rannou Signed-off-by: Richard Purdie (cherry picked from commit 53258fd810bea6475af9f908f7b712a13a02b628) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/locales.py | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 meta/lib/oeqa/selftest/cases/locales.py diff --git a/meta/lib/oeqa/selftest/cases/locales.py b/meta/lib/oeqa/selftest/cases/locales.py new file mode 100644 index 0000000000..433991abf9 --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/locales.py @@ -0,0 +1,45 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.core.decorator import OETestTag +from oeqa.utils.commands import bitbake, runqemu + +class LocalesTest(OESelftestTestCase): + + @OETestTag("runqemu") + def test_locales_on(self): + """ + Summary: Test the locales are generated + Expected: 1. Check the locale exist in the locale-archive + 2. Check the locale exist for the glibc + 3. Check the locale can be generated + Product: oe-core + Author: Louis Rannou + AutomatedBy: Louis Rannou + """ + + features = [] + features.append('EXTRA_IMAGE_FEATURES = "empty-root-password allow-empty-password allow-root-login"') + features.append('IMAGE_INSTALL:append = " glibc-utils localedef"') + features.append('GLIBC_GENERATE_LOCALES = "en_US.UTF-8 fr_FR.UTF-8"') + features.append('IMAGE_LINGUAS:append = " en-us fr-fr"') + features.append('ENABLE_BINARY_LOCALE_GENERATION = "1"') + self.write_config("\n".join(features)) + + # Build a core-image-minimal + bitbake('core-image-minimal') + + with runqemu("core-image-minimal", ssh=False, runqemuparams='nographic') as qemu: + cmd = "locale -a" + status, output = qemu.run_serial(cmd) + # output must includes fr_FR or fr_FR.UTF-8 + self.assertEqual(status, 1, msg='locale test command failed: output: %s' % output) + self.assertIn("fr_FR", output, msg='locale -a test failed: output: %s' % output) + + cmd = "localedef --list-archive -v" + status, output = qemu.run_serial(cmd) + # output must includes fr_FR.utf8 + self.assertEqual(status, 1, msg='localedef test command failed: output: %s' % output) + self.assertIn("fr_FR.utf8", output, msg='localedef test failed: output: %s' % output) From patchwork Sun Feb 12 21:10:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19445 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 5C35DC636D7 for ; Sun, 12 Feb 2023 21:11:43 +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.web10.13.1676236293221386631 for ; Sun, 12 Feb 2023 13:11:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vlJ7lhSj; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id o8so9257243pls.11 for ; Sun, 12 Feb 2023 13:11:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=p/sGelX9T76pETlTtV/LscdR5ex0mRl+Zx4kOYJT9sQ=; b=vlJ7lhSjCz/ksIeR0uqWfTdADb8zorwnbvD7VtGsoLpF9qt3nxnvZYmg3G/cnMM+/J s1sfM9/LL38hgqpmnDYt4BcZ40xdAhQlaSe1EZCSf/0BqxTfzVhd7i8EoMTCqfKGyxVp AKox2FV9e51Zw7q6eKXdwsWJyfESLEmZnuNWYvuZYxkNvpjlM2sjTtHfhRi5fuhHQlr7 66YS3eAuflJd+NCSD0HqQyLeKLhpbUYSyE+mkYk3alRYg4IMZ5j+84txzQ1z+sNfsD8v qVgbpWwhbZWVnDyPARhSOD8mF+5QaiTekBLGLEl5DIrWPA7bxL/xSwZLtantsh+bxn5K eaVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=p/sGelX9T76pETlTtV/LscdR5ex0mRl+Zx4kOYJT9sQ=; b=JEAjnOu98cVTeBlyXgKLyMM2D0oDfqbCzRgYMBlEmv8bN804Pn8MhOgLQck+cciZ1r +dW8VhNqq2naV+Ae+k4GqBZE43cj7Iq18DfUhTrO9+5HLAHrW85eiJFaDaDdWbzt3HfD bhPTTdhb+yLRZ9EtVey1MdW+Kgroqrs5aWcylEBUvgWiDv7pEdja6cz+NWNcZkbVGf7q WwEzwte+RSGdRGnGT0HoASVOh7he8iRgX57Ne45HqBuezF9sXjHgm00npHNgPbXrCC84 2AjDDQlGl/ckSgV/N0IGt5rNDZR9aoiB0+CZjei6yI4zsDX61OLO6emtiWSqut8auKlS lg0A== X-Gm-Message-State: AO0yUKXzrvXK1QthQkm8XF4ggncMz/EAjx7TPs2HFSUrDBP2Z/NyrqJ8 c+d+LjkA1wlw1tTFw/gQWWcSxTX77Kdt5ZBBJH0= X-Google-Smtp-Source: AK7set9cLCejLXk28IvaESg1jWejA52CKrQo48YMCRdXxYqe7yBIDB9ILHjtRAoqT717bc7xev0rdQ== X-Received: by 2002:a17:902:f243:b0:19a:7e03:c4fd with SMTP id j3-20020a170902f24300b0019a7e03c4fdmr5468127plc.0.1676236292197; Sun, 12 Feb 2023 13:11:32 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:31 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/27] testimage: Fix error message to reflect new syntax Date: Sun, 12 Feb 2023 11:10:38 -1000 Message-Id: <03eced200a69ee64cb0efdca164e0d287314beac.1676236110.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 ; Sun, 12 Feb 2023 21:11:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177065 From: Alejandro Hernandez Samaniego Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ec73d19d78e8f30ff9b817490c23bcdf8ea47c86) Signed-off-by: Steve Sakoman --- meta/classes/testimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 8ffaeab284..34173ce68d 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -240,7 +240,7 @@ def testimage_main(d): with open(tdname, "r") as f: td = json.load(f) except FileNotFoundError as err: - bb.fatal('File %s not found (%s).\nHave you built the image with INHERIT += "testimage" in the conf/local.conf?' % (tdname, err)) + bb.fatal('File %s not found (%s).\nHave you built the image with IMAGE_CLASSES += "testimage" in the conf/local.conf?' % (tdname, err)) # Some variables need to be updates (mostly paths) with the # ones of the current environment because some tests require them. From patchwork Sun Feb 12 21:10:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19447 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 6368CC64EC7 for ; Sun, 12 Feb 2023 21:11:43 +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.5.1676236284015063975 for ; Sun, 12 Feb 2023 13:11:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vlKKk/iq; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id be8so11624891plb.7 for ; Sun, 12 Feb 2023 13:11:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=Z4fG1zDasFq9AIW8B/FmwXNhucxZABRm+xKCKb6qm/E=; b=vlKKk/iqaeX3O2lPxOQyAYdUQiqWpLZRQEFv80/3hOxF/aBxpgWI0mhbMQ3a8sShFK cR8md8F304vGhWdi32wy6CL3FbrFFW4jixeFvN0fIRPR1JOsJrsPxdaXQ2i4bhHoHmrN FN3F852rGSjEa41fkXyeVeTi9NCXqYVWG4QQ3LouN0cEjcK58eZFZ0tCrncprhgO1Yd4 xuPIbnUoTRHWiN7E2twuvfNiZv4aX/7R6ZXrauTXTOQCx3bMuUVui7wf1pEg6LymkEm+ w0oH40oAx+wu3cna/Vcps0OMWP7FCxOxqjoPM5MBDnqCvVSSmAZKZ/Pl4QXIUUSPyL8s 6F8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Z4fG1zDasFq9AIW8B/FmwXNhucxZABRm+xKCKb6qm/E=; b=VzhdZr90EwyNyjr9XhddVj0aRrY+n/mM7PxLI678MkI4B5IljqtLxXGwVyGNuhYJ4P wqSgWeqetyZix4MXWTqB1bZWWp18AkcpJRrC8wtY8eXmqdm91GloPTxra29LkhaxKEcu r/+O9newjy/q+BbI3GscovHWqwKTjNX6XH02O+UYu6H1mQ706sYtLLscFHwh+dqQQmxR W67uEw9atIZSyJV2zmE+G7qtQl/vU6cUIeGPmeFgRp6BX37qR7tBup4SUQQ36zdw/SJO MC0l3XiDFM9U0yCrWTaWcmbkF+N4cvX2xVd0ik3i76C5AIRhUFjN3ui5IuPr8k1sGjh3 Bytg== X-Gm-Message-State: AO0yUKWo6kmW1dnwZZ+kpgzAATyCyu6LU2DufXwu/3LrPnbra30rpMje 9smzc/yRmUHb2jn3giTl1rJUYnnkYnUm4in7kqg= X-Google-Smtp-Source: AK7set9VJDYEO4cuITMqdP2zU9w60Xfe2N0uP95jAKSyd2wMOkYrGBqPpabh1FGJvdiuhuZFb7a0rA== X-Received: by 2002:a17:903:32d1:b0:19a:9686:ea85 with SMTP id i17-20020a17090332d100b0019a9686ea85mr4582654plr.17.1676236293991; Sun, 12 Feb 2023 13:11:33 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/27] libc-locale: Fix on target locale generation Date: Sun, 12 Feb 2023 11:10:39 -1000 Message-Id: <258115c2a7d78f0416f952122c9448a805dab08f.1676236110.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 ; Sun, 12 Feb 2023 21:11:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177066 From: Richard Purdie If on target locale generation is used, it fails at first boot showing errors about a missing directory. Ensure the directory exists. Signed-off-by: Richard Purdie (cherry picked from commit f2844c9f1bbb729562063d96a3d1cc9d44dafa0a) Signed-off-by: Steve Sakoman --- meta/classes/libc-package.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 13ef8cdc0d..baab8fc9a9 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -45,6 +45,7 @@ PACKAGE_NO_GCONV ?= "0" OVERRIDES:append = ":${TARGET_ARCH}-${TARGET_OS}" locale_base_postinst_ontarget() { +mkdir ${libdir}/locale localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s %s } From patchwork Sun Feb 12 21:10:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19449 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 6AF6FC64ED6 for ; Sun, 12 Feb 2023 21:11:43 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.12.1676236285844440022 for ; Sun, 12 Feb 2023 13:11:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tFTYOlhZ; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id r8so11655650pls.2 for ; Sun, 12 Feb 2023 13:11:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=THLRCelePnaYSyvnR7XLw5Qr9ygbFpRyI3u/kxzPEOQ=; b=tFTYOlhZzYxGOmbDC9g5sLT+2mEipKE/vbk81FHhGyaBFKedUwdhF5ww9Lthw3vTVp Xnxr9D5yrZEU6pEWx+xs84XQ/k43w7vnEeRLIGGQf4bLNRcoaAwUJzkhiNfWrmcypR2N 6e69lfJBEn2aYJuWMOwyoHFQMb3OuPiR6sKFSzsIiV7QEaAj/9B8fdkIO5LaYXTWghs+ OhC4Yl3ukUNuEnzXegFWdyVA4nrbWoijKeK+wO1I24PsmiMDcWZq0hUTCcAoKkFPKskh GItP4mYOOGJaJ0C1OIgpujJajHcRrcezp4s2eNm8o5VF7QYZZKtc8swdRWCMffXjDhHn 6Gpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=THLRCelePnaYSyvnR7XLw5Qr9ygbFpRyI3u/kxzPEOQ=; b=4RU0/njes8zX9OmiZ1ESZij/8SaSoha3bq2v1p4vI7o4dkmA7znNp+d3iKvFTEeGgB odYWeijDfD1tI8ZIGHCijruXE6IMArYADd+RmBfl9J52rB+tMlz8DYfoGaSzesvG1GVa XFW5R6WgxDHjm2rp1wqnR3Ri1WRfx0cCCYlX6jhIeclJIoouqc+XFuo40nAU5+qikgeD axxsWgs/sJ0gIvxyhWUUBBvOnDW7b6gNen+BMABBmgLyCmliLy/s+Fx6KydSSG8W1p9k 7GBCfHBqkTx5y1YWaudG6bV9E3GJ3AQfqoEwGZjRbuUgH7icR/9q7cB09h9SRq78ONaZ ohKg== X-Gm-Message-State: AO0yUKXZF+I+sRcAA+EdDlErRHWiG+PQ0smmvl4THcF5efaI104pbFZA 3fhgTgCj4znj4Uqxeam6xkCsZkDLlI/tW1lPGp8= X-Google-Smtp-Source: AK7set9k6hxfcN3ElXLwPbIxwIZ5YdMXfBK04w6BSxKyiXQ7GQY/9kAw+KlUHT90Wpt8Fxy1bnAR9A== X-Received: by 2002:a17:903:1384:b0:198:e39a:b9c6 with SMTP id jx4-20020a170903138400b00198e39ab9c6mr17212629plb.23.1676236295817; Sun, 12 Feb 2023 13:11:35 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/27] bootchart2: Fix usrmerge support Date: Sun, 12 Feb 2023 11:10:40 -1000 Message-Id: <5d2e5abd098ae0b4f904cd7270daa1eb61708fa6.1676236110.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 ; Sun, 12 Feb 2023 21:11:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177067 From: Harald Seiler bootchart2 introduced a variable EARLY_PREFIX for supporting systems with usrmerge [1]. Right now, the recipe here is sidestepping this feature and trying to replicate it by overwriting other variables and even patching the sources. This wasn't enough, however, as there are still problems: For example, some setup code in the bootchart-collector fails because it expects EARLY_PREFIX to be used [2]. Cleanup the recipe to set EARLY_PREFIX and remove the other workarounds. [1]: https://github.com/xrmx/bootchart/commit/56a638ace1d172163b6d636c89892446b8add4b6 [2]: https://github.com/xrmx/bootchart/blob/3d2136d0335718fbe1a8e2370ccbc30123a6e593/collector/collector.c#L670-L672 Fixes: 4157600d3122 ("bootchart2: switch to add patch from change source in do_install") Signed-off-by: Harald Seiler Signed-off-by: Richard Purdie (cherry picked from commit 7031bc65b10040877392ed774a0cdddef85c12e0) Signed-off-by: Steve Sakoman --- .../0001-bootchart2-support-usrmerge.patch | 37 ------------------- .../bootchart2/bootchart2_0.14.9.bb | 11 ++---- 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch deleted file mode 100644 index 88597cf3a9..0000000000 --- a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 5 Sep 2019 18:37:31 +0800 -Subject: [PATCH] bootchart2: support usrmerge - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1cc2974..f988904 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ endif - PY_SITEDIR ?= $(PY_LIBDIR)/site-packages - LIBC_A_PATH = /usr$(LIBDIR) - # Always lib, even on systems that otherwise use lib64 --SYSTEMD_UNIT_DIR = $(EARLY_PREFIX)/lib/systemd/system -+SYSTEMD_UNIT_DIR ?= $(EARLY_PREFIX)/lib/systemd/system - COLLECTOR = \ - collector/collector.o \ - collector/output.o \ -@@ -99,7 +99,7 @@ install-chroot: - install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs - - install-collector: all install-chroot -- install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) -+ install -m 755 -D bootchartd $(DESTDIR)${BASE_SBINDIR}/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) - install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf - install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector - --- -2.7.4 - diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index b1628075a7..38a1c9d147 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -93,7 +93,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)" SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \ file://bootchartd_stop.sh \ file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ - file://0001-bootchart2-support-usrmerge.patch \ file://0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch \ " @@ -119,12 +118,11 @@ UPDATERCPN = "bootchartd-stop-initscript" INITSCRIPT_NAME = "bootchartd_stop.sh" INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." -EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"' - do_compile:prepend () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" - export LIBDIR="${base_libdir}" + export LIBDIR="/${baselib}" + export EARLY_PREFIX="${root_prefix}" } do_install () { @@ -132,9 +130,8 @@ do_install () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" export DESTDIR="${D}" - export LIBDIR="${base_libdir}" - export PKGLIBDIR="${base_libdir}/bootchart" - export SYSTEMD_UNIT_DIR="${systemd_system_unitdir}" + export LIBDIR="/${baselib}" + export EARLY_PREFIX="${root_prefix}" oe_runmake install NO_PYTHON_COMPILE=1 install -d ${D}${sysconfdir}/init.d From patchwork Sun Feb 12 21:10:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19448 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 6B92FC636D3 for ; Sun, 12 Feb 2023 21:11:43 +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.5.1676236284015063975 for ; Sun, 12 Feb 2023 13:11:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XvzfYm+s; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id be8so11624969plb.7 for ; Sun, 12 Feb 2023 13:11:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=Dqgv1sXLyVJNJt9k+6xvzMhVPcD5f2uoZ77RTA8bPUo=; b=XvzfYm+shbJq0Nb9cl3Cju5ZkwD+tbdM2GnLn7EmxfpZZmtxbWyfZAc68TovRtmgHr TQXMDky/Q4agUqHPCaJekQrbIWeM4XspKWFxU/xd/bOXXqlumqe/HUQn77lFIhFy9qDc +X8skiOalzKAv9mSxyMlOjLKqQVg9G37eClyzViioMb6Ya/8f9sifslmYhbV3FpZdCEa 2buXeoFxXDDJcT76kSdyK8b7Pc9mikx97kgf939efzaV+FPMiBbYM+4zvA25eMmYXdIX qC4sTq5AEol/iYOZ0O8iID6OW19A+9WsQvAtBZFwWFoFhjsXjeCEnPYdPQ2Hk67Xcx5/ AVfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Dqgv1sXLyVJNJt9k+6xvzMhVPcD5f2uoZ77RTA8bPUo=; b=IWzMTvFaY1jMBOlC9S3X3MTnagnbJisd9EnQZ7wFV0ZF5WUX5QAII4qhGpzQg6HmUN ARnH7q6tbgHlVxFrL5dj1isKP1fbSKfeRSx2UfNzcJL6ODO+i3EifyKIe1R7CRTMdNXz 8vxACm8KUUWDyp8VFV4rFUcgZF6FQ/kvzo9EPae6qw6CsXVISfDj0P2sob07rzsX5XFk 1D+a2Sv+AKbeXJC0PCYyVxLZRUNeG0zIXeOWExF4O8duwDUZhcc7OXR8w8GyTeI/2vqU fs2LTpBnvrJXq51Lh8vrCSA5BVnS1F+7zpx5zFzFNGJto0upbAQ0LixN55LRnUe1v0z9 eGAg== X-Gm-Message-State: AO0yUKXF9QDNiF3o/Xl1K3ta47HdCsEkW/Eg7dje0JDyRvkpdFe3oJur qNMbDF4nmuwYQqhlq4w8gVTgSuFw+AN6mrnATkA= X-Google-Smtp-Source: AK7set9KK2zrYbuWJ2w1sQEy2o9RA7IjS66wu6p130oXAMwDmeXb8gfdtEoqO0uFCCA7MshGQ2NKgA== X-Received: by 2002:a17:903:2308:b0:196:6162:1a76 with SMTP id d8-20020a170903230800b0019661621a76mr27069729plh.0.1676236297765; Sun, 12 Feb 2023 13:11:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/27] recipe_sanity: fix old override syntax Date: Sun, 12 Feb 2023 11:10:41 -1000 Message-Id: <381fcdba555d0b56fcd4525d82bec851b3da95ec.1676236110.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 ; Sun, 12 Feb 2023 21:11:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177068 From: Ulrich Ölmann Signed-off-by: Ulrich Ölmann Signed-off-by: Richard Purdie (cherry picked from commit 18eeea6fcd8ade49390a978134f51646da2f7764) Signed-off-by: Steve Sakoman --- meta/classes/recipe_sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass index 7fa4a849ea..df6e9a7db9 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass @@ -10,7 +10,7 @@ def bad_runtime_vars(cfgdata, d): for var in d.getVar("__recipe_sanity_badruntimevars").split(): val = d.getVar(var, False) if val and val != cfgdata.get(var): - __note("%s should be %s_${PN}" % (var, var), d) + __note("%s should be %s:${PN}" % (var, var), d) __recipe_sanity_reqvars = "DESCRIPTION" __recipe_sanity_reqdiffvars = "" From patchwork Sun Feb 12 21:10:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19444 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 5C064C636D4 for ; Sun, 12 Feb 2023 21:11:43 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.6.1676236278486361097 for ; Sun, 12 Feb 2023 13:11:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mYMeTSLQ; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id e17so2772010plg.12 for ; Sun, 12 Feb 2023 13:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=1v4v9wNUhxWDROS6FK96WBDXKWnfXKENog9s/gGsa7M=; b=mYMeTSLQilCFJInPopq8fbgHFIiPhzOU53YwzPRFCh5zhYaCDybMGGoM171ulCYzR8 mSfS6p2MnZOd1XYusMs6Ix/C4ZXPZvZf+P4DmkZc3si/v2SnB5iM4YLZw4lH0wNNMFBT DvZyuhyVAHmf8S+QjIRiZ91QgF6OisFqd8Ewu14s/+TjCVZoJL0gkApJ45jj2x3ppXKP g3KX1t9Meq7pKBDVis+5VAq0hER9T3X6akq/QtPDIfDWRRZ9bw0oJvw5ci15BfrztaXv M/1MguCKCLg2ghLwilhiwnOR7kql/tFenda81boYzY0I7BeVoVZXcjdmxHO2NI64y1g3 kKvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=1v4v9wNUhxWDROS6FK96WBDXKWnfXKENog9s/gGsa7M=; b=EP3v8nTdV4zubaw20WhdWLh5xKwJgsLBTjOKHGChXLF4cH/gmAj+JHqEReJ8KB9GmB crFzX3N40RTDnD9gB83WR5IUMptk19ZI7k8QGICckWPv2zpk6I0bkm3F4+f929r7C8CI YnuNIFFLtHwfsKZoF4eUKyh9XGW1nPy8//XUiLOG/snyxsCD6KLhNr+aKon+16SBQbWv cpsWy+2tHUQuEVjEPlhUoL6D1Jl82nF3EgwvaAkl16xJr2tSi6ICGjwmXczDJB5VO8yX mUr97grWz6Xsy0oTYNLg0DJGe/uTm1JrOpeOdlO35/iDKP6JKkCesfdORkXt7zuPdy8l MZnA== X-Gm-Message-State: AO0yUKXEH+pcueVDr0xOj1mDqenaWvn3wPMI2fw7B4CGqqALOiY+znYo L5CYB4kb+ij4J1SZJyl4A5IHABTye1a18UmYzx4= X-Google-Smtp-Source: AK7set+D6drSj+l8iSwBCLraqyyDv3oXdRKH/Ii7THRrExeNlTedOr7R4NBzJcG48TK562gT283B8w== X-Received: by 2002:a17:902:cf08:b0:194:a6e0:3ba with SMTP id i8-20020a170902cf0800b00194a6e003bamr11469839plg.54.1676236299626; Sun, 12 Feb 2023 13:11:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:39 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/27] lsof: fix old override syntax Date: Sun, 12 Feb 2023 11:10:42 -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 ; Sun, 12 Feb 2023 21:11:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177069 From: Ulrich Ölmann Signed-off-by: Ulrich Ölmann Signed-off-by: Richard Purdie (cherry picked from commit 052f767f85eddab9b6e5d78268d2732f4a65d446) Signed-off-by: Steve Sakoman --- meta/recipes-extended/lsof/lsof_4.94.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/lsof/lsof_4.94.0.bb b/meta/recipes-extended/lsof/lsof_4.94.0.bb index 62f42975af..d50959d73c 100644 --- a/meta/recipes-extended/lsof/lsof_4.94.0.bb +++ b/meta/recipes-extended/lsof/lsof_4.94.0.bb @@ -22,7 +22,7 @@ S = "${WORKDIR}/git" inherit update-alternatives -ALTERNATIVE_${PN} = "lsof" +ALTERNATIVE:${PN} = "lsof" ALTERNATIVE_LINK_NAME[lsof] = "${sbindir}/lsof" # Make our priority higher than busybox ALTERNATIVE_PRIORITY = "100" From patchwork Sun Feb 12 21:10:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19446 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 56D0AC05027 for ; Sun, 12 Feb 2023 21:11:43 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.17.1676236302499036227 for ; Sun, 12 Feb 2023 13:11:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jgaO7S6Q; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id pj3so10163418pjb.1 for ; Sun, 12 Feb 2023 13:11:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=epAO2EG8Q+yCBh9i+dO5JtNWsxsXr+yoTlOwZxxSwdY=; b=jgaO7S6Qmsd5NVAIoA5pT7UG2y/LAP6WjCHazrnjZr636Hq7y/BDU0r2YKrnGaXPkM wDoETwZ5so2KBtg/d9Eec1rfWPGSaWYiY886YfnTB25X/c6GCtlEV+Xpu4M649DKBO/j EEiezgP5A18j+AoaEtIF8bPufaU8fKfmHC1Nq75WVdDf5yCq/CWo+Q7OgrgcClfL805V wuGKma/jBiFCljhFb67lmYtot1JK56So5ekR0mw7WAlqQIUS0fxwOWpbqAJe1sB6tkM+ WsmC6mNu+yg4Jft9pkDkwvlwp75aQrE86e5DxYm5WotHIrRDd4hLMIk8PtetKnGE9uiW YY5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=epAO2EG8Q+yCBh9i+dO5JtNWsxsXr+yoTlOwZxxSwdY=; b=2XRO0TjSWCuMvclpTIndJM9CbE0N3iyLmUUGNgN/BK7FNhVVMo5R7kVWgFE5dn9JzC x31NfyoWHW5Gfuu3iwSLYjJ0vuLzMsoJc/DT2eET1RucP4Yx0W4XKdx0pJKU8Q5nyZw1 lX1qNQ2vzJk5Oe8WmYkudu/tuOIaNU+nemYTQMm1syKqEyVF2KqWxnsrQkIaFMLpR6mY tTpJDCfmSRSY6+9Z+E0sgSSXM3ucQ1+J8U0PlyFFZ9gGh4qH/mGxNVvTvq9IKdqsOB2O 8sxu3jWyJipm0uOusKgxfGu5N8GGzr8PqdtAsCQUqLkxDLnIsdQ4AsdHlpd+D/b4AEMe hBnQ== X-Gm-Message-State: AO0yUKXZuSkoNRpk1/s6lUPAToKseyKtx8P0jSozBz4L5NdPn+63QtDl ZiCxXRFSBeWT/Wu3C6R5RowlcC7CeEZGWnmsczQ= X-Google-Smtp-Source: AK7set8Kdu697MgTiK0ljUQGXF6sRpy4i9Stasls90llOClAv/elybyL6aQrBupOrwN3jAzA+MJk8g== X-Received: by 2002:a17:902:cad4:b0:19a:8378:bde2 with SMTP id y20-20020a170902cad400b0019a8378bde2mr4220525pld.39.1676236301465; Sun, 12 Feb 2023 13:11:41 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id d23-20020a170902b71700b001933b4b1a49sm5675482pls.183.2023.02.12.13.11.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 13:11:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 27/27] oeqa context.py: fix --target-ip comment to include ssh port number Date: Sun, 12 Feb 2023 11:10:43 -1000 Message-Id: <54c30e509074073b99a7a8890482ba1af2abbab9.1676236110.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 ; Sun, 12 Feb 2023 21:11:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177070 From: Mikko Rapeli Providing ssh port number is supported too with "--target-ip 192.168.0.10:22". Signed-off-by: Mikko Rapeli Signed-off-by: Richard Purdie (cherry picked from commit 637919b9df0abc06da5b2f9b389cf25376bd6b7c) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/context.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index 8092dd0bae..0c5d1869ab 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -67,11 +67,11 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): % self.default_target_type) runtime_group.add_argument('--target-ip', action='store', default=self.default_target_ip, - help="IP address of device under test, default: %s" \ + help="IP address and optionally ssh port (default 22) of device under test, for example '192.168.0.7:22'. Default: %s" \ % self.default_target_ip) runtime_group.add_argument('--server-ip', action='store', default=self.default_target_ip, - help="IP address of device under test, default: %s" \ + help="IP address of the test host from test target machine, default: %s" \ % self.default_server_ip) runtime_group.add_argument('--host-dumper-dir', action='store',