From patchwork Fri Jun 9 16:53: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: 25345 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 EC66EC7EE45 for ; Fri, 9 Jun 2023 16:54:15 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.130.1686329646467989857 for ; Fri, 09 Jun 2023 09:54:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=qr7AqJHr; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-653bed78635so1464917b3a.0 for ; Fri, 09 Jun 2023 09:54:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329645; x=1688921645; 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=rPQLfsa06t7PkNwp01hdcUrq9SWYyiUCaVME1GDZWMo=; b=qr7AqJHr5ChkAbgui0EczzY3twOCWteN4rmL3/5FVFOSobIv3rDDQAT6sfcfpa2VYA Egx6NRGQk+2gMEU3sq/gC8cPjO4U3lq1ZURxnjxqellkgPSNft2xborzvVxTeKoN2kn+ 3wPH1etSxjxzG0k2lvErfuSQtof25IOTnJ8yx0kLuYu7qkUHovl6RVu4yoIx6bgIIT1M lHRA7u8dF9Amp9NFKuj83b49a19ytjkr8vZaP9gh6gGXZ47hElLzhWXCIuCWb+oE6D3D 0TB5nhBogJXfnhJ0ge/3j0Cdeya+ZyseaD5p1jrB0dufjRV1lbxdsOm3vuyH04l8oql4 VL6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329645; x=1688921645; 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=rPQLfsa06t7PkNwp01hdcUrq9SWYyiUCaVME1GDZWMo=; b=HlljsZYAX9rWpCbT3u2ai8UitBKrgl8XCsZiJkSgABAmzQGjkg/HwTt3GhCt+6+xJ3 6whO7acAxpqSy3U5pPXSmrCNroHET5/vC2yKIqgBpC7Wyv8Qfw6KVIsGdxDuws776YSj 9QCSDuJ7aiX0VyKmPo9NyBmVOO50KutxQTLLyO6MLZ2XynRKgakh9VBJVnzUHzOY8kR6 CsM5O9gKbiOj5jH7w8eF4B6GCRrRxYwFTmycHGzGWZdp1c2JefcY4BloqvEDndKeo/qt az6UYCB/F0YXhFwwG4qBmOgJfVLZif3HI3n3u6ODGXEDRTiOgwyK8LMNr1rIw2PMUrct aSjg== X-Gm-Message-State: AC+VfDxzklEFO64LEMwVUk3Xr0FyKqMCqO4VGPvtnk9QW/F/lU7kk5P9 aooz2O9OJAX6WDuAZUgBxL+ZjgCF4g9VP4ME9o8= X-Google-Smtp-Source: ACHHUZ6LcDV6xakcwkrZ8mRAjwoxu4JMBgG3fWC0v/j4SH7SlEH14OF6W1Hrs7C2vwlvDa/rrZCXOw== X-Received: by 2002:a05:6a20:158a:b0:10b:bf2d:71bb with SMTP id h10-20020a056a20158a00b0010bbf2d71bbmr2987088pzj.27.1686329645040; Fri, 09 Jun 2023 09:54:05 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 01/30] sysstat: Fix CVE-2023-33204 Date: Fri, 9 Jun 2023 06:53:28 -1000 Message-Id: <5aee537b52382d5b5e702ecb4c3f34e38a90a398.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182567 From: Xiangyu Chen References: https://nvd.nist.gov/vuln/detail/CVE-2023-33204 https://ubuntu.com/security/CVE-2023-33204 Upstream Patch: https://github.com/sysstat/sysstat/commit/954ff2e2673c Signed-off-by: Xiangyu Chen Signed-off-by: Sanjay Chitroda Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 7a6871590b908e4b749484d913da5e280c20d05f) Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- .../sysstat/sysstat/CVE-2023-33204.patch | 46 +++++++++++++++++++ .../sysstat/sysstat_12.6.2.bb | 4 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch diff --git a/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch b/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch new file mode 100644 index 0000000000..a7b51f3217 --- /dev/null +++ b/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch @@ -0,0 +1,46 @@ +From 0764cb56df4a5afdf04980c9eb6735f789f5aa42 Mon Sep 17 00:00:00 2001 +From: Pavel Kopylov +Date: Wed, 17 May 2023 11:33:45 +0200 +Subject: [PATCH] Fix an overflow which is still possible for some values. + +CVE: CVE-2023-33204 +Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/954ff2e2673c] + +Backport Changes: +Adopt additional changes as per following merge commit of pull request: +https://github.com/sysstat/sysstat/commit/6f8dc568e6ab + +Signed-off-by: Xiangyu Chen +Signed-off-by: Sanjay Chitroda +--- + common.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/common.c b/common.c +index a3d31a5..138920c 100644 +--- a/common.c ++++ b/common.c +@@ -447,15 +447,17 @@ int check_dir(char *dirname) + void check_overflow(unsigned int val1, unsigned int val2, + unsigned int val3) + { +- if ((unsigned long long) val1 * (unsigned long long) val2 * +- (unsigned long long) val3 > UINT_MAX) { ++ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && ++ (((unsigned long long)UINT_MAX / (unsigned long long)val1 < ++ (unsigned long long)val2) || ++ ((unsigned long long)UINT_MAX / ((unsigned long long)val1 * ++ (unsigned long long)val2) < (unsigned long long)val3))) { + #ifdef DEBUG +- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", +- __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * +- (unsigned long long) val3); ++ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n", ++ __FUNCTION__, val1, val2, val3); + #endif + exit(4); +- } ++ } + } + + #ifndef SOURCE_SADC diff --git a/meta/recipes-extended/sysstat/sysstat_12.6.2.bb b/meta/recipes-extended/sysstat/sysstat_12.6.2.bb index f9e5778e76..b5014eaefb 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.6.2.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.6.2.bb @@ -2,6 +2,8 @@ require sysstat.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" -SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch" +SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch \ + file://CVE-2023-33204.patch \ + " SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48" From patchwork Fri Jun 9 16:53:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25349 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 F35A8C7EE2F for ; Fri, 9 Jun 2023 16:54:15 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.131.1686329648872720148 for ; Fri, 09 Jun 2023 09:54:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=ZKNOtusG; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-65242634690so1617609b3a.0 for ; Fri, 09 Jun 2023 09:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329648; x=1688921648; 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=rypwtqB6BEQIe6rPiNd7ptHijuRom+Ip3cKfIc1q/Es=; b=ZKNOtusGspfKQHTqDUnGXujufADruk2ftagnquwP0XiS1nycDPaXHof7GdxcNzNE+a VoWMEpwX/yvPKxaKI8YziBPxB4l4BOrBXC4/bFmwuAEkeXjnaa8szAfjufFcpJKZYjq9 yYSpHI5WXyqeOIkIgx7c6ygX32zDbgrP13ORqxuiFUHYWTbvR8Ghcijv1suj/++Hk/mz lw03H9enufjCpuVdSPzPaoy0MsMRL6yeQEBoNKgZ+fP86h7tpXkCHxuCTj1bePMUVwu9 L62l6f5EcW9xEwnky11FcxuFscO+ca8/3dCKmsJNuQl7qKQ5DlPteb6jLYzFT1tVfGwK syVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329648; x=1688921648; 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=rypwtqB6BEQIe6rPiNd7ptHijuRom+Ip3cKfIc1q/Es=; b=LfHb/EUgtbXenOpp1ZO0TL1kOhUJ5nzQM+8l9uQbdEbl/GlqctQ32KLkbKkucsKcD0 o2z/b8zbCaVLLt4+SgR1S5ve571KkEvRIwF9EGcRnV0wi9YwBGmiGKP25KUBVf/w2Bcv jr15m4bDAJX/C/Ci3gwKT3ie8Q08nEJd6XqcQRvOFhiJGkVOfLFyQcgOqH/+TK59zEU4 5gX9djbrL1YSsekgzbn/18jjFkTKgUzWwH8UPNgSxXA0mS9nL8eogRssagSJJU4tJsQO wdvmhMq1yS4ewXG1N4wNeIkVnPuuBL3UoLLnL0I7aFGGmmY5VhvUfzNYEK2rEMo3giZG RBUg== X-Gm-Message-State: AC+VfDz3u/GpHbmeCLH6nKMJG7QDO9rXlnfGnwhzDc80a+5sFnbpDzxl hP4ANTEtIvZJMmn7tbYqiZG0tOJ3XWXNqQG9KjY= X-Google-Smtp-Source: ACHHUZ6lb5avcGbgWxHdi+ZptwRt/aBBaRpJWTgS5Z49n1RvMJga2FlP+s70+biyazPVV8rv+aRGJg== X-Received: by 2002:a05:6a20:4303:b0:105:63b0:5bf8 with SMTP id h3-20020a056a20430300b0010563b05bf8mr1731035pzk.18.1686329647255; Fri, 09 Jun 2023 09:54:07 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 02/30] go: Upgrade 1.20.1 -> 1.20.4 Date: Fri, 9 Jun 2023 06:53:29 -1000 Message-Id: <5847869334dd6687441708e26d1c0ab0a648e7f5.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182568 From: Khem Raj - Remove already upstreamed patches - Brings a list of changes [1] [2] [3] [1] https://github.com/golang/go/issues?q=milestone%3AGo1.20.2+label%3ACherryPickApproved [2] https://github.com/golang/go/issues?q=milestone%3AGo1.20.3+label%3ACherryPickApproved [3] https://github.com/golang/go/issues?q=milestone%3AGo1.20.4+label%3ACherryPickApproved Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit e043bfb42156c59c93c6a4816528a63cfdaccc3e) Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- .../go/{go-1.20.1.inc => go-1.20.4.inc} | 5 +- ...e_1.20.1.bb => go-binary-native_1.20.4.bb} | 6 +- ..._1.20.1.bb => go-cross-canadian_1.20.4.bb} | 0 ...{go-cross_1.20.1.bb => go-cross_1.20.4.bb} | 0 ...osssdk_1.20.1.bb => go-crosssdk_1.20.4.bb} | 0 ...o-native_1.20.1.bb => go-native_1.20.4.bb} | 0 ...runtime_1.20.1.bb => go-runtime_1.20.4.bb} | 0 ...ompile-instantiated-generic-methods-.patch | 90 -------- .../go/go/CVE-2023-24532.patch | 208 ------------------ .../go/go/CVE-2023-24537.patch | 89 -------- .../go/{go_1.20.1.bb => go_1.20.4.bb} | 0 11 files changed, 4 insertions(+), 394 deletions(-) rename meta/recipes-devtools/go/{go-1.20.1.inc => go-1.20.4.inc} (77%) rename meta/recipes-devtools/go/{go-binary-native_1.20.1.bb => go-binary-native_1.20.4.bb} (78%) rename meta/recipes-devtools/go/{go-cross-canadian_1.20.1.bb => go-cross-canadian_1.20.4.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.20.1.bb => go-cross_1.20.4.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.20.1.bb => go-crosssdk_1.20.4.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.20.1.bb => go-native_1.20.4.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.20.1.bb => go-runtime_1.20.4.bb} (100%) delete mode 100644 meta/recipes-devtools/go/go/0010-cmd-compile-re-compile-instantiated-generic-methods-.patch delete mode 100644 meta/recipes-devtools/go/go/CVE-2023-24532.patch delete mode 100644 meta/recipes-devtools/go/go/CVE-2023-24537.patch rename meta/recipes-devtools/go/{go_1.20.1.bb => go_1.20.4.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.20.1.inc b/meta/recipes-devtools/go/go-1.20.4.inc similarity index 77% rename from meta/recipes-devtools/go/go-1.20.1.inc rename to meta/recipes-devtools/go/go-1.20.4.inc index 179f0e29eb..05bc168e0c 100644 --- a/meta/recipes-devtools/go/go-1.20.1.inc +++ b/meta/recipes-devtools/go/go-1.20.4.inc @@ -14,8 +14,5 @@ SRC_URI += "\ file://0007-exec.go-do-not-write-linker-flags-into-buildids.patch \ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ - file://0010-cmd-compile-re-compile-instantiated-generic-methods-.patch \ - file://CVE-2023-24532.patch \ - file://CVE-2023-24537.patch \ " -SRC_URI[main.sha256sum] = "b5c1a3af52c385a6d1c76aed5361cf26459023980d0320de7658bae3915831a2" +SRC_URI[main.sha256sum] = "9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6" diff --git a/meta/recipes-devtools/go/go-binary-native_1.20.1.bb b/meta/recipes-devtools/go/go-binary-native_1.20.4.bb similarity index 78% rename from meta/recipes-devtools/go/go-binary-native_1.20.1.bb rename to meta/recipes-devtools/go/go-binary-native_1.20.4.bb index 239334552a..87ce8a558f 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.20.1.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.20.4.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02" -SRC_URI[go_linux_arm64.sha256sum] = "5e5e2926733595e6f3c5b5ad1089afac11c1490351855e87849d0e7702b1ec2e" -SRC_URI[go_linux_ppc64le.sha256sum] = "85cfd4b89b48c94030783b6e9e619e35557862358b846064636361421d0b0c52" +SRC_URI[go_linux_amd64.sha256sum] = "698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd" +SRC_URI[go_linux_arm64.sha256sum] = "105889992ee4b1d40c7c108555222ca70ae43fccb42e20fbf1eebb822f5e72c6" +SRC_URI[go_linux_ppc64le.sha256sum] = "8c6f44b96c2719c90eebabe2dd866f9c39538648f7897a212cac448587e9a408" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.20.1.bb b/meta/recipes-devtools/go/go-cross-canadian_1.20.4.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.20.1.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.20.4.bb diff --git a/meta/recipes-devtools/go/go-cross_1.20.1.bb b/meta/recipes-devtools/go/go-cross_1.20.4.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.20.1.bb rename to meta/recipes-devtools/go/go-cross_1.20.4.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.20.1.bb b/meta/recipes-devtools/go/go-crosssdk_1.20.4.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.20.1.bb rename to meta/recipes-devtools/go/go-crosssdk_1.20.4.bb diff --git a/meta/recipes-devtools/go/go-native_1.20.1.bb b/meta/recipes-devtools/go/go-native_1.20.4.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.20.1.bb rename to meta/recipes-devtools/go/go-native_1.20.4.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.20.1.bb b/meta/recipes-devtools/go/go-runtime_1.20.4.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.20.1.bb rename to meta/recipes-devtools/go/go-runtime_1.20.4.bb diff --git a/meta/recipes-devtools/go/go/0010-cmd-compile-re-compile-instantiated-generic-methods-.patch b/meta/recipes-devtools/go/go/0010-cmd-compile-re-compile-instantiated-generic-methods-.patch deleted file mode 100644 index f9ac202421..0000000000 --- a/meta/recipes-devtools/go/go/0010-cmd-compile-re-compile-instantiated-generic-methods-.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 7a3bb16b43efba73674629eae4369f9004e37f22 Mon Sep 17 00:00:00 2001 -From: Cuong Manh Le -Date: Sat, 18 Mar 2023 00:53:07 +0700 -Subject: [PATCH] cmd/compile: re-compile instantiated generic methods in - linkshared mode - -For G[T] that was seen and compiled in imported package, it is not added -to typecheck.Target.Decls, prevent wasting compile time re-creating -DUPOKS symbols. However, the linker do not support a type symbol -referencing a method symbol across DSO boundary. That causes unreachable -sym error when building under -linkshared mode. - -To fix it, always re-compile generic methods in linkshared mode. - -Fixes #58966 - -Change-Id: I894b417cfe8234ae1fe809cc975889345df22cef -Reviewed-on: https://go-review.googlesource.com/c/go/+/477375 -Run-TryBot: Cuong Manh Le -Reviewed-by: Cherry Mui -Reviewed-by: Matthew Dempsky -TryBot-Result: Gopher Robot - -Upstream-Status: Backport [https://github.com/golang/go/commit/bcd82125f85c7c552493e863fa1bb14e6c444557] - -Signed-off-by: Jose Quaresma ---- - misc/cgo/testshared/shared_test.go | 7 ++++++- - misc/cgo/testshared/testdata/issue58966/main.go | 15 +++++++++++++++ - src/cmd/compile/internal/noder/unified.go | 6 +++++- - 3 files changed, 26 insertions(+), 2 deletions(-) - create mode 100644 misc/cgo/testshared/testdata/issue58966/main.go - -diff --git a/misc/cgo/testshared/shared_test.go b/misc/cgo/testshared/shared_test.go -index b14fb1cb3a..03da8f9435 100644 ---- a/misc/cgo/testshared/shared_test.go -+++ b/misc/cgo/testshared/shared_test.go -@@ -1112,8 +1112,13 @@ func TestStd(t *testing.T) { - t.Skip("skip in short mode") - } - t.Parallel() -+ tmpDir := t.TempDir() - // Use a temporary pkgdir to not interfere with other tests, and not write to GOROOT. - // Cannot use goCmd as it runs with cloned GOROOT which is incomplete. - runWithEnv(t, "building std", []string{"GOROOT=" + oldGOROOT}, -- filepath.Join(oldGOROOT, "bin", "go"), "install", "-buildmode=shared", "-pkgdir="+t.TempDir(), "std") -+ filepath.Join(oldGOROOT, "bin", "go"), "install", "-buildmode=shared", "-pkgdir="+tmpDir, "std") -+ -+ // Issue #58966. -+ runWithEnv(t, "testing issue #58966", []string{"GOROOT=" + oldGOROOT}, -+ filepath.Join(oldGOROOT, "bin", "go"), "run", "-linkshared", "-pkgdir="+tmpDir, "./issue58966/main.go") - } -diff --git a/misc/cgo/testshared/testdata/issue58966/main.go b/misc/cgo/testshared/testdata/issue58966/main.go -new file mode 100644 -index 0000000000..2d923c3607 ---- /dev/null -+++ b/misc/cgo/testshared/testdata/issue58966/main.go -@@ -0,0 +1,15 @@ -+// Copyright 2023 The Go Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style -+// license that can be found in the LICENSE file. -+ -+package main -+ -+import "crypto/elliptic" -+ -+var curve elliptic.Curve -+ -+func main() { -+ switch curve { -+ case elliptic.P224(): -+ } -+} -diff --git a/src/cmd/compile/internal/noder/unified.go b/src/cmd/compile/internal/noder/unified.go -index ed97a09302..25136e6aad 100644 ---- a/src/cmd/compile/internal/noder/unified.go -+++ b/src/cmd/compile/internal/noder/unified.go -@@ -158,7 +158,11 @@ func readBodies(target *ir.Package, duringInlining bool) { - // Instantiated generic function: add to Decls for typechecking - // and compilation. - if fn.OClosure == nil && len(pri.dict.targs) != 0 { -- if duringInlining { -+ // cmd/link does not support a type symbol referencing a method symbol -+ // across DSO boundary, so force re-compiling methods on a generic type -+ // even it was seen from imported package in linkshared mode, see #58966. -+ canSkipNonGenericMethod := !(base.Ctxt.Flag_linkshared && ir.IsMethod(fn)) -+ if duringInlining && canSkipNonGenericMethod { - inlDecls = append(inlDecls, fn) - } else { - target.Decls = append(target.Decls, fn) diff --git a/meta/recipes-devtools/go/go/CVE-2023-24532.patch b/meta/recipes-devtools/go/go/CVE-2023-24532.patch deleted file mode 100644 index 22f080dbd4..0000000000 --- a/meta/recipes-devtools/go/go/CVE-2023-24532.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 602eeaab387f24a4b28c5eccbb50fa934f3bc3c4 Mon Sep 17 00:00:00 2001 -From: Filippo Valsorda -Date: Mon, 13 Feb 2023 15:16:27 +0100 -Subject: [PATCH] [release-branch.go1.20] crypto/internal/nistec: reduce P-256 - scalar - -Unlike the rest of nistec, the P-256 assembly doesn't use complete -addition formulas, meaning that p256PointAdd[Affine]Asm won't return the -correct value if the two inputs are equal. - -This was (undocumentedly) ignored in the scalar multiplication loops -because as long as the input point is not the identity and the scalar is -lower than the order of the group, the addition inputs can't be the same. - -As part of the math/big rewrite, we went however from always reducing -the scalar to only checking its length, under the incorrect assumption -that the scalar multiplication loop didn't require reduction. - -Added a reduction, and while at it added it in P256OrdInverse, too, to -enforce a universal reduction invariant on p256OrdElement values. - -Note that if the input point is the infinity, the code currently still -relies on undefined behavior, but that's easily tested to behave -acceptably, and will be addressed in a future CL. - -Updates #58647 -Fixes #58720 -Fixes CVE-2023-24532 - -(Filed with the "safe APIs like complete addition formulas are good" dept.) - -Change-Id: I7b2c75238440e6852be2710fad66ff1fdc4e2b24 -Reviewed-on: https://go-review.googlesource.com/c/go/+/471255 -TryBot-Result: Gopher Robot -Reviewed-by: Roland Shoemaker -Run-TryBot: Filippo Valsorda -Auto-Submit: Filippo Valsorda -Reviewed-by: Damien Neil -(cherry picked from commit 203e59ad41bd288e1d92b6f617c2f55e70d3c8e3) -Reviewed-on: https://go-review.googlesource.com/c/go/+/471695 -Reviewed-by: Dmitri Shuralyov -Auto-Submit: Dmitri Shuralyov -Reviewed-by: Filippo Valsorda -Run-TryBot: Roland Shoemaker - -CVE: CVE-2023-24532 -Upstream-Status: Backport [602eeaab387f24a4b28c5eccbb50fa934f3bc3c4] -Signed-off-by: Ross Burton - ---- - src/crypto/internal/nistec/nistec_test.go | 81 +++++++++++++++++++++++ - src/crypto/internal/nistec/p256_asm.go | 17 +++++ - src/crypto/internal/nistec/p256_ordinv.go | 1 + - 3 files changed, 99 insertions(+) - -diff --git a/src/crypto/internal/nistec/nistec_test.go b/src/crypto/internal/nistec/nistec_test.go -index 309f68be16a9f..9103608c18a0f 100644 ---- a/src/crypto/internal/nistec/nistec_test.go -+++ b/src/crypto/internal/nistec/nistec_test.go -@@ -8,6 +8,7 @@ import ( - "bytes" - "crypto/elliptic" - "crypto/internal/nistec" -+ "fmt" - "internal/testenv" - "math/big" - "math/rand" -@@ -165,6 +166,86 @@ func testEquivalents[P nistPoint[P]](t *testing.T, newPoint func() P, c elliptic - } - } - -+func TestScalarMult(t *testing.T) { -+ t.Run("P224", func(t *testing.T) { -+ testScalarMult(t, nistec.NewP224Point, elliptic.P224()) -+ }) -+ t.Run("P256", func(t *testing.T) { -+ testScalarMult(t, nistec.NewP256Point, elliptic.P256()) -+ }) -+ t.Run("P384", func(t *testing.T) { -+ testScalarMult(t, nistec.NewP384Point, elliptic.P384()) -+ }) -+ t.Run("P521", func(t *testing.T) { -+ testScalarMult(t, nistec.NewP521Point, elliptic.P521()) -+ }) -+} -+ -+func testScalarMult[P nistPoint[P]](t *testing.T, newPoint func() P, c elliptic.Curve) { -+ G := newPoint().SetGenerator() -+ checkScalar := func(t *testing.T, scalar []byte) { -+ p1, err := newPoint().ScalarBaseMult(scalar) -+ fatalIfErr(t, err) -+ p2, err := newPoint().ScalarMult(G, scalar) -+ fatalIfErr(t, err) -+ if !bytes.Equal(p1.Bytes(), p2.Bytes()) { -+ t.Error("[k]G != ScalarBaseMult(k)") -+ } -+ -+ d := new(big.Int).SetBytes(scalar) -+ d.Sub(c.Params().N, d) -+ d.Mod(d, c.Params().N) -+ g1, err := newPoint().ScalarBaseMult(d.FillBytes(make([]byte, len(scalar)))) -+ fatalIfErr(t, err) -+ g1.Add(g1, p1) -+ if !bytes.Equal(g1.Bytes(), newPoint().Bytes()) { -+ t.Error("[N - k]G + [k]G != ∞") -+ } -+ } -+ -+ byteLen := len(c.Params().N.Bytes()) -+ bitLen := c.Params().N.BitLen() -+ t.Run("0", func(t *testing.T) { checkScalar(t, make([]byte, byteLen)) }) -+ t.Run("1", func(t *testing.T) { -+ checkScalar(t, big.NewInt(1).FillBytes(make([]byte, byteLen))) -+ }) -+ t.Run("N-1", func(t *testing.T) { -+ checkScalar(t, new(big.Int).Sub(c.Params().N, big.NewInt(1)).Bytes()) -+ }) -+ t.Run("N", func(t *testing.T) { checkScalar(t, c.Params().N.Bytes()) }) -+ t.Run("N+1", func(t *testing.T) { -+ checkScalar(t, new(big.Int).Add(c.Params().N, big.NewInt(1)).Bytes()) -+ }) -+ t.Run("all1s", func(t *testing.T) { -+ s := new(big.Int).Lsh(big.NewInt(1), uint(bitLen)) -+ s.Sub(s, big.NewInt(1)) -+ checkScalar(t, s.Bytes()) -+ }) -+ if testing.Short() { -+ return -+ } -+ for i := 0; i < bitLen; i++ { -+ t.Run(fmt.Sprintf("1<<%d", i), func(t *testing.T) { -+ s := new(big.Int).Lsh(big.NewInt(1), uint(i)) -+ checkScalar(t, s.FillBytes(make([]byte, byteLen))) -+ }) -+ } -+ // Test N+1...N+32 since they risk overlapping with precomputed table values -+ // in the final additions. -+ for i := int64(2); i <= 32; i++ { -+ t.Run(fmt.Sprintf("N+%d", i), func(t *testing.T) { -+ checkScalar(t, new(big.Int).Add(c.Params().N, big.NewInt(i)).Bytes()) -+ }) -+ } -+} -+ -+func fatalIfErr(t *testing.T, err error) { -+ t.Helper() -+ if err != nil { -+ t.Fatal(err) -+ } -+} -+ - func BenchmarkScalarMult(b *testing.B) { - b.Run("P224", func(b *testing.B) { - benchmarkScalarMult(b, nistec.NewP224Point().SetGenerator(), 28) -diff --git a/src/crypto/internal/nistec/p256_asm.go b/src/crypto/internal/nistec/p256_asm.go -index 6ea161eb49953..99a22b833f028 100644 ---- a/src/crypto/internal/nistec/p256_asm.go -+++ b/src/crypto/internal/nistec/p256_asm.go -@@ -364,6 +364,21 @@ func p256PointDoubleAsm(res, in *P256Point) - // Montgomery domain (with R 2²⁵⁶) as four uint64 limbs in little-endian order. - type p256OrdElement [4]uint64 - -+// p256OrdReduce ensures s is in the range [0, ord(G)-1]. -+func p256OrdReduce(s *p256OrdElement) { -+ // Since 2 * ord(G) > 2²⁵⁶, we can just conditionally subtract ord(G), -+ // keeping the result if it doesn't underflow. -+ t0, b := bits.Sub64(s[0], 0xf3b9cac2fc632551, 0) -+ t1, b := bits.Sub64(s[1], 0xbce6faada7179e84, b) -+ t2, b := bits.Sub64(s[2], 0xffffffffffffffff, b) -+ t3, b := bits.Sub64(s[3], 0xffffffff00000000, b) -+ tMask := b - 1 // zero if subtraction underflowed -+ s[0] ^= (t0 ^ s[0]) & tMask -+ s[1] ^= (t1 ^ s[1]) & tMask -+ s[2] ^= (t2 ^ s[2]) & tMask -+ s[3] ^= (t3 ^ s[3]) & tMask -+} -+ - // Add sets q = p1 + p2, and returns q. The points may overlap. - func (q *P256Point) Add(r1, r2 *P256Point) *P256Point { - var sum, double P256Point -@@ -393,6 +408,7 @@ func (r *P256Point) ScalarBaseMult(scalar []byte) (*P256Point, error) { - } - scalarReversed := new(p256OrdElement) - p256OrdBigToLittle(scalarReversed, (*[32]byte)(scalar)) -+ p256OrdReduce(scalarReversed) - - r.p256BaseMult(scalarReversed) - return r, nil -@@ -407,6 +423,7 @@ func (r *P256Point) ScalarMult(q *P256Point, scalar []byte) (*P256Point, error) - } - scalarReversed := new(p256OrdElement) - p256OrdBigToLittle(scalarReversed, (*[32]byte)(scalar)) -+ p256OrdReduce(scalarReversed) - - r.Set(q).p256ScalarMult(scalarReversed) - return r, nil -diff --git a/src/crypto/internal/nistec/p256_ordinv.go b/src/crypto/internal/nistec/p256_ordinv.go -index 86a7a230bdce8..1274fb7fd3f5c 100644 ---- a/src/crypto/internal/nistec/p256_ordinv.go -+++ b/src/crypto/internal/nistec/p256_ordinv.go -@@ -25,6 +25,7 @@ func P256OrdInverse(k []byte) ([]byte, error) { - - x := new(p256OrdElement) - p256OrdBigToLittle(x, (*[32]byte)(k)) -+ p256OrdReduce(x) - - // Inversion is implemented as exponentiation by n - 2, per Fermat's little theorem. - // diff --git a/meta/recipes-devtools/go/go/CVE-2023-24537.patch b/meta/recipes-devtools/go/go/CVE-2023-24537.patch deleted file mode 100644 index 6b5dc2c8d9..0000000000 --- a/meta/recipes-devtools/go/go/CVE-2023-24537.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 110e4fb1c2e3a21631704bbfaf672230b9ba2492 Mon Sep 17 00:00:00 2001 -From: Damien Neil -Date: Wed, 22 Mar 2023 09:33:22 -0700 -Subject: [PATCH] go/scanner: reject large line and column numbers in //line - directives - -Setting a large line or column number using a //line directive can cause -integer overflow even in small source files. - -Limit line and column numbers in //line directives to 2^30-1, which -is small enough to avoid int32 overflow on all reasonbly-sized files. - -For #59180 -Fixes CVE-2023-24537 - -Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1802456 -Reviewed-by: Julie Qiu -Reviewed-by: Roland Shoemaker -Run-TryBot: Damien Neil -Change-Id: I149bf34deca532af7994203fa1e6aca3c890ea14 -Reviewed-on: https://go-review.googlesource.com/c/go/+/482078 -Reviewed-by: Matthew Dempsky -TryBot-Bypass: Michael Knyszek -Run-TryBot: Michael Knyszek -Auto-Submit: Michael Knyszek - -CVE: CVE-2023-24537 -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - src/go/parser/parser_test.go | 16 ++++++++++++++++ - src/go/scanner/scanner.go | 7 +++++-- - 2 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/src/go/parser/parser_test.go b/src/go/parser/parser_test.go -index 153562df75068..22b11a0cc4535 100644 ---- a/src/go/parser/parser_test.go -+++ b/src/go/parser/parser_test.go -@@ -764,3 +764,19 @@ func TestRangePos(t *testing.T) { - }) - } - } -+ -+// TestIssue59180 tests that line number overflow doesn't cause an infinite loop. -+func TestIssue59180(t *testing.T) { -+ testcases := []string{ -+ "package p\n//line :9223372036854775806\n\n//", -+ "package p\n//line :1:9223372036854775806\n\n//", -+ "package p\n//line file:9223372036854775806\n\n//", -+ } -+ -+ for _, src := range testcases { -+ _, err := ParseFile(token.NewFileSet(), "", src, ParseComments) -+ if err == nil { -+ t.Errorf("ParseFile(%s) succeeded unexpectedly", src) -+ } -+ } -+} -diff --git a/src/go/scanner/scanner.go b/src/go/scanner/scanner.go -index 16958d22ce299..0cd9f5901d0bb 100644 ---- a/src/go/scanner/scanner.go -+++ b/src/go/scanner/scanner.go -@@ -253,13 +253,16 @@ func (s *Scanner) updateLineInfo(next, offs int, text []byte) { - return - } - -+ // Put a cap on the maximum size of line and column numbers. -+ // 30 bits allows for some additional space before wrapping an int32. -+ const maxLineCol = 1<<30 - 1 - var line, col int - i2, n2, ok2 := trailingDigits(text[:i-1]) - if ok2 { - //line filename:line:col - i, i2 = i2, i - line, col = n2, n -- if col == 0 { -+ if col == 0 || col > maxLineCol { - s.error(offs+i2, "invalid column number: "+string(text[i2:])) - return - } -@@ -269,7 +272,7 @@ func (s *Scanner) updateLineInfo(next, offs int, text []byte) { - line = n - } - -- if line == 0 { -+ if line == 0 || line > maxLineCol { - s.error(offs+i, "invalid line number: "+string(text[i:])) - return - } diff --git a/meta/recipes-devtools/go/go_1.20.1.bb b/meta/recipes-devtools/go/go_1.20.4.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.20.1.bb rename to meta/recipes-devtools/go/go_1.20.4.bb From patchwork Fri Jun 9 16:53: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: 25347 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 EC639C7EE2E for ; Fri, 9 Jun 2023 16:54:15 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web10.152.1686329650018597278 for ; Fri, 09 Jun 2023 09:54:10 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=WMY0S/X6; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-652a6cf1918so1714127b3a.1 for ; Fri, 09 Jun 2023 09:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329649; x=1688921649; 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=DMPMe+NolPn2yfgpNLdmNNEqN+FeyeCxdgQLBGqDblw=; b=WMY0S/X62NJZKLcBaVlVw+7zupuhKE8eCGJMEZH1HMCwDNkyTGzXGrcc2JAa3J6rIy eOrQNhgLM6lxF/5ft292KKWGp/+HMy6bFZPZA7rne3pyM0KniyN8TgyX+HMCEFAwZ3ET fSdD/nhRh39Do8jLuOWCHlCU1N3PXpnNfMI8gBzmfP1H5eR5ia4evsqsILhO0jHC7sNH RuSezPj6b3LpJINObcDEdsvqe16bYRyk9NtCij4roPj6Pup08X7PFj/yBTsEB+5jmD0f fqS/UtVg7CeEJctj9mlaqRJX4TAfnJO18v6PcS48r5+wmwtFLFX4iqqLMzlMEXxD+caL GzHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329649; x=1688921649; 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=DMPMe+NolPn2yfgpNLdmNNEqN+FeyeCxdgQLBGqDblw=; b=QJW9/3A8YDy+e9VfTQbtJI3BTpntblfEjCwYCCufgQ/or7Lq0SdHubO3Md+sgTHKKP JNw7htxTtynA/jXkqfANBNMjEGOjmAzzPAbCcuEzZNno/wh1A0Wx7uXKcSB7iC6eT5lf iNHvVDKtGe9sCvtjfMawvS3fYlIfiTPyL7x2DODp6AzfyZT0SImy1fou/o7CZ1gaoJiy qkcBvTRQh/EehJrsI/OK4pJ6No3+x+6SON7Ft8rPnsZmZnitOpLrfBY0681t8IGL/MP0 FX1y9yh7vPo8P1LoYj/AZt8u1aSWDXckWwha4RbS3h2afDViQzflErXTVON6NjLo4U7r iMgg== X-Gm-Message-State: AC+VfDzrI8rCL9f8/DyOgQN2yPCAcNAApCbI862dTOO7+R9UBAEGFpYh tDK4lhVFrDDolJedJeNLsbDOuO5GIFm4If/hUgE= X-Google-Smtp-Source: ACHHUZ6hpMLG94sURZvRrAHasHPakj8p9PbyCHUIbscLycPVGdMrqNUU4L5U7FQseYIDbZasi1i2+g== X-Received: by 2002:a05:6a21:3404:b0:10f:9317:153a with SMTP id yn4-20020a056a21340400b0010f9317153amr1313280pzb.62.1686329649042; Fri, 09 Jun 2023 09:54:09 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 03/30] go: Use -no-pie to build target cgo Date: Fri, 9 Jun 2023 06:53:30 -1000 Message-Id: <0e9f47eddf786972b409088629d0f62c6bc74448.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182569 From: Khem Raj Fixes go: ELF binary /usr/lib/go/pkg/tool/linux_arm64/pprof has relocations in .text go: ELF binary /usr/lib/go/bin/go has relocations in .text [textrel] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit a27d39aebd5966ffffb57c20518381cb06ba8373) Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go_1.20.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/go/go_1.20.4.bb b/meta/recipes-devtools/go/go_1.20.4.bb index 587ee55944..46f5fbc6be 100644 --- a/meta/recipes-devtools/go/go_1.20.4.bb +++ b/meta/recipes-devtools/go/go_1.20.4.bb @@ -3,7 +3,7 @@ require go-target.inc inherit linuxloader -CGO_LDFLAGS:append:mips = " -no-pie" +CGO_LDFLAGS:append = " -no-pie" export GO_LDSO = "${@get_linuxloader(d)}" export CC_FOR_TARGET = "gcc" From patchwork Fri Jun 9 16:53:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25348 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 0BB92C83005 for ; Fri, 9 Jun 2023 16:54:16 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web10.155.1686329651872786519 for ; Fri, 09 Jun 2023 09:54:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=P7NAzDNm; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-652a6cf1918so1714165b3a.1 for ; Fri, 09 Jun 2023 09:54:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329651; x=1688921651; 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=VUA1LSQH+0EFvNwxm4cyHHUOY6RcuwkHh3RJxbfVEw4=; b=P7NAzDNmjb8QEnsSH3a9Hu58tDwAlIUfF7ZCUbiW5tCioSYUZDQ1jrOx0ghfhgszEZ SFjeRa8fHJF6hsHec5cED8eD1X+J4T4Ci6SdrWR3yIH99sdQB/MAQYyG+DMySwD/yAA8 Q0hJFOpCs/NyF6HWRXp+SpJt4SCV96DEnjYfjawVqzhg7m+eNdWuMVWqjmFedBCQW27T L5sjcnrjyD99UZddpQSsjY0sPEFDcDiwukf5yhDGvWkortIiOBi/R2qS1oGmHIbuzyyE MMxXk3QJ4yPbqgryoVb+WIlsI2Q70eivC7C9Fk018G9to9VjYA+UszPdTh15mTnPwmPd ll2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329651; x=1688921651; 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=VUA1LSQH+0EFvNwxm4cyHHUOY6RcuwkHh3RJxbfVEw4=; b=hWqOXIw6CbSqPgdLTI6g50dxZbSS2crJd1GT2neHAVsVq3tlAYzzD0NpJ5svV0pRDr fuIdINi4jtaKWKqYJqF8Qz581J0eMIzeKzKZsji+pycfUL/3mo8eIIu1DS64n8kyobGd +N47vX3vAVq4wf8H2x1x1cuszT2iUPPQYf3NNfk/0GaAzrd6cDymFBD3EpiWnMJwzOao +j5WpUkcwjb0NBA2LhWOwPd2umS/gpSkCzmalm7/wJORliDM1DkwYiXVQD+OukrE403G WykZJHnyxIZjnmw84feITA4qrylSqybz+9YWDtZakR43AgfHqqIPpa0FIMnYjNHbIQ0P aZrw== X-Gm-Message-State: AC+VfDzPjlkoU6vcgOgRnqKIiplzO+2ieYw9LK+AtbZ3bwqEOJQv1bpP bwuDY5JDvkvYB1H4EM6n5azcNxur6m9dzYexRC8= X-Google-Smtp-Source: ACHHUZ65KHMeJbwfH8MDlQeGZYCpgMS6qojaFmU5EuGSCufaAFrdBEKuAZkBKE6hLCm0lSZEHP7cbQ== X-Received: by 2002:a05:6a00:ad6:b0:64c:c453:244f with SMTP id c22-20020a056a000ad600b0064cc453244fmr1974775pfl.15.1686329650660; Fri, 09 Jun 2023 09:54:10 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 04/30] rpm: update 4.18.0 -> 4.18.1 Date: Fri, 9 Jun 2023 06:53:31 -1000 Message-Id: <0206e2700e290f04cb4c4c2cf50c1e1f1f4ae6ee.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182570 From: Alexander Kanavin Summary of changes from RPM 4.18.0 General bugfixes and enhancements Command line Fix signature reserved space not restored on --delsign (#2382, regression in 4.15.0) Copy original lead on signing instead of recreating (#1326, regression in 4.14.0) Issue a warning when signing created an OpenPGP v3 signature (#2286) Transactions Fix install of block and character special files (#2195, #2275, regression in 4.18.0) Handle downgrade within V-R when epoch goes away (RhBug:1845069) Package building Spec Restore BuildRequires check in rpmbuild -bp (regression in 4.15.0) Fix space handling in %setup (#2335, regression in 4.18.0) Issue a deprecation warning on %patchN syntax Macros Don’t embed CPU count of build system in packages (#2343) Make CPU and thread-related macros available on all platforms (#2265) Fix macro scoping level on re-entry from %[] expression (#2354) Split ___build_pre macro to make mocking rpm build environment easier Buildroot policies Fix xargs use in brp-remove-la-files on macOS (#2332, regression in 4.17.0) Generators Disable debuginfod server lookups in build and dependency generator scripts Exclude kernel modules from ELF dependency generation (regression in 4.17.0) Signatures and keys Fix type confusion bugs in the internal OpenPGP implementation Plugins Make write() non-blocking in fapolicyd plugin (RhBug:2110787) Add a handler for libselinux log messages (RhBug:2123719, RhBug:2050774) API changes N/A Internal improvements and cleanups Fix potential uninitialized variable use on public key import Fix various leaks during package build and install Fix getopt() usage to comply with POSIX Build process Generate Python egg-info from automake builds (#130, #2230) Revise ISANAME for loongarch Documentation Document %_binary_payload and %_source_payload syntax in RPM package format manual Various typo and grammar fixes in reference manuals Minor CONTRIBUTING.md updates Drop: 0001-docs-do-not-build-manpages-requires-pandoc.patch (pandoc is now detected from $PATH) fifofix.patch (upstream fixed the issue) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit d8d673b2dc86e04cc278dc111b36d52d60bc25f7) Signed-off-by: Steve Sakoman --- ...olor-setting-for-mips64_n32-binaries.patch | 26 ++++++------- ...lib-rpm-as-the-installation-path-for.patch | 30 +++++++------- ...o-not-build-manpages-requires-pandoc.patch | 23 ----------- meta/recipes-devtools/rpm/files/fifofix.patch | 22 ----------- .../rpm/files/fix-declaration.patch | 39 +++++++++++++++++++ .../rpm/{rpm_4.18.0.bb => rpm_4.18.1.bb} | 7 ++-- 6 files changed, 70 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch delete mode 100644 meta/recipes-devtools/rpm/files/fifofix.patch create mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch rename meta/recipes-devtools/rpm/{rpm_4.18.0.bb => rpm_4.18.1.bb} (97%) diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch index 9f5dde0720..9fa486dfd3 100644 --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch @@ -1,4 +1,4 @@ -From 5492ac3c716020a27a25253bbffe810db43202bf Mon Sep 17 00:00:00 2001 +From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 9 Mar 2017 18:54:02 +0200 Subject: [PATCH] Add a color setting for mips64_n32 binaries @@ -11,11 +11,11 @@ Signed-off-by: Alexander Kanavin rpmrc.in | 2 ++ 2 files changed, 6 insertions(+) -Index: git/build/rpmfc.c -=================================================================== ---- git.orig/build/rpmfc.c -+++ git/build/rpmfc.c -@@ -645,6 +645,7 @@ exit: +diff --git a/build/rpmfc.c b/build/rpmfc.c +index 26606378f..a16e3f4e9 100644 +--- a/build/rpmfc.c ++++ b/build/rpmfc.c +@@ -646,6 +646,7 @@ exit: static const struct rpmfcTokens_s rpmfcTokens[] = { { "directory", RPMFC_INCLUDE }, @@ -23,20 +23,20 @@ Index: git/build/rpmfc.c { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, -@@ -1150,6 +1151,9 @@ static uint32_t getElfColor(const char * +@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) color = RPMFC_ELF32; break; } + if (ehdr.e_machine == EM_MIPS || ehdr.e_machine == EM_MIPS_RS3_LE) + if (ehdr.e_flags & EF_MIPS_ABI2) + color = RPMFC_ELFMIPSN32; - elf_end(elf); } - close(fd); -Index: git/rpmrc.in -=================================================================== ---- git.orig/rpmrc.in -+++ git/rpmrc.in + if (elf) + elf_end(elf); +diff --git a/rpmrc.in b/rpmrc.in +index 2975a3a0e..c7232b48b 100644 +--- a/rpmrc.in ++++ b/rpmrc.in @@ -139,6 +139,8 @@ archcolor: mipsr6el 1 archcolor: mips64r6 2 archcolor: mips64r6el 2 diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index 6f613d0a7d..8fdc5edb10 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch @@ -1,4 +1,4 @@ -From 4ab6a4c5bbad65c3401016bb26b87214cdd0c59b Mon Sep 17 00:00:00 2001 +From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 27 Feb 2017 09:43:30 +0200 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for @@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin rpm.am | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac +diff --git a/configure.ac b/configure.ac +index e6676c581..ec28db9b6 100644 +--- a/configure.ac ++++ b/configure.ac @@ -942,7 +942,7 @@ else usrprefix=$prefix fi @@ -26,11 +26,11 @@ Index: git/configure.ac AC_SUBST(RPMCONFIGDIR) AC_SUBST(OBJDUMP) -Index: git/macros.in -=================================================================== ---- git.orig/macros.in -+++ git/macros.in -@@ -911,7 +911,7 @@ package or when debugging this package.\ +diff --git a/macros.in b/macros.in +index a2411d784..735b74d99 100644 +--- a/macros.in ++++ b/macros.in +@@ -930,7 +930,7 @@ package or when debugging this package.\ %_sharedstatedir %{_prefix}/com %_localstatedir %{_prefix}/var %_lib lib @@ -39,10 +39,10 @@ Index: git/macros.in %_includedir %{_prefix}/include %_infodir %{_datadir}/info %_mandir %{_datadir}/man -Index: git/rpm.am -=================================================================== ---- git.orig/rpm.am -+++ git/rpm.am +diff --git a/rpm.am b/rpm.am +index 55b5b3935..5a51f102b 100644 +--- a/rpm.am ++++ b/rpm.am @@ -1,10 +1,10 @@ # Internal binaries ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm @@ -55,4 +55,4 @@ Index: git/rpm.am +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 12:0:3 + rpm_version_info = 13:0:4 diff --git a/meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch b/meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch deleted file mode 100644 index d7137f1d10..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9bf1693092385eba9841614613313010221ca01f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 29 Jun 2021 20:11:26 +0200 -Subject: [PATCH] docs: do not build manpages (requires pandoc) - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - docs/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -Index: git/docs/Makefile.am -=================================================================== ---- git.orig/docs/Makefile.am -+++ git/docs/Makefile.am -@@ -1,7 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = man -- - EXTRA_DIST = - - EXTRA_DIST += \ diff --git a/meta/recipes-devtools/rpm/files/fifofix.patch b/meta/recipes-devtools/rpm/files/fifofix.patch deleted file mode 100644 index 71703d7f0c..0000000000 --- a/meta/recipes-devtools/rpm/files/fifofix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Calling openat() on a fifo causes a pseudo hang for us (e.g. the fifo in psplash). -Avoid calling openat for fifos. - -Introduced upstream with: - -https://github.com/rpm-software-management/rpm/commit/96ec957e281220f8e137a2d5eb23b83a6377d556 - -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/issues/2195] - -Index: git/lib/fsm.c -=================================================================== ---- git.orig/lib/fsm.c -+++ git/lib/fsm.c -@@ -1010,7 +1010,7 @@ int rpmPackageFilesInstall(rpmts ts, rpm - rc = RPMERR_UNKNOWN_FILETYPE; - } - -- if (!rc && fd == -1 && !S_ISLNK(fp->sb.st_mode)) { -+ if (!rc && fd == -1 && !S_ISLNK(fp->sb.st_mode) && !S_ISFIFO(fp->sb.st_mode)) { - /* Only follow safe symlinks, and never on temporary files */ - fd = fsmOpenat(di.dirfd, fp->fpath, - fp->suffix ? AT_SYMLINK_NOFOLLOW : 0, 0); diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch new file mode 100644 index 0000000000..e5c84ebd49 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/fix-declaration.patch @@ -0,0 +1,39 @@ +From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Thu, 16 Mar 2023 19:05:04 +0100 +Subject: [PATCH] Fix compiler error on clang + +Turns out variable declarations are not allowed after a label, even in +C99. And while some compilers don't seem to care others do. + +Moving the declaration of mayopen to the start of the function to avoid +this problem. + +Resolves: #2435 +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] +Signed-off-by: Alexander Kanavin +--- + lib/fsm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/fsm.c b/lib/fsm.c +index 5671ac642d..183293edb0 100644 +--- a/lib/fsm.c ++++ b/lib/fsm.c +@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; + int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; + int firstlinkfile = -1; ++ int mayopen = 0; + char *tid = NULL; + struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); + struct filedata_s *firstlink = NULL; +@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + + setmeta: + /* Special files require path-based ops */ +- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); ++ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); + if (!rc && fd == -1 && mayopen) { + int flags = O_RDONLY; + /* Only follow safe symlinks, and never on temporary files */ diff --git a/meta/recipes-devtools/rpm/rpm_4.18.0.bb b/meta/recipes-devtools/rpm/rpm_4.18.1.bb similarity index 97% rename from meta/recipes-devtools/rpm/rpm_4.18.0.bb rename to meta/recipes-devtools/rpm/rpm_4.18.1.bb index 7790db8b5a..6da2edddf3 100644 --- a/meta/recipes-devtools/rpm/rpm_4.18.0.bb +++ b/meta/recipes-devtools/rpm/rpm_4.18.1.bb @@ -35,15 +35,14 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc file://0001-perl-disable-auto-reqs.patch \ file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ - file://0001-docs-do-not-build-manpages-requires-pandoc.patch \ file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ - file://fifofix.patch \ file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ + file://fix-declaration.patch \ " PE = "1" -SRCREV = "ea0d77c52e176e2876fdb1d07ad41e9e2635a93e" +SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" S = "${WORKDIR}/git" @@ -187,7 +186,7 @@ FILES:${PN}-archive = "\ PACKAGES += "python3-rpm" PROVIDES += "python3-rpm" -FILES:python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" +FILES:python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/* ${PYTHON_SITEPACKAGES_DIR}/rpm-*.egg-info" RDEPENDS:${PN}-build = "bash perl python3-core debugedit" From patchwork Fri Jun 9 16:53: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: 25346 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 0900DC8300C for ; Fri, 9 Jun 2023 16:54:16 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web11.132.1686329653208652439 for ; Fri, 09 Jun 2023 09:54:13 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=z+1T66Nd; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-65055aa4ed7so1670838b3a.3 for ; Fri, 09 Jun 2023 09:54:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329652; x=1688921652; 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=+YoKdD0c9LbVykTLio/PbA1fiNuSLQod6hSHDxdmsPs=; b=z+1T66NdOVpPKb6X1hyyHmODy0Sif5HYD8qp2F91hwvoW1zT4vTEVQCgOADQ1eCy7j bkUXbKR0XQhi8QPLVUEZKpV88X1RAJhR0uiM0gey6FJuhQBQYH5EZAjQC6P3tLH7Duz3 PFpjkDgwLLVl9KIMLu/zEFVe3L5SXHV8+3fkW7eLuVrmtNKRM/oZu2wEmIY5vSYTCmIn el/GXnRHu6/4BcBn4Ez0b1FEnhdVCy7G7hMl0x5tI3LVYFs2N5e6fWSIhcOEQ3UAvXPO 0n/XBv/IbjKyNZSU//+cv7eMrOnvH2GRf0lONkbUvIVsPCqdw6gFcMw4QXlYM3xCMEqi +27g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329652; x=1688921652; 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=+YoKdD0c9LbVykTLio/PbA1fiNuSLQod6hSHDxdmsPs=; b=P6FuQk3J2LLNKYxbi6ZTUtHefK7CvzCAUyfHDmSzAM6Y7D1xMeUn/R+OqacKjhVVo9 Rm5VWVCSi079XQqxuqc2TIJFeW0gkLkchzw0QG1j5W0XVSn4bT99v2HJ2eanxwD2QpqW gju9JMzACyBn2NBdACD+vgVsR1qK99foeNKRvd6rjo1cJXjb5cttbZNM1hIbIAfs7JvM 61CiIydMgkQvBR2Xp8OrmVS9wxwVjwszj9mgUB3cqfK9HR/q/Tg4i0Bv4eMvbD/dYlv5 W2Bf1C/aDJ1dCcZMECK1OMGgvvg0FihK+vK4K6BEp2JUmpG0VGEHNFwAIHlDJ/KZej+F 4I7g== X-Gm-Message-State: AC+VfDxTnjWZAJr2gFPGOdtUK9FaAYJlNGphPrf0qqgnYsjxQRdHhet2 s9tdn4CM1I1CBhcYUVcwx7zYstL9td1faBHohJ8= X-Google-Smtp-Source: ACHHUZ6CZ27JZHMc2y78VZMq88+vaxpZTbhYaBoLfRWIjkOGYVUsuRnwvv6xCQWJjSyb+DkiTUYUoA== X-Received: by 2002:a05:6a20:7da8:b0:10c:71de:5dc5 with SMTP id v40-20020a056a207da800b0010c71de5dc5mr1688263pzj.30.1686329652276; Fri, 09 Jun 2023 09:54:12 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 05/30] vim: upgrade 9.0.1429 -> 9.0.1527 Date: Fri, 9 Jun 2023 06:53:32 -1000 Message-Id: <72c741cd9d11f995a20e24d11528842fc020f59e.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182571 From: Randy MacLeod Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-2426 caf642c25 patch 9.0.1499: using uninitialized memory with fuzzy matching Signed-off-by: Randy MacLeod Signed-off-by: Alexandre Belloni (cherry picked from commit 4f9a8df5aca99d0a5c2d2346b27ce7be08e7896c) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 1e27415288..e1d2563316 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -19,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1429" -SRCREV = "1a08a3e2a584889f19b84a27672134649b73da58" +PV .= ".1527" +SRCREV = "c28e7a2b2f23dbd246a1ad7ad7aaa6f7ab2e5887" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Fri Jun 9 16:53: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: 25350 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 2941CC87FDC for ; Fri, 9 Jun 2023 16:54:16 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.133.1686329654565059414 for ; Fri, 09 Jun 2023 09:54:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=IxCBh2zo; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6563ccf5151so2115941b3a.0 for ; Fri, 09 Jun 2023 09:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329654; x=1688921654; 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=uRdPwRrfsfwFIOrz/mqSqpXneQecfdim6K4w9A6f2AY=; b=IxCBh2zovsECZ4gi9TP01u/9Jw4m26/yFc2Uih+tkonWE6BhBb22IJsC817W3pXu9L ao2mLbGepxNCd/yT03ENFsJfL5nk6CSGA8tytrvbdWZ1LcyOkgAH4aiMGuQCE63eUkbV ttqc2MlbW34n4tQ8Rfd982SnvHBFN4Ud/W5iQEfzJSWs15fICFIISoapzxIUWS8avr5c BrMZYZFLV/3Mi8ZXHe8P4XlMOsUdOw14isQpONIHH6U1dwycNL2NyUmkz7A+hh1GHL7N 2ocRHkaiZ/TjlFCv2YiNIDuJtbeA0Lf1sABPG3gRdbMl52DaUCZ7T60DEDKucFnwCqSe kLIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329654; x=1688921654; 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=uRdPwRrfsfwFIOrz/mqSqpXneQecfdim6K4w9A6f2AY=; b=P6+/7Z4TbFYCixFPtz1LkdaWy9wjUX/PGXvLYw1UVNqbD7r9PyCg/3xyDE+bqW6wRh 4hVvul9wgBTHJqr9G5LXNhZqX3xX4bnUPZrU7XzHQUvW07Cg2uIUuEMbDOuDnqJ5g/dZ 1yFsGOEirMl43504c/cma5jmH6DJcNkORzQjSoGvzOVKhygG7v7IkemEivRsIkmGZFq3 6qNGHP6ilTwVBvBfQFKRYICSgqz34je6y2H/x5O0T22mOHMy2nNd1GPXPjmc1yrJnA+9 zkaDFgdrsDjFzyIS6zMiHD7b2ea7cUx63U0TLH+8mokWjIlwUqX6KtrOdraeEm7t0FUV CdsQ== X-Gm-Message-State: AC+VfDy2AMcnRkYgdl1GP5THzk6TOAphmtGwTrHBsxblJ9T++ufkPmVf hbW3zztF8V3Ty217a1D5Ydf8YGzbVaa23ugVN/Q= X-Google-Smtp-Source: ACHHUZ5fxJRgQfsprZbtQiZGbEFdg4ifgYBbgNQGG0UPpyXSijCm3DM9zqQx3bE7zAPUK1HWVPRXog== X-Received: by 2002:a05:6a20:3d08:b0:10b:91c5:45b5 with SMTP id y8-20020a056a203d0800b0010b91c545b5mr2124029pzi.31.1686329653734; Fri, 09 Jun 2023 09:54:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 06/30] xz: upgrade 5.4.2 -> 5.4.3 Date: Fri, 9 Jun 2023 06:53: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 ; Fri, 09 Jun 2023 16:54:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182572 From: Denys Dmytriyenko 5.4.3 (2023-05-04) * All fixes from 5.2.12 * Features in the CMake build can now be disabled as CMake cache variables, similar to the Autotools build. * Minor update to the Croatian translation. Signed-off-by: Denys Dmytriyenko Signed-off-by: Alexandre Belloni (cherry picked from commit 75aaa3d8efa9ba4fdf7145321dc85b34cd3dcebb) Signed-off-by: Steve Sakoman --- meta/recipes-extended/xz/{xz_5.4.2.bb => xz_5.4.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/xz/{xz_5.4.2.bb => xz_5.4.3.bb} (95%) diff --git a/meta/recipes-extended/xz/xz_5.4.2.bb b/meta/recipes-extended/xz/xz_5.4.3.bb similarity index 95% rename from meta/recipes-extended/xz/xz_5.4.2.bb rename to meta/recipes-extended/xz/xz_5.4.3.bb index 87f9602bf6..e1cdac3014 100644 --- a/meta/recipes-extended/xz/xz_5.4.2.bb +++ b/meta/recipes-extended/xz/xz_5.4.3.bb @@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c8ea84ebe7b93cce676b54355dc6b2c0 \ " SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz" -SRC_URI[sha256sum] = "87947679abcf77cc509d8d1b474218fd16b72281e2797360e909deaee1ac9d05" +SRC_URI[sha256sum] = "1c382e0bc2e4e0af58398a903dd62fff7e510171d2de47a1ebe06d1528e9b7e9" UPSTREAM_CHECK_REGEX = "xz-(?P\d+(\.\d+)+)\.tar" CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh" From patchwork Fri Jun 9 16:53: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: 25351 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 EC9D0C7EE2F for ; Fri, 9 Jun 2023 16:54:25 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.136.1686329656220340815 for ; Fri, 09 Jun 2023 09:54:16 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=h0Y8zthM; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-652426346bbso1660167b3a.3 for ; Fri, 09 Jun 2023 09:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329655; x=1688921655; 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=2pKRSUf8AUx7R5veqnKGQ7+2sEUX9m8aFYTyQWHIvtg=; b=h0Y8zthM99IspZzko2GszTDGnaygflXQNgXn2RmvMkyren5ZWI/ArhA7CTyw2+YqIQ xk36HffpTN3h+pUcsXhf8kr2nRAWorrm/Lxz96gr3aU9aPCzaUmf2cL/bKUq/z5XAR62 fYmTLkC2MJ/aTvDzY3NgbNTNjvPLd+aVAxtlo2n9/Cyk2x3yNba0pTxfVp5MaGdQTmYd OHXJwjTVyHt3tOkiQuuRrgkFhK2n/V/zHvsP3Rfn5B1IkJTFosshR6kZ8d2FFKDFk+z/ KTVYuDyKItsdc6lju/O/j5ijbLRGIIvO36lDy8Wbcg/c5+HYFYHoiF9l4e8/StDyZucO NV6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329655; x=1688921655; 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=2pKRSUf8AUx7R5veqnKGQ7+2sEUX9m8aFYTyQWHIvtg=; b=eM8bAAeQW65IU4O6p5nTEWIVoouUKUWKsyp34SHapY+uYIkKSGSBwpt6Y9rfsl+fvu Avfr3yutZ7sdUvDNWCA1NwagHRuG9RgXFcBYxBYrgdgeiD9JzE1koKvNccZZj67r9eLW vXudp+X45i+WUBd8Zwi4jd70n9ZtD6HciMUA+8bRbbiqiKMfbGXhvZbJfJ10k/LSv1sZ A8xnk5PBbjAVnYG5Q/ti3bph0AKbMY9Cc6PibqpLR34tKX1U4UKjS4u5Ptm1C6ZJr+8I gkSRYLk30Wb0MRRd0t9rdyz8NbexmW4MTuRV+w68ECRc1UDHUBaCcwccA/2/2ddh4H8K QcPg== X-Gm-Message-State: AC+VfDxHNTIbBgYxmqWNNFkY/C2x1Hz3NgPN+HPRS22DSXAAi1fKo2+7 iqVSlpMpfCIhZtNCrK3mqQQwOSWwMEX8VO4r35U= X-Google-Smtp-Source: ACHHUZ4rR28ajBBuaeBdd4qhs++dl6BvHe8XjnT2ux48w4Ns7k0YoMCly5OdqJOLYQ1W2Bt3oOaiig== X-Received: by 2002:a05:6a00:2d0e:b0:65f:1772:e253 with SMTP id fa14-20020a056a002d0e00b0065f1772e253mr1755375pfb.2.1686329655266; Fri, 09 Jun 2023 09:54:15 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 07/30] iso-codes: upgrade 4.13.0 -> 4.15.0 Date: Fri, 9 Jun 2023 06:53:34 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182573 From: Wang Mingyu Changelog: ========== - Translation updates for ISO 3166-1 - Translation updates for ISO 3166-3 - Translation updates for ISO 639-2 - Translation updates for ISO 3166-1 - Translation updates for ISO 3166-2 - Translation updates for ISO 3166-3 - Translation updates for ISO 639-2 - Translation updates for ISO 639-3 - Translation updates for ISO 639-5 - Translation updates for ISO 4217 - Translation updates for ISO 15924 * ISO 3166-2: Fix wrong Spanish translation Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 355f2f9fe8a1e6c5e78f136cb3ed77c9004fb75c) Signed-off-by: Steve Sakoman --- .../iso-codes/{iso-codes_4.13.0.bb => iso-codes_4.15.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/iso-codes/{iso-codes_4.13.0.bb => iso-codes_4.15.0.bb} (94%) diff --git a/meta/recipes-support/iso-codes/iso-codes_4.13.0.bb b/meta/recipes-support/iso-codes/iso-codes_4.15.0.bb similarity index 94% rename from meta/recipes-support/iso-codes/iso-codes_4.13.0.bb rename to meta/recipes-support/iso-codes/iso-codes_4.15.0.bb index 1950583f59..6ae6fdf8cb 100644 --- a/meta/recipes-support/iso-codes/iso-codes_4.13.0.bb +++ b/meta/recipes-support/iso-codes/iso-codes_4.15.0.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=https;branch=main;" -SRCREV = "ab6b01d5b56af7da9f0d2d1619a3cf84e43ed76a" +SRCREV = "69ba16daef3c5c5e3c18f2d919e25296a4b946be" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch From patchwork Fri Jun 9 16:53: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: 25352 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 EC95DC7EE29 for ; Fri, 9 Jun 2023 16:54:25 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web10.162.1686329657843028510 for ; Fri, 09 Jun 2023 09:54:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=vPjTolU8; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-53404873a19so724219a12.3 for ; Fri, 09 Jun 2023 09:54:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329657; x=1688921657; 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=8k8ioO4rwvhWw1hSHTiHVayZiyPByHFFA4QzicUGRJY=; b=vPjTolU8Z0o4EDWA/RMZ6Oh9OHtg9LGC7jd89jAZtPGzX0DaU0IExL08bVMEfdTYqB 0NflhIp6Tmla1M6bowRuKJCAi/rUu3rMBZXmvleJjTebR7P7rhqU6ecjEE9YvhNd36vW 8wmvmDfE/JxynBtbnKmPR0/TWGcdg5YNaEeIRes+aCM2MdTmVHuknZ52YzmPKBS77Qfc NmWD/KoOArtxkyt+kubxbi42BL6bJfrq1oac0A+3ZcKXAxEFJE7fOq+k9rfgXCvlbhgV 7pEqcif5/kJSWwvThJIC+DQIPPOALkR9U51FevyDsmgVAOE6omQdwRxFaSu3ulDZcYVC /Uxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329657; x=1688921657; 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=8k8ioO4rwvhWw1hSHTiHVayZiyPByHFFA4QzicUGRJY=; b=iyb7whpgYDEop+UQdElQBS21TbeetJtDzbGJ2gFLxE7vZ5ECRlIjLhaUcqn/05u+bi 8RyWzaSHpt0wLoqYzrwyDXspyU6MTAJJV4of1yLq5LvCq8am9INSNbpBphZaUwCa+Ns+ iI9uHSrRBcwFe9iscxgqF0F+8hE9SGj6HsGI76o1KpTIGP4JLK7RnWyN5hLoBU5LZj1Y hQCO0OGzy7lwaL8fKVZk3dFFy1zRdkHb37XeFH786lFJ/QYv7INWsgySkDf7gfGTw/WR WcruELhw/4wkqbAFT8KBXrR9G1OILTTGWCeG2UWLa6gCoshvp+fNf7i3Anip1xhrLAGS NNjg== X-Gm-Message-State: AC+VfDw2VU6Ax+Y5kELP4OqX+QQ6QxSYQ/daAdZdzPoXAgHY1yEqeLH2 iyElpXhJodviFr01TGAmB9IWFInLfjzIE2GSFu0= X-Google-Smtp-Source: ACHHUZ7blrUS5COBn36ULaGgx7h8oqXl3tlUoZhKQ03Gfzdjqz7tR/6PK4G1fDIq57coXBVwvcRpTg== X-Received: by 2002:a05:6a20:e489:b0:10c:3557:399a with SMTP id ni9-20020a056a20e48900b0010c3557399amr1218484pzb.49.1686329656828; Fri, 09 Jun 2023 09:54:16 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 08/30] libxi: upgrade to v1.8.1 Date: Fri, 9 Jun 2023 06:53: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 ; Fri, 09 Jun 2023 16:54:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182574 From: Sudip Mukherjee Changes: Use xz: upstream has not released bz2. Update sha256sum for new version. Details at: https://gitlab.freedesktop.org/xorg/lib/libxi/-/commits/libXi-1.8.1 Signed-off-by: Sudip Mukherjee Signed-off-by: Alexandre Belloni (cherry picked from commit 278f73b2bc06f25fd66322e38c06ef5ebf894f98) Signed-off-by: Steve Sakoman --- .../xorg-lib/{libxi_1.8.bb => libxi_1.8.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxi_1.8.bb => libxi_1.8.1.bb} (85%) diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.8.bb b/meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb similarity index 85% rename from meta/recipes-graphics/xorg-lib/libxi_1.8.bb rename to meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb index a6cf9b3002..00bd46ef13 100644 --- a/meta/recipes-graphics/xorg-lib/libxi_1.8.bb +++ b/meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb @@ -16,8 +16,8 @@ DEPENDS += "libxext xorgproto libxfixes" PE = "1" XORG_PN = "libXi" -XORG_EXT = "tar.bz2" +XORG_EXT = "tar.xz" -SRC_URI[sha256sum] = "2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00" +SRC_URI[sha256sum] = "89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7" BBCLASSEXTEND = "native nativesdk" From patchwork Fri Jun 9 16:53: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: 25356 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 066FBC83005 for ; Fri, 9 Jun 2023 16:54:26 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.141.1686329660343839647 for ; Fri, 09 Jun 2023 09:54:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=yX5HB3gH; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-653fcd58880so1716841b3a.0 for ; Fri, 09 Jun 2023 09:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329659; x=1688921659; 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=/MNKMSV9lU/LFFjWXkzXW0njPBPDTkADbqjxOKUN+q8=; b=yX5HB3gHHHsNbx9mG/fN5U6Fy5E0UsMLM+7MRVSbuyqd2bl/bDBFU4+Jql3vK3csBf h7MOhqTWdmhZ2jWNQnxR+M/XCoNOsouOO6grvGa4Q5FEGfolc3/CMdmbl7i4JliGA78l ZIuYC6gDDfF82LOYLvBvZ8/cV48+xnsgbBSHA03dxeRZyMkqfJZUld0e/D1Qwyf5RhFU zmQXmW1cpLwNIbXRNtkrYj8ReeJTkB0VDu6mb3qWDbItDw459VF9mkifX/7wDjh5EJoi j1cYz59rosg4dTyiOWVF73sZZM9NdZ9mDAQwj1s8Rxsq424wqTAj8yYrAkeZ+umpfxbv Plhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329659; x=1688921659; 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=/MNKMSV9lU/LFFjWXkzXW0njPBPDTkADbqjxOKUN+q8=; b=e5fY1iJTmBTuur7DnenO22l6e5SA8CzNfy0ZtwDXdQ6JUNbPajj98KKrmRmrKAeChR b2NdGJZmucpC+4txF1x+JWqOH+ykg57o/fvedBWyEiRgJ8u/Nkxo6Ie5MjgvJnBDr/d7 grb5YnT2ef74qQhZtJbpSlMgD6BtFE47cnqfHzUSFnczdTX6x8TRWYqGNS/JAC+aQKlA zvqfw+B2m24HP5M0P+ERAxtPI7w06hBN7dctJniTm/uglWAFJQEuFLBxHSP0PftjuNFe BOj6iAb/qmMnisEXlIri0/KTTeDAd3ub0CA707aO31goTLnrb/9D6rsdeh3MXmNg/KbI 4VzA== X-Gm-Message-State: AC+VfDyYj+jgBYHzOHDHZWkNVauWhCnZpl9TqU/dseEea2YnvXj0bn/+ 13d45EiNlXISMub2HV4wm/I1zRQrkWEWgCiHkg4= X-Google-Smtp-Source: ACHHUZ5pYt74Lfwj/GoQxSI0uWfGgj0x7Y9fxxgpBzlskA7xPIYh36GH6ybseXGaOQZJCK+vfL0jHA== X-Received: by 2002:a05:6a20:e614:b0:10f:52e2:49ec with SMTP id my20-20020a056a20e61400b0010f52e249ecmr1295786pzb.53.1686329658631; Fri, 09 Jun 2023 09:54:18 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 09/30] binutils: stable 2.40 branch updates Date: Fri, 9 Jun 2023 06:53: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 ; Fri, 09 Jun 2023 16:54:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182575 From: Deepthi Hemraj - Rebase existing patches - Drop 0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch which is already in - Correct packaging path to libgprofng.so - Below commits on binutils-2.40 stable branch are updated. 4671be001eb Updated Hungarian translation for the gprof directory ded035f913e lto: Don't add indirect symbols for versioned aliases in IR 74cb2ddeabc gas: arm: Change warning message to not reference specific A-class architecture revision 570b9c09bbf gas: arm: Fix a further IT-predicated vcvt issue in the presense of MVE vcvtn bddd62e188c libctf: get the offsets of fields of unnamed structs/unions right 7aa47eafcce libctf: fix assertion failure with no system qsort_r 165accf0752 coff_get_normalized_symtab bfd_release af35798e957 PR30217, dynamic relocations using local dynamic symbols 18bb604f1e1 PR30198, Assertion and segfault when linking x86_64 elf and coff 34a2b4a0e21 PR30155, ld segfault in _bfd_nearby_section 3d0046f39aa PR30046, power cmpi leads to unknown architecture 5c87fb1d59b ppc32 and "LOAD segment with RWX permissions" 11f5c1ebf14 Updated Serbian translations for gold, gprof and opcodes sub-directories 38e455b1d9a Updated translations for the bfd and gprof directories. b2bc62b7b4e gas: correct symbol name comparison in .startof./.sizeof. handling 17294931e3e configure: remove dependencies on gmp and mpfr when gdb is disabled 1fc096a4c59 Regen config files e1815414077 Pass $JANSSON_LIBS and $ZSTD_LIBS to ld-bootstrap/bootrap.exp 3e888977f16 bpf: fix error conversion from long unsigned int to unsigned int [-Werror=overflow] 65dbb942145 Updated Swedish translation for the binutils sub-directory 27f59ec47a1 RISC-V: make C-extension JAL available again for (32-bit) assembly edd36b26f35 gprofng: PR30043 libgprofng.so.* are installed to a wrong location c6e269febbc gprofng: PR29521 [docs] man pages are not in the release tarball bcea253f5fa toplevel: Makefile.def: add install-strip dependency on libsframe (From OE-Core rev: 5d7389770af6613af4ca8a2d30cc79d494a91075) Signed-off-by: Deepthi Hemraj Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit dcaf5192599b9474901ab73b66c330a401623fc1) Signed-off-by: Steve Sakoman --- .../binutils/binutils-2.40.inc | 3 +- ...s-crosssdk-Generate-relocatable-SDKs.patch | 2 +- ...o-not-generate-linker-script-directo.patch | 2 +- ...dk-Search-for-alternative-ld.so.conf.patch | 8 +- ...004-Point-scripts-location-to-libdir.patch | 6 +- ...stro-compiler-point-to-the-wrong-ins.patch | 2 +- ...-system-directories-when-cross-linki.patch | 8 +- ...ect-assembling-for-ppc-wait-mnemonic.patch | 2 +- .../binutils/0008-Use-libtool-2.4.patch | 252 +++++++++--------- ...h-in-libtool-when-sysroot-is-enabled.patch | 2 +- .../0010-sync-with-OE-libtool-changes.patch | 2 +- ...or-clang-before-checking-gcc-version.patch | 6 +- ...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 2 +- ...sing-_Alignof-when-using-C11-or-newe.patch | 2 +- ...-dependencies-on-gmp-and-mpfr-when-g.patch | 56 ---- .../binutils/binutils_2.40.bb | 2 +- 16 files changed, 150 insertions(+), 207 deletions(-) delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.40.inc b/meta/recipes-devtools/binutils/binutils-2.40.inc index 46de8e3ea9..dbb43044a4 100644 --- a/meta/recipes-devtools/binutils/binutils-2.40.inc +++ b/meta/recipes-devtools/binutils/binutils-2.40.inc @@ -18,7 +18,7 @@ SRCBRANCH ?= "binutils-2_40-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "ffb83e32fc11f36b7b82b876c14888f82cd983b3" +SRCREV ?= "4671be001eb5a899ecac3e2686a92934000f8262" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" SRC_URI = "\ ${BINUTILS_GIT_URI} \ @@ -32,7 +32,6 @@ SRC_URI = "\ file://0011-Check-for-clang-before-checking-gcc-version.patch \ file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ - file://0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch \ file://0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ file://0016-CVE-2023-25586.patch \ " diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 7fffa81724..ca249834ea 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,4 +1,4 @@ -From 25e715730ddcca37021fa4876aed4fa91d5dea25 Mon Sep 17 00:00:00 2001 +From 4bdab425bdd7dc52c95bfd62e035c1b9abe9595e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 87a19c9ec3..663dc4af7d 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From 080a8eafc5961f78222d84aaa816d0933441b7ab Mon Sep 17 00:00:00 2001 +From c79005d4d9991593557766ad569f48c26482399f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 54967b9362..f46116f1af 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,4 @@ -From 90d1bb804033a74b54f64cd5d3127c004c266af8 Mon Sep 17 00:00:00 2001 +From 70da8b91026c5381d430194910fc15e3b6c5ec7f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 19 Feb 2020 09:51:16 -0800 Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index 12b2c3c453f..0590b7055d0 100644 +index b3195b4be68..fc6460317a7 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ @@ -43,7 +43,7 @@ index 12b2c3c453f..0590b7055d0 100644 NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) diff --git a/ld/Makefile.in b/ld/Makefile.in -index 3d5685d6bae..70643b1ce46 100644 +index fe422569228..4a4c851b44a 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -566,7 +566,8 @@ ZLIB = @zlibdir@ -lz @@ -65,7 +65,7 @@ index eff6693e052..95787012b89 100644 info.path = NULL; info.len = info.alloc = 0; - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); if (!ldelf_parse_ld_so_conf (&info, tmppath)) { diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch index 90abd50498..e7d2593c49 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From a7c988d60f11c8279453c2d9edeede001cce7c9e Mon Sep 17 00:00:00 2001 +From fa477bb947fa17543f4550bc0e7e715c8355649c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index 0590b7055d0..c30db94ee3c 100644 +index fc6460317a7..1b875904b8d 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) @@ -25,7 +25,7 @@ index 0590b7055d0..c30db94ee3c 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index 70643b1ce46..0405028e02f 100644 +index 4a4c851b44a..08dcd7b75fc 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -574,7 +574,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) diff --git a/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 9557e871db..7242f48795 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From fc39b9c332a346910695817274d55d0c20dc717a Mon Sep 17 00:00:00 2001 +From 7912f5a918e612950feb04d845934f26160e85da Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation diff --git a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch index 0ca55d4095..87bbe9fb1b 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From b9af05e87ac8eb4fa18a75939edb661056246c30 Mon Sep 17 00:00:00 2001 +From 725ca09ee1041f64589f26ba815ef11da687c608 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -77,7 +77,7 @@ index ad0dc6a106c..d21edaddce7 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index 49936a0cb2a..5f5dad6d67c 100755 +index 995708089fd..6406a42c442 100755 --- a/ld/configure +++ b/ld/configure @@ -839,6 +839,7 @@ with_lib_path @@ -253,7 +253,7 @@ index ceaca2d85d0..62e7b4e5341 100644 { if (error_count < MAX_ERRORS_IN_A_ROW) diff --git a/ld/lexsup.c b/ld/lexsup.c -index c5960385572..eb54627fb71 100644 +index a1c6140100d..d47ba4f977d 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -613,6 +613,14 @@ static const struct ld_option ld_options[] = @@ -271,7 +271,7 @@ index c5960385572..eb54627fb71 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1735,6 +1743,14 @@ parse_args (unsigned argc, char **argv) +@@ -1737,6 +1745,14 @@ parse_args (unsigned argc, char **argv) config.print_map_discarded = true; break; diff --git a/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index 502ce82928..fdd1f7756f 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From ef9aa69324a209e546956a2f674462717ec5af0f Mon Sep 17 00:00:00 2001 +From 4e9d4ace8a340399aeaa8332e2cfbfcc7d2d14d7 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch index 7e7c2579b3..0be871f5cf 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch @@ -1,4 +1,4 @@ -From 0ad92af822bb6f58de3f3889d0adc0b2ef9d477f Mon Sep 17 00:00:00 2001 +From a66b1806350a9bed7b188c7d115991f6cdee51a9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:04:07 +0000 Subject: [PATCH] Use libtool 2.4 @@ -76,7 +76,7 @@ index 80aed657643..106ec256a79 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ all_backends = @all_backends@ diff --git a/bfd/configure b/bfd/configure -index e5d464378f8..ee8ea251479 100755 +index 60ea6becab2..84dcdf167ba 100755 --- a/bfd/configure +++ b/bfd/configure @@ -706,6 +706,9 @@ OTOOL @@ -2038,7 +2038,7 @@ index 27315addc0f..5ddd5a42a7d 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/binutils/configure b/binutils/configure -index 3cb797c2b8d..5578150c1d9 100755 +index c7bd42049c3..06285371350 100755 --- a/binutils/configure +++ b/binutils/configure @@ -700,8 +700,11 @@ OTOOL @@ -3977,7 +3977,7 @@ index 8319181b472..3425e414c1c 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/gas/configure b/gas/configure -index 684e68e0ea2..ba35172965e 100755 +index 3c0c3e27d3b..11baafb9db6 100755 --- a/gas/configure +++ b/gas/configure @@ -686,8 +686,11 @@ OTOOL @@ -5916,7 +5916,7 @@ index c9914e46d7d..1857eb8b5a8 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/gprof/configure b/gprof/configure -index 3e8edd112cb..5b320c60f50 100755 +index c5a081c88aa..a1b06379df4 100755 --- a/gprof/configure +++ b/gprof/configure @@ -663,8 +663,11 @@ OTOOL @@ -7830,7 +7830,7 @@ index 3e8edd112cb..5b320c60f50 100755 chmod +x "$ofile" diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in -index 01f7dca3f2a..3db326271c9 100644 +index a2854950e34..4d307543d81 100644 --- a/gprofng/Makefile.in +++ b/gprofng/Makefile.in @@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ @@ -7850,10 +7850,10 @@ index 01f7dca3f2a..3db326271c9 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/gprofng/configure b/gprofng/configure -index 2afc9a381a6..1e57b41ffa4 100755 +index 3ad87139280..e4593cbb838 100755 --- a/gprofng/configure +++ b/gprofng/configure -@@ -672,6 +672,8 @@ OTOOL +@@ -674,6 +674,8 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -7862,7 +7862,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 OBJDUMP LN_S NM -@@ -802,6 +804,7 @@ enable_static +@@ -804,6 +806,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -7870,7 +7870,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 enable_libtool_lock enable_werror_always enable_gprofng_tools -@@ -1465,6 +1468,8 @@ Optional Packages: +@@ -1467,6 +1470,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -7879,7 +7879,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 --with-jdk=PATH specify prefix directory for installed JDK. --with-system-zlib use installed libz -@@ -6156,8 +6161,8 @@ esac +@@ -6158,8 +6163,8 @@ esac @@ -7890,7 +7890,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 -@@ -6197,7 +6202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -6199,7 +6204,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -7899,7 +7899,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6890,8 +6895,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6892,8 +6897,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7910,7 +7910,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6940,6 +6945,80 @@ esac +@@ -6942,6 +6947,80 @@ esac @@ -7991,7 +7991,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6956,6 +7035,11 @@ case $reload_flag in +@@ -6958,6 +7037,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -8003,7 +8003,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -7124,7 +7208,8 @@ mingw* | pw32*) +@@ -7126,7 +7210,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -8013,7 +8013,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -7278,6 +7363,21 @@ esac +@@ -7280,6 +7365,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -8035,7 +8035,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7293,6 +7393,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -7295,6 +7395,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8193,7 +8193,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 plugin_option= plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" for plugin in $plugin_names; do -@@ -7307,8 +7558,10 @@ for plugin in $plugin_names; do +@@ -7309,8 +7560,10 @@ for plugin in $plugin_names; do done if test -n "$ac_tool_prefix"; then @@ -8206,7 +8206,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -7324,7 +7577,7 @@ do +@@ -7326,7 +7579,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8215,7 +8215,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7344,11 +7597,15 @@ $as_echo "no" >&6; } +@@ -7346,11 +7599,15 @@ $as_echo "no" >&6; } fi @@ -8234,7 +8234,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7364,7 +7621,7 @@ do +@@ -7366,7 +7623,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8243,7 +8243,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7383,6 +7640,10 @@ else +@@ -7385,6 +7642,10 @@ else $as_echo "no" >&6; } fi @@ -8254,7 +8254,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -7394,29 +7655,81 @@ ac_tool_warned=yes ;; +@@ -7396,29 +7657,81 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8351,7 +8351,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 -@@ -7763,8 +8076,8 @@ esac +@@ -7765,8 +8078,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -8362,7 +8362,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7800,6 +8113,7 @@ for ac_symprfx in "" "_"; do +@@ -7802,6 +8115,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -8370,7 +8370,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7841,6 +8155,18 @@ _LT_EOF +@@ -7843,6 +8157,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -8389,7 +8389,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7852,7 +8178,7 @@ _LT_EOF +@@ -7854,7 +8180,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8398,7 +8398,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 const char *name; void *address; } -@@ -7878,8 +8204,8 @@ static const void *lt_preloaded_setup() { +@@ -7880,8 +8206,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8409,7 +8409,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7889,8 +8215,8 @@ _LT_EOF +@@ -7891,8 +8217,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8420,7 +8420,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7927,6 +8253,13 @@ else +@@ -7929,6 +8255,13 @@ else $as_echo "ok" >&6; } fi @@ -8434,7 +8434,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 -@@ -7946,6 +8279,48 @@ fi +@@ -7948,6 +8281,48 @@ fi @@ -8483,7 +8483,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Check whether --enable-libtool-lock was given. -@@ -8154,6 +8529,123 @@ esac +@@ -8156,6 +8531,123 @@ esac need_locks="$enable_libtool_lock" @@ -8607,7 +8607,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 case $host_os in rhapsody* | darwin*) -@@ -8717,6 +9209,8 @@ _LT_EOF +@@ -8719,6 +9211,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -8616,7 +8616,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8785,6 +9279,16 @@ done +@@ -8787,6 +9281,16 @@ done @@ -8633,7 +8633,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Set options -@@ -9270,8 +9774,6 @@ fi +@@ -9272,8 +9776,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8642,7 +8642,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -9437,6 +9939,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9439,6 +9941,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8655,7 +8655,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -9499,7 +10007,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9501,7 +10009,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8664,7 +8664,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9556,13 +10064,17 @@ case $host_os in +@@ -9558,13 +10066,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8688,7 +8688,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # # Check to make sure the PIC flag actually works. -@@ -9623,6 +10135,11 @@ fi +@@ -9625,6 +10137,11 @@ fi @@ -8700,7 +8700,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # # Check to make sure the static flag actually works. # -@@ -9973,7 +10490,8 @@ _LT_EOF +@@ -9975,7 +10492,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8710,7 +8710,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -10072,12 +10590,12 @@ _LT_EOF +@@ -10074,12 +10592,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8725,7 +8725,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 fi ;; esac -@@ -10091,8 +10609,8 @@ _LT_EOF +@@ -10093,8 +10611,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8736,7 +8736,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 fi ;; -@@ -10110,8 +10628,8 @@ _LT_EOF +@@ -10112,8 +10630,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8747,7 +8747,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 else ld_shlibs=no fi -@@ -10157,8 +10675,8 @@ _LT_EOF +@@ -10159,8 +10677,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8758,7 +8758,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 else ld_shlibs=no fi -@@ -10288,7 +10806,13 @@ _LT_EOF +@@ -10290,7 +10808,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8773,7 +8773,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 /* end confdefs.h. */ int -@@ -10301,22 +10825,29 @@ main () +@@ -10303,22 +10827,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8816,7 +8816,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10328,7 +10859,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10330,7 +10861,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -8831,7 +8831,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 /* end confdefs.h. */ int -@@ -10341,22 +10878,29 @@ main () +@@ -10343,22 +10880,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8874,7 +8874,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -10401,20 +10945,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10403,20 +10947,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -8952,7 +8952,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 ;; darwin* | rhapsody*) -@@ -10475,7 +11062,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10477,7 +11064,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8961,7 +8961,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -10483,7 +11070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10485,7 +11072,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8970,7 +8970,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -10499,7 +11086,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10501,7 +11088,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8979,7 +8979,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10523,10 +11110,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10525,10 +11112,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8992,7 +8992,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 ;; esac else -@@ -10605,23 +11192,36 @@ fi +@@ -10607,23 +11194,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -9037,7 +9037,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10706,7 +11306,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10708,7 +11308,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -9046,7 +9046,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10725,9 +11325,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10727,9 +11327,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -9058,7 +9058,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -11303,8 +11903,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11305,8 +11905,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9070,7 +9070,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11337,13 +11938,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11339,13 +11940,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9143,16 +9143,16 @@ index 2afc9a381a6..1e57b41ffa4 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -12221,7 +12880,7 @@ else +@@ -12223,7 +12882,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12224 "configure" +-#line 12226 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12265,10 +12924,10 @@ else +@@ -12267,10 +12926,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9165,16 +9165,16 @@ index 2afc9a381a6..1e57b41ffa4 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12327,7 +12986,7 @@ else +@@ -12329,7 +12988,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12330 "configure" +-#line 12332 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12371,10 +13030,10 @@ else +@@ -12373,10 +13032,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9187,7 +9187,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12766,6 +13425,7 @@ $RM -r conftest* +@@ -12768,6 +13427,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -9195,7 +9195,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12783,6 +13443,7 @@ $RM -r conftest* +@@ -12785,6 +13445,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9203,7 +9203,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -13065,7 +13726,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -13067,7 +13728,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9218,7 +9218,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 /* end confdefs.h. */ int -@@ -13078,22 +13745,29 @@ main () +@@ -13080,22 +13747,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9261,7 +9261,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -13106,7 +13780,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13108,7 +13782,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -9276,7 +9276,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 /* end confdefs.h. */ int -@@ -13119,22 +13799,29 @@ main () +@@ -13121,22 +13801,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9319,7 +9319,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -13177,29 +13864,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13179,29 +13866,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9418,7 +9418,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 darwin* | rhapsody*) -@@ -13305,7 +14038,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13307,7 +14040,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9427,7 +9427,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -13376,10 +14109,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13378,10 +14111,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9440,7 +9440,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 ;; esac fi -@@ -13420,9 +14153,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13422,9 +14155,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9452,7 +9452,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 fi fi link_all_deplibs_CXX=yes -@@ -13492,20 +14225,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13494,20 +14227,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9477,7 +9477,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13700,7 +14433,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13702,7 +14435,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -9486,7 +9486,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 ;; esac -@@ -13746,7 +14479,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13748,7 +14481,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9495,7 +9495,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13787,9 +14520,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13789,9 +14522,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -9507,7 +9507,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13924,6 +14657,13 @@ private: +@@ -13926,6 +14659,13 @@ private: }; _LT_EOF @@ -9521,7 +9521,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13937,7 +14677,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13939,7 +14679,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9530,7 +9530,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13946,13 +14686,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13948,13 +14688,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9557,7 +9557,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13972,8 +14721,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13974,8 +14723,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9568,7 +9568,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -14009,6 +14760,7 @@ else +@@ -14011,6 +14762,7 @@ else fi $RM -f confest.$objext @@ -9576,7 +9576,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # PORTME: override above test on systems where it is broken case $host_os in -@@ -14044,7 +14796,7 @@ linux*) +@@ -14046,7 +14798,7 @@ linux*) solaris*) case $cc_basename in @@ -9585,7 +9585,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -14109,8 +14861,6 @@ fi +@@ -14111,8 +14863,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9594,7 +9594,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -14215,6 +14965,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14217,6 +14967,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9606,7 +9606,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 dgux*) case $cc_basename in ec++*) -@@ -14367,7 +15122,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14369,7 +15124,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9615,7 +9615,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -14432,10 +15187,17 @@ case $host_os in +@@ -14434,10 +15189,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9636,7 +9636,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # # Check to make sure the PIC flag actually works. -@@ -14493,6 +15255,8 @@ fi +@@ -14495,6 +15257,8 @@ fi @@ -9645,7 +9645,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # # Check to make sure the static flag actually works. # -@@ -14670,6 +15434,7 @@ fi +@@ -14672,6 +15436,7 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -9653,7 +9653,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14684,15 +15449,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -14686,15 +15451,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9679,7 +9679,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14955,8 +15725,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14957,8 +15727,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9691,7 +9691,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14988,13 +15759,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14990,13 +15761,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9764,7 +9764,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -15534,6 +16363,7 @@ fi +@@ -15536,6 +16365,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9772,7 +9772,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -17690,13 +18520,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -17751,13 +18581,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -9793,7 +9793,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17711,14 +18548,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -17772,14 +18609,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -9812,7 +9812,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17751,12 +18591,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -17812,12 +18652,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -9826,7 +9826,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17795,8 +18635,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote +@@ -17856,8 +18696,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -9836,7 +9836,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -17823,12 +18663,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ +@@ -17884,12 +18724,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -9850,7 +9850,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -17866,8 +18706,13 @@ reload_flag \ +@@ -17927,8 +18767,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9864,7 +9864,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 STRIP \ RANLIB \ CC \ -@@ -17877,12 +18722,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -17938,12 +18783,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -9880,7 +9880,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -17898,7 +18745,6 @@ no_undefined_flag \ +@@ -17959,7 +18806,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9888,7 +9888,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -17920,8 +18766,8 @@ LD_CXX \ +@@ -17981,8 +18827,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9898,7 +9898,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -17933,7 +18779,6 @@ no_undefined_flag_CXX \ +@@ -17994,7 +18840,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9906,7 +9906,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -17967,6 +18812,7 @@ module_cmds \ +@@ -18028,6 +18873,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9914,7 +9914,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -17981,7 +18827,8 @@ archive_expsym_cmds_CXX \ +@@ -18042,7 +18888,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9924,7 +9924,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -18738,7 +19585,8 @@ $as_echo X"$file" | +@@ -18799,7 +19646,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -9934,7 +9934,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -18841,19 +19689,42 @@ SP2NL=$lt_lt_SP2NL +@@ -18902,19 +19750,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9978,7 +9978,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -18883,6 +19754,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -18944,6 +19815,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -9991,7 +9991,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -18892,6 +19769,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -18953,6 +19830,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -10001,7 +10001,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19006,12 +19886,12 @@ with_gcc=$GCC +@@ -19067,12 +19947,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -10017,7 +10017,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -19098,9 +19978,6 @@ inherit_rpath=$inherit_rpath +@@ -19159,9 +20039,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -10027,7 +10027,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -19116,6 +19993,9 @@ include_expsyms=$lt_include_expsyms +@@ -19177,6 +20054,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -10037,7 +10037,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -19162,210 +20042,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -19223,210 +20103,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -10411,7 +10411,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -19393,12 +20232,12 @@ with_gcc=$GCC_CXX +@@ -19454,12 +20293,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10427,7 +10427,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -19485,9 +20324,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -19546,9 +20385,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10437,7 +10437,7 @@ index 2afc9a381a6..1e57b41ffa4 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -19503,6 +20339,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -19564,6 +20400,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10448,10 +10448,10 @@ index 2afc9a381a6..1e57b41ffa4 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in -index a45018334e8..4c30941c6b6 100644 +index 3cd2068cbf6..c5d431236aa 100644 --- a/gprofng/doc/Makefile.in +++ b/gprofng/doc/Makefile.in -@@ -237,6 +237,7 @@ CXXFLAGS = @CXXFLAGS@ +@@ -240,6 +240,7 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -10459,7 +10459,7 @@ index a45018334e8..4c30941c6b6 100644 DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ -@@ -272,6 +273,7 @@ LN_S = @LN_S@ +@@ -275,6 +276,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -10508,7 +10508,7 @@ index eef61ba85f7..0eb1521b704 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure -index e92fbfc2242..09e93f878ae 100755 +index 079a0b71ec3..a28289cfe9d 100755 --- a/gprofng/libcollector/configure +++ b/gprofng/libcollector/configure @@ -641,6 +641,8 @@ OTOOL @@ -13108,7 +13108,7 @@ index e92fbfc2242..09e93f878ae 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in -index 4274762334e..74ab09d7661 100644 +index 605fa4f6fd4..313c4ceb4ca 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@ @@ -13128,7 +13128,7 @@ index 4274762334e..74ab09d7661 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index 0405028e02f..bd18a0a9e55 100644 +index 08dcd7b75fc..17c58dd2fd0 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@ @@ -13156,7 +13156,7 @@ index 0405028e02f..bd18a0a9e55 100644 ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/ld/configure b/ld/configure -index 5f5dad6d67c..18150633570 100755 +index 6406a42c442..21ab5b06709 100755 --- a/ld/configure +++ b/ld/configure @@ -700,8 +700,11 @@ OTOOL @@ -29906,7 +29906,7 @@ index c1eca5a42ed..7cab295b26d 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/opcodes/configure b/opcodes/configure -index 483ae4f7a9c..907807594f9 100755 +index d2364991ee8..f9a46eec7a3 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -682,6 +682,9 @@ OTOOL diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index ce795b7522..afd694db4d 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From d6f4f62fda4fde10b805b06d5e61792ee821449c Mon Sep 17 00:00:00 2001 +From ff2754e302d06df51f8dd8ef877afb65eb30fcab Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch index 910bd38694..cc0fb551b2 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 654b4ea9e28aad037e788672ca0d9ba450b3285e Mon Sep 17 00:00:00 2001 +From 039b4afd7d3b5a599aebee97410809276a622ccd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch index a825f9c842..b921dd1218 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch @@ -1,4 +1,4 @@ -From 9d35ab04de550f1db5d2e74d37fdeab4ca436148 Mon Sep 17 00:00:00 2001 +From 4eb24605fb2012c0f02883d1f560d5d852c0705e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Apr 2020 14:17:20 -0700 Subject: [PATCH] Check for clang before checking gcc version @@ -18,7 +18,7 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 417fc5a970c..bdc3583215f 100755 +index 9cb953a197e..b63b5cd3de0 100755 --- a/configure +++ b/configure @@ -5460,7 +5460,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -31,7 +31,7 @@ index 417fc5a970c..bdc3583215f 100755 #endif int main() {} diff --git a/configure.ac b/configure.ac -index 3a1eb0357e5..1c00b9aec42 100644 +index e95a9ed116e..2df870b86af 100644 --- a/configure.ac +++ b/configure.ac @@ -1444,7 +1444,7 @@ if test "$GCC" = yes; then diff --git a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 1871fbc799..f69071ae96 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 9a296e537708296d32c07c1dc681f59de3d1acf9 Mon Sep 17 00:00:00 2001 +From 9613e47bfdea18d2764eec130676e3e0b40c676f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 10 Mar 2022 21:21:33 -0800 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty diff --git a/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch index 91ac606f78..9cdc7e219d 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch @@ -1,4 +1,4 @@ -From 5fb47367d885a4a32625f09138b306d36ec3769f Mon Sep 17 00:00:00 2001 +From 8af01d85c4e5a5558d770291b7df86acfd59827c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 15 Jan 2023 00:16:25 -0800 Subject: [PATCH] Define alignof using _Alignof when using C11 or newer diff --git a/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch b/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch deleted file mode 100644 index 04c1310cbe..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 518c167116ab7aa6bb84a97200aeda2c4289e064 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= -Date: Tue, 3 Jan 2023 14:24:43 +0100 -Subject: [PATCH] configure: remove dependencies on gmp and mpfr when gdb is - disabled - -Since 991180627851801f1999d1ebbc0e569a17e47c74, the configure checks -about GMP and MPFR for gdb builds have been moved to the toplevel -configure. -However, it doesn't take into account the --disable-gdb option. Meaning -that a build without gdb will require these libraries even if not -needed. - -ChangeLog: - - * configure.ac: Skip GMP and MPFR when --disable-gdb is - provided. - * configure: Regenerate. - -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=5fb0e308577143ceb313fde5538dc9ecb038f29f] -Signed-off-by: Khem Raj ---- - configure | 4 +++- - configure.ac | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index bdc3583215f..b63b5cd3de0 100755 ---- a/configure -+++ b/configure -@@ -8032,7 +8032,9 @@ if test -d ${srcdir}/gcc ; then - require_mpc=yes - fi - if test -d ${srcdir}/gdb ; then -- require_gmp=yes -+ if test "x$enable_gdb" != xno; then -+ require_gmp=yes -+ fi - fi - - gmplibs="-lmpfr -lgmp" -diff --git a/configure.ac b/configure.ac -index 1c00b9aec42..2df870b86af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1585,7 +1585,9 @@ if test -d ${srcdir}/gcc ; then - require_mpc=yes - fi - if test -d ${srcdir}/gdb ; then -- require_gmp=yes -+ if test "x$enable_gdb" != xno; then -+ require_gmp=yes -+ fi - fi - - gmplibs="-lmpfr -lgmp" diff --git a/meta/recipes-devtools/binutils/binutils_2.40.bb b/meta/recipes-devtools/binutils/binutils_2.40.bb index 9087af87c5..4ce1b4bec2 100644 --- a/meta/recipes-devtools/binutils/binutils_2.40.bb +++ b/meta/recipes-devtools/binutils/binutils_2.40.bb @@ -66,7 +66,7 @@ PACKAGE_BEFORE_PN += "libbfd libopcodes gprofng" FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" FILES:gprofng = "${sysconfdir}/gprofng.rc ${libdir}/gprofng/libgp-*.so ${libdir}/gprofng/libgprofng.so.* ${bindir}/gp-* ${bindir}/gprofng" -FILES:${PN}-dev += "${libdir}/gprofng/libgprofng.so ${libdir}/libsframe.so" +FILES:${PN}-dev += "${libdir}/libgprofng.so ${libdir}/libsframe.so" SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR:class-nativesdk = "" From patchwork Fri Jun 9 16:53: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: 25354 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 081C9C7EE45 for ; Fri, 9 Jun 2023 16:54:26 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.142.1686329661318206255 for ; Fri, 09 Jun 2023 09:54:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=0Ad90AeY; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-662f0feafb2so1546736b3a.1 for ; Fri, 09 Jun 2023 09:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329660; x=1688921660; 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=wv9+NWMig/0sw9tAEh0HT7i6aVBSofgCTayHy0Kmx8s=; b=0Ad90AeYCy1CgSSYagUpCnLM0wCWuhbmSMy97GnYdfjmb0Yc4GqdEvFMwdCk9ySEUb pbD5+1KAgF8667dhE39conDGHUpL1EEbG7uM8T6/kGQbQnqatmz6egN/o9VQ5lWVivVy FeeCTrd32rI4R4Gq6tIL9wttkDnVpTAM5Ja7fnAkSm1hBd+4bPwikAZF8FMYvQxwz/K9 v80l0muOXPKIWiwsKnhwIC0pJtovx/Itxa7/UCpnljwW5ty8ySd+gG39Nsg7aZNmBHgb 4VpoY7nq0HvyxmLphAwIYgxC4q+OYR1ynwli+QLt/GY1jbDkuPaqkuFKuAHav0KQ60V3 jnXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329660; x=1688921660; 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=wv9+NWMig/0sw9tAEh0HT7i6aVBSofgCTayHy0Kmx8s=; b=WUubEyKJEqjF9snXa9eiF9374lEM6bOfQVvxjCcwbcgTGBINFHNrQMHebM233ThGgI D3CC0jPXO+M7WJMbW+EU57F3LpgInDeSnMF+xXCvT7gOPN9l9mfly7/N5Srs3/K+akxI brA7VQk/s/113iCDabBiJCXWXZjMwtTxBAUmFe9SnJwBbJtae/X0/SZCLBNK6a5oNfSt pGV3ByuLQpm5TqhZXIcaafABkv2fPwRpA15I9rUlFs6rXVeVMLyMZvTPCeRAgq20TMIs oKG5pHmo+yYs/glRDTdX9KKxa8FrqCEYcZsgfgg7aKxnF9+KBNc3QnersEvHuBdBH1qi 6rUg== X-Gm-Message-State: AC+VfDyRZweJghBUc3YN8Fv/Lvlx/E6KHpZC1zMXamygV2BKdBMwtzxA NAUMdov0xC2Z4sXFKREd0drRV7SlgbZtYsvBQqE= X-Google-Smtp-Source: ACHHUZ532bvi1YGez5BxKZG6AwOm+29joICVrJgDdA5PdJ7seryoWbu4ROFPDZydNRx7PHxOcvsMbA== X-Received: by 2002:a05:6a00:1803:b0:647:157b:cb61 with SMTP id y3-20020a056a00180300b00647157bcb61mr2659140pfa.7.1686329660326; Fri, 09 Jun 2023 09:54:20 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 10/30] binutils: package static libs from gprofng Date: Fri, 9 Jun 2023 06:53:37 -1000 Message-Id: <4ed0f0cc0ecc290f1bbb8262afa62b45513e9cc6.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182576 From: Martin Jansa * fixes: ERROR: binutils-2.40-r0 do_package: QA Issue: binutils: Files/directories were installed but not shipped in any package: /usr/lib/gprofng/libgp-collectorAPI.a Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. binutils: 1 installed and not shipped files. [installed-vs-shipped] (From OE-Core rev: ab6ae4b715143364288ba164f8ab5c3cd7f486ae) Signed-off-by: Martin Jansa Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit f72fd51e0da100e7ed90992225688bf43e2a69b6) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/binutils/binutils_2.40.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/binutils/binutils_2.40.bb b/meta/recipes-devtools/binutils/binutils_2.40.bb index 4ce1b4bec2..9fe4bf5ae3 100644 --- a/meta/recipes-devtools/binutils/binutils_2.40.bb +++ b/meta/recipes-devtools/binutils/binutils_2.40.bb @@ -67,6 +67,7 @@ FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" FILES:gprofng = "${sysconfdir}/gprofng.rc ${libdir}/gprofng/libgp-*.so ${libdir}/gprofng/libgprofng.so.* ${bindir}/gp-* ${bindir}/gprofng" FILES:${PN}-dev += "${libdir}/libgprofng.so ${libdir}/libsframe.so" +FILES:${PN}-staticdev += "${libdir}/gprofng/*.a" SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR:class-nativesdk = "" From patchwork Fri Jun 9 16:53: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: 25353 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 0575DC7EE2E for ; Fri, 9 Jun 2023 16:54:26 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.170.1686329662743104328 for ; Fri, 09 Jun 2023 09:54:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=UfAxyqfj; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-652d76be8c2so2102598b3a.3 for ; Fri, 09 Jun 2023 09:54:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329662; x=1688921662; 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=38fsvO975XJ/CzEp87o7WaoUyDqk6QPSZ+KpsLfacDY=; b=UfAxyqfjPK55rzJODgUZQ/PqGonrMLH5Fncei+LpjBS6knWKRPdxzCUQifWSXfm96V KOKjzpqRQrZc1t7NJXG2l+Pz4LFp6DdFPmsEkdxMOvN+CiCim0TgZXP+tMOESVO8k+xD onzwX972tz9NYtH0xC1Cp2jjZpugr4jWhKI4+C38GyDnGyTIlhKz9YyBHDscNQV/SWlS 7Hri5skpJWsc/mC014gNmK2d6QK7WslNWE4yqzX6x7MfezZWO7Wy5HerLreBNVfC/aFL lbbHvF+ZPm/T4GOpqHdT8aIUipu0IrzhyzFsEr80KzOL94zVFxlDj7s643jwOJPApEMu G/Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329662; x=1688921662; 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=38fsvO975XJ/CzEp87o7WaoUyDqk6QPSZ+KpsLfacDY=; b=fYmnl9O6Kqez0kOrObmuBa8i7eIgsDizDFy9UIKrL+qrFt7OC5a/skyUhNLFw7pVEo YqNXLtq5CWkR+/WnnI/jnnehpVq2Wn1qx2rGKG39AcYrL3WIJX+D5efsKL4placVlyrY izNJPed3p0FVbQULoAyWs6MFtYN8H72ibyqF7KrO8JfzyFkR5Yeclr6Nub8OWnjz/y3T 2x/SCivMP2lKlxTJHD2/RwudXS68/61A0kB2XlWr96I8mo1+adgBWnQe12huHQn+cwdp sBd5cmcbnENRz0VCe7FqIkVlubgVscOAEsMczmskjVge2fMb8rkLYCpDZs1QurGJQE0U sFKw== X-Gm-Message-State: AC+VfDyBS8vGlaJbL0nnzbDKEiULktIdhWOh2Ut1v4c6RoXzUSdSx6Dq iJJr/IC+MP5VXhKKzSVM5ic9uU1WAMdad0s6BDw= X-Google-Smtp-Source: ACHHUZ43rCYCoQfCCG6KuRVnbiIGn5vJ257a8lSFWE53uio+wSkh+ujKSk38GLu0MvK4WbIsxdyrYg== X-Received: by 2002:a05:6a21:3405:b0:114:9bbc:c325 with SMTP id yn5-20020a056a21340500b001149bbcc325mr1897652pzb.11.1686329661861; Fri, 09 Jun 2023 09:54:21 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 11/30] avahi: fix D-Bus introspection Date: Fri, 9 Jun 2023 06:53:38 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182577 From: Eero Aaltonen Install and package the D-Bus introspection files. Signed-off-by: Eero Aaltonen Signed-off-by: Alexandre Belloni (cherry picked from commit b8183ad25af3bcf23f04dd649b6ef665569fac8c) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/avahi/avahi_0.8.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb index bf6835e0d6..8649140a45 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb @@ -83,7 +83,6 @@ RRECOMMENDS:${PN}:append:libc-glibc = " libnss-mdns" do_install() { autotools_do_install rm -rf ${D}/run - rm -rf ${D}${datadir}/dbus-1/interfaces test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 rm -rf ${D}${libdir}/avahi @@ -135,7 +134,7 @@ FILES:avahi-daemon = "${sbindir}/avahi-daemon \ ${sysconfdir}/avahi/services \ ${sysconfdir}/dbus-1 \ ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/dbus-1/interfaces \ ${datadir}/avahi/avahi-service.dtd \ ${datadir}/avahi/service-types \ ${datadir}/dbus-1/system-services" From patchwork Fri Jun 9 16:53: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: 25355 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 24511C8300C for ; Fri, 9 Jun 2023 16:54:26 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.145.1686329664924618738 for ; Fri, 09 Jun 2023 09:54:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=HGEA/a5W; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-653436fcc1bso1717547b3a.2 for ; Fri, 09 Jun 2023 09:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329664; x=1688921664; 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=VZ9E1q6Xi0Z+Ws6Rfkg6Ten2TdGjQt1WahNIIxVm/4c=; b=HGEA/a5WWOqQFHiMQw6BZzIIk4Wq7TOMa+JgKEruW7CzffAH5PR6eMPfms7l47PGhH uQA51Us7vyUlEXRRY4g3Vuk72nhflH9ERrVO2CtOxr16IQRzwoiQ3RoFpg82OtLGrUwN ynmhcJ54rRh3Ye24vNGj0uGULlcCVW6L8GWUWeQNeW7hJd4OIKFqZuHKCyTKpmrlGGR5 o3exLiGaiI1TFlkaUdsowa1qOz4o1Tg7vcliw944bFR5fdh0LUybz4EB7qXmbT1yIC2F M5rL1oet962nSpVmsZos1KSH6LQ9/j4E9EUEsuzCE2sbajfdk03RqPyhwpUDSQikaL3e y9+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329664; x=1688921664; 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=VZ9E1q6Xi0Z+Ws6Rfkg6Ten2TdGjQt1WahNIIxVm/4c=; b=fc9Iz6xXVmR1PRBz55I+1mJO1iCw14eKWOh7EGxix8sxfYWT9ZI44JXwtHmkyLRYps j3+1tk/98fVT0dHwItOnfGch2P8nbVTAUBgv9F8v9ds0Co8x1DigltrSWmbePRUXc24j eVLnBirkGZLHRjmUp7BXm+kDf/U/q5+P/CtO6xUrEBY6tGNiU29fam7Jaj5iu611nujV Ax3Xrulu8hVymcggOERvI7IuJW6aTDP3UjwkDqrL/kKHklGv2ik04vM2iPPGkG7iSYpD FsBYHiGDlIKABY325JVRtrVbB7C6/1nAxLEHVOFcwdx5o0GXdh1O8AX6c1WNoXdYups2 EHYQ== X-Gm-Message-State: AC+VfDz8Z/1FyCSo1Gixj5AWYO1ikIBm68NYyfivIjYgH3tLygj3533l ohVwMJNc56hOeuqus74rAgQ8S3D5pADeFnDWQns= X-Google-Smtp-Source: ACHHUZ7fGZRze9Sx3Cro0xhYa+JsND5Rpid65u+HRidBjV7in7r3Le2Pv3zfpBHmEX/SV7kt15af5w== X-Received: by 2002:a05:6a00:2451:b0:64f:835c:a9e5 with SMTP id d17-20020a056a00245100b0064f835ca9e5mr1750752pfj.16.1686329663877; Fri, 09 Jun 2023 09:54:23 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 12/30] e2fsprogs: Fix error SRCDIR when using usrmerge DISTRO_FEATURES Date: Fri, 9 Jun 2023 06:53:39 -1000 Message-Id: <0e9cd399f7f5dcd31420cce8e0dc8c25f33bd80b.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182578 From: Qiu Tingting When build e2fsprogs ptest with usrmerge DISTRO_FEATURES, in test_script and test_one scripts, value of SRCDIR has problem. SRCDIR=/usr/usr/lib/e2fsprogs/ptest/test ptest log # ptest-runner e2fsprogs START: ptest-runner 2022-12-17T11:08 BEGIN: /usr/lib/e2fsprogs/ptest ls: cannot access '/usr/usr/lib/e2fsprogs/ptest/test/[a-zA-Z]_*': No such file or directory ./test_script: line 54: /usr/usr/lib/e2fsprogs/ptest/test/test_post: No such file or directory DURATION: 0 END: /usr/lib/e2fsprogs/ptest 2022-12-17T11:08 STOP: ptest-runner TOTAL: 1 FAIL: 0 Reason In Makefile.in, SRCDIR is set by prefix and libdir. @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script prefix=/usr libdir=/usr/lib (when usrmerge is set) solution Use PTEST_PATH to fix it. Signed-off-by: Qiu Tingting Signed-off-by: Alexandre Belloni (cherry picked from commit 85e3b4f1d4b8734b0dd427d107a9f736bca9b7f7) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | 4 ++-- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch index c3e46ce65f..20839b7286 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch @@ -22,7 +22,7 @@ index 8c4d2048..e021af32 100644 @echo "HTREE=y" >> test_one @echo "QUOTA=y" >> test_one - @echo "SRCDIR=@srcdir@" >> test_one -+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one ++ @echo "SRCDIR=@PTEST_PATH@/test" >> test_one @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one @echo "DD=@DD@" >>test_one @@ -31,7 +31,7 @@ index 8c4d2048..e021af32 100644 @[ -f test_script ] && chmod u+w test_script || true @echo "#!/bin/sh" > test_script - @echo "SRCDIR=@srcdir@" >> test_script -+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script ++ @echo "SRCDIR=@PTEST_PATH@/test" >> test_script @cat $(srcdir)/test_script.in >> test_script @chmod +x-w test_script diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb index 403995e9cf..761b6c1198 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb @@ -132,6 +132,7 @@ do_install_ptest() { sed -e 's!../e2fsck/e2fsck!e2fsck!g' \ -e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect* sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script + sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test/test_script ${D}${PTEST_PATH}/test/test_one # Remove various files find "${D}${PTEST_PATH}" -type f \ From patchwork Fri Jun 9 16:53: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: 25358 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 00E47C7EE29 for ; Fri, 9 Jun 2023 16:54:36 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.173.1686329666530375229 for ; Fri, 09 Jun 2023 09:54:26 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=mQzNd7Fj; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-652699e72f7so1708535b3a.3 for ; Fri, 09 Jun 2023 09:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329665; x=1688921665; 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=bATYXmSIR59LAZUqn0QBdDse9FiYGF/h0BImCX1FG64=; b=mQzNd7Fj0FtpF88fvmoVda5Mg0vufKLH21uLRg4x2EpanN65QCGnoODwfqZ83jLA0w 9t8bwZIaBrZpHoZ2FDSEVGyvWVGE0Vn7H1hJTQGeLvZqqt1JH/BR9/pPC8AR0SFatiVO NBm4cY67MZdygv+zkvXVRvengJa04q2uA1oKfp4PV8zrD8sl4Hn701hlgwVhOOFjA6d/ w5Qnq0WatknHqPWvEOG2E9paDpatCgIqTro16E73L9V25nz3don6qI0uDQa4mM6hToXz 44defODrjyzdWXN+89q4nfGZRh8uNqcu4RKdk29k2w+d+EvYhoajslR2BVnoCEY5OnTh CpjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329665; x=1688921665; 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=bATYXmSIR59LAZUqn0QBdDse9FiYGF/h0BImCX1FG64=; b=gLCDYFwbnxfjv5I9rXrAVyH+GK6u/uwRjKmDWj4zrNJM0ez8+JG/QN7FhwlrPeOnIL kc6kJQN3FiGTtdkFtoKVvzunb38yP7gkreUsEOvIeIkSI/qv54TkKsBbstUvYKdfl99Y JpWe7iJ11naFIt94vLaaCK+cpyVqsog4WIZRryVfYB6ygYYUGJxXAxzkJ/vsrzbT0iXQ FbeT1bEoMNF9jg0PzMa4qyDOE0dvaHCplI4skyp4LsNaQUrfIAyyNY2o82N+vPc7j25o 7X0AzHIPUdfx7KZKKgGczqn7XHyQ9E3XqnIfecGGSomZxsJedgToU2u22eIUIYMZKWod z4QA== X-Gm-Message-State: AC+VfDwVqO5tLtlBxaJu7nbduZcbF1nGx2F+C0OSE2TgUMmFXSwq2F1T VgZwS0ywdyAWZNjJk2z9hM+hswtC1P6vOtDB+OY= X-Google-Smtp-Source: ACHHUZ7I/RVuSlj4A4s6GLkLDDSCNbrlrE5VtTWbeFEHlTp4J9i4VCmcsdLUE1rwIqccbsU1bu/DTg== X-Received: by 2002:a05:6a20:7288:b0:111:1c17:3fc6 with SMTP id o8-20020a056a20728800b001111c173fc6mr1654789pzk.10.1686329665570; Fri, 09 Jun 2023 09:54:25 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 13/30] go.bbclass: don't use test to check output from ls Date: Fri, 9 Jun 2023 06:53:40 -1000 Message-Id: <6f9b6145b473a1adcaf39c1af0d17bec00547ede.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182579 From: Martin Jansa * avoids possibly confusing error message in log.do_install like: ls: cannot access 'etcd/3.5.7-r0/build/bin/linux_arm64/': No such file or directory Signed-off-by: Martin Jansa Signed-off-by: Alexandre Belloni (cherry picked from commit 2f1777e6ac5269a71203b6a2c562a43503be95ae) Signed-off-by: Steve Sakoman --- meta/classes-recipe/go.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index 6b9748406d..9c29fecdce 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass @@ -132,7 +132,7 @@ go_do_install() { tar -C ${B} -cf - --exclude-vcs --exclude '*.test' --exclude 'testdata' pkg | \ tar -C ${D}${libdir}/go --no-same-owner -xf - - if [ -n "`ls ${B}/${GO_BUILD_BINDIR}/`" ]; then + if ls ${B}/${GO_BUILD_BINDIR}/* >/dev/null 2>/dev/null ; then install -d ${D}${bindir} install -m 0755 ${B}/${GO_BUILD_BINDIR}/* ${D}${bindir}/ fi From patchwork Fri Jun 9 16:53:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25360 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 EC748C7EE2F for ; Fri, 9 Jun 2023 16:54:35 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.174.1686329668078906520 for ; Fri, 09 Jun 2023 09:54:28 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=hL54PzeI; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-652a6cf1918so1714482b3a.1 for ; Fri, 09 Jun 2023 09:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329667; x=1688921667; 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=shBusaz4tdGEkAd9k2lLLyxfTpFnLdmBiUTuh5ADeSg=; b=hL54PzeIeKtSwhN3axnDcFjEjKz4vaLb/k4ZAu7n1D1WEX688/cUW7oc5on8cgU+1e HqMGK4Xdm3jKaDkmAbGKIaOqHPNby3qCy1dKYHT6cGS2RQx762VEocyJ+nDjgEaNk9DT 72iuylwF6ewS6WXVvDywQ1XrYbqeUNYdjuXqpv7zD2SbFHyURzWYFmrUbphg+8VZgUX7 6q83jdT7r24Rra+8hdZYpXRNoiwDPG44StkXsYkaZFzQylPjJgYV5fCixL6uhw+qanmy GCgwzRdWFIwWdhN7CwkDxLJpqcEhr+D4vlEa87iRpFfyQQo8zGHHlgLTiUzQv08k7YRH zSwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329667; x=1688921667; 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=shBusaz4tdGEkAd9k2lLLyxfTpFnLdmBiUTuh5ADeSg=; b=KGsqEjC44TXSfVIwc9OMBNlDav1kWBpdrHOevo7lfwMxijKoqcQ1skbgbruSe5deAa 3VOIcgltpP6oe/n4bo4tppewDe7ZoCaiXkNmpW65b9JpeYAZIqiJQTiE8NMreXpe/LKj jW9vQVLmM4CB7Hc3m2DmTBd4ctGCsKg3XBlsQJkh19o0Up5uMaUFUxcQoHyIk+KBLnld EKMABKZBAOGdR3EYVEknslyw/6TuBuoZKDRJUqWxxU3WOxbIw3ox4T017RN9gmfTPb11 XTdo2Y2vUnfGPaavcTho4Lu3l/FhFy49Xq7T2NNR6CyVZJ7X3e4gyo0kwof+wbn7TvJJ pg/w== X-Gm-Message-State: AC+VfDxFSdjNpCYKdw5y3nYwFtsFb7mxUdsSUt5hfhJJ4eUV+5znl3UN gfXUpqrSSbq518Uf+FTUre8XKxYJ8SF9aUhuAR8= X-Google-Smtp-Source: ACHHUZ5Z+wG+tzteg4gg6VKIUuyo9cijCl50pc2dsZUm1KokXjSI4zpmojY0JvHPepIQj7v0EH4qUg== X-Received: by 2002:a05:6a00:1a87:b0:663:6e88:6f93 with SMTP id e7-20020a056a001a8700b006636e886f93mr1745863pfv.28.1686329667167; Fri, 09 Jun 2023 09:54:27 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 14/30] image-live.bbclass: respect IMAGE_MACHINE_SUFFIX Date: Fri, 9 Jun 2023 06:53:41 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182580 From: Martin Jansa * fixes: ERROR: core-image-minimal-1.0-r0 do_bootimg: /OE/build/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-initramfs-qemux86-64.cpio.gz is invalid. initrd image creation failed. ERROR: core-image-minimal-1.0-r0 do_bootimg: ExecutionError('/OE/build/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/run.build_hddimg.2001892', 1, None, None) when IMAGE_MACHINE_SUFFIX is set to empty in local.conf Signed-off-by: Martin Jansa Signed-off-by: Alexandre Belloni (cherry picked from commit ed072d2a0abe5a22330160f67ee5e83c2eae1dac) Signed-off-by: Steve Sakoman --- meta/classes-recipe/image-live.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/image-live.bbclass b/meta/classes-recipe/image-live.bbclass index 1034acc49e..168774a464 100644 --- a/meta/classes-recipe/image-live.bbclass +++ b/meta/classes-recipe/image-live.bbclass @@ -38,7 +38,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ LABELS_LIVE ?= "boot install" ROOT_LIVE ?= "root=/dev/ram0" INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs" -INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_FSTYPES}" +INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}${IMAGE_MACHINE_SUFFIX}.${INITRAMFS_FSTYPES}" LIVE_ROOTFS_TYPE ?= "ext4" ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" From patchwork Fri Jun 9 16:53:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25361 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 EC713C7EE2E for ; Fri, 9 Jun 2023 16:54:35 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.152.1686329669788328565 for ; Fri, 09 Jun 2023 09:54:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=4AdVzRFG; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-65242634690so1617904b3a.0 for ; Fri, 09 Jun 2023 09:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329669; x=1688921669; 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=I9fZdFYfUvzFXurAl3sxWJ4AQG2W7zt0QPzy153dJCA=; b=4AdVzRFGqnzzKw5OrBlwhFhKzRR+xSH2/q9/D8WlfI5z2GxdHcBxkGjfvkSVyhO9j+ Ppxla7HsI9ThzO+r9pEpU+RUR/ivOEDilNuB+50WnwdZxpXlKNBhMbCPSsMdaLwrbTEn cKdcZxXmRiow6WemR1kD08CXjNffwTiHWM8bcJla7qGhvqxql2ObdZh6I7fCa1BF4Zll RXXd8ZgE3GDJfZVpqF0KzUUYHYkKTY8NdKZbWoW8k/+PaEMPq27uRQ00CeWNBZANdihM mSb6ybcZaSpXFR6kDW96M8VRA8Kq1qnBsUarGHk0ca6hD0JIXl1dkgK+ehpBZ7fbcX7G tZQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329669; x=1688921669; 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=I9fZdFYfUvzFXurAl3sxWJ4AQG2W7zt0QPzy153dJCA=; b=eQaTbUkvzVdaBSyH5iGLHulVlUwouQ6+SPKiL/pCJaLhW/qGdzZRMUHyG77Y+RdEe3 QzvYw/tvMLghI6vFHwag7l0hXP2czkxVbIS6ZlCENRkfV9gVfKceFmJO5CvCVZEW2mAQ z3pI+vAmcDFG4L10sJS8pJb17Nx9xylM+otKT34SAxUyVru9m/S6Z86xQwb0Y3QU8mY1 pT9f9epMalYZ2sna99QI5JrqkdWvOSJ5zWizmkB7N1TGSt3AnlTstwf1kh1kZEY3JuYA KCOgPqbWnFG1+3+PLfBXRXSVhPiDrQw0LfjSbGTuUMS69JCKjGkULSo1wE6GEFW/N2kE wNBQ== X-Gm-Message-State: AC+VfDyj1t31s+Ks0Pv6RQ5gTMbiAWGrHNCgxs7fAlK/hWW5KYYpOWQf Ur4F1lL2xO5QS6S/YJCrbPEajVoXjN3aOJy0Jhg= X-Google-Smtp-Source: ACHHUZ78KmiPmiLKW4GcKaiT4bptih5ZkHc9k+sook0wUX7doYXavYJLLVtYtEWxZXtKTUuPFTvvUA== X-Received: by 2002:a05:6a00:1911:b0:663:8255:8cc3 with SMTP id y17-20020a056a00191100b0066382558cc3mr2096592pfi.7.1686329668732; Fri, 09 Jun 2023 09:54:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 15/30] meta: depend on autoconf-archive-native, not autoconf-archive Date: Fri, 9 Jun 2023 06:53: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 ; Fri, 09 Jun 2023 16:54:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182581 From: Ross Burton autoconf-archive is a collection of m4 autoconf macros needed at build-time, and autoconf-archive-native is a suitable provider as there is nothing in the recipe that needs to be cross-compiled. Also if we use DEPENDS=autoconf-archive then the recipe's -dev package ends up RDEPENDing on autoconf-archive, which isn't correct. Universally change any DEPENDS on autoconf-archive to the -native form, and add any missing dependencies that were implicit before. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 571132415ea7fe2d91c62948f2b6aa553eafa83d) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/neard/neard_0.18.bb | 2 +- meta/recipes-core/dbus/dbus_1.14.6.bb | 2 +- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +- meta/recipes-extended/wget/wget.inc | 2 +- .../gobject-introspection/gobject-introspection_1.74.0.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb | 2 +- meta/recipes-kernel/powertop/powertop_2.15.bb | 2 +- meta/recipes-support/icu/icu_72-1.bb | 3 +-- meta/recipes-support/mpfr/mpfr_4.2.0.bb | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/meta/recipes-connectivity/neard/neard_0.18.bb b/meta/recipes-connectivity/neard/neard_0.18.bb index dbd6e3841a..362a7615b6 100644 --- a/meta/recipes-connectivity/neard/neard_0.18.bb +++ b/meta/recipes-connectivity/neard/neard_0.18.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -DEPENDS = "dbus glib-2.0 libnl" +DEPENDS = "dbus glib-2.0 libnl autoconf-archive-native" SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;branch=master \ file://neard.in \ diff --git a/meta/recipes-core/dbus/dbus_1.14.6.bb b/meta/recipes-core/dbus/dbus_1.14.6.bb index a6e18a92cb..da25155773 100644 --- a/meta/recipes-core/dbus/dbus_1.14.6.bb +++ b/meta/recipes-core/dbus/dbus_1.14.6.bb @@ -42,7 +42,7 @@ PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" -DEPENDS = "expat virtual/libintl autoconf-archive glib-2.0" +DEPENDS = "expat virtual/libintl autoconf-archive-native glib-2.0" RDEPENDS:${PN} += "${PN}-common ${PN}-tools" RDEPENDS:${PN}:class-native = "" diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index d345b91472..0cb3f0e6a6 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \ file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6" SECTION = "base" -DEPENDS = "util-linux attr autoconf-archive" +DEPENDS = "util-linux attr autoconf-archive-native" SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index 58cb5ca73d..d31756dbc8 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" inherit autotools gettext texinfo update-alternatives pkgconfig -DEPENDS += "autoconf-archive" +DEPENDS += "autoconf-archive-native" EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \ --disable-rpath" diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb index 781ed65da3..d3a7ce2fd9 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb @@ -27,7 +27,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" +DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive-native" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb index 1b95cfb432..7831b4986a 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb @@ -13,7 +13,7 @@ DEPENDS += "xorgproto \ xtrans \ libxcb \ xorgproto-native \ - autoconf-archive \ + autoconf-archive-native \ " PROVIDES = "virtual/libx11" diff --git a/meta/recipes-kernel/powertop/powertop_2.15.bb b/meta/recipes-kernel/powertop/powertop_2.15.bb index 0aae4c9397..65c6d0fcd3 100644 --- a/meta/recipes-kernel/powertop/powertop_2.15.bb +++ b/meta/recipes-kernel/powertop/powertop_2.15.bb @@ -2,7 +2,7 @@ SUMMARY = "Power usage tool" DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management." HOMEPAGE = "https://01.org/powertop/" BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla" -DEPENDS = "ncurses libnl pciutils autoconf-archive" +DEPENDS = "ncurses libnl pciutils autoconf-archive-native" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" diff --git a/meta/recipes-support/icu/icu_72-1.bb b/meta/recipes-support/icu/icu_72-1.bb index 2b20bdd7b2..c2eae5298f 100644 --- a/meta/recipes-support/icu/icu_72-1.bb +++ b/meta/recipes-support/icu/icu_72-1.bb @@ -6,8 +6,7 @@ same results on all platforms." HOMEPAGE = "http://site.icu-project.org/" LICENSE = "ICU" -DEPENDS = "icu-native autoconf-archive" -DEPENDS:class-native = "autoconf-archive-native" +DEPENDS = "icu-native autoconf-archive-native" CVE_PRODUCT = "international_components_for_unicode" diff --git a/meta/recipes-support/mpfr/mpfr_4.2.0.bb b/meta/recipes-support/mpfr/mpfr_4.2.0.bb index fead5c3833..31804382e0 100644 --- a/meta/recipes-support/mpfr/mpfr_4.2.0.bb +++ b/meta/recipes-support/mpfr/mpfr_4.2.0.bb @@ -9,7 +9,7 @@ inherit autotools texinfo LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ " -DEPENDS = "gmp autoconf-archive" +DEPENDS = "gmp autoconf-archive-native" SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" SRC_URI[sha256sum] = "06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993" From patchwork Fri Jun 9 16:53: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: 25357 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 07397C7EE45 for ; Fri, 9 Jun 2023 16:54:36 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.175.1686329671161567756 for ; Fri, 09 Jun 2023 09:54:31 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=eEU3DBWq; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6563ccf5151so2116349b3a.0 for ; Fri, 09 Jun 2023 09:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329670; x=1688921670; 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=/SiC3eqND7rWAqlIvp4wL4hzpFp2TuZaL01JBPfvnTE=; b=eEU3DBWqtEQ91vvuvZOeOyehYr9EwhYiYhr+/kbZUPVKjd0i2bmqIDfSvZz1/v0aF7 AunE6s3V5ni5TAMJI8BAjGCTaAXaF9eZ9Tj/FGXoOdSX2m5qs7krd326cB+YBp66iR/x N5a13RrtGX0ldINfd1M1u8dubTCT7sd6VdHA/Nu9WrO7FiQdu1xeJVvH+bDGcVRvTV9C p+KmK5H0VPqWgHEQtAQAOpWNgatRFZxBdQ/9q2iee5xCajyjY/5NoyBP4ZETmT/PbHJJ 3+s4at3ZL3u2nf+MOAWhiSUSPL2aigFZDBaotX+4NyZMmAyEWV7aksvw7arjyKuzbBMy XRmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329670; x=1688921670; 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=/SiC3eqND7rWAqlIvp4wL4hzpFp2TuZaL01JBPfvnTE=; b=HCdPG3uXHcfD4nfWPsBFZ3rH341BEG9LGgzSGcEpg50wi2rTsfAGWRgV4seS428BhD VReW4T9jMkfWJgiJgcP6jEap7w6SOFmO9yJXpnMtEnx4nUm3tEYlHhlwd15DxeMl3NB9 fKR1t4yZ95PbV32+sI03BmyjhGSHu/7EpXmh+5aP980FIkK48QlBFgUZeA5WjKlae59q lTkkraPneva0N4ZwzSSkOAI/AHicUq0o7LPFsXCFskDe8CO92mhgTb3TUqSIdJmAbqGa 4JBr5/LBeKuErwxlC0KSzdyuP3fiVgPOGojvxU1+q3TT0Lx1+JFxoa0e0/2P+DGEVfMU PxHg== X-Gm-Message-State: AC+VfDw7LhCpOLX1bCJL4aap0GgULF25sL+ozaFVQIQOAuT04ZWIPxDf MrYvYMD/LKxrLX5bwAYvsqJ2vZ8qdid5i/yzTIw= X-Google-Smtp-Source: ACHHUZ6y6OsXxrOaugwLsrlpmWk00YTegTMcAAkcxF4SgiXMniKoWQ5/K9tlCaF4PNOCp9Ejrv3HYQ== X-Received: by 2002:a05:6a00:15d6:b0:659:3031:5037 with SMTP id o22-20020a056a0015d600b0065930315037mr2335318pfu.3.1686329670303; Fri, 09 Jun 2023 09:54:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 16/30] piglit: Add missing glslang dependencies Date: Fri, 9 Jun 2023 06:53:43 -1000 Message-Id: <67116105614137ede6c09efc0b1adf4ed34e79e7.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182582 From: Tom Hochstein The vulkan configuration requires glslangValidator for build and runtime. Fixes configure error: ``` | CMake Error at CMakeLists.txt:191 (message): | glslangValidator required by vulkan tests not found ``` Fixes runtime error: ``` name: vulkan@shaders@fs-large-local-array result: fail returncode: 1 out: err: glslangValidator: No such file or directory glslangValidator failed ``` Signed-off-by: Tom Hochstein Signed-off-by: Alexandre Belloni (cherry picked from commit 89423cc35d9d2d709adaf032bee8340fb91a3af5) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 4353a0a3a4..117bbd14c8 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -41,7 +41,7 @@ PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd" PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" -PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" +PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native vulkan-loader,glslang" export PIGLIT_BUILD_DIR = "../../../../git" From patchwork Fri Jun 9 16:53:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25359 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 073C9C8300C for ; Fri, 9 Jun 2023 16:54:36 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.156.1686329672678059144 for ; Fri, 09 Jun 2023 09:54:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=LBQXzjwK; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6532671ccc7so2105172b3a.2 for ; Fri, 09 Jun 2023 09:54:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329672; x=1688921672; 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=JSnt2RYDJ+z7DomQBRoyTCbLTjPJ1GzgTc6AhYgkvsk=; b=LBQXzjwKtw660ELRpcs81DU46KcJVTbt2WWIji9o3/rafRK/76wCTRzDrzff43JA4C JmXMQLCjDG+SAa4JOYviOEaMxmmnKbfZlP48uqHwqdxStVSh/25+wdgDrFstn0J4XaeP 3L7+bY7zoVnwxuQpHP7ok2GbiAPvH36UbyfP3Z9EUqtPQLqrmko+TYjXAGINATD28YM5 T46Pd4fTeTlIRZBesIlewJqwt03nb6mkdUYxMXZBrOLGyR7bKQ8gHUa3qMBS4zbtfUVz csSGM6o0u50sXzQDjn7og8iJcZfdmymSzziagMJuxEQpAieL457kd5x5Gpw267z4jB0F 3R9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329672; x=1688921672; 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=JSnt2RYDJ+z7DomQBRoyTCbLTjPJ1GzgTc6AhYgkvsk=; b=PIZg1QVkEDzFCzAd46sWp0ujjjSfNfTTZqg7C3JFS3rBNKYeE6pn0STF+7zSBkwmUR KHSOIb0DlWfqizZKoGXJrCT3OnSx7KG3v8by3YYfUUhmH9eJQCU7gZ9zfVA6/fbGYocA 7AXoZx4GU1zNNb+pFypS9n/EIhlK4QYzMtO95ORyJX+IE2KGmgtJiQ3vY7iezJ77wT4D mQqn/IiiuxbEtQdMK/Eqc7tZOpHvujCXMYfNc7enWM/58krL35WJ8fDDUBTPyreIsbgP AhGaKwmf0bRd9f2Ky3ba+VfgRun60c6IDRRjAkNNHs8TBt6qMUYVjGSV+rKR8RBNxy9Z L9JQ== X-Gm-Message-State: AC+VfDy96cefsap1+Ou/1mDJOpr0X/uVgX5qyiGQr0YbKW/lOkMUv/OT Yt0TCHO1gXC8bvJylPPFB8FbfkgciNzzHVDXN08= X-Google-Smtp-Source: ACHHUZ44PRBgPGukP+4Krzwahu8ATJMp5j1ope766Kdg5VZcNV54xflzG2VAqADKRISLBuvpmDHGGA== X-Received: by 2002:a05:6a20:3d26:b0:114:7239:6a5e with SMTP id y38-20020a056a203d2600b0011472396a5emr1987184pzi.10.1686329671790; Fri, 09 Jun 2023 09:54:31 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 17/30] conf: add nice level to the hash config ignred variables Date: Fri, 9 Jun 2023 06:53:44 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182583 From: Lorenzo Arena This is needed as each user could be setting different nice levels while building, however this should not make the shared cache unusable. Signed-off-by: Lorenzo Arena Signed-off-by: Alexandre Belloni (cherry picked from commit 42784f9360345da1c01d988070253e7ffd5ac4ac) Signed-off-by: Steve Sakoman --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index afd9e2f552..52ef64b50a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -959,7 +959,7 @@ BB_HASHCONFIG_IGNORE_VARS ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ - BB_SETSCENE_ENFORCE BB_CMDLINE BB_SERVER_TIMEOUT" + BB_SETSCENE_ENFORCE BB_CMDLINE BB_SERVER_TIMEOUT BB_NICE_LEVEL" BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ lockfiles vardepsexclude vardeps vardepvalue vardepvalueexclude \ file-checksums python task nostamp \ From patchwork Fri Jun 9 16:53:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25362 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 109B5C83005 for ; Fri, 9 Jun 2023 16:54:36 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.158.1686329674265455063 for ; Fri, 09 Jun 2023 09:54:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=eKSJq/Ok; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-651e298be3fso2074374b3a.2 for ; Fri, 09 Jun 2023 09:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329673; x=1688921673; 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=QJ/Xc6YYXCZj3TY64EvDqcJvT4S8QnZvQkFGFgmnJgs=; b=eKSJq/OkGuZsP9l0+Q5an2MpX+mJF3zv/KDf0SYP5050l3Ig2QVkpyVsT1K9Jovw2E 2b0X5qlDzH+u+bjKMniCCvNMpoPOxozyvSviuovRb8AEVV0pUox4/ZP64cSbfo6lEJlv bellcGOJ018DG6umIyG3+i6n+H33SPLB2GUYZ2U+JAGqzAl77MqBxCenNuyeuAPWjLv8 gsK1s82fW0ADN6puFY9BrAeMCv6t4eHWo10dR48TkHxjpTXP7YM1CUpPtlTc9zgZUxiG 9/xJV7+G2DILofRPBBs3T9gtXGegfgQgBM6tGE5WzR5UIThJxgCzMzqQEjnUox2VgP7F RqCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329673; x=1688921673; 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=QJ/Xc6YYXCZj3TY64EvDqcJvT4S8QnZvQkFGFgmnJgs=; b=AEkPJLd+FhfgHMTdYADBErQ8F2Dv7W9wFBqw/CYG9gftamd62nl6hrRmqjRCr7p5iI 78/Mwo4a/kmpFrK12pMWQ2HkSPn9MPOSPjLzLwF3htdee/umrQKIWjzMt9gP+LCU847a QiNZs+xQjgobenioMzuEqgJuZbONPg/+so5Kit2AcDXue3HBkL/iHwrUvq+SW3GHujkQ QQelk7OfxStIuGdnF9KQAY3TD+gpfFOR91V0GxuUiZZAZ2QWKaR0U4vglOfMyJEMQKmu gZ3eEyLvxm5LXDRWC1t2luFuk5yVwEShYVvHbydUnS2g8emuFa05zzT0wRlP59SzfCUZ x0GA== X-Gm-Message-State: AC+VfDz5BLXGy0GZGGzJ+stDxhapMQaLRrIpWlVf/CIfRgyWis0FEALB mcANpWs3xXiomlbYNyp/l/p/OCr5z8jkWM4oBTo= X-Google-Smtp-Source: ACHHUZ6HXiQDwU6oD3eRiIf+MraRizHd1ERuZnek33Vh0/cuiqe8KHyFXE5Ypwfj+wuBtlV5r3dEdA== X-Received: by 2002:a05:6a20:3d8a:b0:10c:c407:92e5 with SMTP id s10-20020a056a203d8a00b0010cc40792e5mr2379750pzi.22.1686329673329; Fri, 09 Jun 2023 09:54:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 18/30] kernel: don't force PAHOLE=false Date: Fri, 9 Jun 2023 06:53:45 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182584 From: Bruce Ashfield If a specific kernel provider or configuration wants to enable BTF and pahole analysis, it isn't currently possible due to the explicit definition to false in the base kernel build arguments. pahole is now detected by the kernel built itself, so unless pahole-native is enabled, the result is the same. If a kernel does require an explicit disable of pahole, it is better to carry PAHOLE=false in those specific recipes. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b1e4851a36ed47ce6ba880a49264b9a57c78cf4f) Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index e634eabd49..1e97de5696 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -235,7 +235,7 @@ KERNEL_EXTRA_ARGS ?= "" EXTRA_OEMAKE += ' CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}"' EXTRA_OEMAKE += ' HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"' -EXTRA_OEMAKE += ' HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}" PAHOLE=false' +EXTRA_OEMAKE += ' HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}"' KERNEL_ALT_IMAGETYPE ??= "" From patchwork Fri Jun 9 16:53:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25367 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 ED188C7EE2F for ; Fri, 9 Jun 2023 16:54:45 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web10.179.1686329676091544097 for ; Fri, 09 Jun 2023 09:54:36 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=jGInWLaD; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-65242634690so1618005b3a.0 for ; Fri, 09 Jun 2023 09:54:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329675; x=1688921675; 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=zXgoJGI27q/QEdftxR3gdzTfDK6kOv2Kk61yqeWWSAM=; b=jGInWLaD+NWwYt0nul+5pGG+d19LMYo42ymuzrOuPzF7J5k2uZ28LIGGKTlO/7LZgM TmznJFS/QODKDpYDYmOzLaKC4lcAciEqdPiHbVWYLRPnVCN5CAjNi2th1ORpCXgwQBUM Ym6yc0hsjD6Z6g5J7MKQIuQicpZvpFatlYex8xi7FFm1i3S4t9ZFMlTfuxjjGHu5gBSQ oJKKwnRaqIzHVhLcccubEuL2RCTLoJa4JnghmBeBupASDgOLMPOVcpXcJvq/Wrqn5NMW P/d7fKIX8IuICMMi9jGd/TngvnikYel3iHQEWTmpwuM7TFSJJ8o+QTctgfpivcLqSnQo KtZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329675; x=1688921675; 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=zXgoJGI27q/QEdftxR3gdzTfDK6kOv2Kk61yqeWWSAM=; b=jWJUdsHQkqjEz2B12wEzBwbofoH6Wiyv8B63QX71dzpWWlUVZNJrMCW81kBfs5T0vf XWldhvYSsdO3RqwlkpBIGRJUGlDIAaCUthABYkg6CwtzSTFgQMjQWJNszS8zZ2+ZrIx+ tjt6i7SPROQTDQqCaHx9MNFvj1UCjOl2EFvdJQvH00jXs1Ns7e8OiTxzK947JZmaGtJ5 oLXVVYoO036ppjbfwnv5hVO/bMlW2JMPosShmFXQ7zHDIVvreOmQ/xRHNO72J3uazKGT XAy13HmONsuMvJHKdngOaLPhHmF55KbYSrgRVJ7XlLlfyEQdCt0Ec4mau/ULor9VQ3m0 bn8A== X-Gm-Message-State: AC+VfDx5mQII+9rEBfI1bluCihvOivKYh/n/MUqdeFVlPskC5bMQCiaW z7tJiMOb2vPqSBTdwzNBCdwcW1bi9hVJkVPdtyk= X-Google-Smtp-Source: ACHHUZ7HxePJZvnYDmkgCjfF7aIskCRXEuU9hmwE6bXbekJYI1Wfp2i3KVooy/a0Vj60SLEqaLeiLg== X-Received: by 2002:a05:6a20:729a:b0:10c:c5df:8bb7 with SMTP id o26-20020a056a20729a00b0010cc5df8bb7mr1662187pzk.30.1686329674979; Fri, 09 Jun 2023 09:54:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 19/30] linux-yocto: move build / debug dependencies to .inc Date: Fri, 9 Jun 2023 06:53:46 -1000 Message-Id: <67a972a1d8c2ff271cbbca68a2805ea31f079fa1.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182585 From: Bruce Ashfield When the architecture and debug specific build and runtime dependencies were introduced, they were only applicable to "newer" kernel versions and were enabled in the version specific recipes. These are now common dependencies, so we can avoid the duplication and move them to a common location. We also change the adhoc nature of the existing elfutils definition, as it is now detected by the kernel build and we no longer need the work around to the native sysroot. Finally, we change the undocumented KERNEL_DEBUG_OPTIONS to KERNEL_DEBUG and use it to conditionally enable features that need extended support (and support sometimes out of oe-core). Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 7ddeb149e7a78bedeb945898fec5e8f13b7c5711) Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto.inc | 10 ++++++++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 4 ---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 934591ff1c..04a8105e17 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -59,8 +59,14 @@ do_install:append(){ # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES:append:qemuall=" features/kernel-sample/kernel-sample.scc" -KERNEL_DEBUG_OPTIONS ?= "stack" -KERNEL_EXTRA_ARGS:append:x86-64 = " ${@bb.utils.contains('KERNEL_DEBUG_OPTIONS', 'stack', 'HOST_LIBELF_LIBS="-L${RECIPE_SYSROOT_NATIVE}/usr/lib/pkgconfig/../../../usr/lib/ -lelf"', '', d)}" +KERNEL_DEBUG ?= "" +# These used to be version specific, but are now common dependencies. New +# tools / dependencies will continue to be added in version specific recipes. +DEPENDS += '${@bb.utils.contains_any("ARCH", [ "x86", "arm64" ], "elfutils-native", "", d)}' +DEPENDS += "openssl-native util-linux-native" +DEPENDS += "gmp-native libmpc-native" +DEPENDS += '${@bb.utils.contains("KERNEL_DEBUG", "True", "pahole-native", "", d)}' +EXTRA_OEMAKE += '${@bb.utils.contains("KERNEL_DEBUG", "True", "", "PAHOLE=false", d)}' do_devshell:prepend() { # setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native) diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 36f7ed8791..6640000d83 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -45,10 +45,6 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" LINUX_VERSION ?= "6.1.25" -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" -DEPENDS += "gmp-native libmpc-native" - PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" From patchwork Fri Jun 9 16:53:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25363 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 ED14DC7EE29 for ; Fri, 9 Jun 2023 16:54:45 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.182.1686329677506811269 for ; Fri, 09 Jun 2023 09:54:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=pvmLKyCU; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6532671ccc7so2105289b3a.2 for ; Fri, 09 Jun 2023 09:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329676; x=1688921676; 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=5YP9LHMBa1TZPPGgShiDGALuLQEiT7HeENJl99qm7ME=; b=pvmLKyCUT9be2XPGtFVPVkCcWKDdZHwX89Q2wkpM/Lb2Fq7iSm0y7HfCIKFh3E/oZL QP8ZeBw7jEHDDF3caO1VdPtHBug2fQOtZTdW1tL6fS1yHR7X9on8qmc7b3luw3GR2dPL YQYC7J+oFmZ4MtZdx6GCeo6Ptj4GBmG4oM1LblqdGl3Qp5wiJXH2GyxEiocjbLILMLRZ i7jo8i3DQYHqryt5chHMEAITlRb9n1Cse3zT2NRayu1+16+GYOvhxQ3oY4vtoYqykSNg /CkaF3i7B9FGpct6XPyLbuZ5Avev4YfkO/KqK4vX/Gic0xQUhwTrqo7yDt+VcXEBTvKO TbEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329676; x=1688921676; 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=5YP9LHMBa1TZPPGgShiDGALuLQEiT7HeENJl99qm7ME=; b=foswEj493Y1YBO5wxZIYmAQ4oxzvQtdw1S4G6neRwROe++qFVALNEi1Ixt1smnc9JR v7MKfkzsSSw32EFolhzEbOxk5dBRZxHDVsIVczDPiaHiVU6LpE92jWARw9f3ce/BwxzH Q4wLHOgFXMNF080wGSLhW2D7NE3Hy9FCp5axVLxu2UP2W8K0ol8Je4YoUpxmX+S+kfHh 6NJghNC0TTQMfW8HnZ7h09J/JY2DCE8V2FsZMr3ei3cNlPh88KuLZiTHX4YPRpmNDJ1f IXPV22jVU2CjuKmolnaFpQm/rBa7q5WRMxIJB4+sMcFscvXRE+hqQBqV0s3bh3cyfaIw iUDQ== X-Gm-Message-State: AC+VfDwGyCrSMuADsLqiUlHGwnukGCjLLkuC/JHgZENMfSffjqQAv/so a3xXIgpZtxt16Eqh2GehLINCmzGZiztIZu2SZf8= X-Google-Smtp-Source: ACHHUZ66mObnnVNcv1sinSm8hKyPS81y+DdK8GPnsrUqJOcquozgi5WiPLHtVXDF2DNzvJ0NFvi8Wg== X-Received: by 2002:a05:6a00:1a10:b0:652:98e9:fb1 with SMTP id g16-20020a056a001a1000b0065298e90fb1mr2169032pfv.32.1686329676640; Fri, 09 Jun 2023 09:54:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 20/30] kmscube: Correct DEPENDS to avoid overwrite Date: Fri, 9 Jun 2023 06:53:47 -1000 Message-Id: <45bd0b8c1256640aef98d497e9d53553a1bd1dab.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182586 From: Ranjitsinh Rathod As part of the below commit, DEPENDS gets overwrite which is wrong Link: https://git.yoctoproject.org/poky/commit/?id=bd947d3343dcd96e79fc8157f32a2a087cd710a7 So correct the DEPENDS varibales Signed-off-by: Ranjitsinh Rathod Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 63f338255000874c62bf01ccc11f2c100014c3d9) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/kmscube/kmscube_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index b2c10e09fb..67ac97b963 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -6,7 +6,7 @@ OpenGL or OpenGL ES." HOMEPAGE = "https://cgit.freedesktop.org/mesa/kmscube/" LICENSE = "MIT" SECTION = "graphics" -DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm" +DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" @@ -19,7 +19,6 @@ S = "${WORKDIR}/git" inherit meson pkgconfig features_check REQUIRED_DISTRO_FEATURES = "opengl" -DEPENDS = "virtual/libgbm" PACKAGECONFIG ??= "" PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base" From patchwork Fri Jun 9 16:53:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25365 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 EEC06C7EE2E for ; Fri, 9 Jun 2023 16:54:45 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.163.1686329679460272823 for ; Fri, 09 Jun 2023 09:54:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=WFHoOeRd; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-64d44b198baso1544405b3a.0 for ; Fri, 09 Jun 2023 09:54:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329678; x=1688921678; 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=VJ9thQ+1fKepM94O9nD7jhODh8jVznIHv021LCLi1AQ=; b=WFHoOeRdkLja5pgWpIuFmBkAerkq9U0CVUoJgdtCR460guL6LkyXxwufTwhMvA0fVd wvDFFJq5AIMFMsBClyZqnhEcaW+feCa4vUi55hoVs2THUJ6s2vUKnul8cK/ONypsQ4oD ngQZxDhSbnlcWUfXSjG2hPJ4eq2/0xqJC3ei5VcyKSTmvcbOGv4af2aB2dsuCh96IITp oRRnTnpZnKfU8H2fJAI86Q0NgHqPFoGvwalny+qoYk5t/oyib7UJo/t2Tigan8VOgW11 8hqiuQsf+f3nKd/Qa4alFyDc+KV/mcgET06+iWEd8ilh/BfEYCP8EZXB+lIQRYUGTGL4 BAGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329678; x=1688921678; 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=VJ9thQ+1fKepM94O9nD7jhODh8jVznIHv021LCLi1AQ=; b=ixASP48H5W6KMq+IOhYyBnOCRwMyWoTqp3Fv9vehpqflP2m5HIz/ijRyk8iifSETgg P3YiAWMh2XqU7ItTVx2Sk4b/u33IC2LSgmg28zoXslQR1tM8ussrBl5gAp3T63JXFI4S eVEAPid4Je1uxQnNJmq0jvvjd/QSfKXuWpHnD9IMgV3f0TvXZBXn32KHQoMB73Iq10oV mplDOAx6okrV/ILyBTL2hdpvyHxhbE/BaFpvkjB4D7FNky5llhfBAwYRIvnaPBh2DFRT Y+CSszX8H/7LnYUAmS77TN+/iZoKB2VlcFYrYgrMAZ7384I328UN7t9OLZlXGCNmJnkd 4Iaw== X-Gm-Message-State: AC+VfDwozmsLcNGcfYxOjHQq82fjhXwv7RFj0mbgxVdo5FV4xlRH6IGU RCjvGkitVUB1W8u66sJYbZjqgZf5DmOscbqO0nM= X-Google-Smtp-Source: ACHHUZ61dRmXe473Rd5iJ31nEtD8BV3t3eKZqCgFnC4bd+a0M9Hkx9eDH2NNFz9eVnKxs5nbjNhUew== X-Received: by 2002:a05:6a00:892:b0:650:1a64:d8d3 with SMTP id q18-20020a056a00089200b006501a64d8d3mr2601832pfj.14.1686329678572; Fri, 09 Jun 2023 09:54:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 21/30] oeqa/selftest/cases/devtool.py: skip all tests require folder a git repo Date: Fri, 9 Jun 2023 06:53:48 -1000 Message-Id: <5b913494b472ef03435cabf984361b43c3d813f4.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182587 From: Thomas Roos Devtool selftests require poky dir a git repo, when downloading poky as a tar, this is not the case. Those tests will now skipped. [YOCTO #12389] Signed-off-by: Thomas Roos Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 95a5bc130dc51ea9de95c64dbf0e9c7892415d50) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/devtool.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 94873fd19f..f51de8efe0 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -10,6 +10,7 @@ import shutil import tempfile import glob import fnmatch +import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer @@ -40,6 +41,13 @@ def setUpModule(): canonical_layerpath = os.path.realpath(canonical_layerpath) + '/' edited_layers.append(layerpath) oldmetapath = os.path.realpath(layerpath) + + # when downloading poky from tar.gz some tests will be skipped (BUG 12389) + try: + runCmd('git rev-parse --is-inside-work-tree', cwd=canonical_layerpath) + except: + raise unittest.SkipTest("devtool tests require folder to be a git repo") + result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath) oldreporoot = result.output.rstrip() newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot)) From patchwork Fri Jun 9 16:53:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25364 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 0FB6BC8300C for ; Fri, 9 Jun 2023 16:54:46 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.164.1686329681097730276 for ; Fri, 09 Jun 2023 09:54:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=FA0gXLoO; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-65055aa4ed7so1671281b3a.3 for ; Fri, 09 Jun 2023 09:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329680; x=1688921680; 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=29meFdTFUMQq1hkbK1p45r7FNy00GPkSuNYusLB8qCE=; b=FA0gXLoORtiRXzHod43i6CuiOGqCkBIERrtOLr4Fy9CqP3fzSSA6qRjsPivyLKG8s5 2eKDLY4Ex6BXBGu32b7bjrdHZ68san4VAMxrXVuEBQ0IkuHBkVHmJNtZ5rflok/eRSMH eiWrAcsm9mlxxPvjx0ZgrFAIosW/xhAKiHh4RM9j5DQDoFhxcCxWzkHXjFN7FLDLKj41 hzWZchdX+drhIBbAK411WjOMFw+lBlrr8AHqkih5NWMmU6T+XDuYEBZkF9M8h10UdR1+ rUSyQqCsSyvAukioPN8iSgd2QpOgPF2uNlgomQGX2Z7YZcO7FOgFfMmBrO2tDV5p4913 +6hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329680; x=1688921680; 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=29meFdTFUMQq1hkbK1p45r7FNy00GPkSuNYusLB8qCE=; b=N9ls8gNVnx3HdTcf2PiI6peEbbOAvkPYs1Dmf5aZW5dSrHf77qcvgXot7pOJWj05L9 cigWq5oJ2CWKWfAoSukeSa5xE0dIBwxd55ueLb8b756ITV73zJPgBkzrVUZKEFqF0d5e LPGAUqpjjv3rotN5Iep+6GBAAIz1e9hv+7+d7Cnq6RF4r0+LfGC9Pu7Vi94KPy6O1VLz jN2OdmYYbYYqd692PNxmgM2Smr6PRY9Y33jJZ9YcrIdF3TVWfxVAAsHCUUnzfLAibQJ8 4C5ov9kO/Q1WXvTWwPG9UtDKLD70w4BmsihmyJl9y14/P5yWkMxHnrIRIVTvMsX7BsFz +f5g== X-Gm-Message-State: AC+VfDxeZwY8lA5rHoc+eqhHo57Q2tz7UOHsQGSClgBsTiP2He+e4v6l v8ACtYH9rB89PgmBCs0hfVCt24miPJpd3VwSZ8Y= X-Google-Smtp-Source: ACHHUZ4qrhnaEpx0pvSRlU0B6Z7kA2I2Fwn2adaa01DCc71ACZmbRPRZyXYTwtCwKebabFas3xWq3Q== X-Received: by 2002:a05:6a00:2385:b0:64d:5864:c052 with SMTP id f5-20020a056a00238500b0064d5864c052mr1769330pfc.28.1686329680153; Fri, 09 Jun 2023 09:54:40 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 22/30] musl: Correct SRC_URI Date: Fri, 9 Jun 2023 06:53:49 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182588 From: Peter Kjellerstedt When the protocol used to fetch the Git repository was changed from "git" to "https" in commit 139102a73d (recipes: Default to https git protocol where possible), the URI was not updated to match. Signed-off-by: Peter Kjellerstedt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0434a5ae168f737741e66a7fe1e30a8703b8ce16) Signed-off-by: Steve Sakoman --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 3b0dd53c73..8b9642dda1 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -12,7 +12,7 @@ PV = "${BASEVER}+git${SRCPV}" # mirror is at git://github.com/kraj/musl.git -SRC_URI = "git://git.musl-libc.org/musl;branch=master;protocol=https \ +SRC_URI = "git://git.musl-libc.org/git/musl;branch=master;protocol=https \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ " From patchwork Fri Jun 9 16:53:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25368 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 107B6C83005 for ; Fri, 9 Jun 2023 16:54:46 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web10.187.1686329682722155443 for ; Fri, 09 Jun 2023 09:54:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=rAOriBA+; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-655d1fc8ad8so1727819b3a.1 for ; Fri, 09 Jun 2023 09:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329682; x=1688921682; 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=XNsbHdvStTsW4fDbMrd3Ir4W3/T01WFGLpOehofLk4o=; b=rAOriBA+B7iUUO2a/pXFeHHqL2sT+E2ixsnZ4H5UAu/ZDMER6ZrrDyAP42r0Bkdkmd yIcF4gCcyuYGcQ1vDs4iG2CY4McAu/o3vFNIGn8tZScwSggnOA7QMxLHKoqbw6SU3WMs eb1d3hxojgrtVQr3jKS5BDzHI7Sf+63lpI/DFPHKdfO0rZDbebBEIOqEANp+u3KYrWtO 2VkQU/gdR1qb3DLezYiLH7+pbWcOucbmvQuPCW3XoHhSobj6diB6flqqsvUN71FtXtWt X/3to6a4f1tO4dDp+1pCqWse+OhSEkGdqFaIcfI2roEAPIURycleD77SmCAwDp5cgN3/ m7pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329682; x=1688921682; 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=XNsbHdvStTsW4fDbMrd3Ir4W3/T01WFGLpOehofLk4o=; b=PY1zJFJqMQCPiw2wCtiKO/ipaFg3nBYauroSbswft/y+QiCcGzDzjYnb02W8/sphtD NTiniy2FMP9SP1zBLqRhgb7VVaBWPA/6aISJr5JAR7qHdls0a5tBuCB2k0Rns5GXZDhO TLR5Zz4moBx3kSRhZXcM8tWw3UdNBcE9EjYXKW2kRorqdOycgV1sqt/ffRAW/DW8Zj6+ SHduJeoD2S1+3vWkCPZ5Ey/GgwqFW8jOVBXfS3heIOHDncV1xKjmP2F+A1O7WR8m0scV CnC7qM2cIAPMYgBtotCcL5rWNIDdXis0ugPbKOYjbj7dlmMckFU6HxhHpVugYjYmCdkW wuUQ== X-Gm-Message-State: AC+VfDwPIL8iqq3yDGTXIN8sfZzk7XCDf6B7lkYaP/SzwYx1LhEgF8uG /2qlxz/GG+8C2p0Kk1tUdzvqYlrBT1D+brpjmdU= X-Google-Smtp-Source: ACHHUZ5KXQCxvqqCxJPcDKPaY/Q8qcEOPlp9GzvjiCBogSDtGnqN1/vG74ye8/y9uEI6VEfuMyzZjA== X-Received: by 2002:a05:6a00:1887:b0:663:18c:a176 with SMTP id x7-20020a056a00188700b00663018ca176mr1937541pfh.32.1686329681657; Fri, 09 Jun 2023 09:54:41 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 23/30] xf86-video-intel: Use the HTTPS protocol to fetch the Git repositories Date: Fri, 9 Jun 2023 06:53:50 -1000 Message-Id: <155fb4ffbb02522cc5dde22c4d8a69a3e299b86f.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182589 From: Peter Kjellerstedt This matches the change in commit 139102a73d (recipes: Default to https git protocol where possible), which did this for most recipes. Signed-off-by: Peter Kjellerstedt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 21a06cb3f19570c65fc83d45069cab22136768b0) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index 74ec57aa66..21b499e666 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb @@ -13,8 +13,7 @@ SRCREV = "31486f40f8e8f8923ca0799aea84b58799754564" PV = "2.99.917+git${SRCPV}" S = "${WORKDIR}/git" -SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel;branch=master \ -" +SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=https;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" From patchwork Fri Jun 9 16:53:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25366 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 0F31DC7EE45 for ; Fri, 9 Jun 2023 16:54:46 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.189.1686329684295221557 for ; Fri, 09 Jun 2023 09:54:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=I6LeP6at; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-652328c18d5so1590230b3a.1 for ; Fri, 09 Jun 2023 09:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329683; x=1688921683; 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=qBo5PeCt9SIaJpH9so7UYVHYogr4IZzAUfBl9rIMMLs=; b=I6LeP6atOOOrvpF7HVHfg5ebUs5QXssLbWHDaNpM70NysA2frkkWJK3GGWRRmMkuPE w96pG1PCE4Tz6S5hOjgvzs5WETrr+45DT4oZwdeW8Cwh3od3H/+LEQC8dmoNfrue2VkR XZeafD781dsdQS2W39hEIG37jZRPHuFyBiqofxdKSjrmgecIiJrAE+2YvMmcjPJe7bVh 7BOYsW1K9IuSFGS4BkoTdpQq42AklZSDjq1duwK7+qsokYRlPbPpxR9GCVGTbEEXnkSL ++49gibTBWCvBkKJkwsUKcOjVzOU2BA8uPZpaKbyc19sp+yeH7qUAk5yzIZ/9BMQ+6i6 /PUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329683; x=1688921683; 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=qBo5PeCt9SIaJpH9so7UYVHYogr4IZzAUfBl9rIMMLs=; b=dvXmzB7xBGPFa2I3OeKMUOrYwJdRB8ZYKaNtWmZ4c3+Ok/NZgEmrd789SXxqU3te0S pWmirmMbvwLPsbYiM20SWDcvgq1Wf9oew6QSQTShB8nEnMZOZapxjIuD7EmbnLgkSsiT dFb18kwmOtkuHDDok/RATFe0HGT0mClDiNzHJB/D8Zz3cgKQ2bDlb/aKgauxdIcExBFG fiuwYmAoLSknU/3OAlBDIzbm5I+ULo/VxypHIocL/Z/dil2dAaXzJ7piBLTXkvisRTUb QXVAGONfj/jLyjPDeMrVFh1TAHERLaaxSaunlTaPtM2L4ASaHy3+PtXUMl+qTiByr/hW LsGg== X-Gm-Message-State: AC+VfDwbRaE2maVB+n6Nvemwq4g38oxttdUNG4l+igw62WvCo3WWiYfp 6XlVw6czAd7FS73Gt1B9PF6uljMER7tQE0yC7ug= X-Google-Smtp-Source: ACHHUZ56PCUVNyDKoXpfsbps3onjoQfmSG1/SN0uw+2n89MDV5r0n8qOdRT2dpRuOMXokeJfcsh8uQ== X-Received: by 2002:a05:6a00:148d:b0:64a:5cde:3a7d with SMTP id v13-20020a056a00148d00b0064a5cde3a7dmr1985010pfu.27.1686329683401; Fri, 09 Jun 2023 09:54:43 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 24/30] staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot Date: Fri, 9 Jun 2023 06:53:51 -1000 Message-Id: <08e561035255e765e4293d4031115ea308cc29d3.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182590 From: Chen Qi When running prepare_recipe_sysroot task, the extend_recipe_sysroot is run twice. What prepare_recipe_sysroot does is executing extend_recipe_sysroot, there's no need to add extend_recipe_sysroot to its prefuncs. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit bf7584a2ac16ee46ff5b41536b06bb46d0cbada7) Signed-off-by: Steve Sakoman --- meta/classes-global/staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index a058d344fd..664a9c59b5 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -654,7 +654,7 @@ python staging_taskhandler() { bbtasks = e.tasklist for task in bbtasks: deps = d.getVarFlag(task, "depends") - if task == "do_configure" or (deps and "populate_sysroot" in deps): + if task != 'do_prepare_recipe_sysroot' and (task == "do_configure" or (deps and "populate_sysroot" in deps)): d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ") } staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" From patchwork Fri Jun 9 16:53:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25372 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 EBB6EC7EE29 for ; Fri, 9 Jun 2023 16:54:55 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.166.1686329685937935389 for ; Fri, 09 Jun 2023 09:54:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=VOU0YY+H; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-650c89c7e4fso2083275b3a.0 for ; Fri, 09 Jun 2023 09:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329685; x=1688921685; 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=DH0CYTDRsc94EJxAw86QyrI+bcu66iIEHd0VqBT47RE=; b=VOU0YY+HrmJ8DIICVPtYqQNB67CZwCHbAiBC5klbc4qWpw0wMBXYfNX1lUu6hqIXpo WfV+HYJBIuHVGUnGO3bGLz8Ix0SK9JzE4g9uoHtUVMKNjoakBUBYo7bZOXCoJijlaDlg kY4vL4eLJxgpufOygCl5t+lbLRnilvmeg4fm0jCBxee9vRhY36scnidllu+0eSQO2zfU 9NAWYxVOmSaBvimny3AQHybA2tBzQ0pkoItloOz+r5KzZl3Q6VX5AfhNgnjD2kk4V07L q9wRBczy33JIjLabEiUmtwwo4NIxiNegkrncJ81RGYUXaxwzWX8YGwPhnL8bC8WtpHB7 dQuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329685; x=1688921685; 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=DH0CYTDRsc94EJxAw86QyrI+bcu66iIEHd0VqBT47RE=; b=c/W6OfTpqhPyE4lH3iwQb4iBRpXVoMx6jU4KEiqb6XKInDNkdfS0Te6FNtoXFaXo4m l/ArqKYb8sIKRfJOYAyC7C72HsPvTzcfAzOR0biPse/ejrCCyigNupwAtL4hzCY/y62c /9z0A+FBTjED3mhsmDEbwKbH5uOXNGCsL1+74zjImwkbria3Z9+p2rawdvzJnc+AVpwZ FctRXEcPT/svIgnbBeFaOTlzoiHR9X93CaqKVrKdD5/psw5iqhyPu3XfKrxQ/neA7Ail WXW05ZiR2oOG4l54Af3V44cqacvHcH2pyHwwJ7qfR2u+wW9Lxe+pcqd614vjnSYdNBG6 C5Hw== X-Gm-Message-State: AC+VfDwVrCYrDX2BLBOcli4DQVtZoNUIjmsy/dMUyfdaDq3QeZLqVYlo ZVcpNbhSP9XLOPrJ07b31KF9K/PbMBTikX4HH9g= X-Google-Smtp-Source: ACHHUZ7pkN4OxNSA9/yek6emo8EOw+Pkr3C99O51+7ZIjPv7LhG7tESU4oiRoAIOPpuclnAjuEKxNQ== X-Received: by 2002:a05:6a00:24c9:b0:64d:4412:9923 with SMTP id d9-20020a056a0024c900b0064d44129923mr2308317pfv.3.1686329684894; Fri, 09 Jun 2023 09:54:44 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 25/30] lib/terminal.py: Add urxvt terminal Date: Fri, 9 Jun 2023 06:53:52 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182591 From: Pavel Zhukov This fixes failure [1] of menuconfig task in rxvt-unicode terminal in case if xterm/Konsole/Gnome is not installed. Tested with rxvt-unicode-256color [1] WARNING: Terminal screen is supported but did not start ERROR: No valid terminal found, unable to open devshell. Tried the following commands: tmux split-window -c "{cwd}" "do_terminal" tmux new-window -c "{cwd}" -n "zephyr-helloworld Configuration" "do_terminal" xfce4-terminal -T "zephyr-helloworld Configuration" -e "do_terminal" terminology -T="zephyr-helloworld Configuration" -e do_terminal mate-terminal --disable-factory -t "zephyr-helloworld Configuration" -x do_terminal konsole --separate --workdir . -p tabtitle="zephyr-helloworld Configuration" -e do_terminal gnome-terminal -t "zephyr-helloworld Configuration" -- do_terminal xterm -T "zephyr-helloworld Configuration" -e do_terminal rxvt -T "zephyr-helloworld Configuration" -e do_terminal tmux new -c "{cwd}" -d -s devshell -n devshell "do_terminal" screen -D -m -t "zephyr-helloworld Configuration" -S devshell do_terminal DEBUG: Python function do_menuconfig finished Signed-off-by: Pavel Zhukov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8d2fe4df8ae33e033caf4119a76715f085be1d15) Signed-off-by: Steve Sakoman --- meta/lib/oe/terminal.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 71ffc87019..4412bc14c1 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -104,6 +104,10 @@ class Rxvt(XTerminal): command = 'rxvt -T "{title}" -e {command}' priority = 1 +class URxvt(XTerminal): + command = 'urxvt -T "{title}" -e {command}' + priority = 1 + class Screen(Terminal): command = 'screen -D -m -t "{title}" -S devshell {command}' From patchwork Fri Jun 9 16:53:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25374 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 EDA9CC7EE2E for ; Fri, 9 Jun 2023 16:54:55 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.167.1686329687375583478 for ; Fri, 09 Jun 2023 09:54:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=YN/wF//a; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-650352b89f6so1594341b3a.0 for ; Fri, 09 Jun 2023 09:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329686; x=1688921686; 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=JgFmN9ISwvgoDOsMTV4YXm7DL+zEAuxoIsXfrxPTPOQ=; b=YN/wF//aW5LyImKxxrs7VjyLWxVKFFXMc/PVQIDlSzw6jxGgxNY8s1CfitSWFT+Lj/ 5Okl1LJta5ghIeV2y8tFYUx0R75+S7BBJppj1UhEen/xFYIAJO2LhW6CzUKSTYQ9dTjh xW0wgEjAQfuF2+KL+F+teLUnH3UMpjVCDvjKLuCWRQQoJbWAMJW8spy1QSLLJAjJZVAm mWfBX1JY048JYYwrwhbJGbUMnjs/Msp3NJj/qBXHQKStU+3qOmYsntMq+BEfiFnJp8Cb 0hetultRIdwZaR+h/ZCarCiloRA3Jqr/YP1EvBB8jT2cSrE0/dKE7hP8QfItqpSbv13K HwVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329686; x=1688921686; 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=JgFmN9ISwvgoDOsMTV4YXm7DL+zEAuxoIsXfrxPTPOQ=; b=NtCaGXSadSegS9cMcTUDnUAO1O9IQATvnZZ/ggJg5yc5D9ro3rOCBHE0sJt02GCIw3 qxkmZsCOm6ZzZKnD3H3naG2wAyAm30nY2Iqr7eN1avl9XASI+piKRvu7aIEKD8cTu3Et iF+rIF56PHqc4Yn7jrSKKCyt8e7gAJdKpI7tvP0dx5q2ym60XNn4F3HP9SLJJZzHR/7Y xlUygNRLK2xy/7/A7LB8P1i08LwOToLb5Vr3sBRIb+k7yT57oGZiLxoNy8qzOY+pQ6kB gfFVDo+dwzv9xMTQAhJRwGC9hPupT0I05aAIOtgfXE7oAOvd7ZhJQcg9AMTxn13QGF+8 gAjw== X-Gm-Message-State: AC+VfDzlLGKDB9qsJ6MZp/AjwuXjkYtjoitWh+ySqB/ShYX+MyU57u8y JZzf74WbbEcNNIg/43evYl/8f1uM5FaejP8GKUU= X-Google-Smtp-Source: ACHHUZ6yhIsxgb1fUgjyzKY7Oq7rpFfjEEqJVXuztjTdXpbtrBKU6LhqwJHiAKz6EsqtSskeFN2DSg== X-Received: by 2002:a05:6a00:997:b0:657:2f01:6078 with SMTP id u23-20020a056a00099700b006572f016078mr1755727pfg.28.1686329686447; Fri, 09 Jun 2023 09:54:46 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 26/30] rpm: drop unused 0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch Date: Fri, 9 Jun 2023 06:53:53 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182592 From: Martin Jansa * it was removed from SRC_URI in oe-core commit: commit 67257ca87c6fa8e6050a20ecea50daf834c7e869 Author: Alexander Kanavin Date: Sat Apr 25 19:28:00 2020 +0200 Subject: rpm: upgrade to 4.15.1 and it's unused since then Signed-off-by: Martin Jansa Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c801a215fb2d53bdec7f4c9a20ff7969e8071e5c) Signed-off-by: Steve Sakoman --- ...support-for-unused-MD2-and-RIPEMD160.patch | 81 ------------------- 1 file changed, 81 deletions(-) delete mode 100644 meta/recipes-devtools/rpm/files/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch diff --git a/meta/recipes-devtools/rpm/files/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch b/meta/recipes-devtools/rpm/files/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch deleted file mode 100644 index 734e38bb39..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 2d53d1e308a5bd15a16cc289fa7e1f264ea706be Mon Sep 17 00:00:00 2001 -From: Panu Matilainen -Date: Tue, 26 Jun 2018 10:46:14 +0300 -Subject: [PATCH] Rip out partial support for unused MD2 and RIPEMD160 digests - -Inspired by #453, adding configure-checks for unused digests algorithms -seems nonsensical, at no point in rpm history have these algorithms been -used for anything in rpm so there's not even backward compatibility to -care about. So the question becomes why do we appear to have (some) -support for those unused algorithms? So lets don't, problem solved... - -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ff4b9111aeba01dd025dd133ce617fb80f7398a0] -Signed-off-by: Alexander Kanavin ---- - rpmio/digest_beecrypt.c | 7 ------- - rpmio/digest_nss.c | 2 -- - rpmio/digest_openssl.c | 6 ------ - 3 files changed, 15 deletions(-) - -diff --git a/rpmio/digest_beecrypt.c b/rpmio/digest_beecrypt.c -index 597027e25..653a39491 100644 ---- a/rpmio/digest_beecrypt.c -+++ b/rpmio/digest_beecrypt.c -@@ -132,10 +132,6 @@ DIGEST_CTX rpmDigestInit(int hashalgo, rpmDigestFlags flags) - ctx->Digest = (void *) sha512Digest; - break; - #endif -- case PGPHASHALGO_RIPEMD160: -- case PGPHASHALGO_MD2: -- case PGPHASHALGO_TIGER192: -- case PGPHASHALGO_HAVAL_5_160: - default: - free(ctx); - return NULL; -@@ -292,9 +288,6 @@ static int pgpVerifySigRSA(pgpDigAlg pgpkey, pgpDigAlg pgpsig, uint8_t *hash, si - case PGPHASHALGO_SHA1: - prefix = "3021300906052b0e03021a05000414"; - break; -- case PGPHASHALGO_MD2: -- prefix = "3020300c06082a864886f70d020205000410"; -- break; - case PGPHASHALGO_SHA256: - prefix = "3031300d060960864801650304020105000420"; - break; -diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c -index e11920e3e..b3d2b5595 100644 ---- a/rpmio/digest_nss.c -+++ b/rpmio/digest_nss.c -@@ -117,7 +117,6 @@ static HASH_HashType getHashType(int hashalgo) - { - switch (hashalgo) { - case PGPHASHALGO_MD5: return HASH_AlgMD5; -- case PGPHASHALGO_MD2: return HASH_AlgMD2; - case PGPHASHALGO_SHA1: return HASH_AlgSHA1; - #ifdef SHA224_LENGTH - case PGPHASHALGO_SHA224: return HASH_AlgSHA224; -@@ -217,7 +216,6 @@ static SECOidTag getHashAlg(unsigned int hashalgo) - { - switch (hashalgo) { - case PGPHASHALGO_MD5: return SEC_OID_MD5; -- case PGPHASHALGO_MD2: return SEC_OID_MD2; - case PGPHASHALGO_SHA1: return SEC_OID_SHA1; - #ifdef SHA224_LENGTH - case PGPHASHALGO_SHA224: return SEC_OID_SHA224; -diff --git a/rpmio/digest_openssl.c b/rpmio/digest_openssl.c -index 18e52a724..0ae48dd1d 100644 ---- a/rpmio/digest_openssl.c -+++ b/rpmio/digest_openssl.c -@@ -172,12 +172,6 @@ static const EVP_MD *getEVPMD(int hashalgo) - case PGPHASHALGO_SHA1: - return EVP_sha1(); - -- case PGPHASHALGO_RIPEMD160: -- return EVP_ripemd160(); -- -- case PGPHASHALGO_MD2: -- return EVP_md2(); -- - case PGPHASHALGO_SHA256: - return EVP_sha256(); - From patchwork Fri Jun 9 16:53:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25369 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 F3DF9C7EE45 for ; Fri, 9 Jun 2023 16:54:55 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.194.1686329688978912413 for ; Fri, 09 Jun 2023 09:54:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=F8Oy8nra; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-652699e72f7so1708948b3a.3 for ; Fri, 09 Jun 2023 09:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329688; x=1688921688; 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=88SnwcahxVIvFObNOoXDCk3nYqAx0LvdlgvYcqf9ztE=; b=F8Oy8nrasPtoHip22abvdFECnYoyc8LhHhc2v0sFiP2/CJujOdrlock/m8B37z9PcL o5DciwyLTlqKBVlBlgV6WR8kBBz79PhjCTm54G5UFfK1LP0zuL2koJ2QIjaNPsI6aOsa aGh0as5PA6Y9R4SUDT/l/xvzyQ1SugJ7KD82Sol3jM3ZWFf43zrRJrsoCirkpmyWibW4 JZDZz2eFGRgj40rnDcERReAFHHQcosjuwKX9+qt4ZtDbgcjIiulMvlxA9O0lAnc5dr59 3PXE0RIWE6qJNcf1gWhXGugwFHdeORlLMjfzH3qU/Q0uE00sUmksCo7y2bUFajfIGHBp jisw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329688; x=1688921688; 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=88SnwcahxVIvFObNOoXDCk3nYqAx0LvdlgvYcqf9ztE=; b=eIG731GHPPeZMeNKXhf+B5EUfi/vhe33y4Rf/xjwoUUWwvriWNDAaAuE6smfqvJ3Mu Te31gThNDAdN98tqeaDXLdnXn+h5h2N0Ne1ODGZdpmwvlklzPE1kv7oyn3VayrLLHQDE E0t7vg2LLVIAr6LiqukcVZyoNA6yLgSh87ltUi75FULfxokZNP/fvDRxF5I/BhTWjL1a 6fYK1hWefNsDVr0Ic34RdaS7Qdqzu0Xnlavz2gu0sAtKzSCDucX9VIc7+EVPCLPl43js n1RhN3aUYr22PRhL/FiIyKkh2HWwL1Ab0NBCpJmju9mYZeDgnFRPE24fNBjMCvaRsf65 M9lA== X-Gm-Message-State: AC+VfDyWTKu6Rg4QGlnEWnNJl5gKXKmMxEkfpCecUnXr71hKzmptSa6N XkwXMnX+fg2f3F0eh7I1dp8IVxEobt7jLDBnGTE= X-Google-Smtp-Source: ACHHUZ5Mkx5WeIA3iOxrHmMBfOoMzrAEiCLD4iZdKdBz6dNQXZTEVB8OT29hp5PUV//6reiWqjq+DQ== X-Received: by 2002:a05:6a20:1454:b0:117:c3f8:2f39 with SMTP id a20-20020a056a20145400b00117c3f82f39mr1776535pzi.19.1686329687956; Fri, 09 Jun 2023 09:54:47 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:47 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 27/30] oeqa: adding selftest-hello and use it to speed up tests Date: Fri, 9 Jun 2023 06:53:54 -1000 Message-Id: <95241ece5fcef53901b97f96ae961cea208ca31a.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182593 From: Thomas Roos Adding a selftest version of hello world to run it in tests where no download is necessary. Also using this in several tests to speed them up. Using the -native version wherever possible will also speed up tests a lot. [YOCTO #11142] Signed-off-by: Thomas Roos Signed-off-by: Alexandre Belloni (cherry picked from commit c3f26b63934888df0e3cd563c1c2804eb78a368e) Signed-off-by: Steve Sakoman --- .../selftest-hello/files/helloworld.c | 8 ++++++++ .../selftest-hello/selftest-hello_1.0.bb | 19 +++++++++++++++++++ meta/lib/oeqa/selftest/cases/bbtests.py | 18 +++++++++--------- 3 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 meta-selftest/recipes-test/selftest-hello/files/helloworld.c create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb diff --git a/meta-selftest/recipes-test/selftest-hello/files/helloworld.c b/meta-selftest/recipes-test/selftest-hello/files/helloworld.c new file mode 100644 index 0000000000..fc7169b7b8 --- /dev/null +++ b/meta-selftest/recipes-test/selftest-hello/files/helloworld.c @@ -0,0 +1,8 @@ +#include + +int main(void) +{ + printf("Hello world!\n"); + + return 0; +} diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb new file mode 100644 index 0000000000..547587bef4 --- /dev/null +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Simple helloworld application -- selftest variant" +SECTION = "examples" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "file://helloworld.c" + +S = "${WORKDIR}" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 helloworld ${D}${bindir} +} + +BBCLASSEXTEND = "native nativesdk" \ No newline at end of file diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index d97bda13c2..1dd2839c8d 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -41,7 +41,7 @@ class BitbakeTests(OESelftestTestCase): def test_event_handler(self): self.write_config("INHERIT += \"test_events\"") - result = bitbake('m4-native') + result = bitbake('selftest-hello-native') find_build_started = re.search(r"NOTE: Test for bb\.event\.BuildStarted(\n.*)*NOTE: Executing.*Tasks", result.output) find_build_completed = re.search(r"Tasks Summary:.*(\n.*)*NOTE: Test for bb\.event\.BuildCompleted", result.output) self.assertTrue(find_build_started, msg = "Match failed in:\n%s" % result.output) @@ -49,11 +49,11 @@ class BitbakeTests(OESelftestTestCase): self.assertNotIn('Test for bb.event.InvalidEvent', result.output) def test_local_sstate(self): - bitbake('m4-native') - bitbake('m4-native -cclean') - result = bitbake('m4-native') - find_setscene = re.search("m4-native.*do_.*_setscene", result.output) - self.assertTrue(find_setscene, msg = "No \"m4-native.*do_.*_setscene\" message found during bitbake m4-native. bitbake output: %s" % result.output ) + bitbake('selftest-hello-native') + bitbake('selftest-hello-native -cclean') + result = bitbake('selftest-hello-native') + find_setscene = re.search("selftest-hello-native.*do_.*_setscene", result.output) + self.assertTrue(find_setscene, msg = "No \"selftest-hello-native.*do_.*_setscene\" message found during bitbake selftest-hello-native. bitbake output: %s" % result.output ) def test_bitbake_invalid_recipe(self): result = bitbake('-b asdf', ignore_status=True) @@ -175,7 +175,7 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertIn('localconf', result.output) def test_dry_run(self): - result = runCmd('bitbake -n m4-native') + result = runCmd('bitbake -n selftest-hello-native') self.assertEqual(0, result.status, "bitbake dry run didn't run as expected. %s" % result.output) def test_just_parse(self): @@ -233,7 +233,7 @@ INHERIT:remove = \"report-error\" def test_setscene_only(self): """ Bitbake option to restore from sstate only within a build (i.e. execute no real tasks, only setscene)""" - test_recipe = 'ed' + test_recipe = 'selftest-hello-native' bitbake(test_recipe) bitbake('-c clean %s' % test_recipe) @@ -246,7 +246,7 @@ INHERIT:remove = \"report-error\" 'Executed tasks were: %s' % (task, str(tasks))) def test_skip_setscene(self): - test_recipe = 'ed' + test_recipe = 'selftest-hello-native' bitbake(test_recipe) bitbake('-c clean %s' % test_recipe) From patchwork Fri Jun 9 16:53:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25370 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 076BCC8300C for ; Fri, 9 Jun 2023 16:54:56 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.171.1686329690611500543 for ; Fri, 09 Jun 2023 09:54:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=JCedzkd2; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-652699e72f7so1708964b3a.3 for ; Fri, 09 Jun 2023 09:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329690; x=1688921690; 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=9jjf8hFaSIOS/6f+NCfCnPBnBT6rsc7NP/NxAy2q/bk=; b=JCedzkd2Yfq7liszwqAERUwaop01KW1l9f4/3fGJSb6iIeZY+b1q+R/QD75ylCW+oH WR2wsm3I+Qf8v3q4dyQ+g4+Px739OAPnS8PEkNPxx3AKOTlYsJ5kvU6HXdXrntYjahbp q0UmFo98jX9cNCsMmrzWxXBsx09ZZu4sLHciFvVTKdKO4f2snxRQAARCZipYzkseuKhj e54JQiPfbSQOy+sCApvQ2eBxvAH5HXwFJu2/AQRFFRRsNhJraSC0BvGnXwoYDdJCOYzh BFgDs6eWTWOCfA7E79kJez0hx56ze9VcaF1lyu4HZNLyczun/r/uVJdR8u5s4gfNFJMw /xVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329690; x=1688921690; 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=9jjf8hFaSIOS/6f+NCfCnPBnBT6rsc7NP/NxAy2q/bk=; b=KbV523YGoUZjpHpp+9iA0d93hWpdUqXSlm7KQRHFFxEIHZvggVbh0yHdYwhauA4CG6 4uFKzUmrCbA+7B3WxmBlQ5IdrbCXyi+KRLFgVbJdWMakfFBrL/K6OISoumSjORXzrc2n 2dGALIm/TDctITUmYMHZOSW1j7EdwYC+E292ZsPLGVNhZnigSi+HGUIya7Qvr7NN1Y8K 6VXs+XA72wALLx4tQXekM3j7ys+SCvs2/LElvvY6qkGapyq3P9QZr4a9C4fJQIo+TJJs 4XXYL3jtgSU55frH6LZvOT4188n/x7LFCvEPSgKuWP8E7f/LNDtdyAKMCQW5cGcdUzrF HjVw== X-Gm-Message-State: AC+VfDzVRqO43wSuw/Ozz2eR2vAAw7SYYH0G6UfufotavfE1NMTt0sSw esOhQJye9JFyCDOvs2ohhDu+l7qNlxTOpyWOqGU= X-Google-Smtp-Source: ACHHUZ7iLBtBJfCecydRdcrdujdv45Wo/R0LWOcZ7I5qw0u1pNG4tAtBBl+YIUOul0OAk3rMqB8tHA== X-Received: by 2002:a05:6a21:797:b0:119:10a3:d79d with SMTP id mg23-20020a056a21079700b0011910a3d79dmr1376660pzb.14.1686329689643; Fri, 09 Jun 2023 09:54:49 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 28/30] selftest/reproducible: Allow native/cross reuse in test Date: Fri, 9 Jun 2023 06:53:55 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182594 From: Richard Purdie We don't compare reproducibility of the native/cross components, only the target ones. With the long build times of rust-native, the test now takes crazy lengths of time so this tweak should allow us to reuse native/cross artefacts from sstate whilst still testing the target output is reproducible. Signed-off-by: Richard Purdie (cherry picked from commit b494d83c639a877cefeb7cbab6d37195e492f059) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/reproducible.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index cd7aa8aafa..1f0ed32fa0 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -151,7 +151,7 @@ class ReproducibleTests(OESelftestTestCase): def setUpLocal(self): super().setUpLocal() - needed_vars = ['TOPDIR', 'TARGET_PREFIX', 'BB_NUMBER_THREADS'] + needed_vars = ['TOPDIR', 'TARGET_PREFIX', 'BB_NUMBER_THREADS', 'BB_HASHSERVE'] bb_vars = get_bb_vars(needed_vars) for v in needed_vars: setattr(self, v.lower(), bb_vars[v]) @@ -225,7 +225,7 @@ class ReproducibleTests(OESelftestTestCase): # mirror, forcing a complete build from scratch config += textwrap.dedent('''\ SSTATE_DIR = "${TMPDIR}/sstate" - SSTATE_MIRRORS = "" + SSTATE_MIRRORS = "file://.*/.*-native.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH file://.*/.*-cross.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" ''') self.logger.info("Building %s (sstate%s allowed)..." % (name, '' if use_sstate else ' NOT')) From patchwork Fri Jun 9 16:53:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25371 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 06B1EC7EE2F for ; Fri, 9 Jun 2023 16:54:56 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.199.1686329692171449295 for ; Fri, 09 Jun 2023 09:54:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=PHVIcyoo; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-652d1d3e040so1611598b3a.1 for ; Fri, 09 Jun 2023 09:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329691; x=1688921691; 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=Y2DXY0rkq/i8yPccomW4TBuIc6WRwOAXTQ7Pnp02RM0=; b=PHVIcyoo6kBVXJq2CLqkBQQOu4hjE50Ei2uv8ujyndOaROeQLccl2XLUa+Fy9v/8Ip BWP4N+ln/5uQPsvHewawQoAMaLdMRzkISZhU4k59qgZOUe+jS5dgrBvyfdKSPJAOJZBE alEPPmKzpLkwqiTXW4sIHrBQbygRztyYgWMy8nNADgdLZ5br9ilIr+VJ644kLA8J/cr1 PdsFzJ80QRga7gPIbju8kiMw5GFMom6KSRDZqzgRFyzzTySVKig8WIDd+aEwLLNa2l4Z eDCw7aIB4eLzTxdfcc8fNp+1oyvEyJqEAKIHer37dM+389oUNMP0RmSkE0Ahbditr469 GpMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329691; x=1688921691; 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=Y2DXY0rkq/i8yPccomW4TBuIc6WRwOAXTQ7Pnp02RM0=; b=j4W8LRsHyIF7p4mIenr3IqawNf5U7z32yOWiEL5P3WqBcWJgPOjVhNLnGYnzdUKmoG gAHVP+0ZuXB91pOZ6wquktx3sFd0CGDJ/9HTz33Aqf4RTYntwIbimTeOUlALdI+MYHeU U0Llfk4hi87Vg97SR3BZUBlWWG6XuDku/mU7HkLaGZSY6yuRl1zXITKhE/tfpoqV5sVd bOWPf3tlJsShX/aquv4nuayC1gNAZ6E8XUODTfADcZv5meceOA+J7Yn/7nyRJx5Pq6K2 pxPve0j8v/7pK5pwiCOK1MrkdM0VhZySh13Zmv1PeL5+A+HPI4+VQmsksG41fhOk27tq +lYw== X-Gm-Message-State: AC+VfDzF3nlY9BOW2/9FP5OWXq/iDm5ekPGvzqxG24TdzCAT2QMUoJ1U KVV2N+5r/CNAIvy6Isi54ExFr005Qs+wH9F86pQ= X-Google-Smtp-Source: ACHHUZ6pRXb2N/v6xLC/o5hHL0BkazxrYtTR/Pb0YiTkMhkm0ULAHJ3uFzIbg+XDbiyksAzOITzZHg== X-Received: by 2002:a05:6a00:2d02:b0:659:f92d:904c with SMTP id fa2-20020a056a002d0200b00659f92d904cmr1702324pfb.3.1686329691195; Fri, 09 Jun 2023 09:54:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 29/30] uninative: Upgrade to 3.10 to support gcc 13 Date: Fri, 9 Jun 2023 06:53:56 -1000 Message-Id: <6d9e48a3322a9abdca7444dbfa2288af3c91113b.1686329289.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182595 From: Michael Halstead Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie (cherry picked from commit f811bffb861b23238e8291394bd6e8407f013619) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/yocto-uninative.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index 8a5cab5360..f3c05b7e20 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -7,9 +7,9 @@ # UNINATIVE_MAXGLIBCVERSION = "2.37" -UNINATIVE_VERSION = "3.9" +UNINATIVE_VERSION = "3.10" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "de35708c95c34573af140da910132c3291ba4fd26ebf7b74b755ada432cdf07b" -UNINATIVE_CHECKSUM[i686] ?= "adac07b08adb88eb26fc7fd87fee0cec9d5be167bf7c5ffd3a549a2a6699c29c" -UNINATIVE_CHECKSUM[x86_64] ?= "3dd82c3fbdb59e87bf091c3eef555a05fae528eeda3083828f76cd4deaceca8b" +UNINATIVE_CHECKSUM[aarch64] ?= "b11f7dff0ff5e3c971f22e89a105efb0f8d2006fd71d1ea3e5da771e416b0e01" +UNINATIVE_CHECKSUM[i686] ?= "ad7daa7fca7693ca07eea5279f830333530171d357759b380954a25254edd8dd" +UNINATIVE_CHECKSUM[x86_64] ?= "ce8ff7e3247da312fbf84008f415bc1b4d113ac9fe4ec91581e4a20cd8b475d3" From patchwork Fri Jun 9 16:53:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 25373 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 139B1C87FDC for ; Fri, 9 Jun 2023 16:54:56 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.172.1686329693777859074 for ; Fri, 09 Jun 2023 09:54:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=eEV6F+jH; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-53fa455cd94so748909a12.2 for ; Fri, 09 Jun 2023 09:54:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1686329693; x=1688921693; 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=TJice8P5kvprZyo7ewSAgpw0rlxG5a0L5Fbl0WpJL+0=; b=eEV6F+jHUH2Iqe3vN18t2bbM/6VpCUWFlbyPZH1H8AQtZbWJhzhKDrqwpC9DQWt8WD EP57NIxdCqz6jtzfhg56PHyI/Mofybf15p36NS630OFXCpvDQlZOiHgL4iid4ZxF4sEI UQIimxWTv7vzeOeEZRiK2b9PDc25SuuF64ausuRoMhQjziODCt8eCYZxnT9sV9mvYZIe cysO3X0z/XWuBel0oBULZQROnBCibZ3cRvMulyYH1J+XkGeQPbPLd3zOPH4a2jZb934y SCoSbV55CBGGgFQ3RRopUrNXLBFRShFD4rfnFIJINQDHcdBc3EBqx6MzQ29HzMvazTmI yF/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686329693; x=1688921693; 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=TJice8P5kvprZyo7ewSAgpw0rlxG5a0L5Fbl0WpJL+0=; b=R1GVV039Q8O5cbMc5zZs1HA/TylRCS3U+rx/1/0wmWVlx73fjzNTiiq1qYQHcibs/Y geyUB2wfa6uQYkS3ip1teuBN4O8gGm8zf7ucU92OsgreO9BumYUC6pltqbIMKONvtIy1 sZfkEXwuSp5jM7okrdLepK4Bgs56HNBnGZwDUi2x+6uveIovNej60utdZhjS5zQKX6sl F9FvV/57KdXBEZwuF/i7Tt+FUZhU/mEzm9/BFYC/Hs2QZfVTxNS9qzqPMUjf5skgEbdI Y47zPGVRBEoloenYl9bcuQybNFJ9s1hdXo6NrzBrHpUtv1MHkTq+pCupe6W5WitOqjiS 2rhw== X-Gm-Message-State: AC+VfDyidiDCOibecgUZrOYJbIF+Dy1PP/v4QiBQgtUaajpxHITczTXB 9HfTpXqvNPOC+EwFZ2uIa0YeHiaG0wH05ws/bTU= X-Google-Smtp-Source: ACHHUZ7t4pIPRAPz6p1J6/S/tv+ntLlXe83iNVM6SPoYCSgXOmSA51RaZL5IPu/E/pDU/ZUIpvPHyQ== X-Received: by 2002:a05:6a21:150d:b0:10c:1076:ff69 with SMTP id nq13-20020a056a21150d00b0010c1076ff69mr1368685pzb.48.1686329692866; Fri, 09 Jun 2023 09:54:52 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id j24-20020a62b618000000b0065980654baasm2901071pff.130.2023.06.09.09.54.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 09:54:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 30/30] uninative: Upgrade to 4.0 to include latest gcc 13.1.1 Date: Fri, 9 Jun 2023 06:53:57 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jun 2023 16:54:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182596 From: Michael Halstead Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie (cherry picked from commit f87becb69e02bdf055dffb633ed4f6d36b36f7a7) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/yocto-uninative.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index f3c05b7e20..ad4816a1f3 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -7,9 +7,9 @@ # UNINATIVE_MAXGLIBCVERSION = "2.37" -UNINATIVE_VERSION = "3.10" +UNINATIVE_VERSION = "4.0" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "b11f7dff0ff5e3c971f22e89a105efb0f8d2006fd71d1ea3e5da771e416b0e01" -UNINATIVE_CHECKSUM[i686] ?= "ad7daa7fca7693ca07eea5279f830333530171d357759b380954a25254edd8dd" -UNINATIVE_CHECKSUM[x86_64] ?= "ce8ff7e3247da312fbf84008f415bc1b4d113ac9fe4ec91581e4a20cd8b475d3" +UNINATIVE_CHECKSUM[aarch64] ?= "7baa8418a302df52e00916193b0a04f318356d9d2670c9a2bce3e966efefd738" +UNINATIVE_CHECKSUM[i686] ?= "83114d36883d43a521e280742b9849bf85d039b2f83d8e21d480659babe75ee8" +UNINATIVE_CHECKSUM[x86_64] ?= "fd75b2a1a67a10f6b7d65afb7d0f3e71a63b0038e428f34dfe420bb37716558a"