From patchwork Tue May 9 17:23:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23717 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 06649C77B7C for ; Tue, 9 May 2023 17:23:54 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mx.groups.io with SMTP id smtpd.web10.39152.1683653030460337529 for ; Tue, 09 May 2023 10:23:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=hB5iOiNp; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-50bc0117683so11197077a12.1 for ; Tue, 09 May 2023 10:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653028; x=1686245028; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wWnnk3/OWk0V3vA0y5OwGq4MFU8RiuL21WE4zwNx/Os=; b=hB5iOiNpA32NTs7KH+N7pw9PGzBMhqbIWvS5M9se7LDnMbThU6AcGZnqnNLSdY2Lr1 Zcecd+sUQTnZZDx/a0oQwOe8M15SSHw9p1Cc1oVm4+xCw/1E78NAR3lhNxgAcuQwiRgQ BXtHtVsx7hw6VTePysBU4Tgeb27Q9IGpJjN3zflwsT2V7AGXThEJ+JQ4YFrhkbC4Jjvf yQCWDaAtVo7j8mg9z3zCTV86MnR5ewGHnmLDPZPW0j2jA5LtZ/1QP1nF9cZl39l5werG d3Uzot37ycB3czFJMv5D2TK7/LyAFqB9mjhsTVWbgFOzZMCgJgcDHZBEb+TO0KbVWvZ/ di9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653028; x=1686245028; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wWnnk3/OWk0V3vA0y5OwGq4MFU8RiuL21WE4zwNx/Os=; b=Bn7AyhKBJnm01zLmmDSy1L8S+3V4vJ98JmpBYloagE6XAabI0WCgtpS6Q//31WJZpy W3dBqjL8rXHZSo75T2GOhawapnCZeClPOZkabFS36jO+4fY7GfK1F7YrDNJUG24lJ6// vgHeN45Ibu/EzhbCMAiEMenGy4/6CK5Z9MNOMyl+HfHXMwHYjXapFNYhxjPfDw5qTUpd 9KvOt3klM73Tl425jXc/RQ5VMhNgQc1TCHVSydnBOZzcbMj6oDWDSClQ51cYSqn+lY1Q eNWWUtgxlHnKGKkuBozjg+FIrXzg+3cQZTh0RlvkxjegbtBGnUshy2Hm9Fim/6ZSeZXz 4NeA== X-Gm-Message-State: AC+VfDx1SUzUzWJgjCEonqRlZ8/huMBcsWRusbysxIN7a+vLL5ALL8If sxPrHwB9/nvasBkGycdbadQ82mKyZSY= X-Google-Smtp-Source: ACHHUZ6r2LvxQrg+I6vAgy9DcJsQVCxAMmqPzSvRWWVMIfYGONXMsGQ31l0ebyPVNrBI+L2Ajkjxsg== X-Received: by 2002:a17:906:eeca:b0:965:d17b:292 with SMTP id wu10-20020a170906eeca00b00965d17b0292mr11700498ejb.60.1683653028214; Tue, 09 May 2023 10:23:48 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:47 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/27] insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only) Date: Tue, 9 May 2023 19:23:18 +0200 Message-Id: <20230509172344.1516743-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181056 This was done in a selftest, but that is too late and creates friction in integration as errors are not seen until autobuilder fails. Bonus fix: SUMMARY check wasn't even working, as in the absence of one set in the recipe there is a default value set from bitbake.conf. I left DESCRIPTION check out for now, as many recipes don't actually have it, and it's set from SUMMARY (plus a dot) if absent. Signed-off-by: Alexander Kanavin --- meta/classes-global/insane.bbclass | 26 ++++++++++++++++ meta/lib/oeqa/selftest/cases/distrodata.py | 36 ---------------------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 8788f58fc5b..632f738c86d 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -34,6 +34,7 @@ WARN_QA ?= " libdir xorg-driver-abi buildpaths \ missing-update-alternatives native-last missing-ptest \ license-exists license-no-generic license-syntax license-format \ license-incompatible license-file-missing obsolete-license \ + missing-metadata \ " ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ @@ -1473,6 +1474,28 @@ python do_qa_unpack() { unpack_check_src_uri(d.getVar('PN'), d) } +python do_qa_fetch() { + def test_missing_metadata(d): + fn = d.getVar("FILE") + if not '/meta/recipes-' in fn: + # We are only interested in OE-Core + return + pn = d.getVar('BPN') + srcfile = d.getVar('SRC_URI').split() + # Check that SUMMARY is not the same as the default from bitbake.conf + if d.getVar('SUMMARY') == d.expand("${PN} version ${PV}-${PR}"): + oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a SUMMARY. Please add an entry.".format(pn, fn), d) + if not d.getVar('HOMEPAGE'): + if srcfile and srcfile[0].startswith('file') or not d.getVar('SRC_URI'): + # We are only interested in recipes SRC_URI fetched from external sources + pass + else: + oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a HOMEPAGE. Please add an entry.".format(pn, fn), d) + + test_missing_metadata(d) + oe.qa.exit_if_errors(d) +} + # Check for patch fuzz do_patch[postfuncs] += "do_qa_patch " @@ -1484,6 +1507,9 @@ do_configure[postfuncs] += "do_qa_configure " # Check does S exist. do_unpack[postfuncs] += "do_qa_unpack" +# Check basic recipe metadata (e.g. SUMMARY/HOMEPAGE/RECIPE_MAINTAINER) +do_fetch[postfuncs] += "do_qa_fetch" + python () { import re diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py index c83a3a7bd67..fd262fe3c9e 100644 --- a/meta/lib/oeqa/selftest/cases/distrodata.py +++ b/meta/lib/oeqa/selftest/cases/distrodata.py @@ -39,42 +39,6 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re """ + "\n".join(regressed_successes) self.assertTrue(len(regressed_failures) == 0 and len(regressed_successes) == 0, msg) - def test_missing_homepg(self): - """ - Summary: Test for oe-core recipes that don't have a HOMEPAGE or DESCRIPTION - Expected: All oe-core recipes should have a DESCRIPTION entry - Expected: All oe-core recipes should have a HOMEPAGE entry except for recipes that are not fetched from external sources. - Product: oe-core - """ - with bb.tinfoil.Tinfoil() as tinfoil: - tinfoil.prepare(config_only=False) - no_description = [] - no_homepage = [] - for fn in tinfoil.all_recipe_files(variants=False): - if not '/meta/recipes-' in fn: - # We are only interested in OE-Core - continue - rd = tinfoil.parse_recipe_file(fn, appends=False) - pn = rd.getVar('BPN') - srcfile = rd.getVar('SRC_URI').split() - #Since DESCRIPTION defaults to SUMMARY if not set, we are only interested in recipes without DESCRIPTION or SUMMARY - if not (rd.getVar('SUMMARY') or rd.getVar('DESCRIPTION')): - no_description.append((pn, fn)) - if not rd.getVar('HOMEPAGE'): - if srcfile and srcfile[0].startswith('file') or not rd.getVar('SRC_URI'): - # We are only interested in recipes SRC_URI fetched from external sources - continue - no_homepage.append((pn, fn)) - if no_homepage: - self.fail(""" -The following recipes do not have a HOMEPAGE. Please add an entry for HOMEPAGE in the recipe. -""" + "\n".join(['%s (%s)' % i for i in no_homepage])) - - if no_description: - self.fail(""" -The following recipes do not have a DESCRIPTION. Please add an entry for DESCRIPTION in the recipe. -""" + "\n".join(['%s (%s)' % i for i in no_description])) - def test_maintainers(self): """ Summary: Test that oe-core recipes have a maintainer and entries in maintainers list have a recipe From patchwork Tue May 9 17:23:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23718 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 1B1A1C7EE25 for ; Tue, 9 May 2023 17:23:54 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web10.39153.1683653030511985163 for ; Tue, 09 May 2023 10:23:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=PGjTmM4I; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-965e4be7541so944394866b.1 for ; Tue, 09 May 2023 10:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653029; x=1686245029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G6ixIkxc9Do+FmH8KnJ3mBqQZEZPCdXb76jEH42PZog=; b=PGjTmM4I1yhzghrrFGvCi9sQlhOO0pAwSLL4ffJHRWFjxQ8ou6UTwkGCTfsHjpenki GThrOWnD9mkd7VC1SK8DSJy+pJUVv+OqUD4sIez4zGrPNWgxiNwKiHnTOdgVC+nfmRK/ pCXHmOtRa3Cg/IklnbN2PSfEgq94jbeInq44EZYbbIcGgysHHQ73iFr0aWWUtmdpBpCn J7LFbnRzYTV8z3HuHiajXt+kWawDZMjnm0TLQOalF9kLgutukW+OyZi/IJUH+N5w7/cq UBrwXshgmsidEhLCiU/Eiurg+Rc8DWA5F1ICNOiVCAStvJLRpQlwvzWTKDMSycCsjRqp pQsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653029; x=1686245029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G6ixIkxc9Do+FmH8KnJ3mBqQZEZPCdXb76jEH42PZog=; b=EKp32vcP5wzrq4riLQHcwI7PIcm+NwM+NPxWqrVRc9IWlKsuDeHHmmCbHr4CM0BMqh 1mXXQ0/Gx3Ksded7lUled+Q9MWdD7bWQBmQm4qKMREnhDsGSygWA4UsToB6IUHnHI1Bo RAbcYam4qTnZzqJ8vfTzxeM3ExCI7Pg5OXL3Up2zQHPEaLqi+OQvyttA6C4rCfxogXIt Qlz+sehDM4++8DTlEVDqcVbGz/18SbsqvyZ0798TolDzMN8xDITj2upeTfNTw9sH6Kss UAGscKkLuZX1y/ZZks4BYsuGYcla7adRrrZ6fBmrNR5dA/5sskTUkV/BPJe7xCgplCi3 Y9Jw== X-Gm-Message-State: AC+VfDzUKZa/6r1msU67M3IbbQzzN/hn6UZB8NQa37CJtuu+wf6R6G9H u24seN2liabxZu26RgKgho9leQdwCLU= X-Google-Smtp-Source: ACHHUZ7+b9iHZxs+N/5NpF9lN4qOHvjJNf0iSaHzxm7pMni5pY113zR4hmMNNrK1S2b92oXwxU57oQ== X-Received: by 2002:a17:907:36c1:b0:94e:e082:15b2 with SMTP id bj1-20020a17090736c100b0094ee08215b2mr12753893ejc.55.1683653028806; Tue, 09 May 2023 10:23:48 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:48 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/27] insane.bbclass: add a RECIPE_MAINTAINER check (oe-core recipes only) Date: Tue, 9 May 2023 19:23:19 +0200 Message-Id: <20230509172344.1516743-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181057 Absent maintainer entries are as well a frequent source of friction, as they are checked only in selftest, and so aren't revealed until autobuilder runs. The selftest is retained as it also checks for obsolete entries in maintainers.inc (not possible to do in insane class). Signed-off-by: Alexander Kanavin --- meta/classes-global/insane.bbclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 632f738c86d..50f60337cc4 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1492,7 +1492,19 @@ python do_qa_fetch() { else: oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a HOMEPAGE. Please add an entry.".format(pn, fn), d) + def test_missing_maintainer(d): + fn = d.getVar("FILE") + if not '/meta/recipes-' in fn: + # We are only interested in OE-Core + return + pn = d.getVar("PN") + if pn.endswith("-native") or pn.startswith("nativesdk-"): + return + if not d.getVar('RECIPE_MAINTAINER'): + oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc.".format(pn, fn), d) + test_missing_metadata(d) + test_missing_maintainer(d) oe.qa.exit_if_errors(d) } From patchwork Tue May 9 17:23:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23720 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 08313C7EE23 for ; Tue, 9 May 2023 17:23:54 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.39289.1683653031361427637 for ; Tue, 09 May 2023 10:23:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=dSFoc0Bo; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-9659c5b14d8so1001384066b.3 for ; Tue, 09 May 2023 10:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653030; x=1686245030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f5QFS8zF/+pNJ3eEurIX0fPnwjthTJRdXEQXEmE6YPU=; b=dSFoc0BoQrOXLlFac4dz4nPUNW1oePt5LKhcFb1AjPXoHXiH8SxP/2JNFLmIUt/LB4 CCCYawY8DQLKOyKRsr0rsEAJLtXIX6Nc8NVpZ+cQnWXV5sZ0IhbtMEHc6MbYNLiaAJXb mb99rCPmBP+HjkVKuEOpmxctaZ4F8EWOmYV/fE8iDIiNC31ml4w0tL4xoPEulLZ60Q5m 0tbAI9cLoexe3rXTaBToX7yOgMpzeCiNAd9YvX4YFk3WTavpjEYrsyhzCXd7XZXz9zoA w15A97mjs/VOiLU9l7wC6riKEdfiZQerX7ARei9j8J2dNtgq9M/gibabZOoOFkRijo4m lcFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653030; x=1686245030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f5QFS8zF/+pNJ3eEurIX0fPnwjthTJRdXEQXEmE6YPU=; b=SxmOVZjlsGlyybWERYDXupBc800R81ooGImGaRdyrlP46FtCPlOOIp4ZW5l1gr7T74 StWHeg9XS5TGQEx61BH+WnUKz2Z3NTX9VaZSoxPbjgSkrDHz4KLrZ0+wxFl1AzkyaJYR S3bWnZTexccKkQQWrqaUc5Oeu4wbi4INpz2fRvzk8zSafOsV9csUwGtnuzmCggfvp5xi KZdc87k5KzcJdi/zQ8J4CotXRsnTnX8eAU4Ffw5EwBRfqlh+qvxXJZpWWTkjJrMCnJsW iq9NBxNdiMdPyfrFOtD/xcCrMJpW97LZKmTfMroXgfeEv/N/E5+D0UhTr02THcxAxBmp T5+A== X-Gm-Message-State: AC+VfDz5LzMm9UcimnS0sq54X/ya7O4EsjfZRYLUD6SAaT/N76HTxBfA wrAe3K9kAiho+/+TzBY+7KhiJgoBLRo= X-Google-Smtp-Source: ACHHUZ5jV5tCBimBoHTr9TcO2/89GVw/uFRGO1IBn8XKDwuZ5pQYRzJV2hcuA2e95uD1aT0IV6SzDg== X-Received: by 2002:a17:906:fe45:b0:92f:33ca:c9a3 with SMTP id wz5-20020a170906fe4500b0092f33cac9a3mr12483046ejb.71.1683653029424; Tue, 09 May 2023 10:23:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/27] apmd: remove recipe and apm MACHINE_FEATURE Date: Tue, 9 May 2023 19:23:20 +0200 Message-Id: <20230509172344.1516743-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181058 APM has been obsolete for a very long time, and debian no longer packages it or carries the source tarball. Signed-off-by: Alexander Kanavin --- .../conf/distro/include/default-providers.inc | 1 - meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-bsp/apmd/apmd/apmd.service | 7 - meta/recipes-bsp/apmd/apmd/apmd_proxy | 91 ------------ meta/recipes-bsp/apmd/apmd/apmd_proxy.conf | 16 --- meta/recipes-bsp/apmd/apmd/default | 8 -- meta/recipes-bsp/apmd/apmd/init | 51 ------- meta/recipes-bsp/apmd/apmd/legacy.patch | 133 ------------------ meta/recipes-bsp/apmd/apmd/libtool.patch | 41 ------ meta/recipes-bsp/apmd/apmd/linkage.patch | 53 ------- meta/recipes-bsp/apmd/apmd/unlinux.patch | 25 ---- meta/recipes-bsp/apmd/apmd/wexitcode.patch | 26 ---- meta/recipes-bsp/apmd/apmd_3.2.2-15.bb | 85 ----------- .../packagegroups/packagegroup-base.bb | 7 - .../matchbox-panel-2/matchbox-panel-2_2.12.bb | 2 - .../matchbox-session-sato/session | 1 - .../matchbox-session-sato_0.1.bb | 2 +- 17 files changed, 1 insertion(+), 549 deletions(-) delete mode 100644 meta/recipes-bsp/apmd/apmd/apmd.service delete mode 100644 meta/recipes-bsp/apmd/apmd/apmd_proxy delete mode 100644 meta/recipes-bsp/apmd/apmd/apmd_proxy.conf delete mode 100644 meta/recipes-bsp/apmd/apmd/default delete mode 100755 meta/recipes-bsp/apmd/apmd/init delete mode 100644 meta/recipes-bsp/apmd/apmd/legacy.patch delete mode 100644 meta/recipes-bsp/apmd/apmd/libtool.patch delete mode 100644 meta/recipes-bsp/apmd/apmd/linkage.patch delete mode 100644 meta/recipes-bsp/apmd/apmd/unlinux.patch delete mode 100644 meta/recipes-bsp/apmd/apmd/wexitcode.patch delete mode 100644 meta/recipes-bsp/apmd/apmd_3.2.2-15.bb diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 3a4e989c1f9..d18173c7449 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -24,7 +24,6 @@ PREFERRED_PROVIDER_virtual/make-native ?= "make-native" # Default virtual runtime providers # VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg" -VIRTUAL-RUNTIME_apm ?= "apm" VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" VIRTUAL-RUNTIME_base-utils ?= "busybox" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index e24d8545ba7..3c0362b5ff6 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -38,7 +38,6 @@ RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker /dev/null; then -# # Reject system suspends and standbys if we are on AC power -# exit 1 # Reject (NOTE kernel support must be enabled) -#fi - -if [ "${1}" = "suspend" -o "${1}" = "standby" ]; then - run-parts -a "${1}" -a "${2}" /etc/apm/event.d - if [ -d /etc/apm/suspend.d ]; then - run-parts -a "${1}" -a "${2}" /etc/apm/suspend.d - fi -elif [ "${1}" = "resume" ]; then - if [ -d /etc/apm/resume.d ]; then - run-parts -a "${1}" -a "${2}" /etc/apm/resume.d - fi - run-parts -a "${1}" -a "${2}" /etc/apm/event.d -else - run-parts -a "${1}" -a "${2}" /etc/apm/event.d - if [ -d /etc/apm/other.d ]; then - run-parts -a "${1}" -a "${2}" /etc/apm/other.d - fi -fi - -exit 0 diff --git a/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf b/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf deleted file mode 100644 index 751145c522c..00000000000 --- a/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/apm/apmd_proxy.conf: configuration file for apmd. -# -# This file is managed by debconf when installing or reconfiguring the -# package. It is generated by merging the answers gathered by debconf -# into the template file "/usr/share/apmd/apmd_proxy.conf". - -# The following doesn't yet work, because current kernels (up to at least -# 2.4.20) do not support rejection of APM events. Supporting this would -# require substantial modifications to the APM driver. We will re-enable -# this feature if the driver is ever modified. -- cph@debian.org -# -# Set the following to "false" if you want to reject system suspend or -# system standby requests when the computer is running on AC power. -# Otherwise set this to "true". Such requests are never rejected when -# the computer is running on battery power. -#SUSPEND_ON_AC=true diff --git a/meta/recipes-bsp/apmd/apmd/default b/meta/recipes-bsp/apmd/apmd/default deleted file mode 100644 index 4b7965abf85..00000000000 --- a/meta/recipes-bsp/apmd/apmd/default +++ /dev/null @@ -1,8 +0,0 @@ -# -# Default for /etc/init.d/apmd -# - -# As apmd can be called with arguments, we use the following variable -# to store them, e.g., APMD="-w 5 -p 2". -# See the manual page apmd(8) for details. -APMD="--proxy-timeout 30" diff --git a/meta/recipes-bsp/apmd/apmd/init b/meta/recipes-bsp/apmd/apmd/init deleted file mode 100755 index c0b41aa9d17..00000000000 --- a/meta/recipes-bsp/apmd/apmd/init +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: apmd -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Advanced Power Management daemon -### END INIT INFO - -# Source function library. -. /etc/init.d/functions - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -[ -f /etc/default/rcS ] && . /etc/default/rcS -[ -f /etc/default/apmd ] && . /etc/default/apmd - -case "$1" in - start) - echo -n "Starting advanced power management daemon: " - start-stop-daemon -S -x /usr/sbin/apmd -- \ - -P /etc/apm/apmd_proxy $APMD - if [ $? = 0 ]; then - echo "apmd." - else - echo "(failed.)" - fi - ;; - stop) - echo -n "Stopping advanced power management daemon: " - start-stop-daemon -K \ - -x /usr/sbin/apmd - echo "apmd." - ;; - status) - status /usr/sbin/apmd; - exit $? - ;; - restart|force-reload) - $0 stop - $0 start - exit - ;; - *) - echo "Usage: /etc/init.d/apmd {start|stop|status|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta/recipes-bsp/apmd/apmd/legacy.patch b/meta/recipes-bsp/apmd/apmd/legacy.patch deleted file mode 100644 index 88713118057..00000000000 --- a/meta/recipes-bsp/apmd/apmd/legacy.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 3595933d221f0ba836917debc0776b8723972ec9 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 11 Aug 2015 17:40:50 +0300 -Subject: [PATCH 1/3] Patch with fixes provided by Debian. - -This patch is taken from -ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2-15.debian.tar.xz - -Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin - ---- - Makefile | 2 +- - apm.c | 3 ++- - apm.h | 9 +++++++++ - apmd.c | 15 ++++++++------- - 4 files changed, 20 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index bf346d9..92fc0fd 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,7 +43,7 @@ DESTDIR= - - CC=gcc - CFLAGS=-O -g --XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \ -+XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \ - -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ - -DVERSION=\"$(VERSION)\" \ - -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" -diff --git a/apm.c b/apm.c -index b21c057..0359b1c 100644 ---- a/apm.c -+++ b/apm.c -@@ -219,12 +219,13 @@ int main(int argc, char **argv) - } - } - -- -+#if 0 - if (!(i.apm_flags & APM_32_BIT_SUPPORT)) - { - fprintf(stderr, "32-bit APM interface not supported\n"); - exit(1); - } -+#endif - - if (verbose && (i.apm_flags & 0x10)) - printf("APM BIOS Power Management is currently disabled\n"); -diff --git a/apm.h b/apm.h -index fb24dfd..824cc06 100644 ---- a/apm.h -+++ b/apm.h -@@ -20,6 +20,13 @@ - * $Id: apm.h,v 1.7 1999/07/05 22:31:11 apenwarr Exp $ - * - */ -+#ifndef _APM_H -+#define _APM_H 1 -+ -+#ifndef __KERNEL_STRICT_NAMES -+#define __KERNEL_STRICT_NAMES -+#endif -+ - #include - #include - -@@ -93,3 +100,5 @@ extern int apm_reject(int fd); - #else - #define apm_reject(fd) (-EINVAL) - #endif -+ -+#endif -diff --git a/apmd.c b/apmd.c -index 49ed3a1..560f536 100644 ---- a/apmd.c -+++ b/apmd.c -@@ -343,7 +343,7 @@ static int call_proxy(apm_event_t event) - /* parent */ - int status, retval; - ssize_t len; -- time_t time_limit; -+ time_t countdown; - - if (pid < 0) { - /* Couldn't fork */ -@@ -356,8 +356,9 @@ static int call_proxy(apm_event_t event) - /* Capture the child's output, if any, but only until it terminates */ - close(fds[1]); - fcntl(fds[0], F_SETFL, O_RDONLY|O_NONBLOCK); -- time_limit = time(0) + proxy_timeout; -+ countdown = proxy_timeout; - do { -+ countdown -= 1; - while ((len = read(fds[0], line, sizeof(line)-1)) > 0) { - line[len] = 0; - APMD_SYSLOG(LOG_INFO, "+ %s", line); -@@ -372,16 +373,16 @@ static int call_proxy(apm_event_t event) - goto proxy_done; - } - -- sleep(1); -+ while (sleep(1) > 0) ; - } while ( -- (time(0) < time_limit) -+ (countdown >= 0) - || (proxy_timeout < 0) - ); - - APMD_SYSLOG(LOG_NOTICE, "Proxy has been running more than %d seconds; killing it", proxy_timeout); - - kill(pid, SIGTERM); -- time_limit = time(0) + 5; -+ countdown = 5; - do { - retval = waitpid(pid, &status, WNOHANG); - if (retval == pid) -@@ -392,9 +393,9 @@ static int call_proxy(apm_event_t event) - goto proxy_done; - } - -- sleep(1); -+ while (sleep(1) > 0) ; - -- } while (time(0) < time_limit); -+ } while (countdown >= 0); - - kill(pid, SIGKILL); - status = __W_EXITCODE(0, SIGKILL); --- -2.1.4 - diff --git a/meta/recipes-bsp/apmd/apmd/libtool.patch b/meta/recipes-bsp/apmd/apmd/libtool.patch deleted file mode 100644 index fd0a952890d..00000000000 --- a/meta/recipes-bsp/apmd/apmd/libtool.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d5dde7ca91a5aed273d8fe269e1a5194e85c8c79 Mon Sep 17 00:00:00 2001 -From: Scott Garman -Date: Tue, 13 Jul 2010 16:46:46 +0800 -Subject: [PATCH] apmd: upgrade to 3.2.2-14 - -Add by RP to address "unable to infer tagged configuration" error: - commit 35de05e61b88c0808a5e885bb0efdf420555d5ad - Author: Richard Purdie - Date: Sun Jun 1 16:13:38 2008 +0000 - - apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky) - -However I didn't see same issue with current libtool-2.2.10. Also per my understanding, -the default tag, if not specified, falls back to CC. So disable it from patching, but -keep it here. If we encounter similar issue in the future, we could then push upstream - -Comment added by Kevin Tian , 2010-07-16 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 92fc0fd..8e283dc 100644 ---- a/Makefile -+++ b/Makefile -@@ -59,8 +59,8 @@ RANLIB=ranlib - #LDFLAGS=-s - - LIBTOOL=libtool --quiet --LT_COMPILE = $(LIBTOOL) --mode=compile $(CC) --LT_LINK = $(LIBTOOL) --mode=link $(CC) -+LT_COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -+LT_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) - LT_INSTALL = $(LIBTOOL) --mode=install install - LT_CLEAN = $(LIBTOOL) --mode=clean rm - diff --git a/meta/recipes-bsp/apmd/apmd/linkage.patch b/meta/recipes-bsp/apmd/apmd/linkage.patch deleted file mode 100644 index 3d32c49cd27..00000000000 --- a/meta/recipes-bsp/apmd/apmd/linkage.patch +++ /dev/null @@ -1,53 +0,0 @@ -When building use the libtool intermediate .lo files instead of explicitly using -the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is -a static build, and .libs/foo.o is a shared build. - -If static libraries have been disabled globally then libtool won't generate them -and explicit references to foo.o won't be satisfied. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - -diff --git a/Makefile b/Makefile -index bb695c6..5f60146 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,7 +28,7 @@ endif - - .SUFFIXES: - --OBJS=apmlib.o -+OBJS=apmlib.lo - EXES=apm apmd xapm apmsleep - HEADERS=apm.h - -@@ -66,22 +66,22 @@ all: $(EXES) - - $(OBJS): $(HEADERS) - --%.o: %.c -+%.lo: %.c - $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) $< - --%: %.o $(LIBAPM) -+%: %.lo $(LIBAPM) - $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) - --xapm.o: xapm.c -+xapm.lo: xapm.c - $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $< - --apmd: apmd.o -+apmd: apmd.lo - --apmsleep: apmsleep.o -+apmsleep: apmsleep.lo - --apmexists: apmexists.o -+apmexists: apmexists.lo - --xapm: xapm.o $(LIBAPM) -+xapm: xapm.lo $(LIBAPM) - $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS) - - $(LIBAPM): apmlib.lo diff --git a/meta/recipes-bsp/apmd/apmd/unlinux.patch b/meta/recipes-bsp/apmd/apmd/unlinux.patch deleted file mode 100644 index ec8206cf174..00000000000 --- a/meta/recipes-bsp/apmd/apmd/unlinux.patch +++ /dev/null @@ -1,25 +0,0 @@ -copy OE commit message here: - commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359 - Author: Michael Krelin - Date: Tue May 29 12:27:45 2007 +0000 - - apmd: prevent build from interferring with host kernel headers. Closes #1257 - -comment added by Kevin Tian , 2010-07-13 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman - ---- apmd-3.2.2.orig/Makefile -+++ apmd-3.2.2/Makefile -@@ -43,8 +43,7 @@ - - CC=gcc - CFLAGS=-O -g --XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \ -- -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ -+XTRACFLAGS=-Wall -pipe -I. \ - -DVERSION=\"$(VERSION)\" \ - -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" - LDFLAGS= diff --git a/meta/recipes-bsp/apmd/apmd/wexitcode.patch b/meta/recipes-bsp/apmd/apmd/wexitcode.patch deleted file mode 100644 index c5faa85fa7f..00000000000 --- a/meta/recipes-bsp/apmd/apmd/wexitcode.patch +++ /dev/null @@ -1,26 +0,0 @@ -Define non-posix W* funcitons - -C libraries like musl dont define them - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: apmd-3.2.2.orig/apmd.c -=================================================================== ---- apmd-3.2.2.orig.orig/apmd.c -+++ apmd-3.2.2.orig/apmd.c -@@ -55,6 +55,14 @@ - #define MINIMUM_RATE_CALC_TIME 120 - #endif - -+#ifndef _POSIX_SOURCE -+ -+#define __WCOREFLAG 0200 -+#define __WCOREDUMP(x) (_W_INT(x) & __WCOREFLAG) -+#define __W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) -+ -+#endif -+ - /* - * For the verbosity level feature to be useful, - * we rely on the fact that syslog.h assigns adjacent diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb deleted file mode 100644 index 92c35c98969..00000000000 --- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb +++ /dev/null @@ -1,85 +0,0 @@ -SUMMARY = "Utilities for Advanced Power Management" -DESCRIPTION = "The Advanced Power Management (APM) support provides \ -access to battery status information and a set of tools for managing \ -notebook power consumption." -HOMEPAGE = "http://apenwarr.ca/apmd/" -SECTION = "base" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://apm.h;beginline=6;endline=18;md5=7d4acc1250910a89f84ce3cc6557c4c2" -DEPENDS = "libtool-cross" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/a/${BPN}/${BPN}_3.2.2.orig.tar.gz;name=tarball \ - file://legacy.patch \ - file://libtool.patch \ - file://unlinux.patch \ - file://wexitcode.patch \ - file://linkage.patch \ - file://init \ - file://default \ - file://apmd_proxy \ - file://apmd_proxy.conf \ - file://apmd.service" - -SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8" -SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d" - -# for this package we're mostly interested in tracking debian patches, -# and not in the upstream version where all development has effectively stopped -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apmd/" -UPSTREAM_CHECK_REGEX = "(?P((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" - -S = "${WORKDIR}/apmd-3.2.2.orig" - -inherit update-rc.d systemd - -INITSCRIPT_NAME = "apmd" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_SERVICE:${PN} = "apmd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_compile() { - # apmd doesn't use whole autotools. Just libtool for installation - oe_runmake apm apmd -} - -do_install() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/apm - install -d ${D}${sysconfdir}/apm/event.d - install -d ${D}${sysconfdir}/apm/other.d - install -d ${D}${sysconfdir}/apm/suspend.d - install -d ${D}${sysconfdir}/apm/resume.d - install -d ${D}${sysconfdir}/apm/scripts.d - install -d ${D}${sysconfdir}/default - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sbindir} - install -d ${D}${bindir} - install -d ${D}${libdir} - install -d ${D}${datadir}/apmd - install -d ${D}${includedir} - - install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm - install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd - install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/ - install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/ - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/apmd - oe_libinstall -so libapm ${D}${libdir} - install -m 0644 apm.h ${D}${includedir} - - sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd - chmod 755 ${D}${sysconfdir}/init.d/apmd - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_system_unitdir}/ - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/apmd.service -} - -PACKAGES =+ "libapm apm" - -FILES:libapm = "${libdir}/libapm${SOLIBS}" -FILES:apm = "${bindir}/apm*" diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index d60e1774712..eeb26ca5880 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -16,7 +16,6 @@ PACKAGES = ' \ \ ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \ - ${@bb.utils.contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \ @@ -52,7 +51,6 @@ RDEPENDS:packagegroup-base = "\ packagegroup-machine-base \ \ module-init-tools \ - ${@bb.utils.contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ @@ -149,11 +147,6 @@ SUMMARY:packagegroup-base-acpi = "ACPI support" RDEPENDS:packagegroup-base-acpi = "\ acpid" -SUMMARY:packagegroup-base-apm = "APM support" -RDEPENDS:packagegroup-base-apm = "\ - ${VIRTUAL-RUNTIME_apm} \ - apmd" - SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support" RDEPENDS:packagegroup-base-ext2 = "\ e2fsprogs-e2fsck \ diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb index b71d1e5cd95..83425f60fe1 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ DEPENDS = "gtk+3 startup-notification dbus dbus-glib dbus-glib-native" DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" -DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" # The startup-notification requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" @@ -28,7 +27,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \ EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" -EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index 3a70574af9d..61fea510545 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -22,7 +22,6 @@ matchbox-desktop & START_APPLETS=showdesktop,windowselector END_APPLETS=$KEYBOARD_APPLET,systray,startup-notify,notify END_APPLETS=battery,$END_APPLETS # feature-acpi -END_APPLETS=battery,$END_APPLETS # feature-apm END_APPLETS=clock,$END_APPLETS END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index 020e211ea59..49bf30ee5ea 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb @@ -26,7 +26,7 @@ FILES:${PN} += "${datadir}/themes/Sato/index.theme" do_install() { # This is the set of machine features that the script has markers for - FEATURES="acpi apm phone" + FEATURES="acpi phone" SCRIPT="${S}/sedder" rm -f $SCRIPT touch $SCRIPT From patchwork Tue May 9 17:23:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23719 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 18170C7EE2D for ; Tue, 9 May 2023 17:23:54 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web10.39154.1683653031827222728 for ; Tue, 09 May 2023 10:23:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Ogji8atM; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-9661a1ff1e9so568237266b.1 for ; Tue, 09 May 2023 10:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653030; x=1686245030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RX8QW5/cMGoCSjfXJ+BHPgzn3sH1a4kHSLIXapjRU6A=; b=Ogji8atM4ZJaL2QvdWJEwv+Y9E8wITpeVhtWVIjfUg5oakt9+WIY0cCUGk8mR0Iy+P lyPJYr6bKcbPxPiWl4jORTAysH6rHKW9nwK9tEmHwWPbrcUD3Wv4YaFWMf4RphmryFtc gNuEbR9Xi2Fr6MCmHVgPOqTJVls4RGXN2jTIYxJwBxelwzv4xmBplaY571K+gjIuJuDD w5vyqhEsHTcNWJrMFxadVXdx9fAk+R+bpKbcJX7lDusZjkgcRO/msVYtO/pVFbc4Kwnm Ekr+MgJHYOyexLbPBy1gJArErx36UoJ/DFeeBVU4WXEI4xksa5pT02Y0x5iKOOsXxLE1 QVbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653030; x=1686245030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RX8QW5/cMGoCSjfXJ+BHPgzn3sH1a4kHSLIXapjRU6A=; b=hpbo36WF66c2psilEhVedoSMRPbau94ZZPFJTeaKHn5RRDLHpA08Yaqh1DIdjCCWeD +uoETn2cOL04KnsqtMT2F95J7OONr0pzVSIJUEIXCdNxGNvv0T1/Hy4hnMdrWhWP0Gdq nYBQewImReTX4Fd7y0Qxvd0RZoo3V+xwodNkCqUu1piL8hlONqu1Nhg8u11alQX33Hr2 5aJiNivBrzmNQacvsYhhKln3Uh8c1wdMH4GZKlBDOyBt7aoAHIIMISybMJ4dxlPITPTe P1x2eYgF3iK/mjkUtd5AWpCc5wXe/1Qq0N7z8KPe6QFh95zyjLX0dCMXJCi90U2dKNBn i5EA== X-Gm-Message-State: AC+VfDw27r9QrCJjs+NaOqfPEA7E5iHqllcjHSlMYYhgWXKsAllelD2B fWuY8ASxltW5BCjiDoHDoGyXrY7eJ18= X-Google-Smtp-Source: ACHHUZ7w0R+9yfk2EAhTdxLuJQc2CUBTHDr59B9nv4VKH4H6FRX4xuXTEGbcvMpkfmaftgtflesldw== X-Received: by 2002:a17:906:eec5:b0:94b:cd7c:59f4 with SMTP id wu5-20020a170906eec500b0094bcd7c59f4mr11914043ejb.16.1683653030167; Tue, 09 May 2023 10:23:50 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/27] glib-2.0: upgrade 2.74.6 -> 2.76.2 Date: Tue, 9 May 2023 19:23:21 +0200 Message-Id: <20230509172344.1516743-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181059 Drop backports. Refactor relocate-modules.patch; upstream has implemented the same logic, but made it os x only - we can simply drop those ifdef guards: https://gitlab.gnome.org/GNOME/glib/-/commit/af83c6571e47d06468b8162dd29ad57bcf4967a8 Signed-off-by: Alexander Kanavin --- ...-info-don-t-assume-million-in-one-ev.patch | 50 ------------ ...build-do-not-use-can_run_host_binari.patch | 48 ------------ .../glib-2.0/glib-2.0/cpp-null.patch | 77 ------------------- .../glib-2.0/glib-2.0/cpp-null2.patch | 31 -------- .../glib-2.0/glib-2.0/relocate-modules.patch | 47 +++++------ ...{glib-2.0_2.74.6.bb => glib-2.0_2.76.2.bb} | 6 +- 6 files changed, 22 insertions(+), 237 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.74.6.bb => glib-2.0_2.76.2.bb} (87%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch deleted file mode 100644 index 57ada66907e..00000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3c56ff21b9a5fe18f9cec9b97ae1788fdf5d563e Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 6 Jul 2021 19:26:03 +0100 -Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2990] -Signed-off-by: Ross Burton - - don't happen - -The access and creation time tests create a file, gets the time in -seconds, then gets the time in microseconds and assumes that the -difference between the two has to be above 0. - -As rare as this may be, it can happen: - -$ stat g-file-info-test-50A450 -c %y -2021-07-06 18:24:56.000000767 +0100 - -Change the test to simply assert that the difference not negative to -handle this case. - -This is the same fix as 289f8b, but that was just modification time. - ---- - gio/tests/g-file-info.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c -index d9ad045..c9b12b0 100644 ---- a/gio/tests/g-file-info.c -+++ b/gio/tests/g-file-info.c -@@ -307,7 +307,7 @@ test_g_file_info_access_time (void) - g_assert_nonnull (dt_usecs); - - ts = g_date_time_difference (dt_usecs, dt); -- g_assert_cmpint (ts, >, 0); -+ g_assert_cmpint (ts, >=, 0); - g_assert_cmpint (ts, <, G_USEC_PER_SEC); - - /* Try again with nanosecond precision. */ -@@ -442,7 +442,7 @@ test_g_file_info_creation_time (void) - g_assert_nonnull (dt_usecs); - - ts = g_date_time_difference (dt_usecs, dt); -- g_assert_cmpint (ts, >, 0); -+ g_assert_cmpint (ts, >=, 0); - g_assert_cmpint (ts, <, G_USEC_PER_SEC); - - /* Try again with nanosecond precision. */ diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch deleted file mode 100644 index db08b5af555..00000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fdbffaea2fa85c203cc6aacb5734acac65aeaa19 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 11 Nov 2022 13:12:42 +0100 -Subject: [PATCH] tests/meson.build: do not use can_run_host_binaries() - -can_run_host_binaries() returns true even when cross compiling, -if there is an executable wrapper defined that can run -cross-binaries under some kind of emulation. - -Unfortunately, custom_target() will not use the wrapper -and will attempt to execute the command directly. Until -this is addressed in meson upstream, we have to disable -these targets in cross scenarios. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3067] -Signed-off-by: Alexander Kanavin - ---- - gio/tests/meson.build | 2 +- - glib/tests/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 49cfa25ce..ea59656f9 100644 ---- a/gio/tests/meson.build -+++ b/gio/tests/meson.build -@@ -652,7 +652,7 @@ if installed_tests_enabled - endforeach - endif - --if meson.can_run_host_binaries() -+if not meson.is_cross_build() - - compiler_type = '--compiler=@0@'.format(cc.get_id()) - -diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 69508178e..e4f75f302 100644 ---- a/glib/tests/meson.build -+++ b/glib/tests/meson.build -@@ -411,7 +411,7 @@ executable('testing-helper', 'testing-helper.c', - ) - - # some testing of gtester functionality --if meson.can_run_host_binaries() and host_system != 'windows' -+if not meson.is_cross_build() and host_system != 'windows' - xmllint = find_program('xmllint', required: false) - if xmllint.found() - tmpsample_xml = custom_target('tmpsample.xml', diff --git a/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch b/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch deleted file mode 100644 index 63cbf90ab23..00000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0ca5254c5d92aec675b76b4bfa72a6885cde6066 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Sat, 29 Oct 2022 04:30:52 +0200 -Subject: [PATCH] glib/gmacros: Always define NULL as nullptr in C++11 and - newer - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066] -Signed-off-by: Alexander Kanavin ---- - glib/gmacros.h | 9 ++++++++- - glib/tests/cxx.cpp | 13 ------------- - 2 files changed, 8 insertions(+), 14 deletions(-) - -diff --git a/glib/gmacros.h b/glib/gmacros.h -index 5302841105..9fe8270822 100644 ---- a/glib/gmacros.h -+++ b/glib/gmacros.h -@@ -870,10 +870,17 @@ - */ - #ifndef NULL - # ifdef __cplusplus --# define NULL (0L) -+# if __cplusplus >= 201103L -+# define NULL (nullptr) -+# else -+# define NULL (0L) -+# endif /* __cplusplus >= 201103L */ - # else /* !__cplusplus */ - # define NULL ((void*) 0) - # endif /* !__cplusplus */ -+#elif defined (__cplusplus) && __cplusplus >= 201103L -+# undef NULL -+# define NULL (nullptr) - #endif - - #ifndef FALSE -diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp -index 6ac60791c8..045457c6e2 100644 ---- a/glib/tests/cxx.cpp -+++ b/glib/tests/cxx.cpp -@@ -34,21 +34,12 @@ test_typeof (void) - MyObject *obj3 = g_atomic_pointer_get (&obj2); - g_assert_true (obj3 == obj); - --#if __cplusplus >= 201103L -- MyObject *obj4 = nullptr; --#else - MyObject *obj4 = NULL; --#endif - g_atomic_pointer_set (&obj4, obj3); - g_assert_true (obj4 == obj); - --#if __cplusplus >= 201103L -- MyObject *obj5 = nullptr; -- g_atomic_pointer_compare_and_exchange (&obj5, nullptr, obj4); --#else - MyObject *obj5 = NULL; - g_atomic_pointer_compare_and_exchange (&obj5, NULL, obj4); --#endif - g_assert_true (obj5 == obj); - - MyObject *obj6 = g_steal_pointer (&obj5); -@@ -195,11 +186,7 @@ test_steal_pointer (void) - int - main (int argc, char *argv[]) - { --#if __cplusplus >= 201103L -- g_test_init (&argc, &argv, nullptr); --#else - g_test_init (&argc, &argv, NULL); --#endif - - g_test_add_func ("/C++/typeof", test_typeof); - g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); --- -GitLab - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch b/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch deleted file mode 100644 index 763d5ce539f..00000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7dc19632f3115e3f517c6bc80436fe72c1dcdeb4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Sat, 29 Oct 2022 04:16:00 +0200 -Subject: [PATCH] glib/tests/cxx: Ensure NULL is always casted to a pointer - type - -Otherwise it may not be recognized as valid sentinel -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4] -Signed-off-by: Alexander Kanavin ---- - glib/tests/cxx.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp -index 045457c6e2..aa5e0cb576 100644 ---- a/glib/tests/cxx.cpp -+++ b/glib/tests/cxx.cpp -@@ -186,7 +186,11 @@ test_steal_pointer (void) - int - main (int argc, char *argv[]) - { -+#if __cplusplus >= 201103L - g_test_init (&argc, &argv, NULL); -+#else -+ g_test_init (&argc, &argv, static_cast(NULL)); -+#endif - - g_test_add_func ("/C++/typeof", test_typeof); - g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); --- -GitLab diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index ae6881b61e8..3dba599fc0b 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From a3cdf17643bf33d532ec269913974195e136b7fc Mon Sep 17 00:00:00 2001 +From 38e401969a2ff8269919cbeacec733a67f041735 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -13,38 +13,33 @@ Signed-off-by: Ross Burton Port patch to 2.48 Signed-off-by: Jussi Kukkonen - --- - gio/giomodule.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) + gio/giomodule.c | 5 ----- + 1 file changed, 5 deletions(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index f5dbb45..c926e77 100644 +index 11ce7d8..cc27ecd 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -58,6 +58,8 @@ - #ifdef G_OS_WIN32 - #include "gregistrysettingsbackend.h" - #include "giowin32-priv.h" -+#else -+#include - #endif - #include - -@@ -1261,7 +1263,15 @@ get_gio_module_dir (void) - NULL); +@@ -1271,9 +1271,6 @@ get_gio_module_dir (void) g_free (install_dir); #else -- module_dir = g_strdup (GIO_MODULE_DIR); -+ Dl_info info; -+ -+ if (dladdr (g_io_module_new, &info)) { -+ char *libdir = g_path_get_dirname (info.dli_fname); -+ module_dir = g_build_filename (libdir, "gio", "modules", NULL); -+ g_free (libdir); -+ } else { -+ module_dir = g_strdup (GIO_MODULE_DIR); -+ } + module_dir = g_strdup (GIO_MODULE_DIR); +-#ifdef __APPLE__ +-#include "TargetConditionals.h" +-#if TARGET_OS_OSX + #include + { + g_autofree gchar *path = NULL; +@@ -1292,8 +1289,6 @@ get_gio_module_dir (void) + } + } + } +-#endif +-#endif #endif } +-- +2.30.2 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb similarity index 87% rename from meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb index 5b79ae481c3..224f2c262e0 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb @@ -14,14 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch \ - file://0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch \ - file://cpp-null.patch \ - file://cpp-null2.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "069cf7e51cd261eb163aaf06c8d1754c6835f31252180aff5814e5afc7757fbc" +SRC_URI[sha256sum] = "24f3847857b1d8674cdb0389a36edec0f13c666cd3ce727ecd340eb9da8aca9e" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. From patchwork Tue May 9 17:23:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23716 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 15C09C7EE24 for ; Tue, 9 May 2023 17:23:54 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web11.39294.1683653032747905583 for ; Tue, 09 May 2023 10:23:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=FKWqpR/J; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-965ac4dd11bso1220673566b.2 for ; Tue, 09 May 2023 10:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653031; x=1686245031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tu0akmkggmQjVuKzvxKHQ39ItkrZb9I0nG2h/1+wCxI=; b=FKWqpR/J9NkVsuUcbSqiNKEciWXwinfI/fEgAUENzT0+Mq8SvgctujShFYRkYE67NJ J/M5G2EQOvrVF9azGcfhwsCaRBNA9CyBLqiEhiJ+u8652I1WcvF2DlFEgDEkX3nzrdgE EjNmG1wiFMAc2nkoY/Cd54sGOtDVuniMfWCv+6REGjp9yMO3p7nu9k8zbL/6jpeRp3Yw CFL1WyLuyXTJZjiuPsgupg3vln8l/6BZ0VVDstcGCA6th9SRspax02sg25orvAKjuvMC L1lZSIiMPsiAOzvRyty6V3VfwvH+R+t/J4Mk9dPseT1af7YOKn7XA4vqHHEYh3iJe6XX FmHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653031; x=1686245031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tu0akmkggmQjVuKzvxKHQ39ItkrZb9I0nG2h/1+wCxI=; b=Agr96BjDvfsQ0079xyzvPP/uUfk5DZdB3YYrnId82WG5C4NOvxTuzllx1xDzrOl2CJ Nomg/BIC8l77daVuiA2GzNGtaQwx67Z50tN+NHac+BopNF2iUtDq1usnbUX0fafp14mz pcdd7pjsSl6s1wEj4VA4Jr6NqaGhmILABFsykEd+jRpyPdc6eFPBzbNoFZYjBb/05WMa wLc5BpZQGZWmhT3idHGCZ7hVfBU0+JmmDvK8uH+uNciqi7/qz5WcSN7hNvbjwj7pjvpR y9GiDmI/Sg9hNAZkEjC+hozNEyTddvaDJwxtJRXDwEToYKBvdOgCiB/Xv0yqsUdYYAOC KYbg== X-Gm-Message-State: AC+VfDxU8kyL1eNjsWWYJr8AvMkZkykJI32Ecw4wgnR7CAmxU1jyejBV mZ37Nab58y3hIO2rNlycrufsKrcVBmk= X-Google-Smtp-Source: ACHHUZ6+7T3xOUYFA3rdldE6heSkDSNebwoRfFsmdrvPZCWnNG6olBc1ZCKwVpu6ywa3aeI1i3ieDA== X-Received: by 2002:a17:907:842:b0:94e:c8c:42ec with SMTP id ww2-20020a170907084200b0094e0c8c42ecmr12631313ejb.20.1683653030902; Tue, 09 May 2023 10:23:50 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:50 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/27] ppp: upgrade 2.4.9 -> 2.5.0 Date: Tue, 9 May 2023 19:23:22 +0200 Message-Id: <20230509172344.1516743-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181060 Convert the build from handcrafted makefiles to autotools; this makes all custom tweaks in the recipe unnecessary, and allows removing all patches. Signed-off-by: Alexander Kanavin --- ...1-ppp-fix-build-against-5.15-headers.patch | 36 -------------- .../ppp/ppp/CVE-2022-4603.patch | 48 ------------------- .../ppp/ppp/makefix.patch | 40 ---------------- .../ppp/{ppp_2.4.9.bb => ppp_2.5.0.bb} | 31 ++---------- 4 files changed, 3 insertions(+), 152 deletions(-) delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch delete mode 100644 meta/recipes-connectivity/ppp/ppp/CVE-2022-4603.patch delete mode 100644 meta/recipes-connectivity/ppp/ppp/makefix.patch rename meta/recipes-connectivity/ppp/{ppp_2.4.9.bb => ppp_2.5.0.bb} (77%) diff --git a/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch b/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch deleted file mode 100644 index c91246dbf5c..00000000000 --- a/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch +++ /dev/null @@ -1,36 +0,0 @@ -From aba3273273e826c6dc90f197ca9a3e800e826891 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Fri, 5 Nov 2021 12:41:35 -0400 -Subject: [PATCH] ppp: fix build against 5.15 headers - -The 5.15 kernel has removed ipx support, along with the userspace -visible header. - -This support wasn't used previously (as it hasn't been very well -maintained in the kernel for several years), so we can simply -disable it in our build and wait for upstream to do a release that -drops the support. - -Upstream-Status: Inappropriate [OE-specific configuration/headers] - -Signed-off-by: Bruce Ashfield ---- - pppd/Makefile.linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 22837c5..23b9b22 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -91,7 +91,7 @@ MAXOCTETS=y - - INCLUDE_DIRS= -I../include - --COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -pipe -+COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP -pipe - - CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' - --- -2.25.1 - diff --git a/meta/recipes-connectivity/ppp/ppp/CVE-2022-4603.patch b/meta/recipes-connectivity/ppp/ppp/CVE-2022-4603.patch deleted file mode 100644 index 4325b1d6b02..00000000000 --- a/meta/recipes-connectivity/ppp/ppp/CVE-2022-4603.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a75fb7b198eed50d769c80c36629f38346882cbf Mon Sep 17 00:00:00 2001 -From: Paul Mackerras -Date: Thu, 4 Aug 2022 12:23:08 +1000 -Subject: [PATCH] pppdump: Avoid out-of-range access to packet buffer - -This fixes a potential vulnerability where data is written to spkt.buf -and rpkt.buf without a check on the array index. To fix this, we -check the array index (pkt->cnt) before storing the byte or -incrementing the count. This also means we no longer have a potential -signed integer overflow on the increment of pkt->cnt. - -Fortunately, pppdump is not used in the normal process of setting up a -PPP connection, is not installed setuid-root, and is not invoked -automatically in any scenario that I am aware of. - -Signed-off-by: Paul Mackerras - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - pppdump/pppdump.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c -index 2b815fc9..b85a8627 100644 ---- a/pppdump/pppdump.c -+++ b/pppdump/pppdump.c -@@ -297,6 +297,10 @@ dumpppp(f) - printf("%s aborted packet:\n ", dir); - q = " "; - } -+ if (pkt->cnt >= sizeof(pkt->buf)) { -+ printf("%s over-long packet truncated:\n ", dir); -+ q = " "; -+ } - nb = pkt->cnt; - p = pkt->buf; - pkt->cnt = 0; -@@ -400,7 +404,8 @@ dumpppp(f) - c ^= 0x20; - pkt->esc = 0; - } -- pkt->buf[pkt->cnt++] = c; -+ if (pkt->cnt < sizeof(pkt->buf)) -+ pkt->buf[pkt->cnt++] = c; - break; - } - } diff --git a/meta/recipes-connectivity/ppp/ppp/makefix.patch b/meta/recipes-connectivity/ppp/ppp/makefix.patch deleted file mode 100644 index fce068cae02..00000000000 --- a/meta/recipes-connectivity/ppp/ppp/makefix.patch +++ /dev/null @@ -1,40 +0,0 @@ -We were seeing reproducibility issues where one host would use the internal -logwtmp wrapper, another would use the one in libutil. The issue was that in -some cases the "\#include" was making it to CC, in others, "#include". The -issue seems to be related to shell escaping. - -The root cause looks to be: -http://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4 - -Instead of relying on shell quoting, use make to indirect the variable -and avoid the problem. - -See https://github.com/paulusmack/ppp/issues/233 - -Upstream-Status: Backport [https://github.com/paulusmack/ppp/commit/b4430f7092ececdff2504d5f3393a4c6528c3686] -Signed-off-by: Richard Purdie - -Index: ppp-2.4.9/pppd/Makefile.linux -=================================================================== ---- ppp-2.4.9.orig/pppd/Makefile.linux -+++ ppp-2.4.9/pppd/Makefile.linux -@@ -80,7 +80,8 @@ PLUGIN=y - #USE_SRP=y - - # Use libutil; test if logwtmp is declared in to detect --ifeq ($(shell echo '\#include ' | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes) -+UTMPHEADER = "\#include " -+ifeq ($(shell echo $(UTMPHEADER) | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes) - USE_LIBUTIL=y - endif - -@@ -143,7 +144,8 @@ CFLAGS += -DHAS_SHADOW - #LIBS += -lshadow $(LIBS) - endif - --ifeq ($(shell echo '\#include ' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) -+CRYPTHEADER = "\#include " -+ifeq ($(shell echo $(CRYPTHEADER) | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) - CFLAGS += -DHAVE_CRYPT_H=1 - LIBS += -lcrypt - endif diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb similarity index 77% rename from meta/recipes-connectivity/ppp/ppp_2.4.9.bb rename to meta/recipes-connectivity/ppp/ppp_2.5.0.bb index 7e3ae43b58e..4b052f8ed96 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ - file://makefix.patch \ file://pon \ file://poff \ file://init \ @@ -24,31 +23,15 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://ppp_on_boot \ file://provider \ file://ppp@.service \ - file://0001-ppp-fix-build-against-5.15-headers.patch \ - file://CVE-2022-4603.patch \ " -SRC_URI[sha256sum] = "f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d" +SRC_URI[sha256sum] = "5cae0e8075f8a1755f16ca290eb44e6b3545d3f292af4da65ecffe897de636ff" -inherit autotools-brokensep systemd +inherit autotools systemd -TARGET_CC_ARCH += " ${LDFLAGS}" -EXTRA_OEMAKE = "CC='${CC}' STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" -EXTRA_OECONF = "--disable-strip" - -# Package Makefile computes CFLAGS, referencing COPTS. -# Typically hard-coded to '-O2 -g' in the Makefile's. -# -EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"' - -EXTRA_OECONF:append:libc-musl = " --disable-ipxcp" - -do_configure () { - oe_runconf -} +EXTRA_OECONF += "--with-openssl=${STAGING_EXECPREFIXDIR}" do_install:append () { - make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ @@ -68,12 +51,6 @@ do_install:append () { install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_system_unitdir} sed -i -e 's,@SBINDIR@,${sbindir},g' \ ${D}${systemd_system_unitdir}/ppp@.service - rm -rf ${D}/${mandir}/man8/man8 - chmod u+s ${D}${sbindir}/pppd -} - -do_install:append:libc-musl () { - install -Dm 0644 ${S}/include/net/ppp_defs.h ${D}${includedir}/net/ppp_defs.h } CONFFILES:${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" @@ -96,5 +73,3 @@ SUMMARY:${PN}-password = "Plugin for PPP to get passwords via a pipe" SUMMARY:${PN}-l2tp = "Plugin for PPP for l2tp support" SUMMARY:${PN}-tools = "Additional tools for the PPP package" -# Ignore compatibility symlink rp-pppoe.so->pppoe.so -INSANE_SKIP:${PN}-oe += "dev-so" From patchwork Tue May 9 17:23:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23715 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 0AE35C7EE22 for ; Tue, 9 May 2023 17:23:54 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web10.39157.1683653033066250407 for ; Tue, 09 May 2023 10:23:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Vbsu5z2l; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-96598a7c5e0so981116366b.3 for ; Tue, 09 May 2023 10:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653031; x=1686245031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C9wQc77+ojSHOdFtt6OHLK0P4yHrblh0GLWAdWRXVZo=; b=Vbsu5z2la6OmAR9SxaEEcZGJS4NneLGaSqnDqaOK89dw1lkttolsvYQ9VOHa1/sCCQ o8xVccFtsBYlD3/8ZLGWRQkV9HVbf07z7gQZbvIfJeGV3PuNDMU4Jjwls9DGSnASHETF 6BIVIK+YygphwNKGLOqVMoZPk3DKnGA8WI4iWpwffujbzu1ZqJ1lkZUNrDM8pa4yZgDA HZwGOl5g4k4jUk8MgojrxUiaHq2lCURLVzkbzd+oixfewte0VJpr0ojmi2XqEmaJamY7 Gf2lA51FQ2HmGvGl+OZaSuEaM6tAATDFj37gUao1T6tfzGsKZ14kK1cSSjNnbPCoHW7Q 80kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653031; x=1686245031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C9wQc77+ojSHOdFtt6OHLK0P4yHrblh0GLWAdWRXVZo=; b=aNrJ5WpBBbXgNJD8oAaG6BG6pyafaKjNbJErBTWORVHGe0BjGxKkUkge6BJOSW55SA X1z0S62demsHDip22W/kf91Qb9k9ZfpiqCtAcHapmha+MHIIVArIYSJspYae+e/wvll/ eWDdP6/lPqEYjZRhBuPumN0YcZ0OAl5YNQFdVoOU7SnDIYEwvKSDg+aVnfKzIvmPbO35 UyHXwL7CzATAROEQu+kQZVAo/LuvogSJ6nJgA3dF7YNCBH0jsDvFRRVku2Oh/ta9dbky 5EmWssGPUaI+5rrrKMJUlbb4KfnqDVQ1hanYYYDXg/mSr4t3+hP9rFnZsZCur/E9yTIX mX8w== X-Gm-Message-State: AC+VfDwgrUmvtY2VhHess7s5WDBrphmK/Tu1bNkmFmzQNN+YUhgH1yUO ltT2mVYkv1Q+GHdGevjLTTO1B8IZVDo= X-Google-Smtp-Source: ACHHUZ5u5ZTUnUDE3MwNOpp3GttZktzAqYh8p1aZ9A+FAUbOVBLbku9UOqTkbKGC5ltUxJdLJwiFcQ== X-Received: by 2002:a17:907:98e:b0:94a:5c6d:3207 with SMTP id bf14-20020a170907098e00b0094a5c6d3207mr13310817ejc.44.1683653031609; Tue, 09 May 2023 10:23:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:51 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/27] ovmf: update 202211 -> 202302 Date: Tue, 9 May 2023 19:23:23 +0200 Message-Id: <20230509172344.1516743-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181061 Signed-off-by: Alexander Kanavin --- .../ovmf/ovmf/0005-debug-prefix-map.patch | 44 +++++++++---------- meta/recipes-core/ovmf/ovmf_git.bb | 4 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch b/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch index 1b6687cfafc..7adc45465c0 100644 --- a/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch +++ b/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch @@ -1,4 +1,4 @@ -From 9f28dd5f183f6e4d2b023cd555bb30446ae5f618 Mon Sep 17 00:00:00 2001 +From cf6361f27cd6318622fd58ab6c0a9407cc633b1e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Jun 2021 19:56:28 +0200 Subject: [PATCH] debug prefix map @@ -22,7 +22,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index c4e4c7ded0..058205da72 100755 +index 471eb67c0c..a16fb5c9f1 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1849,7 +1849,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N @@ -31,10 +31,10 @@ index c4e4c7ded0..058205da72 100755 -DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common +DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common ENV(GCC_PREFIX_MAP) - DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe - DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe - DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -fno-pic -fno-pie -@@ -1871,8 +1871,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere + DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie + DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -fno-plt -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections + DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access +@@ -1869,8 +1869,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map @@ -45,59 +45,59 @@ index c4e4c7ded0..058205da72 100755 DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h DEFINE GCC_ASLCC_FLAGS = -x c -@@ -2026,7 +2026,7 @@ DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include A +@@ -2022,7 +2022,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF( *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS) *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC48_IA32_OBJCOPY_FLAGS = -*_GCC48_IA32_NASM_FLAGS = -f elf32 +*_GCC48_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP) - DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os - RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but-set-variable -@@ -2054,7 +2054,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but + DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) + RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable +@@ -2050,7 +2050,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS) *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC48_X64_OBJCOPY_FLAGS = -*_GCC48_X64_NASM_FLAGS = -f elf64 +*_GCC48_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP) - DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Os - RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Os -Wno-unused-but-set-variable -@@ -2166,7 +2166,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s + DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) + RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable +@@ -2159,7 +2159,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC49_IA32_OBJCOPY_FLAGS = -*_GCC49_IA32_NASM_FLAGS = -f elf32 +*_GCC49_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP) - DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os - RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but-set-variable -Wno-unused-const-variable -@@ -2194,7 +2194,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but + DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) + RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable +@@ -2187,7 +2187,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS) *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC49_X64_OBJCOPY_FLAGS = -*_GCC49_X64_NASM_FLAGS = -f elf64 +*_GCC49_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP) - DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Os - RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Os -Wno-unused-but-set-variable -Wno-unused-const-variable -@@ -2312,7 +2312,7 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 + DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) + RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable +@@ -2302,7 +2302,7 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC5_IA32_OBJCOPY_FLAGS = -*_GCC5_IA32_NASM_FLAGS = -f elf32 +*_GCC5_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP) - DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto -Os + DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386 -@@ -2344,7 +2344,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, +@@ -2334,7 +2334,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS) *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC5_X64_OBJCOPY_FLAGS = -*_GCC5_X64_NASM_FLAGS = -f elf64 +*_GCC5_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP) - DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO -Os + DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os -- 2.30.2 diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 5ca0b49b69e..bd92c5d43d7 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -26,8 +26,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0006-reproducible.patch \ " -PV = "edk2-stable202211" -SRCREV = "fff6d81270b57ee786ea18ad74f43149b9f03494" +PV = "edk2-stable202302" +SRCREV = "f80f052277c88a67c55e107b550f504eeea947d3" UPSTREAM_CHECK_GITTAGREGEX = "(?Pedk2-stable.*)" inherit deploy From patchwork Tue May 9 17:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23727 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 DF905C7EE23 for ; Tue, 9 May 2023 17:24:03 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web10.39153.1683653030511985163 for ; Tue, 09 May 2023 10:23:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=qom1RIZ0; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-965e4be7541so944405766b.1 for ; Tue, 09 May 2023 10:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653033; x=1686245033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fagruRoDG1mQj7Dj9mL3RyBggKJlXDlx3plwCn5ih/s=; b=qom1RIZ0iMhJsQ2AcqLbFipYEJdH5rF88iqV3I3fcgEnwv+k8nCKHHXE1pxm2TELTq gRAD7BzvV0qn+13oq9NpUgyrxBsj/D5KnhSzwYxxkSKPKaYnznWZPUBCvw04FRNfTWUZ elOdJY9TKuS9GtKq6kG2tPeMESIhEKtEiplO3nrZuCyszgm0InRegA31CmFHoLgKTS7/ h0AdYYqXmKeFKykaHtIqilulihiW6mU9ZZNhvCYi6IhXKJ9gHpYkRznX410qipIfyMRG d9ZtZCPNDjCfUAGpjJcNGOtjq4agCznW+ELX1tLnGdebEBgC6pewufCCVXko25Ot5ZeH tMzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653033; x=1686245033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fagruRoDG1mQj7Dj9mL3RyBggKJlXDlx3plwCn5ih/s=; b=W6n4ow4UdGrxK9tzz05ZFA6mC12d2FviTBmuDgSEUuYnu/3m2JU7fygvlfJ7eKrVRu RNVnVvJa9Wn7uyL7GnpOqI0qHUN1fgyMtsvr2LebMBqh8JBPcqbGk9OwAapDXikfNWk6 xnU9TSY8d6WoceIgfgz+MHl3Z17dPMdPMgbVAZaulv559+sWvxWfL+xah8g8r433rQj3 5txMHVftzG4mN8MU2z2HH0ZUln39MTopLAkvgxnFJmgs1yEzb9wgeSG4RlqpNnF/NQAW CEbJyJVw96SFBqdbKs04d6N1xbiwQy23SWlWpZWaTAYL6D86wBaJTkUoGdcNqhrQQ3Zi tlPA== X-Gm-Message-State: AC+VfDy+1R+PSQs4Bpc/LCBF8eYKn4qc1vT2RCIt3OQsfo6o58hHbsdA lck5nMY1db7I0lp2y2/lnYIk+T3Fcxc= X-Google-Smtp-Source: ACHHUZ6N/O7URAEHkWQbnbK3EBoPkW9eKBKV0JinFInTl96vIC616nFHTKz+6H3sVbzTIdhHcQ/W4g== X-Received: by 2002:a17:907:9718:b0:966:c09:1c57 with SMTP id jg24-20020a170907971800b009660c091c57mr11951325ejc.65.1683653032504; Tue, 09 May 2023 10:23:52 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:52 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/27] btrfs-tools: update 6.1.3 -> 6.3 Date: Tue, 9 May 2023 19:23:24 +0200 Message-Id: <20230509172344.1516743-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181062 Drop patch, as upstream fixed the issue separately. Signed-off-by: Alexander Kanavin --- ...-ftruncate-stat-instead-of-64bit-equ.patch | 903 ------------------ ...trfs-tools_6.1.3.bb => btrfs-tools_6.3.bb} | 3 +- 2 files changed, 1 insertion(+), 905 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.1.3.bb => btrfs-tools_6.3.bb} (95%) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch deleted file mode 100644 index 2618687088f..00000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch +++ /dev/null @@ -1,903 +0,0 @@ -From 37425f422e46003ed623f8e6387bed1aa5778b96 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 11 Nov 2022 11:26:05 -0800 -Subject: [PATCH] Use pread/pwrite/ftruncate/stat instead of 64bit equivalents - -64bit functions are aliases to original functions when largefile feature -is enabled via autoconf or right macro is passed on compiler cmdline - --D_FILE_OFFSET_BITS=64 - -Upstream-Status: Submitted [https://lore.kernel.org/linux-btrfs/20221215084046.122836-1-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj ---- - cmds/rescue-chunk-recover.c | 4 +- - image/main.c | 14 +-- - kernel-shared/zoned.c | 6 +- - kernel-shared/zoned.h | 4 +- - mkfs/main.c | 4 +- - mkfs/rootdir.c | 10 +- - tests/fsstress.c | 192 ++++++++++++++++++------------------ - tests/fssum.c | 8 +- - 8 files changed, 121 insertions(+), 121 deletions(-) - ---- a/cmds/rescue-chunk-recover.c -+++ b/cmds/rescue-chunk-recover.c -@@ -755,7 +755,7 @@ static int scan_one_device(void *dev_sca - if (is_super_block_address(bytenr)) - bytenr += rc->sectorsize; - -- if (pread64(fd, buf->data, rc->nodesize, bytenr) < -+ if (pread(fd, buf->data, rc->nodesize, bytenr) < - rc->nodesize) - break; - -@@ -1875,7 +1875,7 @@ static int check_one_csum(int fd, u64 st - data = malloc(len); - if (!data) - return -1; -- ret = pread64(fd, data, len, start); -+ ret = pread(fd, data, len, start); - if (ret < 0 || ret != len) { - ret = -1; - goto out; ---- a/image/main.c -+++ b/image/main.c -@@ -691,7 +691,7 @@ static int flush_pending(struct metadump - if (start == BTRFS_SUPER_INFO_OFFSET) { - int fd = get_dev_fd(md->root); - -- ret = pread64(fd, async->buffer, size, start); -+ ret = pread(fd, async->buffer, size, start); - if (ret < size) { - free(async->buffer); - free(async); -@@ -1366,7 +1366,7 @@ static void write_backup_supers(int fd, - break; - btrfs_set_super_bytenr(super, bytenr); - csum_block(buf, BTRFS_SUPER_INFO_SIZE); -- ret = pwrite64(fd, buf, BTRFS_SUPER_INFO_SIZE, bytenr); -+ ret = pwrite(fd, buf, BTRFS_SUPER_INFO_SIZE, bytenr); - if (ret < BTRFS_SUPER_INFO_SIZE) { - if (ret < 0) - error( -@@ -1487,12 +1487,12 @@ static int restore_one_work(struct mdres - else - bytenr = logical; - -- ret = pwrite64(outfd, buffer + offset, chunk_size, bytenr); -+ ret = pwrite(outfd, buffer + offset, chunk_size, bytenr); - if (ret != chunk_size) - goto write_error; - - if (physical_dup) -- ret = pwrite64(outfd, buffer + offset, -+ ret = pwrite(outfd, buffer + offset, - chunk_size, physical_dup); - if (ret != chunk_size) - goto write_error; -@@ -2454,7 +2454,7 @@ static int fixup_device_size(struct btrf - } - if (S_ISREG(buf.st_mode)) { - /* Don't forget to enlarge the real file */ -- ret = ftruncate64(out_fd, dev_size); -+ ret = ftruncate(out_fd, dev_size); - if (ret < 0) { - error("failed to enlarge result image: %m"); - return -errno; -@@ -2913,7 +2913,7 @@ static int restore_metadump(const char * - goto out; - } - if (S_ISREG(st.st_mode) && st.st_size < dev_size) { -- ret = ftruncate64(fileno(out), dev_size); -+ ret = ftruncate(fileno(out), dev_size); - if (ret < 0) { - error( - "failed to enlarge result image file from %llu to %llu: %m", -@@ -3010,7 +3010,7 @@ static int update_disk_super_on_device(s - memcpy(dev_item->fsid, fs_uuid, BTRFS_UUID_SIZE); - csum_block((u8 *)&disk_super, BTRFS_SUPER_INFO_SIZE); - -- ret = pwrite64(fp, &disk_super, BTRFS_SUPER_INFO_SIZE, BTRFS_SUPER_INFO_OFFSET); -+ ret = pwrite(fp, &disk_super, BTRFS_SUPER_INFO_SIZE, BTRFS_SUPER_INFO_OFFSET); - if (ret != BTRFS_SUPER_INFO_SIZE) { - if (ret < 0) { - errno = ret; ---- a/kernel-shared/zoned.c -+++ b/kernel-shared/zoned.c -@@ -194,7 +194,7 @@ static int sb_write_pointer(int fd, stru - bytenr = ((zones[i].start + zones[i].len) - << SECTOR_SHIFT) - BTRFS_SUPER_INFO_SIZE; - -- ret = pread64(fd, buf[i], BTRFS_SUPER_INFO_SIZE, bytenr); -+ ret = pread(fd, buf[i], BTRFS_SUPER_INFO_SIZE, bytenr); - if (ret != BTRFS_SUPER_INFO_SIZE) - return -EIO; - super[i] = (struct btrfs_super_block *)&buf[i]; -@@ -515,8 +515,8 @@ size_t btrfs_sb_io(int fd, void *buf, of - /* We can call pread/pwrite if 'fd' is non-zoned device/file */ - if (zone_size_sector == 0) { - if (rw == READ) -- return pread64(fd, buf, count, offset); -- return pwrite64(fd, buf, count, offset); -+ return pread(fd, buf, count, offset); -+ return pwrite(fd, buf, count, offset); - } - - ASSERT(IS_ALIGNED(zone_size_sector, sb_size_sector)); ---- a/kernel-shared/zoned.h -+++ b/kernel-shared/zoned.h -@@ -150,9 +150,9 @@ int btrfs_wipe_temporary_sb(struct btrfs - #else - - #define sbread(fd, buf, offset) \ -- pread64(fd, buf, BTRFS_SUPER_INFO_SIZE, offset) -+ pread(fd, buf, BTRFS_SUPER_INFO_SIZE, offset) - #define sbwrite(fd, buf, offset) \ -- pwrite64(fd, buf, BTRFS_SUPER_INFO_SIZE, offset) -+ pwrite(fd, buf, BTRFS_SUPER_INFO_SIZE, offset) - - static inline int btrfs_reset_dev_zone(int fd, struct blk_zone *zone) - { ---- a/mkfs/main.c -+++ b/mkfs/main.c -@@ -453,14 +453,14 @@ static int zero_output_file(int out_fd, - /* Only zero out the first 1M */ - loop_num = SZ_1M / SZ_4K; - for (i = 0; i < loop_num; i++) { -- written = pwrite64(out_fd, buf, SZ_4K, location); -+ written = pwrite(out_fd, buf, SZ_4K, location); - if (written != SZ_4K) - ret = -EIO; - location += SZ_4K; - } - - /* Then enlarge the file to size */ -- written = pwrite64(out_fd, buf, 1, size - 1); -+ written = pwrite(out_fd, buf, 1, size - 1); - if (written < 1) - ret = -EIO; - return ret; ---- a/mkfs/rootdir.c -+++ b/mkfs/rootdir.c -@@ -340,7 +340,7 @@ static int add_file_items(struct btrfs_t - goto end; - } - -- ret_read = pread64(fd, buffer, st->st_size, bytes_read); -+ ret_read = pread(fd, buffer, st->st_size, bytes_read); - if (ret_read == -1) { - error("cannot read %s at offset %llu length %llu: %m", - path_name, bytes_read, (unsigned long long)st->st_size); -@@ -386,7 +386,7 @@ again: - - memset(eb->data, 0, sectorsize); - -- ret_read = pread64(fd, eb->data, sectorsize, file_pos + -+ ret_read = pread(fd, eb->data, sectorsize, file_pos + - bytes_read); - if (ret_read == -1) { - error("cannot read %s at offset %llu length %u: %m", -@@ -929,7 +929,7 @@ int btrfs_mkfs_shrink_fs(struct btrfs_fs - u64 new_size; - struct btrfs_device *device; - struct list_head *cur; -- struct stat64 file_stat; -+ struct stat file_stat; - int nr_devs = 0; - int ret; - -@@ -963,14 +963,14 @@ int btrfs_mkfs_shrink_fs(struct btrfs_fs - *new_size_ret = new_size; - - if (shrink_file_size) { -- ret = fstat64(device->fd, &file_stat); -+ ret = fstat(device->fd, &file_stat); - if (ret < 0) { - error("failed to stat devid %llu: %m", device->devid); - return ret; - } - if (!S_ISREG(file_stat.st_mode)) - return ret; -- ret = ftruncate64(device->fd, new_size); -+ ret = ftruncate(device->fd, new_size); - if (ret < 0) { - error("failed to truncate device file of devid %llu: %m", - device->devid); ---- a/tests/fsstress.c -+++ b/tests/fsstress.c -@@ -458,7 +458,7 @@ int get_fname(int, long, pathname_t *, f - void init_pathname(pathname_t *); - int lchown_path(pathname_t *, uid_t, gid_t); - int link_path(pathname_t *, pathname_t *); --int lstat64_path(pathname_t *, struct stat64 *); -+int lstat_path(pathname_t *, struct stat *); - void make_freq_table(void); - int mkdir_path(pathname_t *, mode_t); - int mknod_path(pathname_t *, mode_t, dev_t); -@@ -472,9 +472,9 @@ int rename_path(pathname_t *, pathname_t - int rmdir_path(pathname_t *); - void separate_pathname(pathname_t *, char *, pathname_t *); - void show_ops(int, char *); --int stat64_path(pathname_t *, struct stat64 *); -+int stat_path(pathname_t *, struct stat *); - int symlink_path(const char *, pathname_t *); --int truncate64_path(pathname_t *, off64_t); -+int truncate_path(pathname_t *, off64_t); - int unlink_path(pathname_t *); - void usage(void); - void write_freq(void); -@@ -998,12 +998,12 @@ void - check_cwd(void) - { - #ifdef DEBUG -- struct stat64 statbuf; -+ struct stat statbuf; - int ret; - -- ret = stat64(".", &statbuf); -+ ret = stat(".", &statbuf); - if (ret != 0) { -- fprintf(stderr, "fsstress: check_cwd stat64() returned %d with errno: %d (%m)\n", -+ fprintf(stderr, "fsstress: check_cwd stat() returned %d with errno: %d (%m)\n", - ret, errno); - goto out; - } -@@ -1171,7 +1171,7 @@ again: - void - doproc(void) - { -- struct stat64 statbuf; -+ struct stat statbuf; - char buf[10]; - char cmd[64]; - opnum_t opno; -@@ -1182,7 +1182,7 @@ doproc(void) - dividend = (operations + execute_freq) / (execute_freq + 1); - sprintf(buf, "p%x", procid); - (void)mkdir(buf, 0777); -- if (chdir(buf) < 0 || stat64(".", &statbuf) < 0) { -+ if (chdir(buf) < 0 || stat(".", &statbuf) < 0) { - perror(buf); - _exit(1); - } -@@ -1214,7 +1214,7 @@ doproc(void) - * the forced shutdown happened. - */ - if (errtag != 0 && opno % 100 == 0) { -- rval = stat64(".", &statbuf); -+ rval = stat(".", &statbuf); - if (rval == EIO) { - fprintf(stderr, "Detected EIO\n"); - goto errout; -@@ -1537,18 +1537,18 @@ link_path(pathname_t *name1, pathname_t - } - - int --lstat64_path(pathname_t *name, struct stat64 *sbuf) -+lstat_path(pathname_t *name, struct stat *sbuf) - { - char buf[NAME_MAX + 1]; - pathname_t newname; - int rval; - -- rval = lstat64(name->path, sbuf); -+ rval = lstat(name->path, sbuf); - if (rval >= 0 || errno != ENAMETOOLONG) - return rval; - separate_pathname(name, buf, &newname); - if (chdir(buf) == 0) { -- rval = lstat64_path(&newname, sbuf); -+ rval = lstat_path(&newname, sbuf); - assert(chdir("..") == 0); - } - free_pathname(&newname); -@@ -1870,18 +1870,18 @@ show_ops(int flag, char *lead_str) - } - - int --stat64_path(pathname_t *name, struct stat64 *sbuf) -+stat_path(pathname_t *name, struct stat *sbuf) - { - char buf[NAME_MAX + 1]; - pathname_t newname; - int rval; - -- rval = stat64(name->path, sbuf); -+ rval = stat(name->path, sbuf); - if (rval >= 0 || errno != ENAMETOOLONG) - return rval; - separate_pathname(name, buf, &newname); - if (chdir(buf) == 0) { -- rval = stat64_path(&newname, sbuf); -+ rval = stat_path(&newname, sbuf); - assert(chdir("..") == 0); - } - free_pathname(&newname); -@@ -1913,18 +1913,18 @@ symlink_path(const char *name1, pathname - } - - int --truncate64_path(pathname_t *name, off64_t length) -+truncate_path(pathname_t *name, off64_t length) - { - char buf[NAME_MAX + 1]; - pathname_t newname; - int rval; - -- rval = truncate64(name->path, length); -+ rval = truncate(name->path, length); - if (rval >= 0 || errno != ENAMETOOLONG) - return rval; - separate_pathname(name, buf, &newname); - if (chdir(buf) == 0) { -- rval = truncate64_path(&newname, length); -+ rval = truncate_path(&newname, length); - assert(chdir("..") == 0); - } - free_pathname(&newname); -@@ -2026,7 +2026,7 @@ non_btrfs_freq(const char *path) - ops[btrfs_ops[i]].freq = 0; - } - --void inode_info(char *str, size_t sz, struct stat64 *s, int verbose) -+void inode_info(char *str, size_t sz, struct stat *s, int verbose) - { - if (verbose) - snprintf(str, sz, "[%ld %ld %d %d %lld %lld]", -@@ -2101,7 +2101,7 @@ allocsp_f(opnum_t opno, long r) - struct xfs_flock64 fl; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - -@@ -2122,9 +2122,9 @@ allocsp_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: allocsp - fstat64 %s failed %d\n", -+ printf("%d/%lld: allocsp - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -2160,7 +2160,7 @@ do_aio_rw(opnum_t opno, long r, int flag - size_t len; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - char *dio_env; -@@ -2184,9 +2184,9 @@ do_aio_rw(opnum_t opno, long r, int flag - procid, opno, f.path, e); - goto aio_out; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: do_aio_rw - fstat64 %s failed %d\n", -+ printf("%d/%lld: do_aio_rw - fstat %s failed %d\n", - procid, opno, f.path, errno); - goto aio_out; - } -@@ -2278,7 +2278,7 @@ do_uring_rw(opnum_t opno, long r, int fl - size_t len; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - struct io_uring_sqe *sqe; -@@ -2304,9 +2304,9 @@ do_uring_rw(opnum_t opno, long r, int fl - procid, opno, f.path, e); - goto uring_out; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: do_uring_rw - fstat64 %s failed %d\n", -+ printf("%d/%lld: do_uring_rw - fstat %s failed %d\n", - procid, opno, f.path, errno); - goto uring_out; - } -@@ -2522,7 +2522,7 @@ bulkstat1_f(opnum_t opno, long r) - int fd; - int good; - __u64 ino; -- struct stat64 s; -+ struct stat s; - struct xfs_bstat t; - int v; - struct xfs_fsop_bulkreq bsr; -@@ -2534,7 +2534,7 @@ bulkstat1_f(opnum_t opno, long r) - init_pathname(&f); - if (!get_fname(FT_ANYm, r, &f, NULL, NULL, &v)) - append_pathname(&f, "."); -- ino = stat64_path(&f, &s) < 0 ? (ino64_t)r : s.st_ino; -+ ino = stat_path(&f, &s) < 0 ? (ino64_t)r : s.st_ino; - check_cwd(); - free_pathname(&f); - } else { -@@ -2605,8 +2605,8 @@ clonerange_f( - struct file_clone_range fcr; - struct pathname fpath1; - struct pathname fpath2; -- struct stat64 stat1; -- struct stat64 stat2; -+ struct stat stat1; -+ struct stat stat2; - char inoinfo1[1024]; - char inoinfo2[1024]; - off64_t lr; -@@ -2660,17 +2660,17 @@ clonerange_f( - } - - /* Get file stats */ -- if (fstat64(fd1, &stat1) < 0) { -+ if (fstat(fd1, &stat1) < 0) { - if (v1) -- printf("%d/%lld: clonerange read - fstat64 %s failed %d\n", -+ printf("%d/%lld: clonerange read - fstat %s failed %d\n", - procid, opno, fpath1.path, errno); - goto out_fd2; - } - inode_info(inoinfo1, sizeof(inoinfo1), &stat1, v1); - -- if (fstat64(fd2, &stat2) < 0) { -+ if (fstat(fd2, &stat2) < 0) { - if (v2) -- printf("%d/%lld: clonerange write - fstat64 %s failed %d\n", -+ printf("%d/%lld: clonerange write - fstat %s failed %d\n", - procid, opno, fpath2.path, errno); - goto out_fd2; - } -@@ -2743,8 +2743,8 @@ copyrange_f( - #ifdef HAVE_COPY_FILE_RANGE - struct pathname fpath1; - struct pathname fpath2; -- struct stat64 stat1; -- struct stat64 stat2; -+ struct stat stat1; -+ struct stat stat2; - char inoinfo1[1024]; - char inoinfo2[1024]; - loff_t lr; -@@ -2802,17 +2802,17 @@ copyrange_f( - } - - /* Get file stats */ -- if (fstat64(fd1, &stat1) < 0) { -+ if (fstat(fd1, &stat1) < 0) { - if (v1) -- printf("%d/%lld: copyrange read - fstat64 %s failed %d\n", -+ printf("%d/%lld: copyrange read - fstat %s failed %d\n", - procid, opno, fpath1.path, errno); - goto out_fd2; - } - inode_info(inoinfo1, sizeof(inoinfo1), &stat1, v1); - -- if (fstat64(fd2, &stat2) < 0) { -+ if (fstat(fd2, &stat2) < 0) { - if (v2) -- printf("%d/%lld: copyrange write - fstat64 %s failed %d\n", -+ printf("%d/%lld: copyrange write - fstat %s failed %d\n", - procid, opno, fpath2.path, errno); - goto out_fd2; - } -@@ -2900,7 +2900,7 @@ deduperange_f( - #define INFO_SZ 1024 - struct file_dedupe_range *fdr; - struct pathname *fpath; -- struct stat64 *stat; -+ struct stat *stat; - char *info; - off64_t *off; - int *v; -@@ -2938,7 +2938,7 @@ deduperange_f( - goto out_fdr; - } - -- stat = calloc(nr, sizeof(struct stat64)); -+ stat = calloc(nr, sizeof(struct stat)); - if (!stat) { - printf("%d/%lld: line %d error %d\n", - procid, opno, __LINE__, errno); -@@ -3017,9 +3017,9 @@ deduperange_f( - } - - /* Get file stats */ -- if (fstat64(fd[0], &stat[0]) < 0) { -+ if (fstat(fd[0], &stat[0]) < 0) { - if (v[0]) -- printf("%d/%lld: deduperange read - fstat64 %s failed %d\n", -+ printf("%d/%lld: deduperange read - fstat %s failed %d\n", - procid, opno, fpath[0].path, errno); - goto out_fds; - } -@@ -3027,9 +3027,9 @@ deduperange_f( - inode_info(&info[0], INFO_SZ, &stat[0], v[0]); - - for (i = 1; i < nr; i++) { -- if (fstat64(fd[i], &stat[i]) < 0) { -+ if (fstat(fd[i], &stat[i]) < 0) { - if (v[i]) -- printf("%d/%lld: deduperange write - fstat64 %s failed %d\n", -+ printf("%d/%lld: deduperange write - fstat %s failed %d\n", - procid, opno, fpath[i].path, errno); - goto out_fds; - } -@@ -3179,8 +3179,8 @@ splice_f(opnum_t opno, long r) - { - struct pathname fpath1; - struct pathname fpath2; -- struct stat64 stat1; -- struct stat64 stat2; -+ struct stat stat1; -+ struct stat stat2; - char inoinfo1[1024]; - char inoinfo2[1024]; - loff_t lr; -@@ -3237,17 +3237,17 @@ splice_f(opnum_t opno, long r) - } - - /* Get file stats */ -- if (fstat64(fd1, &stat1) < 0) { -+ if (fstat(fd1, &stat1) < 0) { - if (v1) -- printf("%d/%lld: splice read - fstat64 %s failed %d\n", -+ printf("%d/%lld: splice read - fstat %s failed %d\n", - procid, opno, fpath1.path, errno); - goto out_fd2; - } - inode_info(inoinfo1, sizeof(inoinfo1), &stat1, v1); - -- if (fstat64(fd2, &stat2) < 0) { -+ if (fstat(fd2, &stat2) < 0) { - if (v2) -- printf("%d/%lld: splice write - fstat64 %s failed %d\n", -+ printf("%d/%lld: splice write - fstat %s failed %d\n", - procid, opno, fpath2.path, errno); - goto out_fd2; - } -@@ -3432,7 +3432,7 @@ dread_f(opnum_t opno, long r) - size_t len; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - char *dio_env; -@@ -3454,9 +3454,9 @@ dread_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: dread - fstat64 %s failed %d\n", -+ printf("%d/%lld: dread - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -3522,7 +3522,7 @@ dwrite_f(opnum_t opno, long r) - size_t len; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - char *dio_env; -@@ -3544,9 +3544,9 @@ dwrite_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: dwrite - fstat64 %s failed %d\n", -+ printf("%d/%lld: dwrite - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -3620,7 +3620,7 @@ do_fallocate(opnum_t opno, long r, int m - int64_t lr; - off64_t off; - off64_t len; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - -@@ -3640,9 +3640,9 @@ do_fallocate(opnum_t opno, long r, int m - return; - } - check_cwd(); -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: do_fallocate - fstat64 %s failed %d\n", -+ printf("%d/%lld: do_fallocate - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -3734,7 +3734,7 @@ fiemap_f(opnum_t opno, long r) - int fd; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - int blocks_to_map; -@@ -3757,9 +3757,9 @@ fiemap_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: fiemap - fstat64 %s failed %d\n", -+ printf("%d/%lld: fiemap - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -3807,7 +3807,7 @@ freesp_f(opnum_t opno, long r) - struct xfs_flock64 fl; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - -@@ -3828,9 +3828,9 @@ freesp_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: freesp - fstat64 %s failed %d\n", -+ printf("%d/%lld: freesp - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -4226,7 +4226,7 @@ do_mmap(opnum_t opno, long r, int prot) - int64_t lr; - off64_t off; - int flags; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - sigjmp_buf sigbus_jmpbuf; -@@ -4248,9 +4248,9 @@ do_mmap(opnum_t opno, long r, int prot) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: do_mmap - fstat64 %s failed %d\n", -+ printf("%d/%lld: do_mmap - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -4370,7 +4370,7 @@ read_f(opnum_t opno, long r) - size_t len; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - -@@ -4391,9 +4391,9 @@ read_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: read - fstat64 %s failed %d\n", -+ printf("%d/%lld: read - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -4454,7 +4454,7 @@ readv_f(opnum_t opno, long r) - size_t len; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - struct iovec *iov = NULL; -@@ -4480,9 +4480,9 @@ readv_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: readv - fstat64 %s failed %d\n", -+ printf("%d/%lld: readv - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -4739,7 +4739,7 @@ resvsp_f(opnum_t opno, long r) - struct xfs_flock64 fl; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - -@@ -4760,9 +4760,9 @@ resvsp_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: resvsp - fstat64 %s failed %d\n", -+ printf("%d/%lld: resvsp - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -4971,7 +4971,7 @@ stat_f(opnum_t opno, long r) - { - int e; - pathname_t f; -- struct stat64 stb; -+ struct stat stb; - int v; - - init_pathname(&f); -@@ -4981,7 +4981,7 @@ stat_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- e = lstat64_path(&f, &stb) < 0 ? errno : 0; -+ e = lstat_path(&f, &stb) < 0 ? errno : 0; - check_cwd(); - if (v) - printf("%d/%lld: stat %s %d\n", procid, opno, f.path, e); -@@ -5133,7 +5133,7 @@ truncate_f(opnum_t opno, long r) - pathname_t f; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - -@@ -5144,11 +5144,11 @@ truncate_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- e = stat64_path(&f, &stb) < 0 ? errno : 0; -+ e = stat_path(&f, &stb) < 0 ? errno : 0; - check_cwd(); - if (e > 0) { - if (v) -- printf("%d/%lld: truncate - stat64 %s failed %d\n", -+ printf("%d/%lld: truncate - stat %s failed %d\n", - procid, opno, f.path, e); - free_pathname(&f); - return; -@@ -5157,7 +5157,7 @@ truncate_f(opnum_t opno, long r) - lr = ((int64_t)random() << 32) + random(); - off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE)); - off %= maxfsize; -- e = truncate64_path(&f, off) < 0 ? errno : 0; -+ e = truncate_path(&f, off) < 0 ? errno : 0; - check_cwd(); - if (v) - printf("%d/%lld: truncate %s%s %lld %d\n", procid, opno, f.path, -@@ -5209,7 +5209,7 @@ unresvsp_f(opnum_t opno, long r) - struct xfs_flock64 fl; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - -@@ -5230,9 +5230,9 @@ unresvsp_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: unresvsp - fstat64 %s failed %d\n", -+ printf("%d/%lld: unresvsp - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -5281,7 +5281,7 @@ write_f(opnum_t opno, long r) - size_t len; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - -@@ -5302,9 +5302,9 @@ write_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: write - fstat64 %s failed %d\n", -+ printf("%d/%lld: write - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); -@@ -5337,7 +5337,7 @@ writev_f(opnum_t opno, long r) - size_t len; - int64_t lr; - off64_t off; -- struct stat64 stb; -+ struct stat stb; - int v; - char st[1024]; - struct iovec *iov = NULL; -@@ -5363,9 +5363,9 @@ writev_f(opnum_t opno, long r) - free_pathname(&f); - return; - } -- if (fstat64(fd, &stb) < 0) { -+ if (fstat(fd, &stb) < 0) { - if (v) -- printf("%d/%lld: writev - fstat64 %s failed %d\n", -+ printf("%d/%lld: writev - fstat %s failed %d\n", - procid, opno, f.path, errno); - free_pathname(&f); - close(fd); ---- a/tests/fssum.c -+++ b/tests/fssum.c -@@ -519,9 +519,9 @@ sum(int dirfd, int level, sum_t *dircs, - int excl; - sum_file_data_t sum_file_data = flags[FLAG_STRUCTURE] ? - sum_file_data_strict : sum_file_data_permissive; -- struct stat64 dir_st; -+ struct stat dir_st; - -- if (fstat64(dirfd, &dir_st)) { -+ if (fstat(dirfd, &dir_st)) { - perror("fstat"); - exit(-1); - } -@@ -552,7 +552,7 @@ sum(int dirfd, int level, sum_t *dircs, - } - qsort(namelist, entries, sizeof(*namelist), namecmp); - for (i = 0; i < entries; ++i) { -- struct stat64 st; -+ struct stat st; - sum_t cs; - sum_t meta; - char *path; -@@ -572,7 +572,7 @@ sum(int dirfd, int level, sum_t *dircs, - perror("fchdir"); - exit(-1); - } -- ret = lstat64(namelist[i], &st); -+ ret = lstat(namelist[i], &st); - if (ret) { - fprintf(stderr, "stat failed for %s/%s: %m\n", - path_prefix, path); diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.bb similarity index 95% rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.bb index 05e84defba5..5c43d951c48 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.bb @@ -17,9 +17,8 @@ DEPENDS = "util-linux zlib" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ - file://0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch \ " -SRCREV = "908b4b4450320e30fdef693f09b42f4eb93702c3" +SRCREV = "fba31d634e3bc658e7d42a6c00f31ebb60adf901" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ From patchwork Tue May 9 17:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23731 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 1DDA5C7EE32 for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.39289.1683653031361427637 for ; Tue, 09 May 2023 10:23:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=ULUvWiGR; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-9659c5b14d8so1001397166b.3 for ; Tue, 09 May 2023 10:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653033; x=1686245033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S0d1aMhcNN5aaHGn+LLRwudCONysVNGffqF7WqQiAWg=; b=ULUvWiGRCkYgij3DeFeDx2CcVF0qMaCHjHOW5+swpUlDN8/b1WRIoIc6sE7dZL/7Sb zg9/fAriMH0FRGPyhTd9t75C2Fb0E6THECNlEXc2V3KRrFG5TuLS6PrM2VAOECV9cvJr kUDGTvwmbuNDZShPL4WNIi9rZ4ru5h1mvj10cj/MQcFhJOj9rQ+h3qk/8NFQsei/dcbV oLO/Bntsxn9kdq/BB/Hm2ZwjooPR+rark7zuHpqT/EfbfriZkCirazqpbDgy/+tFqHtb EHo38bqir+jdjqnZWXv72XNDWlH9jYM/2yJn3UeHNLzUVsstbvHpO21E/cqzVh89jWqT mlTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653033; x=1686245033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S0d1aMhcNN5aaHGn+LLRwudCONysVNGffqF7WqQiAWg=; b=SllZZV20Ho4PzfRIHaSz+ViOcwJuR9sKizHKUvvKcqwxqOhUX5RBbSYOAPMLjyIEPF 4n7dxNJNOSFnq8sIfEMfUFK0RCnePW/DFF/Y0rBF2CB9AyNjv6Ni2AeA2Bzkujcjf8Bi 6+oESekmSdoPg7o1n3187a/D5/GZkganAoxccyhRstAGgcnNSIs6frfMiJ6g70VK4kwf 9WonQ16rFj1ZXV+qnB878HUP3QtVMm9OYsXruaCtoyb6yi9hA35gcavHcmXG5P4TxP5p 3Qgik9rfnbHlX06SPtHEkvj0SpNanfGOEV6AV2hBz3We0tSI6leO4I+K6hY5n1A2llo8 g+xw== X-Gm-Message-State: AC+VfDw5TSKa5HZdMgwML4DvgfVRvAzoAHOIIraFvovE99Vv5kBkDNMa kliDy/JhgnA1af6CNrgjh5afPiIE7TQ= X-Google-Smtp-Source: ACHHUZ57MxevJ3pmPkVC+A9Gdtwz3c0nzEqbcR8W/aKj27JW/BwdXrCTA0o6Padx7+fjMUrX/3n1sg== X-Received: by 2002:a17:907:3f18:b0:966:31a1:8d6e with SMTP id hq24-20020a1709073f1800b0096631a18d6emr9251381ejc.57.1683653033149; Tue, 09 May 2023 10:23:53 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:52 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/27] elfutils: update 0.188 -> 0.189 Date: Tue, 9 May 2023 19:23:25 +0200 Message-Id: <20230509172344.1516743-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181063 Drop backports, rebase musl patches. Signed-off-by: Alexander Kanavin --- .../{elfutils_0.188.bb => elfutils_0.189.bb} | 5 +- ...od-Fix-usage-of-deprecated-CURLINFO_.patch | 49 ----------- ...t-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch | 34 ------- .../elfutils/files/0003-musl-utils.patch | 14 +-- .../0015-config-eu.am-do-not-use-Werror.patch | 10 +-- .../handle_DW_TAG_unspecified_type.patch | 88 ------------------- 6 files changed, 13 insertions(+), 187 deletions(-) rename meta/recipes-devtools/elfutils/{elfutils_0.188.bb => elfutils_0.189.bb} (96%) delete mode 100644 meta/recipes-devtools/elfutils/files/0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch delete mode 100644 meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch delete mode 100644 meta/recipes-devtools/elfutils/files/handle_DW_TAG_unspecified_type.patch diff --git a/meta/recipes-devtools/elfutils/elfutils_0.188.bb b/meta/recipes-devtools/elfutils/elfutils_0.189.bb similarity index 96% rename from meta/recipes-devtools/elfutils/elfutils_0.188.bb rename to meta/recipes-devtools/elfutils/elfutils_0.189.bb index 74271b2411e..236f8cef92d 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.188.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.189.bb @@ -21,15 +21,12 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-skip-the-test-when-gcc-not-deployed.patch \ file://ptest.patch \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ - file://0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch \ - file://0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch \ - file://handle_DW_TAG_unspecified_type.patch \ " SRC_URI:append:libc-musl = " \ file://0003-musl-utils.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " -SRC_URI[sha256sum] = "fb8b0e8d0802005b9a309c60c1d8de32dd2951b56f0c3a3cb56d21ce01595dff" +SRC_URI[sha256sum] = "39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8" inherit autotools gettext ptest pkgconfig diff --git a/meta/recipes-devtools/elfutils/files/0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch b/meta/recipes-devtools/elfutils/files/0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch deleted file mode 100644 index ee192e35816..00000000000 --- a/meta/recipes-devtools/elfutils/files/0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d2bf497b12fbd49b4996ccf0744303ffd67735b1 Mon Sep 17 00:00:00 2001 -From: Andrew Paprocki -Date: Wed, 21 Dec 2022 11:15:00 -0500 -Subject: [PATCH] PR29926: debuginfod: Fix usage of deprecated CURLINFO_* - -The `CURLINFO_SIZE_DOWNLOAD_T` and `CURLINFO_CONTENT_LENGTH_DOWNLOAD_T` -identifiers are `enum`s, not pre-processor definitions, so the current -`#ifdef` logic is not selecting the newer API. This results in the -older identifiers being used and they now generate errors when compiled -against Curl 7.87, which has silently deprecated them, causing GCC to -emit `-Werror=deprecated-declarations`. - -Instead, the newer identifiers were added in Curl 7.55, so explicitly -check for `CURL_AT_LEAST_VERSION(7, 55, 0)` instead of the current -logic. This eliminates the error when compiling against Curl 7.87. - -Ref: https://github.com/curl/curl/pull/1511 - -Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=d2bf497b12fbd49b4996ccf0744303ffd67735b1] -Signed-off-by: Andrew Paprocki ---- - debuginfod/debuginfod-client.c | 4 ++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c -index 8873fcc8..692aecce 100644 ---- a/debuginfod/debuginfod-client.c -+++ b/debuginfod/debuginfod-client.c -@@ -1456,7 +1456,7 @@ debuginfod_query_server (debuginfod_client *c, - deflate-compressing proxies, this number is likely to be - unavailable, so -1 may show. */ - CURLcode curl_res; --#ifdef CURLINFO_CONTENT_LENGTH_DOWNLOAD_T -+#if CURL_AT_LEAST_VERSION(7, 55, 0) - curl_off_t cl; - curl_res = curl_easy_getinfo(target_handle, - CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, -@@ -1491,7 +1491,7 @@ debuginfod_query_server (debuginfod_client *c, - if (target_handle) /* we've committed to a server; report its download progress */ - { - CURLcode curl_res; --#ifdef CURLINFO_SIZE_DOWNLOAD_T -+#if CURL_AT_LEAST_VERSION(7, 55, 0) - curl_off_t dl; - curl_res = curl_easy_getinfo(target_handle, - CURLINFO_SIZE_DOWNLOAD_T, --- -2.39.1 - diff --git a/meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch b/meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch deleted file mode 100644 index 2d4c912e824..00000000000 --- a/meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6560fb26a62ef135a804357ef4f15a47de3e49b3 Mon Sep 17 00:00:00 2001 -From: Mark Wielaard -Date: Tue, 10 Jan 2023 23:20:41 +0100 -Subject: [PATCH] debuginfod-client: Use CURLOPT_PROTOCOLS_STR for libcurl >= 7.85.0 - -https://sourceware.org/bugzilla/show_bug.cgi?id=29926 - -Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=6560fb26a62ef135a804357ef4f15a47de3e49b3] -Signed-off-by: Mark Wielaard ---- - debuginfod/debuginfod-client.c | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c -index a16165bd..1ce45632 100644 ---- a/debuginfod/debuginfod-client.c -+++ b/debuginfod/debuginfod-client.c -@@ -1336,8 +1336,13 @@ debuginfod_query_server (debuginfod_client *c, - - /* Only allow http:// + https:// + file:// so we aren't being - redirected to some unsupported protocol. */ -+#if CURL_AT_LEAST_VERSION(7, 85, 0) -+ curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS_STR, -+ "http,https,file"); -+#else - curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS, - (CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FILE)); -+#endif - curl_easy_setopt_ck(data[i].handle, CURLOPT_URL, data[i].url); - if (vfd >= 0) - curl_easy_setopt_ck(data[i].handle, CURLOPT_ERRORBUFFER, --- -2.39.1 - diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch index 1c7cde6d7dd..93f5bdcd00e 100644 --- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch @@ -1,4 +1,4 @@ -From 81da32c3404b58cbad7b3af00854e0cf2dc3dbf1 Mon Sep 17 00:00:00 2001 +From 262ac90394e36e0b4e86042d9c5385703f5b6536 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 23 Aug 2019 10:19:48 +0800 Subject: [PATCH] musl-utils @@ -22,7 +22,7 @@ Signed-off-by: Hongxu Jia 4 files changed, 29 insertions(+) diff --git a/src/arlib.h b/src/arlib.h -index e117166..8326f6c 100644 +index d4a4221..f6336d9 100644 --- a/src/arlib.h +++ b/src/arlib.h @@ -29,6 +29,12 @@ @@ -39,7 +39,7 @@ index e117166..8326f6c 100644 /* State of -D/-U flags. */ extern bool arlib_deterministic_output; diff --git a/src/elfcompress.c b/src/elfcompress.c -index 92f2fac..0b037a5 100644 +index 18ade66..a6ed4e1 100644 --- a/src/elfcompress.c +++ b/src/elfcompress.c @@ -37,6 +37,13 @@ @@ -57,10 +57,10 @@ index 92f2fac..0b037a5 100644 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/src/strip.c b/src/strip.c -index 30a1f9d..e89a7f0 100644 +index 2a2cc80..8e9f773 100644 --- a/src/strip.c +++ b/src/strip.c -@@ -46,6 +46,13 @@ +@@ -45,6 +45,13 @@ #include #include @@ -75,10 +75,10 @@ index 30a1f9d..e89a7f0 100644 /* Name and version of program. */ diff --git a/src/unstrip.c b/src/unstrip.c -index 3472637..40c73f3 100644 +index d5bd182..d797823 100644 --- a/src/unstrip.c +++ b/src/unstrip.c -@@ -52,6 +52,15 @@ +@@ -51,6 +51,15 @@ #include "libeu.h" #include "printversion.h" diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch index a7715587db7..bf8bd7bd958 100644 --- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +++ b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch @@ -1,4 +1,4 @@ -From ff6ab57ba5dd37947ef1ffe5de7af5dbebfeb4e9 Mon Sep 17 00:00:00 2001 +From c209233857a73970d7a7dd8da664903570efc7ea Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 22 Jun 2020 21:35:16 +0000 Subject: [PATCH] config/eu.am: do not use -Werror @@ -16,18 +16,18 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 deletions(-) diff --git a/config/eu.am b/config/eu.am -index 58cd3c4..ac42390 100644 +index e6c241f..4136e7c 100644 --- a/config/eu.am +++ b/config/eu.am -@@ -91,7 +91,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \ +@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ + $(USE_AFTER_FREE3_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -@@ -101,7 +100,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ +@@ -109,7 +108,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ $(TRAMPOLINES_WARNING) \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ diff --git a/meta/recipes-devtools/elfutils/files/handle_DW_TAG_unspecified_type.patch b/meta/recipes-devtools/elfutils/files/handle_DW_TAG_unspecified_type.patch deleted file mode 100644 index 8cab01c29a0..00000000000 --- a/meta/recipes-devtools/elfutils/files/handle_DW_TAG_unspecified_type.patch +++ /dev/null @@ -1,88 +0,0 @@ -From: Mark Wielaard -Date: Thu, 26 Jan 2023 17:19:15 +0000 (+0100) -Subject: backends: Handle DW_TAG_unspecified_type in dwarf_peeled_die_type -X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=f2c522567ad63ac293535fba9704895e685ab5bc;hp=3fa98a6f29b0f370e32549ead7eb897c839af980 - -backends: Handle DW_TAG_unspecified_type in dwarf_peeled_die_type - -binutils 2.40 introduces DW_TAG_unspecified_type for assembly -functions with an unknown return type. This breaks the -run-funcretval.sh testcase because dwfl_module_return_value_location -returns an error for such functions because it cannot determine the -return value location. Fix that by treating DW_TAG_unspecified_type -as if the DIE doesn't have a DW_AT_type. - -Also update the testcase to explicitly checking for -DW_TAG_unspecified_type and printing "returns unspecified type". - -https://sourceware.org/bugzilla/show_bug.cgi?id=30047 - -Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=f2c522567ad63ac293535fba9704895e685ab5bc;hp=3fa98a6f29b0f370e32549ead7eb897c839af980] -Signed-off-by: Mark Wielaard ---- - ---- a/backends/libebl_CPU.h -+++ b/backends/libebl_CPU.h -@@ -1,5 +1,6 @@ - /* Common interface for libebl modules. - Copyright (C) 2000, 2001, 2002, 2003, 2005, 2013, 2014 Red Hat, Inc. -+ Copyright (C) 2023 Mark J. Wielaard - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -53,7 +54,9 @@ extern bool (*generic_debugscn_p) (const - dwarf_tag (_die); }) - - /* Get a type die corresponding to DIE. Peel CV qualifiers off -- it. */ -+ it. Returns zero if the DIE doesn't have a type, or the type -+ is DW_TAG_unspecified_type. Returns -1 on error. Otherwise -+ returns the result tag DW_AT value. */ - static inline int - dwarf_peeled_die_type (Dwarf_Die *die, Dwarf_Die *result) - { -@@ -69,7 +72,14 @@ dwarf_peeled_die_type (Dwarf_Die *die, D - if (dwarf_peel_type (result, result) != 0) - return -1; - -- return DWARF_TAG_OR_RETURN (result); -+ if (result == NULL) -+ return -1; -+ -+ int tag = dwarf_tag (result); -+ if (tag == DW_TAG_unspecified_type) -+ return 0; /* Treat an unspecified type as if there was no type. */ -+ -+ return tag; - } - - #endif /* libebl_CPU.h */ ---- a/tests/funcretval.c -+++ b/tests/funcretval.c -@@ -1,5 +1,6 @@ - /* Test program for dwfl_module_return_value_location. - Copyright (C) 2005 Red Hat, Inc. -+ Copyright (C) 2023 Mark J. Wielaard - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -67,7 +68,18 @@ handle_function (Dwarf_Die *funcdie, voi - error (EXIT_FAILURE, 0, "dwfl_module_return_value_location: %s", - dwfl_errmsg (-1)); - else if (nlocops == 0) -- puts ("returns no value"); -+ { -+ // Check if this is the special unspecified type -+ // https://sourceware.org/bugzilla/show_bug.cgi?id=30047 -+ Dwarf_Die die_mem, *typedie = &die_mem; -+ Dwarf_Attribute attr_mem, *attr; -+ attr = dwarf_attr_integrate (funcdie, DW_AT_type, &attr_mem); -+ if (dwarf_formref_die (attr, typedie) != NULL -+ && dwarf_tag (typedie) == DW_TAG_unspecified_type) -+ puts ("returns unspecified type"); -+ else -+ puts ("returns no value"); -+ } - else - { - printf ("return value location:"); From patchwork Tue May 9 17:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23722 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 E1340C7EE24 for ; Tue, 9 May 2023 17:24:03 +0000 (UTC) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.groups.io with SMTP id smtpd.web11.39296.1683653035670876257 for ; Tue, 09 May 2023 10:23:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=j3n1i2zt; spf=pass (domain: gmail.com, ip: 209.85.208.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-50bc37e1525so11944257a12.1 for ; Tue, 09 May 2023 10:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653034; x=1686245034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V7Cq36K93ZxAE4iZsZDhNIhL6eFwr0BP3Wd2fYeN+sY=; b=j3n1i2ztFbo0e5CULTxGqaEFoIr2oHHenVrSsKfaFgwp3Y2jyXk5hqMZNcV0HKNKEN yOHI/8vLTQLpvP1+7tVPlHaEaLsWPXipeUP/cT00kd/gZmEnBtlKIMW9wnS6xJkfGCHn flRx321erEYII5WuvdNB0vO5wZIHAjONXL/D6zRUx+wpRvAK4jL+mBNDnOl78iiRy9Fv paCULK/drsypBLnh576jNs1ish0pEaAtVOWg/N2CO34PfM20yeADz8+SGcIBr0IYdAF7 qW5BsRENEu66VZvsOlIF2a72Y0o0FaVroA3U8QwSgqcIo+Dcu7r1bQzjEq94fdetQFYV xcQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653034; x=1686245034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V7Cq36K93ZxAE4iZsZDhNIhL6eFwr0BP3Wd2fYeN+sY=; b=Tpfg6AttkTSOGyylcLsCSJEDOvgJAY9rT7eU78FIENY7Lrd2Ld41adho4pxBRisNSQ Jc4XzrTn98PhIYSyPNQQsT56Ohkr6soz6pBTpPtfDAaSPEooJ3TmtiHoaYHPxCr2IrtV UzXkcOA0XuNaWItqD026FfHdj4JpK91aOKAUNWsZzTNHvUYcfAjy527+zmOCd00swaMr nlRqX3uaRHk8yb0d8BagwitxiTyeMslRpvdt0IM9HDaT9Ul8TTPyzjWa8EVJORS4i/dF 5B43tA7gGLlWA77nVw6o4g/n1RyGvZBYRuqYo5Z56BC/SI3w5fU1p9QXemJQle+YWEBb c37Q== X-Gm-Message-State: AC+VfDxpiHa+PRQ0ybFrVafeJkaRRCwNZD5KerzpwqYe3lc61Rt017Ac RQHBBWt783SFlso4kKr+3I5lXuJXrTw= X-Google-Smtp-Source: ACHHUZ47EI2DPVC1tHd90/H9niR0w3EUuva+Stay6peZy98ljAszACJI9Joc82VnVjSM7dR0SujQJQ== X-Received: by 2002:a17:907:3f90:b0:953:9899:d9c1 with SMTP id hr16-20020a1709073f9000b009539899d9c1mr16836734ejc.1.1683653033742; Tue, 09 May 2023 10:23:53 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:53 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/27] erofs-utils: update 1.5 -> 1.6 Date: Tue, 9 May 2023 19:23:26 +0200 Message-Id: <20230509172344.1516743-9-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181064 Drop patches merged upstream. --enable-largefile is no longer necessary, as compiler options are being passed in explicitly. Signed-off-by: Alexander Kanavin --- .../0001-configure-use-AC_SYS_LARGEFILE.patch | 43 ------- ...eplace-l-stat64-by-equivalent-l-stat.patch | 109 ------------------ ...-Make-LFS-mandatory-for-all-usecases.patch | 41 ------- ...{erofs-utils_1.5.bb => erofs-utils_1.6.bb} | 10 +- 4 files changed, 3 insertions(+), 200 deletions(-) delete mode 100644 meta/recipes-devtools/erofs-utils/erofs-utils/0001-configure-use-AC_SYS_LARGEFILE.patch delete mode 100644 meta/recipes-devtools/erofs-utils/erofs-utils/0002-erofs-replace-l-stat64-by-equivalent-l-stat.patch delete mode 100644 meta/recipes-devtools/erofs-utils/erofs-utils/0003-internal.h-Make-LFS-mandatory-for-all-usecases.patch rename meta/recipes-devtools/erofs-utils/{erofs-utils_1.5.bb => erofs-utils_1.6.bb} (62%) diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils/0001-configure-use-AC_SYS_LARGEFILE.patch b/meta/recipes-devtools/erofs-utils/erofs-utils/0001-configure-use-AC_SYS_LARGEFILE.patch deleted file mode 100644 index 75c91f51a79..00000000000 --- a/meta/recipes-devtools/erofs-utils/erofs-utils/0001-configure-use-AC_SYS_LARGEFILE.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fef3b16dba2c5f6ad88951b80cdfbedd423e80a0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 7 Dec 2022 20:16:52 -0800 -Subject: [PATCH v3 1/3] configure: use AC_SYS_LARGEFILE - -The autoconf macro AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS=64 -where necessary to ensure that off_t and all interfaces using off_t -are 64bit, even on 32bit systems. - -Pass -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=66 via CFLAGS - -Upstream-Status: Submitted [https://lore.kernel.org/linux-erofs/20221215064758.93821-1-raj.khem@gmail.com/T/#t] -Signed-off-by: Khem Raj ---- - configure.ac | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index a736ff0..e8bb003 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,6 +13,8 @@ AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_AUX_DIR(config) - AM_INIT_AUTOMAKE([foreign -Wall]) - -+AC_SYS_LARGEFILE -+ - # Checks for programs. - AM_PROG_AR - AC_PROG_CC -@@ -319,6 +321,9 @@ if test "x$enable_lzma" = "xyes"; then - CPPFLAGS="${saved_CPPFLAGS}" - fi - -+# Enable 64-bit off_t -+CFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" -+ - # Set up needed symbols, conditionals and compiler/linker flags - AM_CONDITIONAL([ENABLE_LZ4], [test "x${have_lz4}" = "xyes"]) - AM_CONDITIONAL([ENABLE_LZ4HC], [test "x${have_lz4hc}" = "xyes"]) --- -2.39.0 - diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils/0002-erofs-replace-l-stat64-by-equivalent-l-stat.patch b/meta/recipes-devtools/erofs-utils/erofs-utils/0002-erofs-replace-l-stat64-by-equivalent-l-stat.patch deleted file mode 100644 index d12bebbf870..00000000000 --- a/meta/recipes-devtools/erofs-utils/erofs-utils/0002-erofs-replace-l-stat64-by-equivalent-l-stat.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 856189c324834b838f0e9cfc0d2e05f12518f264 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 7 Dec 2022 22:17:35 -0800 -Subject: [PATCH v3 2/3] erofs: replace [l]stat64 by equivalent [l]stat - -Upstream-Status: Submitted [https://lore.kernel.org/linux-erofs/20221215064758.93821-2-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj ---- - lib/inode.c | 10 +++++----- - lib/xattr.c | 4 ++-- - mkfs/main.c | 4 ++-- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/lib/inode.c b/lib/inode.c -index f192510..38003fc 100644 ---- a/lib/inode.c -+++ b/lib/inode.c -@@ -773,7 +773,7 @@ static u32 erofs_new_encode_dev(dev_t dev) - - #ifdef WITH_ANDROID - int erofs_droid_inode_fsconfig(struct erofs_inode *inode, -- struct stat64 *st, -+ struct stat *st, - const char *path) - { - /* filesystem_config does not preserve file type bits */ -@@ -818,7 +818,7 @@ int erofs_droid_inode_fsconfig(struct erofs_inode *inode, - } - #else - static int erofs_droid_inode_fsconfig(struct erofs_inode *inode, -- struct stat64 *st, -+ struct stat *st, - const char *path) - { - return 0; -@@ -826,7 +826,7 @@ static int erofs_droid_inode_fsconfig(struct erofs_inode *inode, - #endif - - static int erofs_fill_inode(struct erofs_inode *inode, -- struct stat64 *st, -+ struct stat *st, - const char *path) - { - int err = erofs_droid_inode_fsconfig(inode, st, path); -@@ -910,7 +910,7 @@ static struct erofs_inode *erofs_new_inode(void) - /* get the inode from the (source) path */ - static struct erofs_inode *erofs_iget_from_path(const char *path, bool is_src) - { -- struct stat64 st; -+ struct stat st; - struct erofs_inode *inode; - int ret; - -@@ -918,7 +918,7 @@ static struct erofs_inode *erofs_iget_from_path(const char *path, bool is_src) - if (!is_src) - return ERR_PTR(-EINVAL); - -- ret = lstat64(path, &st); -+ ret = lstat(path, &st); - if (ret) - return ERR_PTR(-errno); - -diff --git a/lib/xattr.c b/lib/xattr.c -index 71ffe3e..fd0e728 100644 ---- a/lib/xattr.c -+++ b/lib/xattr.c -@@ -467,7 +467,7 @@ static int erofs_count_all_xattrs_from_path(const char *path) - { - int ret; - DIR *_dir; -- struct stat64 st; -+ struct stat st; - - _dir = opendir(path); - if (!_dir) { -@@ -502,7 +502,7 @@ static int erofs_count_all_xattrs_from_path(const char *path) - goto fail; - } - -- ret = lstat64(buf, &st); -+ ret = lstat(buf, &st); - if (ret) { - ret = -errno; - goto fail; -diff --git a/mkfs/main.c b/mkfs/main.c -index d2c9830..5279805 100644 ---- a/mkfs/main.c -+++ b/mkfs/main.c -@@ -581,7 +581,7 @@ int main(int argc, char **argv) - struct erofs_buffer_head *sb_bh; - struct erofs_inode *root_inode; - erofs_nid_t root_nid; -- struct stat64 st; -+ struct stat st; - erofs_blk_t nblocks; - struct timeval t; - char uuid_str[37] = "not available"; -@@ -609,7 +609,7 @@ int main(int argc, char **argv) - return 1; - } - -- err = lstat64(cfg.c_src_path, &st); -+ err = lstat(cfg.c_src_path, &st); - if (err) - return 1; - if (!S_ISDIR(st.st_mode)) { --- -2.39.0 - diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils/0003-internal.h-Make-LFS-mandatory-for-all-usecases.patch b/meta/recipes-devtools/erofs-utils/erofs-utils/0003-internal.h-Make-LFS-mandatory-for-all-usecases.patch deleted file mode 100644 index 97faa5d6739..00000000000 --- a/meta/recipes-devtools/erofs-utils/erofs-utils/0003-internal.h-Make-LFS-mandatory-for-all-usecases.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8f8cbc7b773da63bce8226249784ba6824635c9c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 7 Dec 2022 20:19:27 -0800 -Subject: [PATCH v3 3/3] internal.h: Make LFS mandatory for all usecases - -erosfs depend on the consistent use of a 64bit offset -type, force downstreams to use transparent LFS (_FILE_OFFSET_BITS=64), -so that it becomes impossible for them to use 32bit interfaces. - -Upstream-Status: Submitted [https://lore.kernel.org/linux-erofs/20221215064758.93821-3-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj ---- - include/erofs/internal.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/include/erofs/internal.h b/include/erofs/internal.h -index 6a70f11..d3b2986 100644 ---- a/include/erofs/internal.h -+++ b/include/erofs/internal.h -@@ -21,6 +21,7 @@ typedef unsigned short umode_t; - - #include "erofs_fs.h" - #include -+#include /* for off_t definition */ - - #ifndef PATH_MAX - #define PATH_MAX 4096 /* # chars in a path name including nul */ -@@ -104,6 +105,10 @@ struct erofs_sb_info { - }; - }; - -+ -+/* make sure that any user of the erofs headers has atleast 64bit off_t type */ -+extern int erofs_assert_largefile[sizeof(off_t)-8]; -+ - /* global sbi */ - extern struct erofs_sb_info sbi; - --- -2.39.0 - diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb b/meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb similarity index 62% rename from meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb rename to meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb index 2b5861882db..43643e07bbc 100644 --- a/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb +++ b/meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb @@ -5,12 +5,8 @@ SECTION = "base" LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20" HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README" -SRCREV = "a2821a66b42aee5430bccee82c280e38d1e9ab29" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master;protocol=https \ - file://0001-configure-use-AC_SYS_LARGEFILE.patch \ - file://0002-erofs-replace-l-stat64-by-equivalent-l-stat.patch \ - file://0003-internal.h-Make-LFS-mandatory-for-all-usecases.patch \ - " +SRCREV = "21710612d35cd952490959bfa6ea9fe87aaa52dd" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "v(?P(\d+(\.\d+)+))" @@ -23,7 +19,7 @@ inherit pkgconfig autotools PACKAGECONFIG ??= "lz4" PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" -EXTRA_OECONF = "${PACKAGECONFIG_CONFARGS} --disable-fuse --enable-largefile" +EXTRA_OECONF = "${PACKAGECONFIG_CONFARGS} --disable-fuse" CFLAGS:append:powerpc64le = " -D__SANE_USERSPACE_TYPES__" From patchwork Tue May 9 17:23:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23721 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 DF8BCC7EE22 for ; Tue, 9 May 2023 17:24:03 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.39297.1683653035974152801 for ; Tue, 09 May 2023 10:23:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=mib7m2lB; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-9659443fb56so948383166b.2 for ; Tue, 09 May 2023 10:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653034; x=1686245034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4bCIakXxDHX8uCjxFbt1hFI9/csG/3QbDPLwtDjIKTA=; b=mib7m2lBzyr+8bcVL7I6JSwHvmPuKia5CY1VlFOJosaORJqGRpaKRamoXCVf+NklKt vQ+smRIYspE800cvNP5kVZUcjOYPBBhq5/etRfqbUwqJ4ntiaTFrPmQise0eoUQaDnKT 0GP5Jy2F4q5CSIdMrFkfuebEToSwfiWvuweYHmQl5HBuSswYhcxFGnYS6Fh66VLTXuUg m/ngTYl/SgnReFijr73tYw4ozB8w99HuHnxqaKRluqmK0KLJGMrSUPTZ9lLDjBjHR1CM KVsht5i6fyjfpHMscErgz8gUMEcrlt0MuFep6O+KDFjxPLtrPuMWy69DnZCJ6FUjaSre AITg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653034; x=1686245034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4bCIakXxDHX8uCjxFbt1hFI9/csG/3QbDPLwtDjIKTA=; b=f11IccpIPTHFfZhCAlNglyONOSJVRJi9KRUQ171rFOmx/9cxWl7d5YV8Jm32d0Rw7r JSzcmRim16cJUNYPat41LJT30Fy90LZ8P7cI7SW4yM9lvOPLLZMB5uZC7tSaShlu/bjo T/EKMv3uNOGSPH8UTryY25J3Yw2PJO7hj5irKDw2lSmk8hEkxa8qiy4TRKwjlcigYL2Q ibokvjn4T6s/JNFHUrIzj0u/9YooAfnvKP0lHDw0flu5dAEBzTrParQ4h5oEdqyln5RT Wy+5v/3bxCahE2rDXmZT1h5WTwoNSZq0yL5DPtYVP+0DnGJoeJqft4lRBpWcj7UVqA9s +16w== X-Gm-Message-State: AC+VfDyoVt4OH5+MS1AJhkSOovnFJPwxGgalYqJY4I7TU/MqLwo+8Hcd lVQIsgs4AJL7Rfh7xLWI3GrcCFaPwz4= X-Google-Smtp-Source: ACHHUZ6hnmm1u66V3BRMLseNbJ3XRqX6qI+rRkORd/s5wDimrkEHFr5fQrmsWyB7P2TfmJTC34Kagw== X-Received: by 2002:a17:907:70d:b0:948:eed:b4e0 with SMTP id xb13-20020a170907070d00b009480eedb4e0mr12992485ejb.61.1683653034434; Tue, 09 May 2023 10:23:54 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:54 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/27] llvm: update 15.0.7 -> 16.0.3 Date: Tue, 9 May 2023 19:23:27 +0200 Message-Id: <20230509172344.1516743-10-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181065 Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/tcmode-default.inc | 2 +- ...e-64bit-off_t-on-32bit-glibc-systems.patch | 79 ------------------- meta/recipes-devtools/llvm/llvm_git.bb | 5 +- 3 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 meta/recipes-devtools/llvm/llvm/0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 9d0b319739c..853a20bfe26 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -24,7 +24,7 @@ GLIBCVERSION ?= "2.37" LINUXLIBCVERSION ?= "6.1%" QEMUVERSION ?= "8.0%" GOVERSION ?= "1.20%" -LLVMVERSION ?= "15.%" +LLVMVERSION ?= "16.%" RUSTVERSION ?= "1.69%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/llvm/llvm/0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch b/meta/recipes-devtools/llvm/llvm/0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch deleted file mode 100644 index fe98e3e4c05..00000000000 --- a/meta/recipes-devtools/llvm/llvm/0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch +++ /dev/null @@ -1,79 +0,0 @@ -From cd2fa12d715929642513fc441287c402f4560096 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 25 Dec 2022 15:13:41 -0800 -Subject: [PATCH] build: Enable 64bit off_t on 32bit glibc systems - -Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based -systems. This will make sure that 64bit versions of LFS functions are -used e.g. lseek will behave same as lseek64. Also revert [1] partially -because this added a cmake test to detect lseek64 but then forgot to -pass the needed macro during actual compile, this test was incomplete too -since libc implementations like musl has 64-bit off_t by default on 32-bit -systems and does not bundle -D_LARGEFILE64_SOURCE [2] under -D_GNU_SOURCE -like glibc, which means the compile now fails on musl because the cmake -check passes but we do not have _LARGEFILE64_SOURCE defined. Moreover, -Using the *64 function was transitional anyways so use --D_FILE_OFFSET_BITS=64 instead - -[1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b -[2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc - -Upstream-Status: Submitted [https://reviews.llvm.org/D139752] -Signed-off-by: Khem Raj ---- - llvm/cmake/config-ix.cmake | 8 +++++--- - llvm/include/llvm/Config/config.h.cmake | 3 --- - llvm/lib/Support/raw_ostream.cpp | 2 -- - llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 2 -- - utils/bazel/llvm-project-overlay/llvm/config.bzl | 1 - - .../llvm/include/llvm/Config/config.h | 3 --- - utils/bazel/llvm_configs/config.h.cmake | 3 --- - 7 files changed, 5 insertions(+), 17 deletions(-) - ---- a/llvm/cmake/config-ix.cmake -+++ b/llvm/cmake/config-ix.cmake -@@ -284,9 +284,6 @@ check_symbol_exists(futimes sys/time.h H - if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) - check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) - endif() --set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") --check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) --set(CMAKE_REQUIRED_DEFINITIONS "") - check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) - check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) - check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2) -@@ -350,6 +347,11 @@ check_symbol_exists(__GLIBC__ stdio.h LL - if( LLVM_USING_GLIBC ) - add_definitions( -D_GNU_SOURCE ) - list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE") -+# enable 64bit off_t on 32bit systems using glibc -+ if (CMAKE_SIZEOF_VOID_P EQUAL 4) -+ add_compile_definitions(_FILE_OFFSET_BITS=64) -+ list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") -+ endif() - endif() - # This check requires _GNU_SOURCE - if (NOT PURE_WINDOWS) ---- a/llvm/include/llvm/Config/config.h.cmake -+++ b/llvm/include/llvm/Config/config.h.cmake -@@ -128,9 +128,6 @@ - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} - --/* Define to 1 if you have the `lseek64' function. */ --#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} -- - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} - ---- a/llvm/lib/Support/raw_ostream.cpp -+++ b/llvm/lib/Support/raw_ostream.cpp -@@ -804,8 +804,6 @@ uint64_t raw_fd_ostream::seek(uint64_t o - flush(); - #ifdef _WIN32 - pos = ::_lseeki64(FD, off, SEEK_SET); --#elif defined(HAVE_LSEEK64) -- pos = ::lseek64(FD, off, SEEK_SET); - #else - pos = ::lseek(FD, off, SEEK_SET); - #endif diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index acf7f4c3d77..eb918383e6f 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,18 +19,17 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "15.0.7" +PV = "16.0.3" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "8dfdcc7b7bf66834a761bd8de445840ef68e4d1a" +SRCREV = "da3cd333bea572fb10470f610a27f22bcb84b08c" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ - file://0035-cmake-Enable-64bit-off_t-on-32bit-glibc-systems.patch;striplevel=2 \ file://llvm-config \ " From patchwork Tue May 9 17:23:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23728 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 14A05C7EE31 for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web10.39159.1683653036680957568 for ; Tue, 09 May 2023 10:23:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=EZXcRuQy; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-50be17a1eceso11930678a12.2 for ; Tue, 09 May 2023 10:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653035; x=1686245035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WQhC1Qt3sCrlqtK76irsJwClLaiR4kAKAkR9RNxN49Q=; b=EZXcRuQyfGmrFmuIm6XLxh0D/MPWZ+jvoVyBjED23n+4emXwVYt3+yTL+QpdbcEBlW 9B2U+AaeMfqC1qbQqEdmlqho0l0xz01n92EpnW8ULX1YYjkXGMQCiL4CSktY44GdTpVI XBsh8kcdhCm8KvcGjMT7TZVCNxqlUyx91Yy+Dgd/pas/kxsF0pQGs1HB5x50GTISOuRP 9MCQhBo7qz4Vkt7P0lLiepq+UcNDA12cpA2wfcJyaCbhEPwvYZMNxVH+k7qMA4++Lw7p 2aQ5nCCoSLdcLoVvQNl2vEwahL58r+1fDJ2l0AjuR7KIGDtWS4Vce9IRcfJWlk4ebXYF 6oGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653035; x=1686245035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WQhC1Qt3sCrlqtK76irsJwClLaiR4kAKAkR9RNxN49Q=; b=Di6tiG2ZqHunKkUio0E1kluzhkWRP7Vg4vCuXO/H8p4YELHtOeQLE6gUv73RJpsTM8 pzLCRBZW6RYcKUMkzlQDLrvP+5JMs+EVDwkal8QYYN5Oi0bBakcWo9Ynbk+n4BzYDIz1 ZPsDK08Cf+xUCgowTYANXudtC+DyJpfcE1ox8NTKAv5Tn6fb29NtaRCLv1E4WVQB6vNZ Iw+2elpjIIPTz5hpdcG/3AyvI33pH4eV8YweyHYPuGtgIpIO9kTQcny6C3O7UlKCY0ja ZvMK8zRzKs+8/2MiFzBhlHN23wim0FJSfmji7HLUBfrvgrBcdw5R6qqtww0OJIB9tZje nsBA== X-Gm-Message-State: AC+VfDwL3NLn1cQIyQl+hPq+kQ+Tiy4e1kn54ncmIj/MRBvMaEravhYg mkW3mkM2EaIfPwFHcibjRLvHjrCSWNU= X-Google-Smtp-Source: ACHHUZ41eE3HHQTHZz5WRGSihP1VjdE18x+DrmCh9zdHGMG3lFXQb/aLkPFKSSUY1UR5cjH90o7RLQ== X-Received: by 2002:a17:907:8a29:b0:965:f8b7:b0cd with SMTP id sc41-20020a1709078a2900b00965f8b7b0cdmr16740758ejc.25.1683653035028; Tue, 09 May 2023 10:23:55 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:54 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/27] meson: update 1.0.1 ->1.1.0 Date: Tue, 9 May 2023 19:23:28 +0200 Message-Id: <20230509172344.1516743-11-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181066 Rebase two patches. Signed-off-by: Alexander Kanavin --- ...for-clang-before-guessing-gcc-or-lcc.patch | 14 +++--- ...-not-manipulate-the-environment-when.patch | 48 +++++++++---------- .../meson/{meson_1.0.1.bb => meson_1.1.0.bb} | 2 +- 3 files changed, 31 insertions(+), 33 deletions(-) rename meta/recipes-devtools/meson/{meson_1.0.1.bb => meson_1.1.0.bb} (98%) diff --git a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch b/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch index 58fa1194398..c449bf8cda4 100644 --- a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch +++ b/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch @@ -1,4 +1,4 @@ -From 8739e1c3bef653415ad4b9b9c318ccfa76c43da6 Mon Sep 17 00:00:00 2001 +From e3d1297c408b9b4d5d6a962aad5501e869287c98 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Mar 2022 15:00:24 -0700 Subject: [PATCH] Check for clang before guessing gcc or lcc @@ -21,19 +21,20 @@ this check anyway. Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/10218] Signed-off-by: Khem Raj + --- mesonbuild/compilers/detect.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py -index 53948b01a..ba335cf39 100644 +index 6eca155..2df241a 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py -@@ -427,13 +427,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin +@@ -334,13 +334,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin version = search_version(out) guess_gcc_or_lcc: T.Optional[str] = None -- if 'Free Software Foundation' in out or 'xt-' in out: +- if 'Free Software Foundation' in out or out.startswith('xt-'): - guess_gcc_or_lcc = 'gcc' - if 'e2k' in out and 'lcc' in out: - guess_gcc_or_lcc = 'lcc' @@ -41,7 +42,7 @@ index 53948b01a..ba335cf39 100644 - # this output has "Free Software Foundation" in its version - guess_gcc_or_lcc = None + if not 'clang' in compiler_name: -+ if 'Free Software Foundation' in out or 'xt-' in out: ++ if 'Free Software Foundation' in out or out.startswith('xt-'): + guess_gcc_or_lcc = 'gcc' + if 'e2k' in out and 'lcc' in out: + guess_gcc_or_lcc = 'lcc' @@ -51,6 +52,3 @@ index 53948b01a..ba335cf39 100644 if guess_gcc_or_lcc: defines = _get_gnu_compiler_defines(compiler) --- -2.35.1 - diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index f01a6678181..19502fa9cd8 100644 --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -1,4 +1,4 @@ -From 2e9582167bf9d3273004edb2637310531f0155ab Mon Sep 17 00:00:00 2001 +From a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -8,30 +8,30 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin --- - mesonbuild/modules/python.py | 6 +----- + mesonbuild/dependencies/python.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 3bbccd1..fda7a25 100644 ---- a/mesonbuild/modules/python.py -+++ b/mesonbuild/modules/python.py -@@ -277,9 +277,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', - # there is no LIBPC, so we can't search in it - return NotFoundDependency('python', env) +diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py +index 14386f9..118a15f 100644 +--- a/mesonbuild/dependencies/python.py ++++ b/mesonbuild/dependencies/python.py +@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', + empty.name = 'python' + return empty -- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None) -- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None) -- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir - try: - return PythonPkgConfigDependency(name, env, kwargs, installation, True) - finally: -@@ -288,8 +285,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', - os.environ[name] = value - elif name in os.environ: - del os.environ[name] -- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) -- set_env('PKG_CONFIG_PATH', old_pkg_path) -+ pass +- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None) +- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None) +- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir + try: + return PythonPkgConfigDependency(name, env, kwargs, installation, True) + finally: +@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', + os.environ[name] = value + elif name in os.environ: + del os.environ[name] +- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) +- set_env('PKG_CONFIG_PATH', old_pkg_path) ++ pass - candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) - # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, + candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) + # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, diff --git a/meta/recipes-devtools/meson/meson_1.0.1.bb b/meta/recipes-devtools/meson/meson_1.1.0.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.0.1.bb rename to meta/recipes-devtools/meson/meson_1.1.0.bb index fd478b21612..278f8e24c56 100644 --- a/meta/recipes-devtools/meson/meson_1.0.1.bb +++ b/meta/recipes-devtools/meson/meson_1.1.0.bb @@ -16,7 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0002-Support-building-allarch-recipes-again.patch \ file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ " -SRC_URI[sha256sum] = "d926b730de6f518728cc7c57bc5e701667bae0c3522f9e369427b2cc7839d3c1" +SRC_URI[sha256sum] = "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f" inherit python_setuptools_build_meta github-releases From patchwork Tue May 9 17:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23732 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 1F1BAC7EE2F for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web10.39160.1683653037523479817 for ; Tue, 09 May 2023 10:23:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=rUXbwY8v; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-965c3f9af2aso901950866b.0 for ; Tue, 09 May 2023 10:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653036; x=1686245036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VEPZqopqScEe8Y2kwDMSB3eZ+7BGEZcukhYtgBsrspY=; b=rUXbwY8vw03J9c0qLdaSQ1O0n8YwJaCGQ7cZPJ0aZ1XelIYVtWP2VbKfcFqg6WKvV+ 2571M0GZ2EuAP0tm7PaTsGdIyaW9eY+PSVsGBf6HDwk4g9y1/z9oupwt7OSAZq7Hbg02 cOdx+GBmEfAdCd0B6cX6oxXcgPBLl4KM38unumB3A8n3OXKxqVU/Y25Cvh57NIhmIq54 Kyk/TcXxnDM0GwzxhmRuclXGQMSrGujrbxH3n+aZl6N3rXzJ/eK+p1QcokbezB0LtX5r MglRTBBPRU8zaBP0lqWDCi8eaaTT2EpnMtzDwCJ/jGf2W8qDDJ5BA8rmphDxAcehOtl6 tbmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653036; x=1686245036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VEPZqopqScEe8Y2kwDMSB3eZ+7BGEZcukhYtgBsrspY=; b=RMdPJv8NlyNAGrtPthok18/9EuAyPPFRG/Cqv0SpdKgw5DFfD+X0/v1O8xNG1UsrjU Paizf6QUZ/NDnNhxozIhNnhgSwOdczk/jfdrK5wBBBdYpEvoV5Plpg9sqKCkinrGo50p +TwdvDaHiZmSzyuxPYaQihgukdwxMy2smRxWN9fwEZMw04WhCqvlCn4jAmbsFvK3ToEq njCoPMbI5ZQJR+WxwRE19UcL43f9iCS+UWnB2dYVU/g4A+AgB7YDfd6M7jJ5kswxET+C O3MOJfyqkABq3b1wTPzT0uDA9255PNf7+scOTDCSBC+pHngRlapLAxNnYErCKZP0GOyd BLzw== X-Gm-Message-State: AC+VfDwAtLi79YCqlXxC3T2ba14ifjlK7k46AcP9EHm1aUH7O/O9uEV8 YesmF/Oncz4K7YogHMLVS769PPhdh9o= X-Google-Smtp-Source: ACHHUZ7gOUJgCeiFPPbcoA5jod9gQ83DobMI9wkBXO2vqVp/njE1rkxmm2jyZZfDpuKrUGBafAWT/A== X-Received: by 2002:a17:907:7dab:b0:967:a127:7e79 with SMTP id oz43-20020a1709077dab00b00967a1277e79mr6336545ejc.28.1683653035733; Tue, 09 May 2023 10:23:55 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:55 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/27] perlcross: update 1.4 -> 1.4.1 Date: Tue, 9 May 2023 19:23:29 +0200 Message-Id: <20230509172344.1516743-12-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181067 Signed-off-by: Alexander Kanavin --- ...h-Add-_GNU_SOURCE-define-and-functio.patch | 485 ------------------ .../{perlcross_1.4.bb => perlcross_1.4.1.bb} | 3 +- 2 files changed, 1 insertion(+), 487 deletions(-) delete mode 100644 meta/recipes-devtools/perl-cross/files/0001-configure_func.sh-Add-_GNU_SOURCE-define-and-functio.patch rename meta/recipes-devtools/perl-cross/{perlcross_1.4.bb => perlcross_1.4.1.bb} (86%) diff --git a/meta/recipes-devtools/perl-cross/files/0001-configure_func.sh-Add-_GNU_SOURCE-define-and-functio.patch b/meta/recipes-devtools/perl-cross/files/0001-configure_func.sh-Add-_GNU_SOURCE-define-and-functio.patch deleted file mode 100644 index 893b55e5acd..00000000000 --- a/meta/recipes-devtools/perl-cross/files/0001-configure_func.sh-Add-_GNU_SOURCE-define-and-functio.patch +++ /dev/null @@ -1,485 +0,0 @@ -From 65db86f0161c393fd5b082c10837b278adadbff2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 7 Aug 2022 23:57:20 -0700 -Subject: [PATCH] configure_func.sh: Add _GNU_SOURCE define and function - signatures - -Modern compilers are getting stricter about include paths and function -signature being known duting compilation e.g. clang-15 now errors out if -a function signature is not found - -try.c:1:18: error: call to undeclared function 'getspnam'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - -This causes the test of function to fail even though the function is -available in libc. Therefore try to add proper include headers which -define these functions and also define _GNU_SOURCE in every test -since some of GNU/Linux funtions e.g. accept4 are guarged by this define - -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/137] -Signed-off-by: Khem Raj ---- - cnf/configure_func.sh | 41 +++++++++++++++++++++-------------------- - 1 file changed, 21 insertions(+), 20 deletions(-) - ---- a/cnf/configure_func.sh -+++ b/cnf/configure_func.sh -@@ -5,6 +5,7 @@ checkfunc() { - mstart "Checking for $2" - if not hinted $1 'found' 'missing'; then - try_start -+ try_add '#define _GNU_SOURCE' - funcincludes "$3" "$4" "$includes" - try_add "int main(void) { $2($3); return 0; }" - try_link -O0 -fno-builtin -@@ -42,115 +43,115 @@ checkfunc d_chroot 'chroot' "NULL" 'unis - checkfunc d_chsize 'chsize' "0,0" - checkfunc d_class 'class' - checkfunc d_clearenv 'clearenv' "" 'stdlib.h' --checkfunc d_closedir 'closedir' "NULL" --checkfunc d_crypt 'crypt' -+checkfunc d_closedir 'closedir' "NULL" 'dirent.h sys/types.h' -+checkfunc d_crypt 'crypt' "NULL,NULL" 'crypt.h' - checkfunc d_ctermid 'ctermid' - checkfunc d_ctime64 'ctime64' - checkfunc d_cuserid 'cuserid' --checkfunc d_difftime 'difftime' "0,0" -+checkfunc d_difftime 'difftime' "0,0" 'time.h' - checkfunc d_difftime64 'difftime64' --checkfunc d_dirfd 'dirfd' -+checkfunc d_dirfd 'dirfd' "NULL" 'dirent.h sys/types.h' - checkfunc d_dladdr 'dladdr' 'NULL, NULL' 'dlfcn.h' --checkfunc d_dlerror 'dlerror' --checkfunc d_dlopen 'dlopen' --checkfunc d_drand48 'drand48' -+checkfunc d_dlerror 'dlerror' "" 'dlfcn.h' -+checkfunc d_dlopen 'dlopen' "NULL,0" "dlfcn.h" -+checkfunc d_drand48 'drand48' "" 'stdlib.h' - checkfunc d_dup2 'dup2' "0,0" 'unistd.h' - checkfunc d_dup3 'dup3' "0,0,0" 'fcntl.h unistd.h' - checkfunc d_duplocale 'duplocale' '0' 'locale.h' --checkfunc d_eaccess 'eaccess' --checkfunc d_endgrent 'endgrent' --checkfunc d_endhent 'endhostent' --checkfunc d_endnent 'endnetent' --checkfunc d_endpent 'endprotoent' --checkfunc d_endpwent 'endpwent' --checkfunc d_endservent 'endservent' -+checkfunc d_eaccess 'eaccess' "NULL,0" 'unistd.h' -+checkfunc d_endgrent 'endgrent' '' 'grp.h sys/types.h' -+checkfunc d_endhent 'endhostent' "" 'netdb.h' -+checkfunc d_endnent 'endnetent' "" 'netdb.h' -+checkfunc d_endpent 'endprotoent' "" 'netdb.h' -+checkfunc d_endpwent 'endpwent' "" 'sys/types.h pwd.h' -+checkfunc d_endservent 'endservent' "" 'netdb.h' - checkfunc d_fchdir 'fchdir' "0" 'unistd.h' --checkfunc d_fchmod 'fchmod' "0,0" 'unistd.h' --checkfunc d_fchmodat 'fchmodat' "0,NULL,0,0" 'unistd.h' -+checkfunc d_fchmod 'fchmod' "0,0" 'unistd.h sys/stat.h' -+checkfunc d_fchmodat 'fchmodat' "0,NULL,0,0" 'unistd.h sys/stat.h' - checkfunc d_fchown 'fchown' "0,0,0" 'unistd.h' - checkfunc d_fcntl 'fcntl' "0,0" 'unistd.h fcntl.h' - checkfunc d_fdclose 'fdclose' --checkfunc d_ffs 'ffs' 'strings.h' --checkfunc d_ffsl 'ffsl' 'strings.h' -+checkfunc d_ffs 'ffs' "0" 'strings.h' -+checkfunc d_ffsl 'ffsl' "0" 'strings.h' - checkfunc d_fgetpos 'fgetpos' "NULL, 0" 'stdio.h' --checkfunc d_flock 'flock' "0,0" 'unistd.h' -+checkfunc d_flock 'flock' "0,0" 'sys/file.h' - checkfunc d_fork 'fork' "" 'unistd.h' - checkfunc d_fp_class 'fp_class' - checkfunc d_fpathconf 'fpathconf' "0,0" 'unistd.h' --checkfunc d_freelocale 'freelocale' '0' 'locale.h' --checkfunc d_fseeko 'fseeko' 'NULL,0,0' --checkfunc d_fsetpos 'fsetpos' 'NULL,0' --checkfunc d_fstatfs 'fstatfs' --checkfunc d_fstatvfs 'fstatvfs' --checkfunc d_fsync 'fsync' --checkfunc d_ftello 'ftello' --checkfunc d_futimes 'futimes' -+checkfunc d_freelocale 'freelocale' "0" 'locale.h' -+checkfunc d_fseeko 'fseeko' "NULL,0,0" 'stdio.h' -+checkfunc d_fsetpos 'fsetpos' "NULL,0" 'stdio.h' -+checkfunc d_fstatfs 'fstatfs' "0,NULL" 'sys/vfs.h' -+checkfunc d_fstatvfs 'fstatvfs' "0,NULL" 'sys/statvfs.h' -+checkfunc d_fsync 'fsync' "0" 'unistd.h' -+checkfunc d_ftello 'ftello' "NULL" 'stdio.h' -+checkfunc d_futimes 'futimes' '0,0' 'sys/time.h' - checkfunc d_gai_strerror 'gai_strerror' '0' 'sys/types.h sys/socket.h netdb.h' --checkfunc d_getaddrinfo 'getaddrinfo' --checkfunc d_get_current_dir_name 'get_current_dir_name' --checkfunc d_getcwd 'getcwd' 'NULL,0' -+checkfunc d_getaddrinfo 'getaddrinfo' "NULL,NULL,NULL,NULL" 'sys/types.h sys/socket.h netdb.h' -+checkfunc d_get_current_dir_name 'get_current_dir_name' "" 'unistd.h' -+checkfunc d_getcwd 'getcwd' 'NULL,0' 'unistd.h' - checkfunc d_getespwnam 'getespwnam' - checkfunc d_getfsstat 'getfsstat' --checkfunc d_getgrent 'getgrent' --checkfunc d_getgrps 'getgroups' --checkfunc d_gethbyaddr 'gethostbyaddr' --checkfunc d_gethbyname 'gethostbyname' -+checkfunc d_getgrent 'getgrent' "" 'sys/types.h grp.h' -+checkfunc d_getgrps 'getgroups' "0,NULL" 'unistd.h' -+checkfunc d_gethbyaddr 'gethostbyaddr' "NULL,0,0" 'netdb.h' -+checkfunc d_gethbyname 'gethostbyname' "NULL" 'netdb.h' - checkfunc d_getnbyaddr 'getnetbyaddr' '0,0' 'netdb.h' - checkfunc d_getnbyname 'getnetbyname' 'NULL' 'netdb.h' --checkfunc d_gethent 'gethostent' --checkfunc d_gethname 'gethostname' --checkfunc d_getitimer 'getitimer' --checkfunc d_getlogin 'getlogin' -+checkfunc d_gethent 'gethostent' "" 'netdb.h' -+checkfunc d_gethname 'gethostname' "NULL,0" 'unistd.h' -+checkfunc d_getitimer 'getitimer' "0,NULL" 'sys/time.h' -+checkfunc d_getlogin 'getlogin' "" 'unistd.h' - checkfunc d_getmnt 'getmnt' --checkfunc d_getmntent 'getmntent' --checkfunc d_getnameinfo 'getnameinfo' --checkfunc d_getnent 'getnetent' --checkfunc d_getnetbyaddr 'getnetbyaddr' --checkfunc d_getnetbyname 'getnetbyname' --checkfunc d_getpagsz 'getpagesize' -+checkfunc d_getmntent 'getmntent' "NULL" 'stdio.h mntent.h' -+checkfunc d_getnameinfo 'getnameinfo' "NULL,0,NULL,0,NULL,0,0" 'sys/socket.h netdb.h' -+checkfunc d_getnent 'getnetent' "" 'netdb.h' -+checkfunc d_getnetbyaddr 'getnetbyaddr' "0,0" 'netdb.h' -+checkfunc d_getnetbyname 'getnetbyname' "NULL" 'netdb.h' -+checkfunc d_getpagsz 'getpagesize' "" 'unistd.h' - checkfunc d_getpbyaddr 'getprotobyaddr' --checkfunc d_getpbyname 'getprotobyname' --checkfunc d_getpbynumber 'getprotobynumber' --checkfunc d_getpent 'getprotoent' --checkfunc d_getpgid 'getpgid' -+checkfunc d_getpbyname 'getprotobyname' "NULL" 'netdb.h' -+checkfunc d_getpbynumber 'getprotobynumber' "0" 'netdb.h' -+checkfunc d_getpent 'getprotoent' "" 'netdb.h' -+checkfunc d_getpgid 'getpgid' "0" 'unistd.h' - checkfunc d_getpgrp 'getpgrp' "" 'unistd.h' - checkfunc d_getpgrp2 'getpgrp2' --checkfunc d_getppid 'getppid' -+checkfunc d_getppid 'getppid' "" 'unistd.h' - checkfunc d_getprior 'getpriority' "0,0" 'sys/time.h sys/resource.h' - checkfunc d_getprpwnam 'getprpwnam' --checkfunc d_getpwent 'getpwent' -+checkfunc d_getpwent 'getpwent' "" 'sys/types.h pwd.h' - checkfunc d_getsbyaddr 'getservbyaddr' --checkfunc d_getsbyname 'getservbyname' --checkfunc d_getsbyport 'getservbyport' --checkfunc d_getsent 'getservent' --checkfunc d_setsent 'setservent' --checkfunc d_endsent 'endservent' --checkfunc d_getspnam 'getspnam' --checkfunc d_gettimeod 'gettimeofday' 'NULL,NULL' -+checkfunc d_getsbyname 'getservbyname' "NULL,NULL" 'netdb.h' -+checkfunc d_getsbyport 'getservbyport' "0,NULL" 'netdb.h' -+checkfunc d_getsent 'getservent' "" 'netdb.h' -+checkfunc d_setsent 'setservent' "0" 'netdb.h' -+checkfunc d_endsent 'endservent' "" 'netdb.h' -+checkfunc d_getspnam 'getspnam' "NULL" 'shadow.h' -+checkfunc d_gettimeod 'gettimeofday' 'NULL,NULL' 'sys/time.h' - checkfunc d_gmtime64 'gmtime64' --checkfunc d_hasmntopt 'hasmntopt' -+checkfunc d_hasmntopt 'hasmntopt' "NULL,NULL" 'stdio.h mntent.h' - checkfunc d_htonl 'htonl' "0" 'stdio.h sys/types.h netinet/in.h arpa/inet.h' --checkfunc d_ilogbl 'ilogbl' -+checkfunc d_ilogbl 'ilogbl' "0.0" 'math.h' - checkfunc d_index 'index' "NULL,0" 'string.h strings.h' --checkfunc d_inetaton 'inet_aton' --checkfunc d_inetntop 'inet_ntop' --checkfunc d_inetpton 'inet_pton' -+checkfunc d_inetaton 'inet_aton' "NULL,NULL" 'sys/socket.h netinet/in.h arpa/inet.h' -+checkfunc d_inetntop 'inet_ntop' "0,NULL,NULL,0" 'arpa/inet.h' -+checkfunc d_inetpton 'inet_pton' "0,NULL,NULL" 'arpa/inet.h' - checkfunc d_isascii 'isascii' "'A'" 'stdio.h ctype.h' - checkfunc d_isblank 'isblank' "' '" 'stdio.h ctype.h' --checkfunc d_killpg 'killpg' -+checkfunc d_killpg 'killpg' "0,0" 'signal.h' - checkfunc d_lchown 'lchown' "NULL, 0, 0" 'unistd.h' --checkfunc d_link 'link' 'NULL,NULL' --checkfunc d_linkat 'linkat' '0,NULL,0,NULL,0' -+checkfunc d_link 'link' 'NULL,NULL' 'unistd.h' -+checkfunc d_linkat 'linkat' '0,NULL,0,NULL,0' 'unistd.h' - checkfunc d_localtime64 'localtime64' - checkfunc d_localeconv_l 'localeconv_l' 'NULL' 'locale.h' --checkfunc d_locconv 'localeconv' --checkfunc d_lockf 'lockf' --checkfunc d_lstat 'lstat' --checkfunc d_madvise 'madvise' -+checkfunc d_locconv 'localeconv' "" 'locale.h' -+checkfunc d_lockf 'lockf' "0,0,0" 'unistd.h' -+checkfunc d_lstat 'lstat' "NULL, NULL" 'sys/stat.h' -+checkfunc d_madvise 'madvise' "NULL,0,0" 'sys/mman.h' - checkfunc d_malloc_good_size 'malloc_good_size' - checkfunc d_malloc_size 'malloc_size' - checkfunc d_mblen 'mblen' '"", 0' 'stdlib.h' --checkfunc d_mbstowcs 'mbstowcs' -+checkfunc d_mbstowcs 'mbstowcs' "NULL,NULL,0" - checkfunc d_mbtowc 'mbtowc' 'NULL, NULL, 0' 'stdlib.h' - checkfunc d_mbrlen 'mbrlen' 'NULL, 0, NULL' 'wchar.h' - checkfunc d_mbrtowc 'mbrtowc' 'NULL, NULL, 0, NULL' 'wchar.h' -@@ -161,152 +162,152 @@ checkfunc d_memmem 'memmem' "NULL, 0, NU - checkfunc d_memmove 'memmove' "NULL, NULL, 0" 'string.h' - checkfunc d_memrchr 'memrchr' "NULL, 0, 0" 'string.h' - checkfunc d_memset 'memset' "NULL, 0, 0" 'string.h' --checkfunc d_mkdir 'mkdir' 'NULL, 0' --checkfunc d_mkdtemp 'mkdtemp' --checkfunc d_mkfifo 'mkfifo' -+checkfunc d_mkdir 'mkdir' 'NULL, 0' 'sys/stat.h' -+checkfunc d_mkdtemp 'mkdtemp' 'NULL' -+checkfunc d_mkfifo 'mkfifo' 'NULL,0' 'sys/types.h sys/stat.h' - checkfunc d_mkostemp 'mkostemp' 'NULL,0' 'stdlib.h' - checkfunc d_mkstemp 'mkstemp' 'NULL' --checkfunc d_mkstemps 'mkstemps' --checkfunc d_mktime 'mktime' 'NULL' -+checkfunc d_mkstemps 'mkstemps' 'NULL,0' -+checkfunc d_mktime 'mktime' 'NULL' 'time.h' - checkfunc d_mktime64 'mktime64' --checkfunc d_mmap 'mmap' --checkfunc d_mprotect 'mprotect' --checkfunc d_msgctl 'msgctl' --checkfunc d_msgget 'msgget' --checkfunc d_msgrcv 'msgrcv' --checkfunc d_msgsnd 'msgsnd' --checkfunc d_msync 'msync' --checkfunc d_munmap 'munmap' -+checkfunc d_mmap 'mmap' 'NULL,0,0,0,0,0' 'sys/mman.h' -+checkfunc d_mprotect 'mprotect' 'NULL,0,0' 'sys/mman.h' -+checkfunc d_msgctl 'msgctl' '0,0,NULL' 'sys/msg.h' -+checkfunc d_msgget 'msgget' '0,0' 'sys/msg.h' -+checkfunc d_msgrcv 'msgrcv' '0,NULL,0,0,0' 'sys/msg.h' -+checkfunc d_msgsnd 'msgsnd' '0,NULL,0,0' 'sys/msg.h' -+checkfunc d_msync 'msync' 'NULL,0,0' 'sys/mman.h' -+checkfunc d_munmap 'munmap' 'NULL,0' 'sys/mman.h' - checkfunc d_newlocale 'newlocale' '0,NULL,0' 'locale.h' --checkfunc d_nice 'nice' '0' --checkfunc d_nl_langinfo 'nl_langinfo' --checkfunc d_nl_langinfo_l 'nl_langinfo_l' -+checkfunc d_nice 'nice' '0' 'unistd.h' -+checkfunc d_nl_langinfo 'nl_langinfo' '0' 'langinfo.h' -+checkfunc d_nl_langinfo_l 'nl_langinfo_l' '0,0' 'langinfo.h' - checkfunc d_open 'open' "NULL,0,0" 'sys/types.h sys/stat.h fcntl.h' - checkfunc d_openat 'openat' "0,NULL,0,0" 'sys/types.h sys/stat.h fcntl.h' --checkfunc d_pathconf 'pathconf' --checkfunc d_pause 'pause' -+checkfunc d_pathconf 'pathconf' 'NULL,0' 'unistd.h' -+checkfunc d_pause 'pause' '' 'unistd.h' - checkfunc d_pipe 'pipe' 'NULL' 'fcntl.h unistd.h' - checkfunc d_pipe2 'pipe' 'NULL,0' 'fcntl.h unistd.h' --checkfunc d_poll 'poll' --checkfunc d_prctl 'prctl' --checkfunc d_pthread_atfork 'pthread_atfork' --checkfunc d_pthread_attr_setscope 'pthread_attr_setscope' --checkfunc d_pthread_yield 'pthread_yield' -+checkfunc d_poll 'poll' 'NULL,0,0' 'poll.h' -+checkfunc d_prctl 'prctl' '0,0,0,0,0' 'sys/prctl.h' -+checkfunc d_pthread_atfork 'pthread_atfork' 'NULL,NULL,NULL' 'pthread.h' -+checkfunc d_pthread_attr_setscope 'pthread_attr_setscope' 'NULL,0' 'pthread.h' -+checkfunc d_pthread_yield 'pthread_yield' '' 'pthread.h' - checkfunc d_querylocale 'querylocale' - checkfunc d_qgcvt 'qgcvt' '1.0,1,NULL' --checkfunc d_rand 'rand' --checkfunc d_random 'random' --checkfunc d_re_comp 're_comp' --checkfunc d_readdir 'readdir' 'NULL' --checkfunc d_readlink 'readlink' --checkfunc d_realpath 'realpath' --checkfunc d_readv 'readv' --checkfunc d_recvmsg 'recvmsg' -+checkfunc d_rand 'rand' '' 'stdlib.h' -+checkfunc d_random 'random' '' 'stdlib.h' -+checkfunc d_re_comp 're_comp' 'NULL' 'sys/types.h regex.h' -+checkfunc d_readdir 'readdir' 'NULL' 'dirent.h' -+checkfunc d_readlink 'readlink' 'NULL,NULL,0' 'unistd.h' -+checkfunc d_realpath 'realpath' 'NULL,NULL' 'limits.h stdlib.h' -+checkfunc d_readv 'readv' '0,NULL,0' 'sys/uio.h' -+checkfunc d_recvmsg 'recvmsg' '0,NULL,0' 'sys/socket.h' - checkfunc d_regcmp 'regcmp' --checkfunc d_regcomp 'regcomp' --checkfunc d_rename 'rename' 'NULL,NULL' --checkfunc d_renameat 'renameat' '0,NULL,0,NULL' --checkfunc d_rewinddir 'rewinddir' --checkfunc d_rmdir 'rmdir' 'NULL' --checkfunc d_sched_yield 'sched_yield' --checkfunc d_seekdir 'seekdir' --checkfunc d_select 'select' '0,NULL,NULL,NULL,NULL' --checkfunc d_semctl 'semctl' --checkfunc d_semget 'semget' --checkfunc d_semop 'semop' --checkfunc d_sendmsg 'sendmsg' --checkfunc d_setegid 'setegid' --checkfunc d_setent 'setservent' --checkfunc d_setenv 'setenv' --checkfunc d_seteuid 'seteuid' --checkfunc d_setgrent 'setgrent' --checkfunc d_setgrps 'setgroups' --checkfunc d_sethent 'sethostent' --checkfunc d_setitimer 'setitimer' --checkfunc d_setlinebuf 'setlinebuf' -+checkfunc d_regcomp 'regcomp' 'NULL,NULL,0' 'regex.h' -+checkfunc d_rename 'rename' 'NULL,NULL' 'stdio.h' -+checkfunc d_renameat 'renameat' '0,NULL,0,NULL' 'fcntl.h stdio.h' -+checkfunc d_rewinddir 'rewinddir' 'NULL' 'sys/types.h dirent.h' -+checkfunc d_rmdir 'rmdir' 'NULL' 'unistd.h' -+checkfunc d_sched_yield 'sched_yield' '' 'sched.h' -+checkfunc d_seekdir 'seekdir' 'NULL,0' 'dirent.h' -+checkfunc d_select 'select' '0,NULL,NULL,NULL,NULL' 'sys/select.h' -+checkfunc d_semctl 'semctl' '0,0,0, NULL' 'sys/sem.h' -+checkfunc d_semget 'semget' '0,0,0' 'sys/sem.h' -+checkfunc d_semop 'semop' '0,NULL,0' 'sys/sem.h' -+checkfunc d_sendmsg 'sendmsg' '0,NULL,0' 'sys/socket.h' -+checkfunc d_setegid 'setegid' '0' 'unistd.h' -+checkfunc d_setent 'setservent' '0' 'netdb.h' -+checkfunc d_setenv 'setenv' 'NULL,NULL,0' -+checkfunc d_seteuid 'seteuid' '0' 'unistd.h' -+checkfunc d_setgrent 'setgrent' '' 'sys/types.h grp.h' -+checkfunc d_setgrps 'setgroups' '0,NULL' 'unistd.h grp.h' -+checkfunc d_sethent 'sethostent' '0' 'netdb.h' -+checkfunc d_setitimer 'setitimer' '0,NULL,NULL' 'sys/time.h' -+checkfunc d_setlinebuf 'setlinebuf' 'NULL' 'stdio.h' - checkfunc d_setlocale 'setlocale' "0,NULL" 'locale.h' --checkfunc d_setnent 'setnetent' --checkfunc d_setpent 'setprotoent' --checkfunc d_setpgid 'setpgid' --checkfunc d_setpgrp 'setpgrp' -+checkfunc d_setnent 'setnetent' '0' 'netdb.h' -+checkfunc d_setpent 'setprotoent' '0' 'netdb.h' -+checkfunc d_setpgid 'setpgid' '0,0' 'unistd.h' -+checkfunc d_setpgrp 'setpgrp' '' 'unistd.h' - checkfunc d_setpgrp2 'setpgrp2' --checkfunc d_setprior 'setpriority' --checkfunc d_setproctitle 'setproctitle' --checkfunc d_setpwent 'setpwent' --checkfunc d_setregid 'setregid' --checkfunc d_setresgid 'setresgid' --checkfunc d_setresuid 'setresuid' --checkfunc d_setreuid 'setreuid' --checkfunc d_setrgid 'setrgid' -+checkfunc d_setprior 'setpriority' '0,0,0' 'sys/resource.h' -+checkfunc d_setproctitle 'setproctitle' 'NULL,NULL' 'sys/types.h unistd.h' -+checkfunc d_setpwent 'setpwent' '' 'sys/types.h pwd.h' -+checkfunc d_setregid 'setregid' '0,0' 'unistd.h' -+checkfunc d_setresgid 'setresgid' '0,0,0' 'unistd.h' -+checkfunc d_setresuid 'setresuid' '0,0,0' 'unistd.h' -+checkfunc d_setreuid 'setreuid' '0,0' 'unistd.h' -+checkfunc d_setrgid 'setrgid' '' - checkfunc d_setruid 'setruid' --checkfunc d_setsid 'setsid' --checkfunc d_setvbuf 'setvbuf' 'NULL,NULL,0,0' -+checkfunc d_setsid 'setsid' '' 'unistd.h' -+checkfunc d_setvbuf 'setvbuf' 'NULL,NULL,0,0' 'stdio.h' - checkfunc d_sfreserve 'sfreserve' "" 'sfio.h' --checkfunc d_shmat 'shmat' --checkfunc d_shmctl 'shmctl' --checkfunc d_shmdt 'shmdt' --checkfunc d_shmget 'shmget' --checkfunc d_sigaction 'sigaction' --checkfunc d_sigprocmask 'sigprocmask' -+checkfunc d_shmat 'shmat' '0,NULL,0' 'sys/shm.h' -+checkfunc d_shmctl 'shmctl' '0,0,NULL' 'sys/shm.h' -+checkfunc d_shmdt 'shmdt' 'NULL' 'sys/shm.h' -+checkfunc d_shmget 'shmget' '0,0,0' 'sys/shm.h' -+checkfunc d_sigaction 'sigaction' '0,NULL,NULL' 'signal.h' -+checkfunc d_sigprocmask 'sigprocmask' '0,NULL,NULL' 'signal.h' - checkfunc d_sigsetjmp 'sigsetjmp' "NULL,0" 'setjmp.h' --checkfunc d_snprintf 'snprintf' --checkfunc d_sockatmark 'sockatmark' -+checkfunc d_snprintf 'snprintf' 'NULL,0,NULL' 'stdio.h' -+checkfunc d_sockatmark 'sockatmark' '0' 'sys/socket.h' - checkfunc d_socket 'socket' "0,0,0" 'sys/types.h sys/socket.h' --checkfunc d_sockpair 'socketpair' -+checkfunc d_sockpair 'socketpair' '0,0,0,NULL' 'sys/socket.h' - checkfunc d_socks5_init 'socks5_init' --checkfunc d_stat 'stat' --checkfunc d_statvfs 'statvfs' -+checkfunc d_stat 'stat' 'NULL,NULL' 'sys/stat.h' -+checkfunc d_statvfs 'statvfs' 'NULL,NULL' 'sys/statvfs.h' - checkfunc d_strchr 'strchr' "NULL,0" 'string.h strings.h' - checkfunc d_strcoll 'strcoll' "NULL,NULL" 'string.h' - checkfunc d_strerror 'strerror' "0" 'string.h stdlib.h' --checkfunc d_strerror_l 'strerror_l' -+checkfunc d_strerror_l 'strerror_l' '0,NULL' 'string.h' - checkfunc d_strftime 'strftime' "NULL,0,NULL,NULL" 'time.h' --checkfunc d_strlcat 'strlcat' --checkfunc d_strlcpy 'strlcpy' -+checkfunc d_strlcat 'strlcat' 'NULL,NULL,0' 'string.h' -+checkfunc d_strlcpy 'strlcpy' 'NULL,NULL,0' 'string.h' - checkfunc d_strnlen 'strnlen' '"",0' 'string.h' - checkfunc d_strtod 'strtod' 'NULL,NULL' - checkfunc d_strtod_l 'strtod_l' - checkfunc d_strtol 'strtol' 'NULL,NULL,0' --checkfunc d_strtold 'strtold' -+checkfunc d_strtold 'strtold' 'NULL,NULL' - checkfunc d_strtold_l 'strtold_l' --checkfunc d_strtoll 'strtoll' --checkfunc d_strtoq 'strtoq' -+checkfunc d_strtoll 'strtoll' 'NULL,NULL,0' -+checkfunc d_strtoq 'strtoq' 'NULL,NULL,0' - checkfunc d_strtoul 'strtoul' 'NULL,NULL,0' - checkfunc d_strtoull 'strtoull' 'NULL,NULL,0' --checkfunc d_strtouq 'strtouq' --checkfunc d_strxfrm 'strxfrm' --checkfunc d_strxfrm_l 'strxfrm_l' --checkfunc d_symlink 'symlink' --checkfunc d_syscall 'syscall' --checkfunc d_sysconf 'sysconf' '0' -+checkfunc d_strtouq 'strtouq' 'NULL,NULL,0' -+checkfunc d_strxfrm 'strxfrm' 'NULL,NULL,0' 'string.h' -+checkfunc d_strxfrm_l 'strxfrm_l' 'NULL,NULL,0,NULL' 'string.h' -+checkfunc d_symlink 'symlink' 'NULL,NULL' 'unistd.h' -+checkfunc d_syscall 'syscall' '0,NULL' 'sys/syscall.h unistd.h' -+checkfunc d_sysconf 'sysconf' '0' 'unistd.h' - checkfunc d_system 'system' 'NULL' --checkfunc d_tcgetpgrp 'tcgetpgrp' --checkfunc d_tcsetpgrp 'tcsetpgrp' --checkfunc d_telldir 'telldir' --checkfunc d_time 'time' 'NULL' --checkfunc d_timegm 'timegm' --checkfunc d_times 'times' 'NULL' -+checkfunc d_tcgetpgrp 'tcgetpgrp' '0' 'unistd.h' -+checkfunc d_tcsetpgrp 'tcsetpgrp' '0,0' 'unistd.h' -+checkfunc d_telldir 'telldir' 'NULL' 'dirent.h' -+checkfunc d_time 'time' 'NULL' 'time.h' -+checkfunc d_timegm 'timegm' 'NULL' 'time.h' -+checkfunc d_times 'times' 'NULL' 'sys/times.h' - checkfunc d_towlower 'towlower' '0' 'wctype.h' - checkfunc d_towupper 'towupper' '0' 'wctype.h' --checkfunc d_truncate 'truncate' 'NULL,0' --checkfunc d_ualarm 'ualarm' --checkfunc d_umask 'umask' '0' --checkfunc d_uname 'uname' --checkfunc d_unlinkat 'unlinkat' '0,NULL,0' -+checkfunc d_truncate 'truncate' 'NULL,0' 'unistd.h' -+checkfunc d_ualarm 'ualarm' 'NULL,NULL' 'unistd.h' -+checkfunc d_umask 'umask' '0' 'sys/stat.h' -+checkfunc d_uname 'uname' 'NULL' 'sys/utsname.h' -+checkfunc d_unlinkat 'unlinkat' '0,NULL,0' 'unistd.h fcntl.h' - checkfunc d_unordered 'unordered' --checkfunc d_unsetenv 'unsetenv' -+checkfunc d_unsetenv 'unsetenv' 'NULL' - checkfunc d_uselocale 'uselocale' '0' 'locale.h' --checkfunc d_usleep 'usleep' --checkfunc d_ustat 'ustat' -+checkfunc d_usleep 'usleep' '0' 'unistd.h' -+checkfunc d_ustat 'ustat' '0,NULL' 'sys/types.h unistd.h' - define d_vfork 'undef' # unnecessary --checkfunc d_vprintf 'vprintf' 'NULL,0' --checkfunc d_vsnprintf 'vsnprintf' --checkfunc d_wait4 'wait4' --checkfunc d_waitpid 'waitpid' '0,NULL,0' --checkfunc d_wcrtomb 'wcrtomb' --checkfunc d_wcscmp 'wcscmp' --checkfunc d_wcstombs 'wcstombs' 'NULL,NULL,0' --checkfunc d_wcsxfrm 'wcsxfrm' --checkfunc d_wctomb 'wctomb' --checkfunc d_writev 'writev' -+checkfunc d_vprintf 'vprintf' 'NULL,0' 'stdio.h' -+checkfunc d_vsnprintf 'vsnprintf' 'NULL,0,NULL,NULL' 'stdio.h' -+checkfunc d_wait4 'wait4' '0,NULL,0,NULL' 'sys/wait.h' -+checkfunc d_waitpid 'waitpid' '0,NULL,0' 'sys/wait.h' -+checkfunc d_wcrtomb 'wcrtomb' 'NULL,0,NULL' 'wchar.h' -+checkfunc d_wcscmp 'wcscmp' 'NULL,NULL' 'wchar.h' -+checkfunc d_wcstombs 'wcstombs' 'NULL,NULL,0' 'wchar.h' -+checkfunc d_wcsxfrm 'wcsxfrm' 'NULL,NULL,0' 'wchar.h' -+checkfunc d_wctomb 'wctomb' 'NULL,NULL' 'wchar.h' -+checkfunc d_writev 'writev' '0,NULL,0' 'sys/uio.h' - unset includes diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.4.bb b/meta/recipes-devtools/perl-cross/perlcross_1.4.1.bb similarity index 86% rename from meta/recipes-devtools/perl-cross/perlcross_1.4.bb rename to meta/recipes-devtools/perl-cross/perlcross_1.4.1.bb index 98a8fa3f8a9..6bf056cc159 100644 --- a/meta/recipes-devtools/perl-cross/perlcross_1.4.bb +++ b/meta/recipes-devtools/perl-cross/perlcross_1.4.1.bb @@ -15,11 +15,10 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-c file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ file://determinism.patch \ file://0001-Makefile-check-the-file-if-patched-or-not.patch \ - file://0001-configure_func.sh-Add-_GNU_SOURCE-define-and-functio.patch \ " GITHUB_BASE_URI = "https://github.com/arsv/perl-cross/releases/" -SRC_URI[perl-cross.sha256sum] = "be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91" +SRC_URI[perl-cross.sha256sum] = "3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca" S = "${WORKDIR}/perl-cross-${PV}" From patchwork Tue May 9 17:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23729 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 2ABBCC7EE33 for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mx.groups.io with SMTP id smtpd.web11.39300.1683653037905742652 for ; Tue, 09 May 2023 10:23:58 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=f+5N9g42; spf=pass (domain: gmail.com, ip: 209.85.208.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-50bc1612940so11534395a12.2 for ; Tue, 09 May 2023 10:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653036; x=1686245036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f40wNGZC6HQMd2a6GIIc8wFbI26TXVpOoeP11tKYQWI=; b=f+5N9g425+6dOhY/sNrhM7niZhy7WIofgHT1imasZ3USyV4Pga7zgMPBipJQzIgarX fHOjyuAwiPq+S0ckYBgypR1ohjjW+gKPchsLmyE+jFPALh+WytHr2ve/iRcyvXT9+kGl iahu5jnju07xodn/3OKm+AtCKOo1gPgWfd4ikp0N0Y+dpvli4gJmA8m6DN8TcVRAlKk1 bUykAUGKuJw3e4ypyX39gEOewR/Bxe2av1imR3UtnQtJqNnYTmQzHEJSlMu1LSUyDC1t /5Am7uft758Vbf1CFcrARk/TcF08kAef4Iw0CN2eQLL4IGqKio8LIQ99HuuSz34HhYQr F5cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653036; x=1686245036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f40wNGZC6HQMd2a6GIIc8wFbI26TXVpOoeP11tKYQWI=; b=MlWISHqu6pv/Wr9Uu0GKVb1SlHIGZVKDY2R+tJGUQwulwzE1XtLKkqiEGrroiv8DBA WY95B2Jbp2+ozq/+iqTo8gKpbZfY4M0hodfTobTqA9+7Gw9sRvCshRNqeKAmCq0GSEUC VT6fn4hJYkCTvM7M6+CmqJK8IBCYilWVOsWZYVuC0i5k04WqjXcFMfV8FwNf0ROj0mUj 8ymp35sqq/nW7SRLeXiDRtgWXH35k+kWMSieDEUMU2fpQ/zanccwOoHI644xli9OFpJU DyD9bkTsAmrNMQhCg+8SBnLu4UuLzFG5FzAiziDric4fHlB7SVVuG+vSTwGvgGwCb2qU 18Eg== X-Gm-Message-State: AC+VfDzkjJjzcX3i8bTkhA3kKpweI1xXKOEowWA2xzBUSShwHOTtzfZq fB+JLU9hoxUWhToNCXk1OFNG2ZSdFYI= X-Google-Smtp-Source: ACHHUZ7EA02+bVWFZXnG3f07gkFY27+ZdaWkgkE1heWCEHkgLUGAQ6osYDzpls7626thaP3DzLZMNQ== X-Received: by 2002:a17:906:9b94:b0:94f:3f92:c7b0 with SMTP id dd20-20020a1709069b9400b0094f3f92c7b0mr13363782ejc.60.1683653036349; Tue, 09 May 2023 10:23:56 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:56 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/27] perl: update 5.36.0 -> 5.36.1 Date: Tue, 9 May 2023 19:23:30 +0200 Message-Id: <20230509172344.1516743-13-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181068 Drop gcc 12 patch, as upstream rejected it, and then (presumably) fixed gcc 12 issues differently. Signed-off-by: Alexander Kanavin --- .../files/0001-Fix-build-with-gcc-12.patch | 143 ------------------ .../perl/files/perl-configpm-switch.patch | 2 +- .../perl/{perl_5.36.0.bb => perl_5.36.1.bb} | 3 +- 3 files changed, 2 insertions(+), 146 deletions(-) delete mode 100644 meta/recipes-devtools/perl/files/0001-Fix-build-with-gcc-12.patch rename meta/recipes-devtools/perl/{perl_5.36.0.bb => perl_5.36.1.bb} (99%) diff --git a/meta/recipes-devtools/perl/files/0001-Fix-build-with-gcc-12.patch b/meta/recipes-devtools/perl/files/0001-Fix-build-with-gcc-12.patch deleted file mode 100644 index 1d98e1389b5..00000000000 --- a/meta/recipes-devtools/perl/files/0001-Fix-build-with-gcc-12.patch +++ /dev/null @@ -1,143 +0,0 @@ -From ee957eb9e4ec29a462cdbb2f3bbe29d4270534ef Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Thu, 2 Jun 2022 13:01:37 +0800 -Subject: [PATCH] proto.h: Fix build with gcc-12 - -Fixes: - In function 'dynprep', - inlined from 'S_sortsv_flags_impl' at pp_sort.c:358:20, - inlined from 'sortsv_amagic_i_ncmp' at pp_sort.c:572:5: - pp_sort.c:1232:1: error: inlining failed in call to 'always_inline' 'S_amagic_i_ncmp': function not considered for inlining - 1232 | S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b) - -Upstream-Status: Submitted [https://github.com/Perl/perl5/pull/19808] - -Signed-off-by: Mingli Yu ---- - proto.h | 42 ++++++++++++++---------------------------- - 1 file changed, 14 insertions(+), 28 deletions(-) - -diff --git a/proto.h b/proto.h -index faca6d1..3a76c04 100644 ---- a/proto.h -+++ b/proto.h -@@ -5606,50 +5606,43 @@ STATIC SSize_t S_unpack_rec(pTHX_ struct tempsym* symptr, const char *s, const c - #endif - #if defined(PERL_IN_PP_SORT_C) - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp(pTHX_ SV *const str1, SV *const str2) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp(pTHX_ SV *const str1, SV *const str2); - #define PERL_ARGS_ASSERT_AMAGIC_CMP \ - assert(str1); assert(str2) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_desc(pTHX_ SV *const str1, SV *const str2) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_desc(pTHX_ SV *const str1, SV *const str2); - #define PERL_ARGS_ASSERT_AMAGIC_CMP_DESC \ - assert(str1); assert(str2) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b); - #define PERL_ARGS_ASSERT_AMAGIC_I_NCMP \ - assert(a); assert(b) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp_desc(pTHX_ SV *const a, SV *const b) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp_desc(pTHX_ SV *const a, SV *const b); - #define PERL_ARGS_ASSERT_AMAGIC_I_NCMP_DESC \ - assert(a); assert(b) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_amagic_ncmp(pTHX_ SV *const a, SV *const b) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_amagic_ncmp(pTHX_ SV *const a, SV *const b); - #define PERL_ARGS_ASSERT_AMAGIC_NCMP \ - assert(a); assert(b) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_amagic_ncmp_desc(pTHX_ SV *const a, SV *const b) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_amagic_ncmp_desc(pTHX_ SV *const a, SV *const b); - #define PERL_ARGS_ASSERT_AMAGIC_NCMP_DESC \ - assert(a); assert(b) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_cmp_desc(pTHX_ SV *const str1, SV *const str2) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_cmp_desc(pTHX_ SV *const str1, SV *const str2); - #define PERL_ARGS_ASSERT_CMP_DESC \ - assert(str1); assert(str2) - #endif -@@ -5671,51 +5664,44 @@ PERL_STATIC_FORCE_INLINE void S_sortsv_flags_impl(pTHX_ SV** array, size_t num_e - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp(pTHX_ SV *const a, SV *const b) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp(pTHX_ SV *const a, SV *const b); - #define PERL_ARGS_ASSERT_SV_I_NCMP \ - assert(a); assert(b) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp_desc(pTHX_ SV *const a, SV *const b) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp_desc(pTHX_ SV *const a, SV *const b); - #define PERL_ARGS_ASSERT_SV_I_NCMP_DESC \ - assert(a); assert(b) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_sv_ncmp(pTHX_ SV *const a, SV *const b) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_sv_ncmp(pTHX_ SV *const a, SV *const b); - #define PERL_ARGS_ASSERT_SV_NCMP \ - assert(a); assert(b) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_sv_ncmp_desc(pTHX_ SV *const a, SV *const b) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_sv_ncmp_desc(pTHX_ SV *const a, SV *const b); - #define PERL_ARGS_ASSERT_SV_NCMP_DESC \ - assert(a); assert(b) - #endif - - # if defined(USE_LOCALE_COLLATE) - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale(pTHX_ SV *const str1, SV *const str2) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale(pTHX_ SV *const str1, SV *const str2); - #define PERL_ARGS_ASSERT_AMAGIC_CMP_LOCALE \ - assert(str1); assert(str2) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale_desc(pTHX_ SV *const str1, SV *const str2) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale_desc(pTHX_ SV *const str1, SV *const str2); - #define PERL_ARGS_ASSERT_AMAGIC_CMP_LOCALE_DESC \ - assert(str1); assert(str2) - #endif - - #ifndef PERL_NO_INLINE_FUNCTIONS --PERL_STATIC_FORCE_INLINE I32 S_cmp_locale_desc(pTHX_ SV *const str1, SV *const str2) -- __attribute__always_inline__; -+PERL_STATIC_FORCE_INLINE I32 S_cmp_locale_desc(pTHX_ SV *const str1, SV *const str2); - #define PERL_ARGS_ASSERT_CMP_LOCALE_DESC \ - assert(str1); assert(str2) - #endif --- -2.25.1 - diff --git a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch index f80de889748..7ca7c7d12fe 100644 --- a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch +++ b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch @@ -1,4 +1,4 @@ -From 055d4c31f41611b7d7fb6b0e38b3818a053de38d Mon Sep 17 00:00:00 2001 +From e789c1a0c9de5928a3b49f5b9d81b63636f5c7bb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 27 May 2007 21:04:11 +0000 Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE) diff --git a/meta/recipes-devtools/perl/perl_5.36.0.bb b/meta/recipes-devtools/perl/perl_5.36.1.bb similarity index 99% rename from meta/recipes-devtools/perl/perl_5.36.0.bb rename to meta/recipes-devtools/perl/perl_5.36.1.bb index b8dba00f188..f7d66e6ed90 100644 --- a/meta/recipes-devtools/perl/perl_5.36.0.bb +++ b/meta/recipes-devtools/perl/perl_5.36.1.bb @@ -17,7 +17,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \ - file://0001-Fix-build-with-gcc-12.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ @@ -26,7 +25,7 @@ SRC_URI:append:class-target = " \ file://encodefix.patch \ " -SRC_URI[perl.sha256sum] = "e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a" +SRC_URI[perl.sha256sum] = "68203665d8ece02988fc77dc92fccbb297a83a4bb4b8d07558442f978da54cc1" B = "${WORKDIR}/perl-${PV}-build" From patchwork Tue May 9 17:23:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23726 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 0DDC1C77B7C for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web11.39301.1683653038726499986 for ; Tue, 09 May 2023 10:23:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=JFs9pn3u; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-9659e9bbff5so1113592466b.1 for ; Tue, 09 May 2023 10:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653037; x=1686245037; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ztZz4JM5QXgSlpXESpCuM/PQdaHMmttBuRZnJGjxyn8=; b=JFs9pn3uYP/hZ2wiaC+oU18BRBKGxMu5rZZGM/ov79I0sNBjR2O/WbqIq1IuZQ2NTh EfUqyBQGT8RYKDwjRlRKSnC0uwNbr9FvfYcL4ZXrRdl1XKO2H0V4lF1SpjLJmbtAjAn3 optfboMIRsTjXfy5lvQbJFpnAChsQBTH6NJVnuScfb4Hts0UbJokiIUn+K23Xb3bUIET ullWjrP/9fnQl5WyLZpRau3ITgKpkQBLu1CYNmm1OXfz6C5ecIF5yVXe/IqtpCcof5Fi E1VD0mbEASazVIMQSsAtRF3I7q+o8h2+HNdzwh0YOujv18JcOKfB26D45eIRJrWgbRee t5yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653037; x=1686245037; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ztZz4JM5QXgSlpXESpCuM/PQdaHMmttBuRZnJGjxyn8=; b=Qr+H9Ox8fFuzIurK5z6k9XdrO2hqZmhWfEnrDse45DzCdPw0d+wL9lGNANFhaFHUOE 4ynkGQ6bhBwwAiAzWkBQs04fyksnip0S93W2mC5GGNV2isT26O9Cxjk4xU60v08Bq0Sa WkXYqKhsRSTcAc1AzEFSEzAmvW2OM9RS9boV36h4qlB2Q6PF3IJySX2+gbxsbIeOpG2g FSuntnG1ZQH5dv1ClZoC6X4zE3aESncRkyR2IYPo3vkUOXjRwK/R3EOPWVuk7l5tCXbj /ZdC5wxUB7rEVs4R3hop5gz8afsrh0Ko+lUARP3m4XYtsrrqeHagNM9OIfbuEXflMaam N4nQ== X-Gm-Message-State: AC+VfDz/fo+B7/zhxk+fh+K/mKp/wg00tG4eSpOL7Y1iCGIU4zsF1fa3 JKzmn+6HFhPbqJixU/8kfBvYrPF+iyM= X-Google-Smtp-Source: ACHHUZ6wa4deH1lu6AmPcspqYot+AH2WicryKP5yui9ekNbr92jPGVk7w4Z3XONic3F623BPMeriRw== X-Received: by 2002:a17:907:5c7:b0:961:be96:b0e6 with SMTP id wg7-20020a17090705c700b00961be96b0e6mr11438215ejb.68.1683653037033; Tue, 09 May 2023 10:23:57 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:56 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/27] rpm: update 4.18.0 -> 4.18.1 Date: Tue, 9 May 2023 19:23:31 +0200 Message-Id: <20230509172344.1516743-14-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181069 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 --- ...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 9f5dde07205..9fa486dfd3c 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 6f613d0a7d8..8fdc5edb10b 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 d7137f1d103..00000000000 --- 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 71703d7f0c6..00000000000 --- 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 00000000000..e5c84ebd498 --- /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 7790db8b5a0..6da2edddf34 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 Tue May 9 17:23:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23734 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 2F736C7EE37 for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web11.39303.1683653039418366187 for ; Tue, 09 May 2023 10:23:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=OQJ67Bl4; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-9659f452148so1083826566b.1 for ; Tue, 09 May 2023 10:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653038; x=1686245038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uyrYJZZpnsXduv7he/FFI1WOUsK2wT9sZvMBpmDQa7w=; b=OQJ67Bl4JAuIum42ZrvC2DrLHtHoOv3BCMMEOlD0DCEJRoFsmTU8ESquhIAN0iDB2c PZB/0HoRi2cTyY93fQRa0bT/uOv2I3BZLkvNO/L/Sn0unfprsGxlOdmdVeNuk7VJrBOi Dxg18XZCIac2z86wXwiwuB0O3GrHsLlyuzX89ISJXy8aKA2WbEZBqJDUMfbYdjdeyrhH zkRBMEiTaT8co17vgtdKAmmat3EC0ob/e1QWi4U1Q7aJQfvOLHDezzVlS2wnHGGzG7od fWiXvfZvpCrfZG5gdwI7CHUvSEo8z/p8RFRMC2qIahDiWGWybIH9tyH/UyIGQQZ41zjq qImA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653038; x=1686245038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uyrYJZZpnsXduv7he/FFI1WOUsK2wT9sZvMBpmDQa7w=; b=k012cdb56eup/tFpATTCc0FuZKtPcSvZzjr6wYFfUCV/fUpfpWmM9gP0eXW7OVp2kZ 7UMvi5fuBsxCKwpGJWnHNVSzkqwlM6bsgAbUKhOpanD1ffvsU/cYOSn78rP0iEVzaWEb 2neeekV82QpxyRZa50I8Stg1j93X2ZfsWpmZN9yU6NyqRhd4Rgr8Xb+cpgUh6RkkCJDP Oj5NV3cJacheWWce+Z7hThti5jAhnR8nxCkg81halhCwZ7eH6mKPK4p3RlUBSvah2V3j bcDetBRvJdjjG9yORnzY5SV/gyTubQRmgFBQ3Vdjk+ODc+F6lnFbFS0GrbMJoZ96nFh+ Qlig== X-Gm-Message-State: AC+VfDx5nanoe9qOU9VdrASsparjpbONlorzgAJLlTFgQ4NhPw4MBxZZ KKrYoiIKNrqwwT1KMlCgtH3+22KO+48= X-Google-Smtp-Source: ACHHUZ4/gMWugqxC562++m+0mjjPH22IhlU5O4EFlnIZE7eanYQLflApmkcUxFdp7IuoUItQT/WlFA== X-Received: by 2002:a17:907:e8b:b0:94f:764e:e310 with SMTP id ho11-20020a1709070e8b00b0094f764ee310mr14335966ejc.37.1683653037704; Tue, 09 May 2023 10:23:57 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:57 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/27] valgrind: update 3.20.0 -> 3.21.0 Date: Tue, 9 May 2023 19:23:32 +0200 Message-Id: <20230509172344.1516743-15-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181070 Drop patches merged upstream. Signed-off-by: Alexander Kanavin --- ...01-drd-tests-Include-missing-cstdint.patch | 34 ---------- ...efine-__THROW-if-not-already-defined.patch | 32 --------- ...inux-seg_override.c-add-missing-incl.patch | 30 ++++++++ ...ck-x86-Define-__THROW-if-not-defined.patch | 32 --------- ...de-Replace-__modify_ldt-with-syscall.patch | 68 ------------------- ...est-wrapper-to-support-PTEST-formats.patch | 52 +++++++------- .../valgrind/valgrind/fixed-perl-path.patch | 38 ++--------- ...{valgrind_3.20.0.bb => valgrind_3.21.0.bb} | 14 +--- 8 files changed, 65 insertions(+), 235 deletions(-) delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch rename meta/recipes-devtools/valgrind/{valgrind_3.20.0.bb => valgrind_3.21.0.bb} (92%) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch b/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch deleted file mode 100644 index fbee24a5389..00000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 687d9fb9e3de832379680e9d5268331011c92afa Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 26 Jan 2023 08:53:26 -0800 -Subject: [PATCH] drd/tests: Include missing - -gcc 13 moved some includes around and as a result is no longer -transitively included [1]. Explicitly include it for uint{32,64}_t. - -Fixes -tsan_thread_wrappers_pthread.h:91:9: error: 'int64_t' does not name a type - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=464859] -Signed-off-by: Khem Raj ---- - drd/tests/tsan_thread_wrappers_pthread.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drd/tests/tsan_thread_wrappers_pthread.h b/drd/tests/tsan_thread_wrappers_pthread.h -index f15e6ad..4cc8062 100644 ---- a/drd/tests/tsan_thread_wrappers_pthread.h -+++ b/drd/tests/tsan_thread_wrappers_pthread.h -@@ -55,6 +55,7 @@ - #define NO_TLS - #endif - -+#include - #include - using namespace std; - --- -2.39.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch deleted file mode 100644 index a48d7db070f..00000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3409dc35c15bb14c8a525239806322648e079ab1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 5 Jul 2017 17:12:43 -0700 -Subject: [PATCH 1/3] memcheck/arm64: Define __THROW if not already defined - -Helps compiling with musl where __THROW is not available - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - memcheck/tests/arm64-linux/scalar.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/memcheck/tests/arm64-linux/scalar.h b/memcheck/tests/arm64-linux/scalar.h -index 9008816..8ef050f 100644 ---- a/memcheck/tests/arm64-linux/scalar.h -+++ b/memcheck/tests/arm64-linux/scalar.h -@@ -12,6 +12,10 @@ - #include - #include - -+#ifndef __THROW -+#define __THROW -+#endif -+ - // Since we use vki_unistd.h, we can't include . So we have to - // declare this ourselves. - extern long int syscall (long int __sysno, ...) __THROW; --- -2.13.2 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch new file mode 100644 index 00000000000..5e36c28523e --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch @@ -0,0 +1,30 @@ +From 978d9ed7f857f2cdcd2a8632f3c2feb56b99c825 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 8 May 2023 11:56:35 +0200 +Subject: [PATCH] none/tests/x86-linux/seg_override.c: add missing include for + musl builds + +Otherwise SYS_modify_ldt is undefined. + +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=382034] +Signed-off-by: Alexander Kanavin + +--- + none/tests/x86-linux/seg_override.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/none/tests/x86-linux/seg_override.c b/none/tests/x86-linux/seg_override.c +index ca8fbfe..4ef4394 100644 +--- a/none/tests/x86-linux/seg_override.c ++++ b/none/tests/x86-linux/seg_override.c +@@ -3,6 +3,10 @@ + #include + #include + #include "../../../config.h" ++#if defined(MUSL_LIBC) ++#include ++#include ++#endif + + + /* Stuff from Wine. */ diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch b/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch deleted file mode 100644 index 5433472291e..00000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 67d199dbdcbb3feff5f8928f87725fc64c0307d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 5 Jul 2017 17:36:42 -0700 -Subject: [PATCH 2/3] memcheck/x86: Define __THROW if not defined - -musl does not have __THROW, therefore make it null - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - memcheck/tests/x86-linux/scalar.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/memcheck/tests/x86-linux/scalar.h b/memcheck/tests/x86-linux/scalar.h -index ef28b03..52f742e 100644 ---- a/memcheck/tests/x86-linux/scalar.h -+++ b/memcheck/tests/x86-linux/scalar.h -@@ -11,6 +11,10 @@ - #include - #include - -+#ifndef __THROW -+#define __THROW -+#endif -+ - // Since we use vki_unistd.h, we can't include . So we have to - // declare this ourselves. - extern long int syscall (long int __sysno, ...) __THROW; --- -2.13.2 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch b/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch deleted file mode 100644 index fa1344c8539..00000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch +++ /dev/null @@ -1,68 +0,0 @@ -From d103475875858ab8a2e6b53ce178bb2f63883d4c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 5 Jul 2017 17:37:56 -0700 -Subject: [PATCH 3/3] tests/seg_override: Replace __modify_ldt() with syscall() - -__modify_ldt() is specific to glibc, replacing it with syscall() -makes it more portable. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - none/tests/x86-linux/seg_override.c | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/none/tests/x86-linux/seg_override.c b/none/tests/x86-linux/seg_override.c -index b7619c9..c89874b 100644 ---- a/none/tests/x86-linux/seg_override.c -+++ b/none/tests/x86-linux/seg_override.c -@@ -2,6 +2,8 @@ - #include - #include - #include -+#include -+#include - - /* Stuff from Wine. */ - -@@ -52,14 +54,11 @@ inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) - /* our copy of the ldt */ - LDT_ENTRY ldt_copy[8192]; - --/* System call to set LDT entry. */ --//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); --extern int __modify_ldt (int, void *, size_t); -- - void print_ldt ( void ) - { - int res; -- res = __modify_ldt( 0, ldt_copy, 8192*sizeof(LDT_ENTRY) ); -+ /* System call to set LDT entry. */ -+ res = syscall(SYS_modify_ldt, 0, ldt_copy, 8192*sizeof(LDT_ENTRY) ); - printf("got %d bytes\n", res ); - perror("error is"); - } -@@ -83,9 +82,6 @@ struct modify_ldt_ldt_s - unsigned int empty:25; - }; - --/* System call to set LDT entry. */ --//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); -- - void set_ldt1 ( void* base ) - { - int stat; -@@ -102,7 +98,8 @@ void set_ldt1 ( void* base ) - ldt_entry.read_exec_only = 0; - ldt_entry.limit_in_pages = 0; - ldt_entry.seg_not_present = 0; -- stat = __modify_ldt (1, &ldt_entry, sizeof (ldt_entry)); -+ /* System call to set LDT entry. */ -+ stat = syscall(SYS_modify_ldt, 1, &ldt_entry, sizeof (ldt_entry)); - printf("stat = %d\n", stat); - } - --- -2.13.2 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch index a3637ea846e..fea3b00f62e 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch @@ -1,7 +1,7 @@ -From f49f27f1bc67d07440b0ac9a7d767a8ea1589bfe Mon Sep 17 00:00:00 2001 +From e244a72c6f8803550f37e81f72bbae039651013b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 15 Dec 2015 15:50:44 +0200 -Subject: [PATCH 5/5] Modify vg_test wrapper to support PTEST formats +Subject: [PATCH] Modify vg_test wrapper to support PTEST formats Change the valgrind regression test script vg_regtest to support the yocto ptest stdout reporting format. The commit adds @@ -25,11 +25,11 @@ Increase time limit to 90 s. Signed-off-by: Yi Fan Yu --- - tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++-------------- + tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in -index a441f42..cb05b52 100755 +index ad18800..e4bd8cb 100755 --- a/tests/vg_regtest.in +++ b/tests/vg_regtest.in @@ -47,6 +47,7 @@ @@ -49,7 +49,7 @@ index a441f42..cb05b52 100755 . " Use EXTRA_REGTEST_OPTS to supply extra args for all tests\n" . "\n"; -@@ -186,6 +187,7 @@ my $outer_args; +@@ -187,6 +188,7 @@ my $run_outer_args = ""; my $valgrind_lib = "$tests_dir/.in_place"; my $keepunfiltered = 0; my $looptillfail = 0; @@ -57,7 +57,7 @@ index a441f42..cb05b52 100755 # default filter is the one named "filter_stderr" in the test's directory my $default_stderr_filter = "filter_stderr"; -@@ -244,6 +246,8 @@ sub process_command_line() +@@ -245,6 +247,8 @@ sub process_command_line() $keepunfiltered = 1; } elsif ($arg =~ /^--loop-till-fail$/) { $looptillfail = 1; @@ -66,7 +66,7 @@ index a441f42..cb05b52 100755 } else { die $usage; } -@@ -365,13 +369,28 @@ sub read_vgtest_file($) +@@ -376,13 +380,28 @@ sub read_vgtest_file($) #---------------------------------------------------------------------------- # Since most of the program time is spent in system() calls, need this to # propagate a Ctrl-C enabling us to quit. @@ -100,7 +100,7 @@ index a441f42..cb05b52 100755 # if $keepunfiltered, copies $1 to $1.unfiltered.out # renames $0 tp $1 sub filtered_rename($$) -@@ -419,23 +438,25 @@ sub do_diffs($$$$) +@@ -430,23 +449,25 @@ sub do_diffs($$$$) # A match; remove .out and any previously created .diff files. unlink("$name.$mid.out"); unlink(<$name.$mid.diff*>); @@ -128,7 +128,7 @@ index a441f42..cb05b52 100755 $vgtest =~ /^(.*)\.vgtest/; my $name = $1; my $fullname = "$dir/$name"; -@@ -454,7 +475,11 @@ sub do_one_test($$) +@@ -465,7 +486,11 @@ sub do_one_test($$) } elsif (256 == $prereq_res) { # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256... # Prereq failed, skip. @@ -141,7 +141,7 @@ index a441f42..cb05b52 100755 return; } else { # Bad prereq; abort. -@@ -472,7 +497,7 @@ sub do_one_test($$) +@@ -483,7 +508,7 @@ sub do_one_test($$) } # If there is a progB, let's start it in background: printf("%-16s valgrind $extraopts $vgopts $prog $args (progB: $progB $argsB)\n", @@ -150,7 +150,7 @@ index a441f42..cb05b52 100755 # progB.done used to detect child has finished. See below. # Note: redirection of stdout and stderr is before $progB to allow argsB # to e.g. redirect stdoutB to stderrB -@@ -488,7 +513,8 @@ sub do_one_test($$) +@@ -499,7 +524,8 @@ sub do_one_test($$) . "touch progB.done) &"); } } else { @@ -160,7 +160,7 @@ index a441f42..cb05b52 100755 } # Collect environment variables, if any. -@@ -529,7 +555,7 @@ sub do_one_test($$) +@@ -540,7 +566,7 @@ sub do_one_test($$) # Find all the .stdout.exp files. If none, use /dev/null. my @stdout_exps = <$name.stdout.exp*>; @stdout_exps = ( "/dev/null" ) if (0 == scalar @stdout_exps); @@ -169,7 +169,7 @@ index a441f42..cb05b52 100755 # Filter stderr $stderr_filter_args = $name if (! defined $stderr_filter_args); -@@ -538,7 +564,7 @@ sub do_one_test($$) +@@ -549,7 +575,7 @@ sub do_one_test($$) # Find all the .stderr.exp files. At least one must exist. my @stderr_exps = <$name.stderr.exp*>; (0 != scalar @stderr_exps) or die "Could not find `$name.stderr.exp*'\n"; @@ -178,7 +178,7 @@ index a441f42..cb05b52 100755 if (defined $progB) { # wait for the child to be finished -@@ -562,7 +588,7 @@ sub do_one_test($$) +@@ -573,7 +599,7 @@ sub do_one_test($$) # Find all the .stdoutB.exp files. If none, use /dev/null. my @stdoutB_exps = <$name.stdoutB.exp*>; @stdoutB_exps = ( "/dev/null" ) if (0 == scalar @stdoutB_exps); @@ -187,7 +187,7 @@ index a441f42..cb05b52 100755 # Filter stderr $stderrB_filter_args = $name if (! defined $stderrB_filter_args); -@@ -571,7 +597,7 @@ sub do_one_test($$) +@@ -582,7 +608,7 @@ sub do_one_test($$) # Find all the .stderrB.exp files. At least one must exist. my @stderrB_exps = <$name.stderrB.exp*>; (0 != scalar @stderrB_exps) or die "Could not find `$name.stderrB.exp*'\n"; @@ -196,7 +196,7 @@ index a441f42..cb05b52 100755 } # Maybe do post-test check -@@ -583,7 +609,7 @@ sub do_one_test($$) +@@ -594,7 +620,7 @@ sub do_one_test($$) # Find all the .post.exp files. If none, use /dev/null. my @post_exps = <$name.post.exp*>; @post_exps = ( "/dev/null" ) if (0 == scalar @post_exps); @@ -205,7 +205,7 @@ index a441f42..cb05b52 100755 } } -@@ -592,6 +618,13 @@ sub do_one_test($$) +@@ -603,6 +629,13 @@ sub do_one_test($$) print("(cleanup operation failed: $cleanup)\n"); } @@ -219,25 +219,25 @@ index a441f42..cb05b52 100755 $num_tests_done++; } -@@ -631,7 +664,7 @@ sub test_one_dir($$) - my $found_tests = (0 != (grep { $_ =~ /\.vgtest$/ } @fs)); +@@ -643,7 +676,7 @@ sub test_one_dir($$) + my $tests_start_time = time; if ($found_tests) { - print "-- Running tests in $full_dir $dashes\n"; + print "-- Running tests in $full_dir $dashes\n" if ($yoctoptest == 0); } foreach my $f (@fs) { if (-d $f) { -@@ -641,7 +674,7 @@ sub test_one_dir($$) - } - } - if ($found_tests) { -- print "-- Finished tests in $full_dir $dashes\n"; +@@ -657,7 +690,7 @@ sub test_one_dir($$) + my $end_time = "(in $tests_cost_time sec)"; + my $end_dashes = "-" x (50 - (length $full_dir) + - (length $end_time) - 1); +- print "-- Finished tests in $full_dir $end_time $end_dashes\n"; + print "-- Finished tests in $full_dir $dashes\n" if ($yoctoptest == 0); } chdir(".."); -@@ -667,10 +700,12 @@ sub summarise_results +@@ -683,10 +716,12 @@ sub summarise_results $num_failures{"stdout"}, plural($num_failures{"stdout"}), $num_failures{"stderrB"}, plural($num_failures{"stderrB"}), $num_failures{"stdoutB"}, plural($num_failures{"stdoutB"}), @@ -253,5 +253,5 @@ index a441f42..cb05b52 100755 print "\n"; } -- -2.6.2 +2.30.2 diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch index db6867f6259..b9804e74516 100644 --- a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch +++ b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch @@ -1,4 +1,4 @@ -From d85cc45e0ddeda68adf594dead715964cb32d0e7 Mon Sep 17 00:00:00 2001 +From beaa5b64c60d501fa9cd59fdc563e5f5bccf6882 Mon Sep 17 00:00:00 2001 From: Qing He Date: Tue, 31 Aug 2010 22:51:58 +0800 Subject: [PATCH] valgrind: fix perl scripts @@ -17,34 +17,13 @@ a better fix would need: Upstream-Status: Inappropriate [configuration] Signed-off-by: Maxin B. John + --- - cachegrind/cg_annotate.in | 2 +- - cachegrind/cg_diff.in | 2 +- - massif/ms_print.in | 2 +- - perf/vg_perf.in | 2 +- - tests/vg_regtest.in | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + massif/ms_print.in | 2 +- + perf/vg_perf.in | 2 +- + tests/vg_regtest.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in -index fea114b..5e814fd 100644 ---- a/cachegrind/cg_annotate.in -+++ b/cachegrind/cg_annotate.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Cachegrind's annotator. cg_annotate.in ---## -diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in -index 9d9258e..d0f0ec7 100755 ---- a/cachegrind/cg_diff.in -+++ b/cachegrind/cg_diff.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Cachegrind's differencer. cg_diff.in ---## diff --git a/massif/ms_print.in b/massif/ms_print.in index a206ce4..df1bc31 100755 --- a/massif/ms_print.in @@ -66,7 +45,7 @@ index 90ee1d2..c585096 100644 ##--- Valgrind performance testing script vg_perf ---## ##--------------------------------------------------------------------## diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in -index 0fe6341..1b45eb7 100755 +index 7152765..ad18800 100755 --- a/tests/vg_regtest.in +++ b/tests/vg_regtest.in @@ -1,4 +1,4 @@ @@ -75,6 +54,3 @@ index 0fe6341..1b45eb7 100755 ##--------------------------------------------------------------------## ##--- Valgrind regression testing script vg_regtest ---## ##--------------------------------------------------------------------## --- -2.29.2 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb similarity index 92% rename from meta/recipes-devtools/valgrind/valgrind_3.20.0.bb rename to meta/recipes-devtools/valgrind/valgrind_3.21.0.bb index 07e50426e44..717d82830e7 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb @@ -27,9 +27,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ file://0002-context-APIs-are-not-available-on-musl.patch \ file://0003-correct-include-directive-path-for-config.h.patch \ - file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ - file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ - file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ file://0001-fix-opcode-not-supported-on-mips32-linux.patch \ file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ @@ -39,9 +36,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ file://0001-docs-Disable-manual-validation.patch \ - file://0001-drd-tests-Include-missing-cstdint.patch \ + file://0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch \ " -SRC_URI[sha256sum] = "8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6" +SRC_URI[sha256sum] = "10ce1618bb3e33fad16eb79552b0a3e1211762448a0d7fce11c8a6243b9ac971" UPSTREAM_CHECK_REGEX = "valgrind-(?P\d+(\.\d+)+)\.tar" COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' @@ -208,13 +205,6 @@ do_install_ptest() { \) \ -exec rm {} \; - # These files need to be newer so touch them. - touch ${D}${PTEST_PATH}/cachegrind/tests/a.c -r ${D}${PTEST_PATH}/cachegrind/tests/cgout-test - - # find *_annotate in ${bindir} for yocto build - sed -i s:\.\./\.\./cachegrind/cg_annotate:${bindir}/cg_annotate: ${D}${PTEST_PATH}/cachegrind/tests/ann1.vgtest - sed -i s:\.\./\.\./cachegrind/cg_annotate:${bindir}/cg_annotate: ${D}${PTEST_PATH}/cachegrind/tests/ann2.vgtest - sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann1.vgtest sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann2.vgtest From patchwork Tue May 9 17:23:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23724 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 F030AC7EE2D for ; Tue, 9 May 2023 17:24:03 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web10.39163.1683653040025173236 for ; Tue, 09 May 2023 10:24:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=LvJvHoem; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-94ef0a8546fso1001247966b.1 for ; Tue, 09 May 2023 10:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653038; x=1686245038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N9oKjNA4Ro4g0+gkbvpLKkChBzWWTDHyn2K8lxThPZs=; b=LvJvHoemvqsdfWAxNwJmQII5T9SkDoRXGbHQgDZ8t6GBoNeYYsbsoAO40TMNr1qxs3 le2QoHHAoRlsPjvtma9YkkqkX2cr7chYLy1PbAwkXDsfK0pQtcOS48UnIoG7q/LeJSs/ Tw9i0Qjw1K8zoIjzAjfP0+rv9DgUNbVv04JaUH7f0Fgt5ADBm5orLcJHIjiMkQutj787 2pY0/DTtSlJHmkp/HjslQCa3nxtBnBCtF9N+rbjva/job8imrOxaTxmUjgUWlWQejJor uh/0XE40WheYr3/ruZe/B2zLDN6vHOY/g45ccOzSna7Pm6LnATsDQ4VBS3GwUVzFQpOR E67A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653038; x=1686245038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N9oKjNA4Ro4g0+gkbvpLKkChBzWWTDHyn2K8lxThPZs=; b=kZeyPSKovxO1ddCi3VPJSuRTyiL6xgzKHn1qwLJO83NIpQAPkmBbzraApS6mmpuHoW g+sP1LmeNK+nJuEuAi5kX2WMdaXC1TykRqZPTpxdeoOLN1fp6PbSgG2cTueP4GAIn2mk M/pl3oyiwtan7pP3bmHQ5hnu+AFu/hqa9FlsJ+2jtVVezQr/tUgmrQ7orqbFokjwTpFj bNtMPrnyxLfRMHxmdqzFLszDQObVChP72Xei28OltGsXKg9tjl46Y/n0UB1K+jYmwedc Ncy0iXT3Aens96id05Aj5HyZwNy9fb83Hk8W6ruySLwwd4F9QpT9HRIlF3xi++ZfZ1kA f4fA== X-Gm-Message-State: AC+VfDwffbMRjJ/Fy/GpIDjz08sTAbObmAsMB1vKp6slvbN+kuilqzcQ VVjUKcazUchRiRmC9T0S8JBzk8O64Ns= X-Google-Smtp-Source: ACHHUZ6646ra+027atSqm1PbFt+RavJYm/puRYH6zrw6lzehNbcahVtcBx/EpTt5Y2GIej0evAapug== X-Received: by 2002:a17:907:d1e:b0:965:66dd:78f8 with SMTP id gn30-20020a1709070d1e00b0096566dd78f8mr14709349ejc.56.1683653038508; Tue, 09 May 2023 10:23:58 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:58 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/27] less: update 608 -> 633 Date: Tue, 9 May 2023 19:23:33 +0200 Message-Id: <20230509172344.1516743-16-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181071 Drop backport. License-update: copyright years. Signed-off-by: Alexander Kanavin --- .../less/files/CVE-2022-46663.patch | 28 ------------------- .../less/{less_608.bb => less_633.bb} | 8 ++---- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-extended/less/files/CVE-2022-46663.patch rename meta/recipes-extended/less/{less_608.bb => less_633.bb} (84%) diff --git a/meta/recipes-extended/less/files/CVE-2022-46663.patch b/meta/recipes-extended/less/files/CVE-2022-46663.patch deleted file mode 100644 index 20f9d89ed86..00000000000 --- a/meta/recipes-extended/less/files/CVE-2022-46663.patch +++ /dev/null @@ -1,28 +0,0 @@ -CVE: CVE-2022-46663 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 -From: Mark Nudelman -Date: Fri, 7 Oct 2022 19:25:46 -0700 -Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. - ---- - line.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/line.c b/line.c -index 236c49ae..cba7bdd1 100644 ---- a/line.c -+++ b/line.c -@@ -633,8 +633,8 @@ ansi_step(pansi, ch) - /* Hyperlink ends with \7 or ESC-backslash. */ - if (ch == '\7') - return ANSI_END; -- if (pansi->prev_esc && ch == '\\') -- return ANSI_END; -+ if (pansi->prev_esc) -+ return (ch == '\\') ? ANSI_END : ANSI_ERR; - pansi->prev_esc = (ch == ESC); - return ANSI_MID; - } diff --git a/meta/recipes-extended/less/less_608.bb b/meta/recipes-extended/less/less_633.bb similarity index 84% rename from meta/recipes-extended/less/less_608.bb rename to meta/recipes-extended/less/less_633.bb index f907a8159cc..2defb5ccb7a 100644 --- a/meta/recipes-extended/less/less_608.bb +++ b/meta/recipes-extended/less/less_633.bb @@ -21,15 +21,13 @@ SECTION = "console/utils" LICENSE = "GPL-3.0-or-later | BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ - file://LICENSE;md5=38fc26d78ca8d284a2a5a4bbc263d29b \ + file://LICENSE;md5=1b2446f5c8632bf63a97d7a49750e1c6 \ " DEPENDS = "ncurses" -SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ - file://CVE-2022-46663.patch \ - " +SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209" +SRC_URI[sha256sum] = "2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f" UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" From patchwork Tue May 9 17:23:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23730 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 01EC0C7EE2E for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web11.39305.1683653041433459721 for ; Tue, 09 May 2023 10:24:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=sRgDlqUn; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-9661047f8b8so713541866b.0 for ; Tue, 09 May 2023 10:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653040; x=1686245040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zGtgB/VNswhUolyO+M0YjIYxRGNbJRAkS7Q2s1Thn6E=; b=sRgDlqUnD51IecL4LTW2Sc+v5zUhbFNe/ySep0afpr/7BSPXC0+8FTiXlip8+/RUQq FK4fxCYPkETu7UFisxUyuTfpHjfJHpDW9kF80em1LGCYf2Omlz4/43N9E/jC2rmq6x0h PeFYtWO9IfO9bHgJPzizYgY8V01y1hzAs1jap+2EMtw3trnWK5TkFUTE+cKNh+0kQUQS 63nzza2QlfY0Ze+cdTnZFCDzRu3r4F68/4nNaoRLygCGJFIx7en23Kcckrili6QHsFWv iI8rlX2nvmI7ncokvv72xLtp7skZRKQtgcybqJy07JLtgNl5ABofLbl947AMz5LegluU tPOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653040; x=1686245040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zGtgB/VNswhUolyO+M0YjIYxRGNbJRAkS7Q2s1Thn6E=; b=JZfyOKDGkj07pgkuGLWbwJ+5Nc1en7ypi3Q3Y0G8QM02FdKY3mWcKEZHC93LH5Gchl 2dQb848G7Ae7upYz7gO79bKOTb4PN/ZnwAzk9rJ/8F5cK/ad4Adb3sxuX4e3DcmJURhk TdHC4hjN7ppraxH83e6azfzvO9Ls4yY3N8FATTDTgmNjUvn2UCjLMCOPLnWPeHrw2Ze5 Lp8LjbuB7X0tgxfZzll3F/+AFuw/+Dg19vgIjVjPMjQKOV/EuspnJRkqFZDQEsvQW94f yBGlTpK5xBOQc6fdJ/Z71+b0Z14rzg+MpNroJkGMqVii3Ai0UAhZV3j37yF0HP9h6T6K vNVQ== X-Gm-Message-State: AC+VfDwav4D1bx+C86AQn30YiedF79itgBh0YnMDYTLwztoVjWAF17Ok G82JjEsWJZlLu+rAicZVqbM4FHYU6Ok= X-Google-Smtp-Source: ACHHUZ78cxpP5w8Mm6bTYVUNcDcOH0Xu8cF6fkc7tz6VwjomNz/y9cs+adidskna3+FBGTglNA5TFg== X-Received: by 2002:a17:907:9302:b0:94f:59aa:8a7c with SMTP id bu2-20020a170907930200b0094f59aa8a7cmr11347759ejc.20.1683653039467; Tue, 09 May 2023 10:23:59 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:59 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/27] librsvf: update 2.54.5 -> 2.56.0 Date: Tue, 9 May 2023 19:23:34 +0200 Message-Id: <20230509172344.1516743-17-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181072 Upstream no longer includes all the crates into tarballs, so use cargo_update_recipe_crates class to make a list for the crate:// fetcher. Signed-off-by: Alexander Kanavin --- meta/recipes-gnome/librsvg/librsvg-crates.inc | 594 ++++++++++++++++++ ...lib.rs-do-not-probe-into-harcoded-li.patch | 17 +- .../{librsvg_2.54.5.bb => librsvg_2.56.0.bb} | 9 +- 3 files changed, 603 insertions(+), 17 deletions(-) create mode 100644 meta/recipes-gnome/librsvg/librsvg-crates.inc rename meta/recipes-gnome/librsvg/{librsvg_2.54.5.bb => librsvg_2.56.0.bb} (90%) diff --git a/meta/recipes-gnome/librsvg/librsvg-crates.inc b/meta/recipes-gnome/librsvg/librsvg-crates.inc new file mode 100644 index 00000000000..d73d1ae6932 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg-crates.inc @@ -0,0 +1,594 @@ +# Autogenerated with 'bitbake -c update_crates librsvg' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/aho-corasick/0.7.20 \ + crate://crates.io/android_system_properties/0.1.5 \ + crate://crates.io/anes/0.1.6 \ + crate://crates.io/anstyle/0.3.4 \ + crate://crates.io/anyhow/1.0.69 \ + crate://crates.io/approx/0.5.1 \ + crate://crates.io/assert_cmd/2.0.10 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base-x/0.2.11 \ + crate://crates.io/bit-set/0.5.3 \ + crate://crates.io/bit-vec/0.6.3 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/block/0.1.6 \ + crate://crates.io/bstr/1.3.0 \ + crate://crates.io/bumpalo/3.12.0 \ + crate://crates.io/bytemuck/1.13.1 \ + crate://crates.io/byteorder/1.4.3 \ + crate://crates.io/cairo-rs/0.17.0 \ + crate://crates.io/cairo-sys-rs/0.17.0 \ + crate://crates.io/cast/0.3.0 \ + crate://crates.io/cc/1.0.79 \ + crate://crates.io/cfg-expr/0.11.0 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/chrono/0.4.24 \ + crate://crates.io/ciborium/0.2.0 \ + crate://crates.io/ciborium-io/0.2.0 \ + crate://crates.io/ciborium-ll/0.2.0 \ + crate://crates.io/clap/3.2.23 \ + crate://crates.io/clap/4.1.9 \ + crate://crates.io/clap_complete/4.1.5 \ + crate://crates.io/clap_derive/4.1.9 \ + crate://crates.io/clap_lex/0.2.4 \ + crate://crates.io/clap_lex/0.3.3 \ + crate://crates.io/codespan-reporting/0.11.1 \ + crate://crates.io/const-cstr/0.3.0 \ + crate://crates.io/const_fn/0.4.9 \ + crate://crates.io/convert_case/0.4.0 \ + crate://crates.io/core-foundation-sys/0.8.3 \ + crate://crates.io/crc32fast/1.3.2 \ + crate://crates.io/criterion/0.4.0 \ + crate://crates.io/criterion-plot/0.5.0 \ + crate://crates.io/crossbeam-channel/0.5.7 \ + crate://crates.io/crossbeam-deque/0.8.3 \ + crate://crates.io/crossbeam-epoch/0.9.14 \ + crate://crates.io/crossbeam-utils/0.8.15 \ + crate://crates.io/cssparser/0.29.6 \ + crate://crates.io/cssparser-macros/0.6.0 \ + crate://crates.io/cxx/1.0.92 \ + crate://crates.io/cxx-build/1.0.92 \ + crate://crates.io/cxxbridge-flags/1.0.92 \ + crate://crates.io/cxxbridge-macro/1.0.92 \ + crate://crates.io/data-url/0.2.0 \ + crate://crates.io/derive_more/0.99.17 \ + crate://crates.io/difflib/0.4.0 \ + crate://crates.io/discard/1.0.4 \ + crate://crates.io/dlib/0.5.0 \ + crate://crates.io/doc-comment/0.3.3 \ + crate://crates.io/dtoa/0.4.8 \ + crate://crates.io/dtoa-short/0.3.3 \ + crate://crates.io/either/1.8.1 \ + crate://crates.io/encoding/0.2.33 \ + crate://crates.io/encoding-index-japanese/1.20141219.5 \ + crate://crates.io/encoding-index-korean/1.20141219.5 \ + crate://crates.io/encoding-index-simpchinese/1.20141219.5 \ + crate://crates.io/encoding-index-singlebyte/1.20141219.5 \ + crate://crates.io/encoding-index-tradchinese/1.20141219.5 \ + crate://crates.io/encoding_index_tests/0.1.4 \ + crate://crates.io/errno/0.2.8 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/fastrand/1.9.0 \ + crate://crates.io/flate2/1.0.25 \ + crate://crates.io/float-cmp/0.9.0 \ + crate://crates.io/fnv/1.0.7 \ + crate://crates.io/form_urlencoded/1.1.0 \ + crate://crates.io/futf/0.1.5 \ + crate://crates.io/futures-channel/0.3.27 \ + crate://crates.io/futures-core/0.3.27 \ + crate://crates.io/futures-executor/0.3.27 \ + crate://crates.io/futures-io/0.3.27 \ + crate://crates.io/futures-macro/0.3.27 \ + crate://crates.io/futures-task/0.3.27 \ + crate://crates.io/futures-util/0.3.27 \ + crate://crates.io/fxhash/0.2.1 \ + crate://crates.io/gdk-pixbuf/0.17.0 \ + crate://crates.io/gdk-pixbuf-sys/0.17.0 \ + crate://crates.io/getrandom/0.1.16 \ + crate://crates.io/getrandom/0.2.8 \ + crate://crates.io/gio/0.17.4 \ + crate://crates.io/gio-sys/0.17.4 \ + crate://crates.io/glib/0.17.5 \ + crate://crates.io/glib-macros/0.17.5 \ + crate://crates.io/glib-sys/0.17.4 \ + crate://crates.io/gobject-sys/0.17.4 \ + crate://crates.io/half/1.8.2 \ + crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/heck/0.4.1 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.2.6 \ + crate://crates.io/hermit-abi/0.3.1 \ + crate://crates.io/iana-time-zone/0.1.53 \ + crate://crates.io/iana-time-zone-haiku/0.1.1 \ + crate://crates.io/idna/0.3.0 \ + crate://crates.io/indexmap/1.9.2 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/io-lifetimes/1.0.7 \ + crate://crates.io/is-terminal/0.4.4 \ + crate://crates.io/itertools/0.10.5 \ + crate://crates.io/itoa/1.0.6 \ + crate://crates.io/js-sys/0.3.61 \ + crate://crates.io/language-tags/0.3.2 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.140 \ + crate://crates.io/libloading/0.7.4 \ + crate://crates.io/libm/0.2.6 \ + crate://crates.io/link-cplusplus/1.0.8 \ + crate://crates.io/linked-hash-map/0.5.6 \ + crate://crates.io/linux-raw-sys/0.1.4 \ + crate://crates.io/locale_config/0.3.0 \ + crate://crates.io/lock_api/0.4.9 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/lopdf/0.29.0 \ + crate://crates.io/mac/0.1.1 \ + crate://crates.io/malloc_buf/0.0.6 \ + crate://crates.io/markup5ever/0.11.0 \ + crate://crates.io/matches/0.1.10 \ + crate://crates.io/matrixmultiply/0.3.2 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/memoffset/0.8.0 \ + crate://crates.io/miniz_oxide/0.6.2 \ + crate://crates.io/nalgebra/0.32.2 \ + crate://crates.io/nalgebra-macros/0.2.0 \ + crate://crates.io/new_debug_unreachable/1.0.4 \ + crate://crates.io/nodrop/0.1.14 \ + crate://crates.io/normalize-line-endings/0.3.0 \ + crate://crates.io/num-complex/0.4.3 \ + crate://crates.io/num-integer/0.1.45 \ + crate://crates.io/num-rational/0.4.1 \ + crate://crates.io/num-traits/0.2.15 \ + crate://crates.io/num_cpus/1.15.0 \ + crate://crates.io/objc/0.2.7 \ + crate://crates.io/objc-foundation/0.1.1 \ + crate://crates.io/objc_id/0.1.1 \ + crate://crates.io/once_cell/1.17.1 \ + crate://crates.io/oorandom/11.1.3 \ + crate://crates.io/os_str_bytes/6.4.1 \ + crate://crates.io/pango/0.17.4 \ + crate://crates.io/pango-sys/0.17.0 \ + crate://crates.io/pangocairo/0.17.0 \ + crate://crates.io/pangocairo-sys/0.17.3 \ + crate://crates.io/parking_lot/0.12.1 \ + crate://crates.io/parking_lot_core/0.9.7 \ + crate://crates.io/paste/1.0.12 \ + crate://crates.io/percent-encoding/2.2.0 \ + crate://crates.io/phf/0.8.0 \ + crate://crates.io/phf/0.10.1 \ + crate://crates.io/phf_codegen/0.8.0 \ + crate://crates.io/phf_codegen/0.10.0 \ + crate://crates.io/phf_generator/0.8.0 \ + crate://crates.io/phf_generator/0.10.0 \ + crate://crates.io/phf_macros/0.10.0 \ + crate://crates.io/phf_shared/0.8.0 \ + crate://crates.io/phf_shared/0.10.0 \ + crate://crates.io/pin-project-lite/0.2.9 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/pkg-config/0.3.26 \ + crate://crates.io/plotters/0.3.4 \ + crate://crates.io/plotters-backend/0.3.4 \ + crate://crates.io/plotters-svg/0.3.3 \ + crate://crates.io/png/0.17.7 \ + crate://crates.io/pom/3.2.0 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/precomputed-hash/0.1.1 \ + crate://crates.io/predicates/2.1.5 \ + crate://crates.io/predicates/3.0.1 \ + crate://crates.io/predicates-core/1.0.6 \ + crate://crates.io/predicates-tree/1.0.9 \ + crate://crates.io/proc-macro-crate/1.3.1 \ + crate://crates.io/proc-macro-error/1.0.4 \ + crate://crates.io/proc-macro-error-attr/1.0.4 \ + crate://crates.io/proc-macro-hack/0.5.20+deprecated \ + crate://crates.io/proc-macro2/1.0.52 \ + crate://crates.io/proptest/1.1.0 \ + crate://crates.io/quick-error/1.2.3 \ + crate://crates.io/quick-error/2.0.1 \ + crate://crates.io/quote/1.0.26 \ + crate://crates.io/rand/0.7.3 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.2.2 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.5.1 \ + crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/rand_hc/0.2.0 \ + crate://crates.io/rand_pcg/0.2.1 \ + crate://crates.io/rand_xorshift/0.3.0 \ + crate://crates.io/rawpointer/0.2.1 \ + crate://crates.io/rayon/1.7.0 \ + crate://crates.io/rayon-core/1.11.0 \ + crate://crates.io/rctree/0.5.0 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/regex/1.7.1 \ + crate://crates.io/regex-automata/0.1.10 \ + crate://crates.io/regex-syntax/0.6.28 \ + crate://crates.io/rgb/0.8.36 \ + crate://crates.io/rustc_version/0.2.3 \ + crate://crates.io/rustc_version/0.4.0 \ + crate://crates.io/rustix/0.36.9 \ + crate://crates.io/rusty-fork/0.3.0 \ + crate://crates.io/ryu/1.0.13 \ + crate://crates.io/safe_arch/0.6.0 \ + crate://crates.io/same-file/1.0.6 \ + crate://crates.io/scopeguard/1.1.0 \ + crate://crates.io/scratch/1.0.5 \ + crate://crates.io/selectors/0.24.0 \ + crate://crates.io/semver/0.9.0 \ + crate://crates.io/semver/1.0.17 \ + crate://crates.io/semver-parser/0.7.0 \ + crate://crates.io/serde/1.0.156 \ + crate://crates.io/serde_derive/1.0.156 \ + crate://crates.io/serde_json/1.0.94 \ + crate://crates.io/servo_arc/0.2.0 \ + crate://crates.io/sha1/0.6.1 \ + crate://crates.io/sha1_smol/1.0.0 \ + crate://crates.io/simba/0.8.0 \ + crate://crates.io/siphasher/0.3.10 \ + crate://crates.io/slab/0.4.8 \ + crate://crates.io/smallvec/1.10.0 \ + crate://crates.io/stable_deref_trait/1.2.0 \ + crate://crates.io/standback/0.2.17 \ + crate://crates.io/stdweb/0.4.20 \ + crate://crates.io/stdweb-derive/0.5.3 \ + crate://crates.io/stdweb-internal-macros/0.2.9 \ + crate://crates.io/stdweb-internal-runtime/0.1.5 \ + crate://crates.io/string_cache/0.8.7 \ + crate://crates.io/string_cache_codegen/0.5.2 \ + crate://crates.io/strsim/0.10.0 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/system-deps/6.0.3 \ + crate://crates.io/tempfile/3.4.0 \ + crate://crates.io/tendril/0.4.3 \ + crate://crates.io/termcolor/1.2.0 \ + crate://crates.io/termtree/0.4.1 \ + crate://crates.io/textwrap/0.16.0 \ + crate://crates.io/thiserror/1.0.39 \ + crate://crates.io/thiserror-impl/1.0.39 \ + crate://crates.io/time/0.2.27 \ + crate://crates.io/time-macros/0.1.1 \ + crate://crates.io/time-macros-impl/0.1.2 \ + crate://crates.io/tinytemplate/1.2.1 \ + crate://crates.io/tinyvec/1.6.0 \ + crate://crates.io/tinyvec_macros/0.1.1 \ + crate://crates.io/toml/0.5.11 \ + crate://crates.io/toml_datetime/0.6.1 \ + crate://crates.io/toml_edit/0.19.7 \ + crate://crates.io/typenum/1.16.0 \ + crate://crates.io/unarray/0.1.4 \ + crate://crates.io/unicode-bidi/0.3.11 \ + crate://crates.io/unicode-ident/1.0.8 \ + crate://crates.io/unicode-normalization/0.1.22 \ + crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/url/2.3.1 \ + crate://crates.io/utf-8/0.7.6 \ + crate://crates.io/version-compare/0.1.1 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/wait-timeout/0.2.0 \ + crate://crates.io/walkdir/2.3.3 \ + crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/wasm-bindgen/0.2.84 \ + crate://crates.io/wasm-bindgen-backend/0.2.84 \ + crate://crates.io/wasm-bindgen-macro/0.2.84 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.84 \ + crate://crates.io/wasm-bindgen-shared/0.2.84 \ + crate://crates.io/web-sys/0.3.61 \ + crate://crates.io/weezl/0.1.7 \ + crate://crates.io/wide/0.7.8 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.42.0 \ + crate://crates.io/windows-sys/0.45.0 \ + crate://crates.io/windows-targets/0.42.2 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ + crate://crates.io/windows_aarch64_msvc/0.42.2 \ + crate://crates.io/windows_i686_gnu/0.42.2 \ + crate://crates.io/windows_i686_msvc/0.42.2 \ + crate://crates.io/windows_x86_64_gnu/0.42.2 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ + crate://crates.io/windows_x86_64_msvc/0.42.2 \ + crate://crates.io/winnow/0.3.6 \ + crate://crates.io/xml5ever/0.17.0 \ + crate://crates.io/yeslogic-fontconfig-sys/4.0.1 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[aho-corasick-0.7.20.sha256sum] = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +SRC_URI[anes-0.1.6.sha256sum] = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +SRC_URI[anstyle-0.3.4.sha256sum] = "1ba0b55c2201aa802adb684e7963ce2c3191675629e7df899774331e3ac747cf" +SRC_URI[anyhow-1.0.69.sha256sum] = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +SRC_URI[approx-0.5.1.sha256sum] = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +SRC_URI[assert_cmd-2.0.10.sha256sum] = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[base-x-0.2.11.sha256sum] = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" +SRC_URI[bit-set-0.5.3.sha256sum] = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +SRC_URI[bit-vec-0.6.3.sha256sum] = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[block-0.1.6.sha256sum] = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +SRC_URI[bstr-1.3.0.sha256sum] = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +SRC_URI[bumpalo-3.12.0.sha256sum] = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +SRC_URI[bytemuck-1.13.1.sha256sum] = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +SRC_URI[cairo-rs-0.17.0.sha256sum] = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +SRC_URI[cairo-sys-rs-0.17.0.sha256sum] = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +SRC_URI[cast-0.3.0.sha256sum] = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +SRC_URI[cfg-expr-0.11.0.sha256sum] = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[chrono-0.4.24.sha256sum] = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +SRC_URI[ciborium-0.2.0.sha256sum] = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +SRC_URI[ciborium-io-0.2.0.sha256sum] = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +SRC_URI[ciborium-ll-0.2.0.sha256sum] = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +SRC_URI[clap-3.2.23.sha256sum] = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +SRC_URI[clap-4.1.9.sha256sum] = "9a9d6ada83c1edcce028902ea27dd929069c70df4c7600b131b4d9a1ad2879cc" +SRC_URI[clap_complete-4.1.5.sha256sum] = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" +SRC_URI[clap_derive-4.1.9.sha256sum] = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" +SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +SRC_URI[clap_lex-0.3.3.sha256sum] = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" +SRC_URI[codespan-reporting-0.11.1.sha256sum] = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +SRC_URI[const-cstr-0.3.0.sha256sum] = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" +SRC_URI[const_fn-0.4.9.sha256sum] = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +SRC_URI[convert_case-0.4.0.sha256sum] = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +SRC_URI[criterion-0.4.0.sha256sum] = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +SRC_URI[criterion-plot-0.5.0.sha256sum] = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +SRC_URI[crossbeam-channel-0.5.7.sha256sum] = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +SRC_URI[crossbeam-deque-0.8.3.sha256sum] = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +SRC_URI[crossbeam-epoch-0.9.14.sha256sum] = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +SRC_URI[crossbeam-utils-0.8.15.sha256sum] = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +SRC_URI[cssparser-0.29.6.sha256sum] = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +SRC_URI[cssparser-macros-0.6.0.sha256sum] = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" +SRC_URI[cxx-1.0.92.sha256sum] = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +SRC_URI[cxx-build-1.0.92.sha256sum] = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +SRC_URI[cxxbridge-flags-1.0.92.sha256sum] = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" +SRC_URI[cxxbridge-macro-1.0.92.sha256sum] = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +SRC_URI[data-url-0.2.0.sha256sum] = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +SRC_URI[derive_more-0.99.17.sha256sum] = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +SRC_URI[difflib-0.4.0.sha256sum] = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +SRC_URI[discard-1.0.4.sha256sum] = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +SRC_URI[dlib-0.5.0.sha256sum] = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +SRC_URI[doc-comment-0.3.3.sha256sum] = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +SRC_URI[dtoa-0.4.8.sha256sum] = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +SRC_URI[dtoa-short-0.3.3.sha256sum] = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" +SRC_URI[either-1.8.1.sha256sum] = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +SRC_URI[encoding-0.2.33.sha256sum] = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +SRC_URI[encoding-index-japanese-1.20141219.5.sha256sum] = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +SRC_URI[encoding-index-korean-1.20141219.5.sha256sum] = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +SRC_URI[encoding-index-simpchinese-1.20141219.5.sha256sum] = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +SRC_URI[encoding-index-singlebyte-1.20141219.5.sha256sum] = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +SRC_URI[encoding-index-tradchinese-1.20141219.5.sha256sum] = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +SRC_URI[encoding_index_tests-0.1.4.sha256sum] = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" +SRC_URI[errno-0.2.8.sha256sum] = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +SRC_URI[fastrand-1.9.0.sha256sum] = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +SRC_URI[flate2-1.0.25.sha256sum] = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +SRC_URI[float-cmp-0.9.0.sha256sum] = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +SRC_URI[form_urlencoded-1.1.0.sha256sum] = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +SRC_URI[futf-0.1.5.sha256sum] = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +SRC_URI[futures-channel-0.3.27.sha256sum] = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +SRC_URI[futures-core-0.3.27.sha256sum] = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +SRC_URI[futures-executor-0.3.27.sha256sum] = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +SRC_URI[futures-io-0.3.27.sha256sum] = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +SRC_URI[futures-macro-0.3.27.sha256sum] = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +SRC_URI[futures-task-0.3.27.sha256sum] = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +SRC_URI[futures-util-0.3.27.sha256sum] = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +SRC_URI[fxhash-0.2.1.sha256sum] = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +SRC_URI[gdk-pixbuf-0.17.0.sha256sum] = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +SRC_URI[gdk-pixbuf-sys-0.17.0.sha256sum] = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +SRC_URI[getrandom-0.2.8.sha256sum] = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +SRC_URI[gio-0.17.4.sha256sum] = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" +SRC_URI[gio-sys-0.17.4.sha256sum] = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +SRC_URI[glib-0.17.5.sha256sum] = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" +SRC_URI[glib-macros-0.17.5.sha256sum] = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40" +SRC_URI[glib-sys-0.17.4.sha256sum] = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +SRC_URI[gobject-sys-0.17.4.sha256sum] = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +SRC_URI[half-1.8.2.sha256sum] = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.2.6.sha256sum] = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +SRC_URI[hermit-abi-0.3.1.sha256sum] = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +SRC_URI[iana-time-zone-haiku-0.1.1.sha256sum] = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +SRC_URI[idna-0.3.0.sha256sum] = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +SRC_URI[indexmap-1.9.2.sha256sum] = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +SRC_URI[io-lifetimes-1.0.7.sha256sum] = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380" +SRC_URI[is-terminal-0.4.4.sha256sum] = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +SRC_URI[itoa-1.0.6.sha256sum] = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +SRC_URI[js-sys-0.3.61.sha256sum] = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +SRC_URI[language-tags-0.3.2.sha256sum] = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" +SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +SRC_URI[libc-0.2.140.sha256sum] = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +SRC_URI[libm-0.2.6.sha256sum] = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +SRC_URI[link-cplusplus-1.0.8.sha256sum] = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +SRC_URI[linked-hash-map-0.5.6.sha256sum] = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +SRC_URI[linux-raw-sys-0.1.4.sha256sum] = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +SRC_URI[locale_config-0.3.0.sha256sum] = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[lopdf-0.29.0.sha256sum] = "de0f69c40d6dbc68ebac4bf5aec3d9978e094e22e29fcabd045acd9cec74a9dc" +SRC_URI[mac-0.1.1.sha256sum] = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" +SRC_URI[malloc_buf-0.0.6.sha256sum] = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +SRC_URI[markup5ever-0.11.0.sha256sum] = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +SRC_URI[matches-0.1.10.sha256sum] = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +SRC_URI[matrixmultiply-0.3.2.sha256sum] = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +SRC_URI[memoffset-0.8.0.sha256sum] = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +SRC_URI[miniz_oxide-0.6.2.sha256sum] = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +SRC_URI[nalgebra-0.32.2.sha256sum] = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +SRC_URI[nalgebra-macros-0.2.0.sha256sum] = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +SRC_URI[new_debug_unreachable-1.0.4.sha256sum] = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +SRC_URI[nodrop-0.1.14.sha256sum] = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +SRC_URI[normalize-line-endings-0.3.0.sha256sum] = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +SRC_URI[num-complex-0.4.3.sha256sum] = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +SRC_URI[num-rational-0.4.1.sha256sum] = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +SRC_URI[num_cpus-1.15.0.sha256sum] = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +SRC_URI[objc-0.2.7.sha256sum] = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +SRC_URI[objc-foundation-0.1.1.sha256sum] = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +SRC_URI[objc_id-0.1.1.sha256sum] = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +SRC_URI[once_cell-1.17.1.sha256sum] = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +SRC_URI[oorandom-11.1.3.sha256sum] = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +SRC_URI[os_str_bytes-6.4.1.sha256sum] = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +SRC_URI[pango-0.17.4.sha256sum] = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +SRC_URI[pango-sys-0.17.0.sha256sum] = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +SRC_URI[pangocairo-0.17.0.sha256sum] = "2feeb7ea7874507f83f5e7ba869c54e321959431c8fbd70d4b735c8b15d90506" +SRC_URI[pangocairo-sys-0.17.3.sha256sum] = "f60f1be8ef08087ddcbdcc1350e06073bff11113d425d12b622b716d96b9611c" +SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +SRC_URI[parking_lot_core-0.9.7.sha256sum] = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +SRC_URI[paste-1.0.12.sha256sum] = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +SRC_URI[percent-encoding-2.2.0.sha256sum] = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +SRC_URI[phf-0.8.0.sha256sum] = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +SRC_URI[phf-0.10.1.sha256sum] = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +SRC_URI[phf_codegen-0.8.0.sha256sum] = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +SRC_URI[phf_codegen-0.10.0.sha256sum] = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +SRC_URI[phf_generator-0.8.0.sha256sum] = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +SRC_URI[phf_generator-0.10.0.sha256sum] = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +SRC_URI[phf_macros-0.10.0.sha256sum] = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +SRC_URI[phf_shared-0.8.0.sha256sum] = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +SRC_URI[phf_shared-0.10.0.sha256sum] = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +SRC_URI[plotters-0.3.4.sha256sum] = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +SRC_URI[plotters-backend-0.3.4.sha256sum] = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +SRC_URI[plotters-svg-0.3.3.sha256sum] = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +SRC_URI[png-0.17.7.sha256sum] = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +SRC_URI[pom-3.2.0.sha256sum] = "07e2192780e9f8e282049ff9bffcaa28171e1cb0844f49ed5374e518ae6024ec" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[precomputed-hash-0.1.1.sha256sum] = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +SRC_URI[predicates-2.1.5.sha256sum] = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +SRC_URI[predicates-3.0.1.sha256sum] = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +SRC_URI[proc-macro-crate-1.3.1.sha256sum] = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +SRC_URI[proc-macro-hack-0.5.20+deprecated.sha256sum] = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +SRC_URI[proc-macro2-1.0.52.sha256sum] = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +SRC_URI[proptest-1.1.0.sha256sum] = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" +SRC_URI[quick-error-1.2.3.sha256sum] = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +SRC_URI[quote-1.0.26.sha256sum] = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +SRC_URI[rand_hc-0.2.0.sha256sum] = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +SRC_URI[rand_pcg-0.2.1.sha256sum] = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +SRC_URI[rand_xorshift-0.3.0.sha256sum] = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +SRC_URI[rawpointer-0.2.1.sha256sum] = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" +SRC_URI[rayon-1.7.0.sha256sum] = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +SRC_URI[rayon-core-1.11.0.sha256sum] = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +SRC_URI[rctree-0.5.0.sha256sum] = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" +SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[regex-1.7.1.sha256sum] = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +SRC_URI[regex-automata-0.1.10.sha256sum] = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +SRC_URI[regex-syntax-0.6.28.sha256sum] = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +SRC_URI[rgb-0.8.36.sha256sum] = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +SRC_URI[rustc_version-0.2.3.sha256sum] = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +SRC_URI[rustix-0.36.9.sha256sum] = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +SRC_URI[rusty-fork-0.3.0.sha256sum] = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +SRC_URI[ryu-1.0.13.sha256sum] = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +SRC_URI[safe_arch-0.6.0.sha256sum] = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +SRC_URI[scratch-1.0.5.sha256sum] = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +SRC_URI[selectors-0.24.0.sha256sum] = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +SRC_URI[semver-0.9.0.sha256sum] = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +SRC_URI[semver-1.0.17.sha256sum] = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +SRC_URI[semver-parser-0.7.0.sha256sum] = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +SRC_URI[serde-1.0.156.sha256sum] = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +SRC_URI[serde_derive-1.0.156.sha256sum] = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +SRC_URI[serde_json-1.0.94.sha256sum] = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +SRC_URI[servo_arc-0.2.0.sha256sum] = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" +SRC_URI[sha1-0.6.1.sha256sum] = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +SRC_URI[sha1_smol-1.0.0.sha256sum] = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +SRC_URI[simba-0.8.0.sha256sum] = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +SRC_URI[slab-0.4.8.sha256sum] = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +SRC_URI[smallvec-1.10.0.sha256sum] = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +SRC_URI[standback-0.2.17.sha256sum] = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +SRC_URI[stdweb-0.4.20.sha256sum] = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +SRC_URI[stdweb-derive-0.5.3.sha256sum] = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +SRC_URI[stdweb-internal-macros-0.2.9.sha256sum] = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +SRC_URI[stdweb-internal-runtime-0.1.5.sha256sum] = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" +SRC_URI[string_cache-0.8.7.sha256sum] = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +SRC_URI[string_cache_codegen-0.5.2.sha256sum] = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[system-deps-6.0.3.sha256sum] = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +SRC_URI[tempfile-3.4.0.sha256sum] = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +SRC_URI[tendril-0.4.3.sha256sum] = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +SRC_URI[termcolor-1.2.0.sha256sum] = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +SRC_URI[thiserror-1.0.39.sha256sum] = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +SRC_URI[thiserror-impl-1.0.39.sha256sum] = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +SRC_URI[time-0.2.27.sha256sum] = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +SRC_URI[time-macros-0.1.1.sha256sum] = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +SRC_URI[time-macros-impl-0.1.2.sha256sum] = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +SRC_URI[tinytemplate-1.2.1.sha256sum] = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +SRC_URI[toml_datetime-0.6.1.sha256sum] = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +SRC_URI[toml_edit-0.19.7.sha256sum] = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +SRC_URI[typenum-1.16.0.sha256sum] = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +SRC_URI[unarray-0.1.4.sha256sum] = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +SRC_URI[unicode-bidi-0.3.11.sha256sum] = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +SRC_URI[unicode-ident-1.0.8.sha256sum] = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[url-2.3.1.sha256sum] = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +SRC_URI[utf-8-0.7.6.sha256sum] = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +SRC_URI[version-compare-0.1.1.sha256sum] = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +SRC_URI[wait-timeout-0.2.0.sha256sum] = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +SRC_URI[walkdir-2.3.3.sha256sum] = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[wasm-bindgen-0.2.84.sha256sum] = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +SRC_URI[wasm-bindgen-backend-0.2.84.sha256sum] = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +SRC_URI[wasm-bindgen-macro-0.2.84.sha256sum] = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +SRC_URI[wasm-bindgen-macro-support-0.2.84.sha256sum] = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +SRC_URI[wasm-bindgen-shared-0.2.84.sha256sum] = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +SRC_URI[web-sys-0.3.61.sha256sum] = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +SRC_URI[weezl-0.1.7.sha256sum] = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +SRC_URI[wide-0.7.8.sha256sum] = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.42.0.sha256sum] = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +SRC_URI[winnow-0.3.6.sha256sum] = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +SRC_URI[xml5ever-0.17.0.sha256sum] = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" +SRC_URI[yeslogic-fontconfig-sys-4.0.1.sha256sum] = "ec657fd32bbcbeaef5c7bc8e10b3db95b143fab8db0a50079773dbf936fd4f73" diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch b/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch index 992ff8dee75..15d5abecc6e 100644 --- a/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch +++ b/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch @@ -10,22 +10,13 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin --- - vendor/system-deps/.cargo-checksum.json | 2 +- - vendor/system-deps/src/lib.rs | 16 +--------------- + system-deps-6.0.3/src/lib.rs | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) -diff --git a/vendor/system-deps/.cargo-checksum.json b/vendor/system-deps/.cargo-checksum.json -index 862df8b..931748e 100644 ---- a/vendor/system-deps/.cargo-checksum.json -+++ b/vendor/system-deps/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.toml":"927df7476ebf5f5983169cfd973f4c95b84da17caeb20d33cccf50e326af5316","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3fe7396637bf9233908f41c6001cfcb00a379225e06e36e508c8b3d7264a8aae","src/lib.rs":"c38fd96ca3233ebee3bb7e37ca8f8a7a2685cdd7fcccf0210eaa879aa91dc684","src/metadata.rs":"657bc1b77e949e4800f9dd808790ffa535820e1658d412121a1da548e0cdd02c","src/test.rs":"9d5f8c1fb7a821352d6ba75cb005ead3e36b4f359e61feb605ab8a36d4fd31f8","src/tests/lib/libteststatic.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/tests/testanotherlib.pc":"bb4fd942324e6d49ce3becd827aa5c948d1924ca6681904a3695c19b1424eb3c","src/tests/testdata.pc":"43f481e989c03674fed5ef78c6420b3f8d36a2ce001928d86c418d1844acd5e7","src/tests/testlib-2.0.pc":"152eb0c70c14c3d948118408f3d1fd3bb7531b02aa792db85bd957f7db90b45b","src/tests/testlib-3.0.pc":"cd39c2ef88f6828c9291150cc4b624e769abef484674eaebaa4f67979501315f","src/tests/testlib.pc":"75c0d8a5345f65794f583c83e1cf0dbf3385af6e6abea1d61bb86eef707a52db","src/tests/teststaticlib.pc":"77df23f6c7c1d47aff18453b47c87e53ec8a96017546e0a55c8c4d1e13b70134","src/tests/toml-missing-file/no-cargo-toml-here":"6ab4da4b56f15315df6538610cfcd2ba3d0f9a7a8414678ff00ab5a78f7d41fa"},"package":"a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709"} -\ No newline at end of file -+{"files":{"Cargo.toml":"927df7476ebf5f5983169cfd973f4c95b84da17caeb20d33cccf50e326af5316","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3fe7396637bf9233908f41c6001cfcb00a379225e06e36e508c8b3d7264a8aae","src/lib.rs":"534efc2f977d8c67d5be3a4c3e81093a6c00ab2de1102404166b1573ad96dbd2","src/metadata.rs":"657bc1b77e949e4800f9dd808790ffa535820e1658d412121a1da548e0cdd02c","src/test.rs":"9d5f8c1fb7a821352d6ba75cb005ead3e36b4f359e61feb605ab8a36d4fd31f8","src/tests/lib/libteststatic.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/tests/testanotherlib.pc":"bb4fd942324e6d49ce3becd827aa5c948d1924ca6681904a3695c19b1424eb3c","src/tests/testdata.pc":"43f481e989c03674fed5ef78c6420b3f8d36a2ce001928d86c418d1844acd5e7","src/tests/testlib-2.0.pc":"152eb0c70c14c3d948118408f3d1fd3bb7531b02aa792db85bd957f7db90b45b","src/tests/testlib-3.0.pc":"cd39c2ef88f6828c9291150cc4b624e769abef484674eaebaa4f67979501315f","src/tests/testlib.pc":"75c0d8a5345f65794f583c83e1cf0dbf3385af6e6abea1d61bb86eef707a52db","src/tests/teststaticlib.pc":"77df23f6c7c1d47aff18453b47c87e53ec8a96017546e0a55c8c4d1e13b70134","src/tests/toml-missing-file/no-cargo-toml-here":"6ab4da4b56f15315df6538610cfcd2ba3d0f9a7a8414678ff00ab5a78f7d41fa"},"package":"a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709"} -diff --git a/vendor/system-deps/src/lib.rs b/vendor/system-deps/src/lib.rs +diff --git a/system-deps-6.0.3/src/lib.rs b/system-deps-6.0.3/src/lib.rs index 45ab1ce..f87d1ec 100644 ---- a/vendor/system-deps/src/lib.rs -+++ b/vendor/system-deps/src/lib.rs +--- a/system-deps-6.0.3/src/lib.rs ++++ b/system-deps-6.0.3/src/lib.rs @@ -800,21 +800,7 @@ impl Config { } diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb b/meta/recipes-gnome/librsvg/librsvg_2.56.0.bb similarity index 90% rename from meta/recipes-gnome/librsvg/librsvg_2.54.5.bb rename to meta/recipes-gnome/librsvg/librsvg_2.56.0.bb index 59278d1b169..1a5d8a6b040 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.56.0.bb @@ -14,13 +14,15 @@ SECTION = "x11/utils" DEPENDS = "cairo gdk-pixbuf glib-2.0 libxml2 pango python3-docutils-native" BBCLASSEXTEND = "native nativesdk" -inherit cargo_common gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala gi-docgen +inherit cargo_common gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala gi-docgen cargo-update-recipe-crates + +require ${BPN}-crates.inc SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ - file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ + file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch;patchdir=${CARGO_VENDORING_DIRECTORY} \ " -SRC_URI[archive.sha256sum] = "4f03190f45324d1fa1f52a79dfcded1f64eaf49b3ae2f88eedab0c07617cae6e" +SRC_URI[archive.sha256sum] = "194b5097d9cd107495f49c291cf0da65ec2b4bb55e5628369751a3f44ba222b3" # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles # so we cannot use cargo class directly, but still need bits and pieces from it @@ -37,7 +39,6 @@ RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" -CARGO_DISABLE_BITBAKE_VENDORING = "1" do_configure[postfuncs] += "cargo_common_do_configure" inherit rust-target-config From patchwork Tue May 9 17:23:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23723 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 EFAFDC7EE25 for ; Tue, 9 May 2023 17:24:03 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web10.39165.1683653041812457409 for ; Tue, 09 May 2023 10:24:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=DFuhx/DG; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-953343581a4so947659866b.3 for ; Tue, 09 May 2023 10:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653040; x=1686245040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bVDgHGaYbvB1inLats3+8LpJ+e074UtfUU3Lu3Yt5fQ=; b=DFuhx/DG5tOaYBQAG9rJYYRENymwxGvOUdVZqCssZUGRPoOlz+vBdty1ShVsKx5Uq2 zgVIpsnHM1JRddYcV/S2xR3k3xR0cWuP2LpS0WgDzGfnqTWHQc2WHmzPuRYnfMOn0cA8 JvmAaENivs2fUDlimurnB76fwHHeI9OVrhpBRP2XfbWqq21YxmW2rrcBZVJKnuHPQsFk qe4yA/mSEH78SkAdcvLSmSJfluihxPsQAekS6uVI224gI46ZbsU4K/gOqkOMtgQzfXPj FLR88zuAJFjNwbCrVYrrFx7ke7M+eL/8XW7OqSYcbmofE7qNAtyKlZgAzkAft1CkmNJD igWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653040; x=1686245040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bVDgHGaYbvB1inLats3+8LpJ+e074UtfUU3Lu3Yt5fQ=; b=lwjwvHcxjZN251IIticE9XMRkOg1U2RjM7EEssXKEnogyAP/VReXbkizsLZifeE1kl niFO04AsxqDphhGv5dtcXdfPjAxlaLVYLBmCL6OquUzDkyTj/lexsbcEdE0OaYRocL/f orsGLGbTsz2BtX8kPK0PQxyPxpxV5Q152NYynYQPrP4NO1zTeDpw8xYXmlld6BJDQMKs TBm2wbX1+5jdQcCLhar2Zc+6MSHIgB3yijY0jafj2VinwF4Gtg1zooabFN5IC6Z2oR+E Mxbsh95JSu0uBZuEL2IzXTibCv/lPTVmVELhYisv07d8XdlT8kEB9EjXoA7hWfWZp7+l yJyw== X-Gm-Message-State: AC+VfDxaXo996xIYc+sy3WtngrTKEezYzyfvbd8QFCaijQ864Ajgm7HF RorP8LLsoLEunSRlGk4j1i9SG4GN50A= X-Google-Smtp-Source: ACHHUZ4KfQ72p719K14IrMwg2G6Ch6urnv6ht8BBPG1jGzo+nOpzeA2WylleMb38g6mf2JW/E3ZsHw== X-Received: by 2002:a17:907:268a:b0:965:d17b:26d with SMTP id bn10-20020a170907268a00b00965d17b026dmr11732124ejc.35.1683653040288; Tue, 09 May 2023 10:24:00 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:23:59 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/27] libva: update 2.16 -> 2.18 Date: Tue, 9 May 2023 19:23:35 +0200 Message-Id: <20230509172344.1516743-18-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181073 Signed-off-by: Alexander Kanavin --- .../{libva-initial_2.16.0.bb => libva-initial_2.18.0.bb} | 0 .../libva/{libva-utils_2.17.1.bb => libva-utils_2.18.2.bb} | 4 ++-- meta/recipes-graphics/libva/libva.inc | 2 +- .../libva/{libva_2.16.0.bb => libva_2.18.0.bb} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-graphics/libva/{libva-initial_2.16.0.bb => libva-initial_2.18.0.bb} (100%) rename meta/recipes-graphics/libva/{libva-utils_2.17.1.bb => libva-utils_2.18.2.bb} (90%) rename meta/recipes-graphics/libva/{libva_2.16.0.bb => libva_2.18.0.bb} (100%) diff --git a/meta/recipes-graphics/libva/libva-initial_2.16.0.bb b/meta/recipes-graphics/libva/libva-initial_2.18.0.bb similarity index 100% rename from meta/recipes-graphics/libva/libva-initial_2.16.0.bb rename to meta/recipes-graphics/libva/libva-initial_2.18.0.bb diff --git a/meta/recipes-graphics/libva/libva-utils_2.17.1.bb b/meta/recipes-graphics/libva/libva-utils_2.18.2.bb similarity index 90% rename from meta/recipes-graphics/libva/libva-utils_2.17.1.bb rename to meta/recipes-graphics/libva/libva-utils_2.18.2.bb index 1e475e804b8..c7bf36023d1 100644 --- a/meta/recipes-graphics/libva/libva-utils_2.17.1.bb +++ b/meta/recipes-graphics/libva/libva-utils_2.18.2.bb @@ -14,8 +14,8 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" -SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.17-branch;protocol=https" -SRCREV = "3a291be22cfe70e41bad8a376fa278efa651fdff" +SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.18-branch;protocol=https" +SRCREV = "76993ae8d0fbd17e5bfff80ed495c71e727f0d06" S = "${WORKDIR}/git" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))$" diff --git a/meta/recipes-graphics/libva/libva.inc b/meta/recipes-graphics/libva/libva.inc index 0f16dacc98f..7ed0c9ed890 100644 --- a/meta/recipes-graphics/libva/libva.inc +++ b/meta/recipes-graphics/libva/libva.inc @@ -18,7 +18,7 @@ LICENSE = "MIT" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/libva-${PV}.tar.bz2" LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" -SRC_URI[sha256sum] = "115faca0db2c417a37da49830870e260450fa13066f5e24e252a20c36d920a1c" +SRC_URI[sha256sum] = "a3577eeba0c23924686c7e2f2030073736c8282a80f27b5473e33ea94ccd4982" S = "${WORKDIR}/libva-${PV}" diff --git a/meta/recipes-graphics/libva/libva_2.16.0.bb b/meta/recipes-graphics/libva/libva_2.18.0.bb similarity index 100% rename from meta/recipes-graphics/libva/libva_2.16.0.bb rename to meta/recipes-graphics/libva/libva_2.18.0.bb From patchwork Tue May 9 17:23:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23725 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 0E867C7EE30 for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web11.39308.1683653042737769846 for ; Tue, 09 May 2023 10:24:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=GzxhJP1X; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-965ab8ed1fcso1111977866b.2 for ; Tue, 09 May 2023 10:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653041; x=1686245041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uiMIM5KmCQl26wRAiZ2dwdbghtAZZeroSE8ZqinXVtA=; b=GzxhJP1XU7DXzENs2Up1U6yq84fIeIrkO1pieTt3WVcSljxC+OyudiP3d86+juo+Te 9Z+vXjXo40K7uXFyn407EkA9e4cgVNm2RBTTHFSWJJnUnJ4oaG16ort8qNoDqdiMmPa6 xtGcwXwMd6iUR2sFs7y6tQgbTjfk2eQlZP1NXg0YGnd11haRRTFBfsBTnlIxFDX2bJDT Ur4de7CG9xI72YiIDXq+z13HmArF0RcmuOHBWIBZiNa87/K7i4Ca8o3u6EI6xBKQlcKc 5MlFCmwigTb1X9pde1w0IYGMWv+aaMjROrjSVksghHLDekNN8EUkyFxti0UvC+9nMUeM gNzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653041; x=1686245041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uiMIM5KmCQl26wRAiZ2dwdbghtAZZeroSE8ZqinXVtA=; b=T3P9WRgPvLoudxr7xMmHF6mu0VXNxlzviA+YPnHC8laE3bjsUf+/aaMf2yzKNx0w1M QuWqCENGBCNRETO2ittvFI2wzQFn5PpJ5PDw4CJnHXt1UFHgvPhEvWLn9HqIvycOCMbn W+p0+h2APjlEC1i/x1+D2utTLZqoWycLk/qNnhv7bBBRdLK5f/hmosSAyYwGMG9TEVGq GUXB37iS8WjorXXIibAGRN/Qo+aOzArhTI7Az7SjYrnuYQ3DtTPdyiBCxSha3GldBLKm YzMaMnmdxC62JC2isAOMIOEAAnyP4a0nWoarRz5H3bJJX5+oNKHH8sqfymemot6ZJnA4 hQBg== X-Gm-Message-State: AC+VfDw8v5rM7CdJ6rhns8gp5LboBODOfjOi/Fz0jCn7lvfHQd2zawpB ru8DjlYa8qrK7Y5j3/4f0R/HeMsUHcA= X-Google-Smtp-Source: ACHHUZ5xnXHwUBRWj7aSZVc6HiAA2E4h9f/AF+RZV/i3ae56PeYjEI39pyXssNA3ZsDx3jwMINIASA== X-Received: by 2002:a17:907:9345:b0:958:4870:8d09 with SMTP id bv5-20020a170907934500b0095848708d09mr13367244ejc.37.1683653041206; Tue, 09 May 2023 10:24:01 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:00 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/27] cryptodev: remove unneeded patch Date: Tue, 9 May 2023 19:23:36 +0200 Message-Id: <20230509172344.1516743-19-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181074 With 1.13 version the needed rules are available directly upstream. This wasn't noticed in 1.12->1.13 patch rebase. I verified that installed files are exactly same with and without the patch. Signed-off-by: Alexander Kanavin --- .../cryptodev/cryptodev-tests_1.13.bb | 7 +- ...and-install-rules-for-cryptodev-test.patch | 66 ------------------- 2 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb index c5414787966..458ad8ecf2a 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb @@ -5,14 +5,13 @@ SUMMARY = "A test suite for /dev/crypto device driver" DEPENDS += "openssl" SRC_URI += " \ -file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ -file://0001-tests-Makefile-do-not-use-Werror.patch \ -" + file://0001-tests-Makefile-do-not-use-Werror.patch \ + " EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' do_compile() { - oe_runmake testprogs + oe_runmake tests } do_install() { diff --git a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch deleted file mode 100644 index 8c40e623890..00000000000 --- a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 3ba8ba9410464d0986bc6cc5ddb1819745af1eb2 Mon Sep 17 00:00:00 2001 -From: Yu Zongchun -Date: Sun, 28 Apr 2013 14:39:22 +0800 -Subject: [PATCH] Add the compile and install rules for cryptodev tests folder - -This is required to install the cryptodev tests folder to rootfs - -Signed-off-by: Yu Zongchun - -Upstream-Status: Pending - ---- - Makefile | 6 ++++++ - tests/Makefile | 8 ++++++++ - 2 files changed, 14 insertions(+) - -diff --git a/Makefile b/Makefile -index d83aee6..3a750a1 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,6 +41,9 @@ modules_install: - install_tests: tests - $(MAKE) -C tests install DESTDIR=$(PREFIX) - -+install_tests: -+ make -C tests install DESTDIR=$(PREFIX) -+ - clean: - $(MAKE) $(KERNEL_MAKE_OPTS) clean - CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests clean -@@ -54,6 +57,9 @@ tests: - - .PHONY: install modules_install tests install_tests - -+testprogs: -+ KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs -+ - CPOPTS = - ifneq ($(SHOW_TYPES),) - CPOPTS += --show-types -diff --git a/tests/Makefile b/tests/Makefile -index 2502f32..2fb7a9a 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -23,6 +23,12 @@ bindir = $(execprefix)/bin - - all: $(hostprogs) - -+install: -+ install -d $(DESTDIR)/usr/bin/tests_cryptodev -+ for bin in $(hostprogs); do \ -+ install -m 755 $${bin} $(DESTDIR)/usr/bin/tests_cryptodev/; \ -+ done -+ - check: $(hostprogs) - ./cipher - ./hmac -@@ -38,6 +44,8 @@ install: - install -m 755 $$prog $(DESTDIR)/$(bindir); \ - done - -+testprogs: $(hostprogs) -+ - clean: - rm -f *.o *~ $(hostprogs) - From patchwork Tue May 9 17:23:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23733 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 31D72C7EE3A for ; Tue, 9 May 2023 17:24:04 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web10.39168.1683653043453750320 for ; Tue, 09 May 2023 10:24:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=O+aCahgV; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-94a34a14a54so1221047666b.1 for ; Tue, 09 May 2023 10:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653042; x=1686245042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a0fLJVWq54C5B5jf1TVk6M45QrhDFy9YNFc+AisTp3E=; b=O+aCahgV9uayziI5SG8217lUwOOa2LoeW7zc9EB2Tp5/ZJtX19ecRpK5EknXirQn0K mEKmIgjMu3yzt4x466t5vKde2dOCysoM3U7ezzNpFMjpikzbvG/UQOhSXAdAtfIm/l8U eo/klNp1rSiBGE5JYFlyBskOZPBYZplyBN/5UWsrJ0191ReUeW1MZ9KD5u0FMBz3ryY/ O/FsY9Om3bKyM6RKLeRxeIpMqn3FfQoHf0exXRILMRI95Y2+VJQr0qJbLCBrrXwrnkPK s1tc2rLH+r+WvvvK+HafR7bdeL2XraDFQ92w1HJdNlzzMS/tL9KMQq+8mPMDLmqOyX51 W3rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653042; x=1686245042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a0fLJVWq54C5B5jf1TVk6M45QrhDFy9YNFc+AisTp3E=; b=AT8pthDvdv3O8AFsKRWedyqDTYKv6jfO6xo2epOsPlfHlTiwsrpXClwPNyMCmEiTPA XJyz7oQ9Zv66rQjY22PEnNUF86kN3gs0WC/UMID2YJ/PaulSOixPrfQ55DvsAp2p33Pq tdWHLNSzoknEH8U2R/U3oP4MHYVppuPnghCf9nxMo9kY4J11Y1nIZiECIpyKwpbKBZoD OMONhQES3CJDYoy/iPTsFrUnlIfavltSLXtXb0k+DEMeRxpQOoVar4z5NNBp4dc8Kclt eIABc4SFWUrKG2/ezyNBhVYiKaTXpC717YttiF4jm0KgKCkfSrJwx21i0M5n509cmi5N sG1Q== X-Gm-Message-State: AC+VfDz2ganjcYIkQ8CxoEEOzae6MV24TdUsqdSrAAd6Mpx6jPis59ga +zCaM3E0lcD25qYiVrU+P8Q6PtXKIBo= X-Google-Smtp-Source: ACHHUZ4SM/uypWpfHIyEKYgi1rKTDXO0G6w/rDb2YjQcj3f2oY0vqkUbJlXk+q4FUTjfjE/ECnTsxw== X-Received: by 2002:a17:907:a06:b0:94e:c97b:e3ba with SMTP id bb6-20020a1709070a0600b0094ec97be3bamr12281059ejc.37.1683653041891; Tue, 09 May 2023 10:24:01 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:01 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 20/27] gpgme: update 1.18.0 -> 1.20.0 Date: Tue, 9 May 2023 19:23:37 +0200 Message-Id: <20230509172344.1516743-20-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181075 Rebase patches. Signed-off-by: Alexander Kanavin --- ...e-gpgme.m4-use-gpgrt-config-with-.pc.patch | 40 +++------ .../gpgme/gpgme/0001-pkgconfig.patch | 81 ++++++++++--------- ...n-gpg-error-config-should-not-be-use.patch | 34 +++----- .../0008-do-not-auto-check-var-PYTHON.patch | 13 +-- .../{gpgme_1.18.0.bb => gpgme_1.20.0.bb} | 2 +- 5 files changed, 71 insertions(+), 99 deletions(-) rename meta/recipes-support/gpgme/{gpgme_1.18.0.bb => gpgme_1.20.0.bb} (97%) diff --git a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch index 0c15cc7c38f..8ed39280cac 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch @@ -1,4 +1,4 @@ -From a001b3c23bf80fd752044615b9bba6b926ff9666 Mon Sep 17 00:00:00 2001 +From ee1421f7a7a9f31400ba992a5be52b88d20170c9 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 10 May 2019 14:18:04 +0800 Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc." @@ -10,36 +10,21 @@ The oe-core does not support gpgrt-config, so revert it Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia + --- - src/gpgme.m4 | 58 +++++++++------------------------------------------- - 1 file changed, 10 insertions(+), 48 deletions(-) + src/gpgme.m4 | 54 ++++++++-------------------------------------------- + 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index c749a5d..8579146 100644 +index f2906c1..8cc2898 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 -@@ -1,5 +1,5 @@ - # gpgme.m4 - autoconf macro to detect GPGME. --# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH -+# Copyright (C) 2002, 2003, 2004, 2014 g10 Code GmbH - # - # This file is free software; as a special exception the author gives - # unlimited permission to copy and/or distribute it, with or without -@@ -9,7 +9,7 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - # --# Last-changed: 2020-11-20 -+# Last-changed: 2014-10-02 - - - AC_DEFUN([_AM_PATH_GPGME_CONFIG], -@@ -36,24 +36,10 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], +@@ -125,24 +125,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl fi fi - use_gpgrt_config="" -- if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG gpgme --exists; then - GPGME_CONFIG="$GPGRT_CONFIG gpgme" - AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) @@ -61,7 +46,7 @@ index c749a5d..8579146 100644 fi gpgme_version_major=`echo $gpgme_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -@@ -66,16 +52,12 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], +@@ -155,16 +141,12 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], [ @@ -80,7 +65,7 @@ index c749a5d..8579146 100644 *** built for $gpgme_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-gpgme-prefix -@@ -136,11 +118,7 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -225,11 +207,7 @@ AC_DEFUN([AM_PATH_GPGME], # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then @@ -93,7 +78,7 @@ index c749a5d..8579146 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -280,11 +258,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -372,11 +350,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then @@ -106,7 +91,7 @@ index c749a5d..8579146 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -293,20 +267,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -385,20 +359,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], fi fi if test $ok = yes; then @@ -129,6 +114,3 @@ index c749a5d..8579146 100644 AC_MSG_RESULT(yes) ifelse([$2], , :, [$2]) _AM_PATH_GPGME_CONFIG_HOST_CHECK --- -2.25.1 - diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 3b2f59c2fcf..738b23cd584 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,4 +1,4 @@ -From 0d7ec5b98dc6cbd35f56deaecec5ecfdaa944aee Mon Sep 17 00:00:00 2001 +From f8221238d51066b7a1a5f2917cce2791876ea8b0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 10 May 2019 14:23:55 +0800 Subject: [PATCH] pkgconfig @@ -19,17 +19,17 @@ Signed-off-by: Wang Mingyu --- configure.ac | 1 + src/Makefile.am | 4 +- - src/gpgme-pthread.pc.in | 15 ++++++ - src/gpgme.m4 | 114 +++------------------------------------- + src/gpgme-pthread.pc.in | 15 +++++ + src/gpgme.m4 | 119 +++------------------------------------- src/gpgme.pc.in | 4 +- - 5 files changed, 28 insertions(+), 110 deletions(-) + 5 files changed, 29 insertions(+), 114 deletions(-) create mode 100644 src/gpgme-pthread.pc.in diff --git a/configure.ac b/configure.ac -index 9d696b9..5b4e730 100644 +index d1b9aca..9c4f97c 100644 --- a/configure.ac +++ b/configure.ac -@@ -926,6 +926,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -1043,6 +1043,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/gpgme-glib.pc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) @@ -77,10 +77,10 @@ index 0000000..074bbf6 +Cflags: -I${includedir} +Requires: libassuan gpg-error diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index 71b0010..5821895 100644 +index 8cc2898..0ff550e 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 -@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script +@@ -168,7 +168,7 @@ dnl config script does not match the host specification the script dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPGME], @@ -89,7 +89,7 @@ index 71b0010..5821895 100644 tmp=ifelse([$1], ,1:0.4.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -178,36 +178,12 @@ AC_DEFUN([AM_PATH_GPGME], min_gpgme_version="$tmp" fi @@ -128,7 +128,7 @@ index 71b0010..5821895 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -216,19 +192,11 @@ AC_DEFUN([AM_PATH_GPGME], fi fi if test $ok = yes; then @@ -148,44 +148,45 @@ index 71b0010..5821895 100644 ]) dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, -@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS +@@ -236,9 +204,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) + dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS dnl and GPGME_PTHREAD_LIBS. dnl - AC_DEFUN([AM_PATH_GPGME_PTHREAD], --[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl +-AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ +- AC_OBSOLETE([$0], [; use AM_PATH_GPGME instead to use GPGME_CFLAGS and GPGME_LIBS])dnl +- AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl ++AC_DEFUN([AM_PATH_GPGME_PTHREAD], +[ tmp=ifelse([$1], ,1:0.4.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], +@@ -248,40 +215,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ min_gpgme_version="$tmp" fi - AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) - ok=no - if test "$GPGME_CONFIG" != "no" ; then -- if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then -- req_major=`echo $min_gpgme_version | \ +- req_major=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -- req_minor=`echo $min_gpgme_version | \ +- req_minor=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- req_micro=`echo $min_gpgme_version | \ +- req_micro=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- if test "$gpgme_version_major" -gt "$req_major"; then +- if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes -- else +- else - if test "$gpgme_version_major" -eq "$req_major"; then -- if test "$gpgme_version_minor" -gt "$req_minor"; then -- ok=yes -- else -- if test "$gpgme_version_minor" -eq "$req_minor"; then -- if test "$gpgme_version_micro" -ge "$req_micro"; then -- ok=yes -- fi +- if test "$gpgme_version_minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$gpgme_version_minor" -eq "$req_minor"; then +- if test "$gpgme_version_micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi - fi -- fi - fi -- fi - fi - fi + PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no]) @@ -193,17 +194,21 @@ index 71b0010..5821895 100644 # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then -- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- if test -z "$use_gpgrt_config"; then +- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- else +- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` +- fi + tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0` if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], +@@ -290,19 +229,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ fi fi if test $ok = yes; then -- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` -- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` +- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --cflags` +- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --libs` - AC_MSG_RESULT(yes) ifelse([$2], , :, [$2]) _AM_PATH_GPGME_CONFIG_HOST_CHECK @@ -218,7 +223,7 @@ index 71b0010..5821895 100644 ]) -@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -321,36 +252,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], min_gpgme_version="$tmp" fi @@ -257,7 +262,7 @@ index 71b0010..5821895 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -359,17 +266,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], fi fi if test $ok = yes; then @@ -276,15 +281,15 @@ index 71b0010..5821895 100644 - AC_SUBST(GPGME_GLIB_LIBS) ]) diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in -index 80d59de..932645b 100644 +index 9ddef5c..932645b 100644 --- a/src/gpgme.pc.in +++ b/src/gpgme.pc.in @@ -9,6 +9,6 @@ Name: gpgme Description: GnuPG Made Easy to access GnuPG Requires.private: gpg-error, libassuan Version: @PACKAGE_VERSION@ --Cflags: -I${includedir} @GPGME_CONFIG_CFLAGS@ --Libs: -L${libdir} @GPGME_CONFIG_LIBS@ +-Cflags: @GPGME_CONFIG_CFLAGS@ +-Libs: @GPGME_CONFIG_LIBS@ +Cflags: -I${includedir} +Libs: -L${libdir} -lgpgme URL: https://www.gnupg.org/software/gpgme/index.html diff --git a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index ecd1793ab9c..0d2692912fd 100644 --- a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,7 +1,7 @@ -From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001 +From 9fce0689bc04506e5758444efa24ea99fe1ff5ef Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 10 May 2019 14:30:36 +0800 -Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used +Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used gpg-error-config was modified by OE to always return an error. So we want to find an alternative way to retrieve whatever it @@ -14,39 +14,23 @@ Signed-off-by: Mark Hatle Rebase to 1.13.0 Signed-off-by: Hongxu Jia + --- - lang/python/setup.py.in | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) + lang/python/setup.py.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index 9785a28..006216d 100755 +index 6f36861..1d9058b 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in -@@ -30,7 +30,6 @@ import subprocess - import sys - - # Out-of-tree build of the gpg bindings. --gpg_error_config = ['gpg-error-config'] - gpgme_config_flags = ['--thread=pthread'] - gpgme_config = ['gpgme-config'] + gpgme_config_flags - gpgme_h = '' -@@ -182,15 +181,9 @@ class BuildExtFirstHack(build): +@@ -169,9 +169,8 @@ class BuildExtFirstHack(build): def _generate_errors_i(self): -- try: -- subprocess.check_call( -- gpg_error_config + ['--version'], stdout=devnull) -- except: -- sys.exit('Could not find gpg-error-config. ' + -- 'Please install the libgpg-error development package.') - +- ge_cflags='@GPG_ERROR_CFLAGS@' gpg_error_content = self._read_header( -- 'gpg-error.h', getconfig('cflags', config=gpg_error_config)) +- 'gpg-error.h', ge_cflags.split(' ') if ge_cflags else []) + "gpg-error.h", os.environ.get('CFLAGS').split()) filter_re = re.compile(r'GPG_ERR_[^ ]* =') rewrite_re = re.compile(r' *(.*) = .*') --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch index dfea1bf78ab..214cf348e43 100644 --- a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch +++ b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch @@ -1,4 +1,4 @@ -From 5bbf7a048b6d81d23186340e839f9f65b5b514b6 Mon Sep 17 00:00:00 2001 +From 94cf9f8fc79c0d1d4529cebdd74328927fda36a2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 10 May 2019 16:19:54 +0800 Subject: [PATCH] do not auto check var-PYTHON @@ -14,18 +14,19 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia --- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 5ef00c0..bbcff93 100644 +index df218ec..6a619ef 100644 --- a/configure.ac +++ b/configure.ac -@@ -425,8 +425,8 @@ if test "$found_py" = "1"; then +@@ -521,9 +521,8 @@ if test "$found_py" = "1"; then if test "$found_py" = "1" -o "$found_py3" = "1"; then # Reset everything, so that we can look for another Python. m4_foreach([mym4pythonver], -- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]], +- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10], +- [3.11],[3.12],[all]], - [unset PYTHON + [[2.7],[3.7]], + [ diff --git a/meta/recipes-support/gpgme/gpgme_1.18.0.bb b/meta/recipes-support/gpgme/gpgme_1.20.0.bb similarity index 97% rename from meta/recipes-support/gpgme/gpgme_1.18.0.bb rename to meta/recipes-support/gpgme/gpgme_1.20.0.bb index deea6f3f7b0..dc5b58d7c33 100644 --- a/meta/recipes-support/gpgme/gpgme_1.18.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.20.0.bb @@ -25,7 +25,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0001-autogen.sh-remove-unknown-in-version.patch \ " -SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e" +SRC_URI[sha256sum] = "25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750" PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" From patchwork Tue May 9 17:23:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23737 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 29BEBC7EE23 for ; Tue, 9 May 2023 17:24:14 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web10.39169.1683653044213192748 for ; Tue, 09 May 2023 10:24:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=ekcq8Dpc; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-965f7bdab6bso918241166b.3 for ; Tue, 09 May 2023 10:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653042; x=1686245042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=StO4sFvLdxQJtKlhqXDkSyusX4W2r2KN8pgyEqkSwBM=; b=ekcq8DpcrVIumVsfs36TXAu2x5tcHuglfh3y5WK/7A5MFXMHa2oB7xOk3+5e4T/zlN GzTYrFT6xgKNcoqaXv/jSOAdw+iB6YEpLZXiJOb1apJPBZ71PlxV0IDAXfiA+OeAnHFB bKSDcjQdpvrU3nLwWloTdzO3Z3Oz7JTx8DrEFnqznTbwJqtxOF6bZIF/GJotUbhmsGsf a6ryPaYnjv+jcAKE8z16/UhrpHZEmIto4Ew+l0gH9VEkEARrLKh+aT/13m+RctiYJRk/ DhsL/NOsBpXtTXQTkAzoilBM63d1B8YYCk2ujwZOpkestrYnyQ5rb8pzRsG+1jnfcngp ijmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653042; x=1686245042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=StO4sFvLdxQJtKlhqXDkSyusX4W2r2KN8pgyEqkSwBM=; b=WqdPEQsj5F+7xxJT4Tis2+OsxxWtdq5p2+P8iLiYmogySTVLUEcjIavePtNBTFzkFI 9EfAdoGrP/cq7ZRFtaqEHqgTu2nFtyrOJ68/1Z7M6GDjl44/yik4nAKnGtfFKDzmAiSu cJzCglQpc3OySxhM6xbLwjBqFkHjQu6IQvbbJAYUSPYNx8bDGSGizP/37rWv5+NrYdjJ BZh5i3Ybe7DFNMTXZ+4iWsVHRR+HTbnvwHPx2lMZ+NdjTxGx+NrFttOz081VyTHqWmUh paDRjJoBhpSZTwUOzmTa1yBKqZjMMTMdzolvqC2OzMsZ1LeHCWKrvLEniwj3gBanQXfY 1nFA== X-Gm-Message-State: AC+VfDyPjWnhQDjED2iwc4dH53EQJTkZXZYq5kwnJ5f9zy2aDcbMWFWk mpsfxvbSpuvjbrLXG237NjkUPauem3E= X-Google-Smtp-Source: ACHHUZ70VvaOLn8O1Qz7fvxiVpamsO02REKmga3b0Wqvtw4tVVzN91aoIRehjglZ9aoN6htyxSnh+w== X-Received: by 2002:a17:906:db08:b0:94f:1c90:cb70 with SMTP id xj8-20020a170906db0800b0094f1c90cb70mr13491682ejb.66.1683653042742; Tue, 09 May 2023 10:24:02 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:02 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 21/27] libatomic-ops: update 7.6.14 -> 7.8.0 Date: Tue, 9 May 2023 19:23:38 +0200 Message-Id: <20230509172344.1516743-21-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181076 License-update: file relocated, formatting. Signed-off-by: Alexander Kanavin --- .../{libatomic-ops_7.6.14.bb => libatomic-ops_7.8.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libatomic-ops/{libatomic-ops_7.6.14.bb => libatomic-ops_7.8.0.bb} (80%) diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.14.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.8.0.bb similarity index 80% rename from meta/recipes-support/libatomic-ops/libatomic-ops_7.6.14.bb rename to meta/recipes-support/libatomic-ops/libatomic-ops_7.8.0.bb index fbfbdacbdd6..d4b77f62447 100644 --- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.14.bb +++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.8.0.bb @@ -5,13 +5,13 @@ SECTION = "optional" PROVIDES += "libatomics-ops" LICENSE = "GPL-2.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://doc/LICENSING.txt;md5=dfc50c7cea7b66935844587a0f7389e7 \ + file://LICENSE;md5=5700d28353dfa2f191ca9b1bd707865e \ " SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libatomic_ops-${PV}.tar.gz" GITHUB_BASE_URI = "https://github.com/ivmai/libatomic_ops/releases" -SRC_URI[sha256sum] = "390f244d424714735b7050d056567615b3b8f29008a663c262fb548f1802d292" +SRC_URI[sha256sum] = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31" S = "${WORKDIR}/libatomic_ops-${PV}" From patchwork Tue May 9 17:23:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23738 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 35F74C7EE2D for ; Tue, 9 May 2023 17:24:14 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web11.39305.1683653041433459721 for ; Tue, 09 May 2023 10:24:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=k/zNYNze; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-9661047f8b8so713556266b.0 for ; Tue, 09 May 2023 10:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653043; x=1686245043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MmVeQLjnSdMEgkQs44gZXjzekVJlfuRwAiiVkJdIKlU=; b=k/zNYNzemua8uO2VYpAb9yFtxiuIUpkIzjN78d+4i1JKFEl6akLSLY1w+z3ZXZZtRn ZkKUCFwTDUydINraO0ff91tIS1nuLfEZ4XRihx+vbo8Auc4VeA8CnpV1lh5R9Gyb8eZJ Eh28unkxI2uXIcv6oQFrYuxoXPUm5DB13gUHAgapUiT+OMqJCOvFUub/I2XzYdMKeiS+ LTKOpFrGka+9Mj9mXuKgtjJsZJEfpavGu774I7b9Ej1TlSxNXU8Cpg96s2Ae6sZPVkk8 /XbBCk7VyWM9Kcsq5F3GCiiVTWD5BtoegjHqrcWjTzA3nQuclSAfq9MrJdb3pVfhdcC9 kixg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653043; x=1686245043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MmVeQLjnSdMEgkQs44gZXjzekVJlfuRwAiiVkJdIKlU=; b=V+7RRa6iWTtAuwPgPag3DKqwZglSYfUhPWWl2ggg191j6E0GyqN4VevnnYXZ9bnKsH t+wl4ADi31GE/cQ9Nt17pK2gKBIUBvZxUYk3H+NQS/1HTnSTCgw6q0wQQeL9LrRQCRW1 UE3PqRdliIIgLWx9+cx5q3v5v37P0MrxIpxwc1/45PznMa+4fqBHLeU30a5rulm0r8GZ wPDK3kHZDFnzI4HpQB29phj20o9K7BZ9WAQp2yYU+dbwmKTJCDHrCA8G4g6N3YZoL3tm 6lEvyjEnl4eNw7FAOIIeZ9e1XSHgdA3Z8PhwViEVdwfIobMzL7ELCXu5h1fy7zd0zaBF fx5w== X-Gm-Message-State: AC+VfDxjO9LygKpC/mOmK0nXGrDsNT4YNTti9r0mlK4H0oI4Gy3fjSb5 brgQ9NgZXW6hKBlluiSmppZ68TvVNT0= X-Google-Smtp-Source: ACHHUZ55y1u0k+RADZOb7bOB+I9hEPqVJpqulckdcuGAscZ2Gyz8uyNjU6zOyOSTJ0SEZYC2x4WC+g== X-Received: by 2002:a17:907:31c4:b0:94e:8431:4767 with SMTP id xf4-20020a17090731c400b0094e84314767mr11337080ejb.38.1683653043616; Tue, 09 May 2023 10:24:03 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:03 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 22/27] libgcrypt: update 1.10.1 -> 1.10.2 Date: Tue, 9 May 2023 19:23:39 +0200 Message-Id: <20230509172344.1516743-22-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181077 Signed-off-by: Alexander Kanavin --- .../files/0001-libgcrypt-fix-m4-file-for-oe-core.patch | 6 +++--- ...pt-fix-building-error-with-O2-in-sysroot-path.patch | 10 +++++----- .../{libgcrypt_1.10.1.bb => libgcrypt_1.10.2.bb} | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename meta/recipes-support/libgcrypt/{libgcrypt_1.10.1.bb => libgcrypt_1.10.2.bb} (96%) diff --git a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch index c873e24ed5f..cbfa30f0ada 100644 --- a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch +++ b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch @@ -1,4 +1,4 @@ -From 839f38e5ecc22b7f1b837284bbbffac8cb32ab1e Mon Sep 17 00:00:00 2001 +From bcfd89abdb5110b93314297120412d4c7f2da313 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Tue, 29 Oct 2019 14:08:32 -0400 Subject: [PATCH] libgcrypt: fix m4 file for oe-core @@ -17,7 +17,7 @@ Signed-off-by: Trevor Gamblin 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 -index 19d514f..21125c7 100644 +index cd4249e..e53a36f 100644 --- a/src/libgcrypt.m4 +++ b/src/libgcrypt.m4 @@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable. @@ -35,7 +35,7 @@ index 19d514f..21125c7 100644 - fi - - use_gpgrt_config="" -- if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG libgcrypt --exists; then - LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt" - AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config]) diff --git a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch index f9c362431c5..cf9ebfb3e61 100644 --- a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch +++ b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch @@ -1,4 +1,4 @@ -From 3c6c10eae0993c8ca60879494c6650f7b8f54ebe Mon Sep 17 00:00:00 2001 +From 0f66e796a8522e1043dda03b88d5f6feae839d16 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 16 Aug 2017 10:44:41 +0800 Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path @@ -25,15 +25,15 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cipher/Makefile.am b/cipher/Makefile.am -index d644005..1cf5072 100644 +index c3d642b..88c883a 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am -@@ -147,7 +147,7 @@ gost-s-box: gost-s-box.c +@@ -153,7 +153,7 @@ gost-s-box: gost-s-box.c if ENABLE_O_FLAG_MUNGING --o_flag_munging = sed -e 's/-O\([2-9sg][2-9sg]*\)/-O1/' -e 's/-Ofast/-O1/g' -+o_flag_munging = sed -e 's/ -O\([2-9sg][2-9sg]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' +-o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g' ++o_flag_munging = sed -e 's/ -O\([2-9sgz][2-9sgz]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' else o_flag_munging = cat endif diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.10.2.bb similarity index 96% rename from meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb rename to meta/recipes-support/libgcrypt/libgcrypt_1.10.2.bb index bf9d7cbd102..58f07a116d2 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.10.2.bb @@ -27,7 +27,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://no-bench-slope.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de" +SRC_URI[sha256sum] = "3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03" # Below whitelisted CVEs are disputed and not affecting crypto libraries for any distro. CVE_CHECK_IGNORE += "CVE-2018-12433 CVE-2018-12438" From patchwork Tue May 9 17:23:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23741 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 29CDEC7EE25 for ; Tue, 9 May 2023 17:24:14 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web11.39310.1683653046043553192 for ; Tue, 09 May 2023 10:24:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=jOXQTN6W; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-969f90d71d4so137241366b.3 for ; Tue, 09 May 2023 10:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653044; x=1686245044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VfUsAjEIfBSWrdDTrtKcIH8F01Ea62L+UOUojLo9QkQ=; b=jOXQTN6Wi3uKeG/vLG39wIacr7F8UktgECJNIILYWlEiytprT0T3gdyMQClXoGp0to Yh1SBUcKPIFnhAj1R5YafuliL8FAy07zDZNLL3yuhnVlyAGUUFpVF34ktOcPjyeBTWdp y/QCslMh9S+m9W7Osz/ZNY23LypzIY3W5eHYmRfXlI0aM4xv3lZFqGTk95iUNSf7Xihj GL07ludg9f4lB9IZAtUxyprDkRxUgcLaaInxH2vvbdIuxyoWKRJ+IlK2icdKzBAq7Bzw Im9TuD3zEoduGLAP+49N0gBroMZ2KALghS73gXZI94iN2cBBfEfEkJxKRtrOr8vSplJv uDiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653044; x=1686245044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VfUsAjEIfBSWrdDTrtKcIH8F01Ea62L+UOUojLo9QkQ=; b=X5gBpXK2HffVAb5NYpGwJeJEzakQAamnDUGPYzk8ZMXEPTpzWElF1E1YLLt+rMW1Ij ZlVMVjviP6Rs6c10RKHSc+ugCwQweIZzID/3r6LsoqJuPZUOFDKmd31gQ7H3OCdHpNkC zO05PQ0hKpLnsCHn7nsirambnUGNF8zlWKmoQ8Y6hWp1tZj3uWupThuXh8MT95psO/Ew WleSip+xvWul1zE2KfZiA1gHhChPQYZqAjFYnDhMDJJcbdX4wD9dEB3ScsjKu3C5Hqer qMKX9muddANS+UZBOycK8Pit+uvSbhXF/TdaC/rQLj2BpSvS5rAaVrkiA1dyf0G2a98O 7vww== X-Gm-Message-State: AC+VfDwtt/w39a9ongYpS+8aH5NNXOejSBOc2ByMXyjwOFHI8ymDYpaG UFKrCWJjA1vf0CFmQd+qICVsC0Gy/rA= X-Google-Smtp-Source: ACHHUZ451Hg0h7LxyVUxgGDDfdr5c0xeDGJSxs/hD/VMfI+KjtNyLEUTIIJN1TQqyqx01htsdV4COg== X-Received: by 2002:a17:907:60d6:b0:957:1df0:9cbf with SMTP id hv22-20020a17090760d600b009571df09cbfmr14373558ejc.19.1683653044511; Tue, 09 May 2023 10:24:04 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:04 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 23/27] libgpg-error: update 1.46 -> 1.47 Date: Tue, 9 May 2023 19:23:40 +0200 Message-Id: <20230509172344.1516743-23-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181079 License-Update: copyright years Signed-off-by: Alexander Kanavin --- .../libgpg-error/libgpg-error/pkgconfig.patch | 59 ++++++++++++++----- ...gpg-error_1.46.bb => libgpg-error_1.47.bb} | 4 +- 2 files changed, 45 insertions(+), 18 deletions(-) rename meta/recipes-support/libgpg-error/{libgpg-error_1.46.bb => libgpg-error_1.47.bb} (92%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 75c1febc10f..3d886bcaa40 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -1,4 +1,4 @@ -From e10f93167c76c477a7b97286cfac603795bf28d8 Mon Sep 17 00:00:00 2001 +From b0df1cb468264a9bb9113524f0e1318c456b2348 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 29 Mar 2018 15:12:17 +0800 Subject: [PATCH] support pkgconfig @@ -14,17 +14,19 @@ Signed-off-by: Armin Kuster Signed-off-by: Zheng Ruoqin --- - src/gpg-error.m4 | 165 +---------------------------------------------- - 1 file changed, 3 insertions(+), 162 deletions(-) + src/gpg-error.m4 | 192 ++--------------------------------------------- + 1 file changed, 5 insertions(+), 187 deletions(-) diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 -index a975e53..af4bf2f 100644 +index 7fa52b1..15a0859 100644 --- a/src/gpg-error.m4 +++ b/src/gpg-error.m4 -@@ -27,162 +27,12 @@ dnl is added to the gpg_config_script_warn variable. +@@ -15,187 +15,14 @@ dnl - AC_DEFUN([AM_PATH_GPG_ERROR], - [ AC_REQUIRE([AC_CANONICAL_HOST]) + dnl Find gpg-error-config, for backward compatibility + dnl +-dnl _AM_PATH_POSSIBLE_GPG_ERROR_CONFIG +-AC_DEFUN([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG],[dnl - gpg_error_config_prefix="" - dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, - dnl since that is consistent with how our three siblings use the directory/ @@ -60,9 +62,14 @@ index a975e53..af4bf2f 100644 - fi - - AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -- min_gpg_error_version=ifelse([$1], ,1.33,$1) -- ok=no +-]) - +-dnl +-dnl Find gpgrt-config, which uses .pc file +-dnl (minimum pkg-config functionality, supporting cross build) +-dnl +-dnl _AM_PATH_GPGRT_CONFIG +-AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH]) - if test "$GPGRT_CONFIG" != "no"; then - # Determine gpgrt_libdir @@ -118,12 +125,9 @@ index a975e53..af4bf2f 100644 - fi - if test -n "$gpgrt_libdir"; then break; fi - done -- if test -z "$libdir_candidates"; then -- # No valid pkgconfig dir in any of the system directories, fallback -- gpgrt_libdir=${possible_libdir1} -- fi -- else -- # When we cannot determine system libdir-format, use this: +- fi +- if test -z "$gpgrt_libdir"; then +- # No valid pkgconfig dir in any of the system directories, fallback - gpgrt_libdir=${possible_libdir1} - fi - else @@ -137,12 +141,33 @@ index a975e53..af4bf2f 100644 - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) - gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` - else +- gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - unset GPGRT_CONFIG - fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - unset GPGRT_CONFIG - fi +-]) +- +-dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl +-dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, +-dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are +-dnl used for programs requireing real multi thread support. +-dnl +-dnl If a prefix option is not used, the config script is first +-dnl searched in $SYSROOT/bin and then along $PATH. If the used +-dnl config script does not match the host specification the script +-dnl is added to the gpg_config_script_warn variable. +-dnl +-AC_DEFUN([AM_PATH_GPG_ERROR],[dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl +-AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl +- min_gpg_error_version=ifelse([$1], ,1.33,$1) +- ok=no - if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` @@ -163,6 +188,8 @@ index a975e53..af4bf2f 100644 - fi - fi - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ++AC_DEFUN([AM_PATH_GPG_ERROR], ++[ AC_REQUIRE([AC_CANONICAL_HOST]) + min_gpg_error_version=ifelse([$1], ,0.0,$1) + PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) if test $ok = yes; then @@ -187,7 +214,7 @@ index a975e53..af4bf2f 100644 fi if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then -@@ -198,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -211,15 +38,6 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl fi fi else diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.46.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.47.bb similarity index 92% rename from meta/recipes-support/libgpg-error/libgpg-error_1.46.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.47.bb index e0f2d86303e..0f35fd95b20 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.46.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.47.bb @@ -6,7 +6,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;beginline=2;endline=18;md5=d82591bc81561f617da71e00ff4a9d79 \ + file://src/gpg-error.h.in;beginline=2;endline=18;md5=20f4cf5d81ea2fad18f6297500018654 \ file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7 \ " @@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://run-ptest \ " -SRC_URI[sha256sum] = "b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d" +SRC_URI[sha256sum] = "9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb" BINCONFIG = "${bindir}/gpg-error-config" From patchwork Tue May 9 17:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23736 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 23A04C7EE22 for ; Tue, 9 May 2023 17:24:14 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web11.39301.1683653038726499986 for ; Tue, 09 May 2023 10:24:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Gi++GbLg; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-9659e9bbff5so1113622566b.1 for ; Tue, 09 May 2023 10:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653045; x=1686245045; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eVIzc4SsCfprqgi6GckyD4qJ9zGjBqtcIA69xl4eieE=; b=Gi++GbLg83jGaG0BdX39RCE5QigRowICT87gcYXaDVMmAUxFi3YZkOfMk8Fln+U1VB VBJEkEEdIzJYAGxVysD2Q4mIJrGmo6PynOD9r2O4JVq6lZXyXKotEUsAfoK8Rrwt79ju wJ0XAglnJGLX8vcokWIFsi/Rvzg6lOTmmhly4UH4UbMr/aZ3ZxZwMHppf0cZYYFtdcJo T3/tk7dqyG8a3j2Di+FV/i089P1wP0tlFTFYDSOzxDV9S00qZae2tt3V3lGqSojUVp9A KJjpcMyW5ulurGZlIb0fqfqSJnMgZKUauBgij4qclZA44p3/n9jdHUsPfKV3JAiT24Bw Am8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653045; x=1686245045; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eVIzc4SsCfprqgi6GckyD4qJ9zGjBqtcIA69xl4eieE=; b=lhUvAfZ0uvd2dzfEeSaV87IkijPWMD49JK4fyRLH5xGXYMrVQxv9oXZuabs/7eqMk1 7xFKUAUDVJG3xcBsovjUTsZlGZFRrGj9CjrV3UHnsIODSxRopFnwBs+3DfNk20Ism/iU 8/YqlnlMXc4hol37bhGXwrgfJEF6CIiswRwqIghF2Lb7Licoa3+HLb+KTHpt5+WpldY8 KVd/7dCRKwGg6qgOnZjfgaJxTZrTT315GYbsJyhhkGyYj5bFMBjpomsKx3PHPZwC1Zl1 pvTBx5BAELbVAq9GSucWYfnBw76tg3wtT6YrhoIbk6tJ0pBazweqgx8Kc4ejPs+8fJHK KyrQ== X-Gm-Message-State: AC+VfDz6HO2nd1YbpvamBxpwCi8jVrJoWVEwsrUwdaHtdtMFEBUc9uEx mGIx3DiL4zYaWo/F3FZUes5gkrxuZcI= X-Google-Smtp-Source: ACHHUZ4OYRVka5Mze/7nKX9EY2XtFRRgkcYCsHMBMcgv5NIzdizaaLLpucBkNZzWbXebG4bmu5om/w== X-Received: by 2002:a17:907:6e0c:b0:93e:8791:7d8e with SMTP id sd12-20020a1709076e0c00b0093e87917d8emr12482161ejc.2.1683653045274; Tue, 09 May 2023 10:24:05 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:04 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Markus Volk , Alexandre Belloni , Richard Purdie Subject: [PATCH 24/27] Remove usage of /var/volatile/tmp Date: Tue, 9 May 2023 19:23:41 +0200 Message-Id: <20230509172344.1516743-24-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181078 From: Markus Volk Glib-2.0 uses ptest to ensure that /tmp is not a symlink. This commit tries to align tmpdir usage. The symlinks for /tmp and /var/tmp are replaced by directories and by default a tmpfs is mounted in /tmp. /var/volatile/tmp is removed. (From OE-Core rev: 3563f05df246f9fd24d7b20a65ce77787ed508b6) Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 4 --- meta/files/fs-perms-persistent-log.txt | 2 -- meta/files/fs-perms.txt | 2 -- .../lib/oeqa/files/buildhistory_filelist1.txt | 1 - .../lib/oeqa/files/buildhistory_filelist2.txt | 1 - meta/recipes-core/base-files/base-files/fstab | 1 + .../base-files/base-files_3.0.14.bb | 4 +-- .../initscripts-1.0/populate-volatile.sh | 2 +- .../initscripts/initscripts-1.0/volatiles | 5 ++- .../initscripts/initscripts_1.0.bb | 3 -- .../systemd/systemd/00-create-volatile.conf | 4 +-- meta/recipes-core/systemd/systemd_253.3.bb | 7 ---- meta/recipes-core/udev/eudev/init | 4 --- .../e2fsprogs/e2fsprogs/run-ptest | 2 +- ...eak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 ------------------- .../valgrind/valgrind_3.21.0.bb | 1 - 16 files changed, 8 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2db84a46eed..d94ffe1df99 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -90,10 +90,6 @@ ROOT_HOME ??= "/home/root" # If set to boolean false ('no', 'n', 'false', 'f', '0'), /var/log is on persistent storage. VOLATILE_LOG_DIR ?= "yes" -# if set to 'yes': /tmp links to /var/tmp which links to /var/volatile/tmp -# otherwise: /tmp is on persistent storage -VOLATILE_TMP_DIR ?= "yes" - BB_RENAMED_VARIABLES[PNBLACKLIST] = "SKIP_RECIPE" BB_RENAMED_VARIABLES[CVE_CHECK_PN_WHITELIST] = "CVE_CHECK_SKIP_RECIPE" BB_RENAMED_VARIABLES[CVE_CHECK_WHITELIST] = "CVE_CHECK_IGNORE" diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt index 518c1be3c93..326c0ed0924 100644 --- a/meta/files/fs-perms-persistent-log.txt +++ b/meta/files/fs-perms-persistent-log.txt @@ -47,7 +47,6 @@ ${oldincludedir} 0755 root root true 0644 root root # Links ${localstatedir}/run link /run ${localstatedir}/lock link /run/lock -${localstatedir}/tmp link volatile/tmp /home 0755 root root false - - - /srv 0755 root root false - - - @@ -57,7 +56,6 @@ ${localstatedir}/local 0755 root root false - - - # Special permissions from base-files # Set 1777 /tmp 01777 root root false - - - -${localstatedir}/volatile/tmp 01777 root root false - - - # Set 0700 ${ROOT_HOME} 0700 root root false - - - diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt index daa4aed840f..ed59311035d 100644 --- a/meta/files/fs-perms.txt +++ b/meta/files/fs-perms.txt @@ -48,7 +48,6 @@ ${oldincludedir} 0755 root root true 0644 root root ${localstatedir}/run link /run ${localstatedir}/log link volatile/log ${localstatedir}/lock link /run/lock -${localstatedir}/tmp link volatile/tmp /home 0755 root root false - - - /srv 0755 root root false - - - @@ -58,7 +57,6 @@ ${localstatedir}/local 0755 root root false - - - # Special permissions from base-files # Set 1777 /tmp 01777 root root false - - - -${localstatedir}/volatile/tmp 01777 root root false - - - # Set 0700 ${ROOT_HOME} 0700 root root false - - - diff --git a/meta/lib/oeqa/files/buildhistory_filelist1.txt b/meta/lib/oeqa/files/buildhistory_filelist1.txt index 8d882895ad5..ec500173838 100644 --- a/meta/lib/oeqa/files/buildhistory_filelist1.txt +++ b/meta/lib/oeqa/files/buildhistory_filelist1.txt @@ -9210,5 +9210,4 @@ lrwxrwxrwx root root 12 ./var/log -> volatile/log lrwxrwxrwx root root 6 ./var/run -> ../run drwxr-xr-x root root 4096 ./var/spool drwxrwxr-x root mail 4096 ./var/spool/mail -lrwxrwxrwx root root 12 ./var/tmp -> volatile/tmp drwxr-xr-x root root 4096 ./var/volatile diff --git a/meta/lib/oeqa/files/buildhistory_filelist2.txt b/meta/lib/oeqa/files/buildhistory_filelist2.txt index ac6307060df..cedec51c382 100644 --- a/meta/lib/oeqa/files/buildhistory_filelist2.txt +++ b/meta/lib/oeqa/files/buildhistory_filelist2.txt @@ -9213,5 +9213,4 @@ lrwxrwxrwx root root 12 ./var/log -> volatile/log lrwxrwxrwx root root 6 ./var/run -> ../run drwxr-xr-x root root 4096 ./var/spool drwxrwxr-x root mail 4096 ./var/spool/mail -lrwxrwxrwx root root 12 ./var/tmp -> volatile/tmp drwxr-xr-x root root 4096 ./var/volatile diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab index 70e400f5674..7064573130b 100644 --- a/meta/recipes-core/base-files/base-files/fstab +++ b/meta/recipes-core/base-files/base-files/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,ptmxmode=0666,gid=5 0 0 tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 tmpfs /var/volatile tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot #/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index ff83567bd91..c2ecea0a257 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -29,7 +29,7 @@ S = "${WORKDIR}" INHIBIT_DEFAULT_DEPS = "1" docdir:append = "/${P}" -dirs1777 = "/tmp ${localstatedir}/volatile/tmp" +dirs1777 = "/tmp /var/tmp" dirs2775 = "" dirs555 = "/sys /proc" dirs755 = "/boot /dev ${base_bindir} ${base_sbindir} ${base_libdir} \ @@ -53,7 +53,7 @@ dirs755-lsb = "/srv \ ${prefix}/lib/locale" dirs2775-lsb = "/var/mail" -volatiles = "${@'log' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''} tmp" +volatiles = "${@'log' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''}" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/issue /${sysconfdir}/issue.net \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh index bc630e871c1..ecfb6fdc2b5 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh @@ -23,7 +23,7 @@ ROOT_DIR="$(echo "$DIRNAME" | sed -ne 's:/etc/.*::p')" [ "$ROOTFS_READ_ONLY" = "yes" ] && VOLATILE_ENABLE_CACHE=no CFGDIR="${ROOT_DIR}/etc/default/volatiles" -TMPROOT="${ROOT_DIR}/var/volatile/tmp" +TMPROOT="${ROOT_DIR}/tmp" COREDEF="00_core" [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems." diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles index cd8a4be05f2..7232a8ef900 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles +++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles @@ -25,11 +25,10 @@ # link the file defined as /var/test will actually be created as /tmp/testfile. d root root 1777 /run/lock none d root root 0755 /var/volatile/log none -d root root 1777 /var/volatile/tmp none l root root 1777 /var/lock /run/lock l root root 0755 /var/run /run -l root root 1777 /var/tmp /var/volatile/tmp -l root root 1777 /tmp /var/tmp +d root root 1777 /tmp +d root root 1777 /var/tmp d root root 0755 /var/lock/subsys none f root root 0664 /var/log/wtmp none f root root 0664 /var/run/utmp none diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 4dc477bb8d6..7c9d9ca4f10 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -108,9 +108,6 @@ do_install () { sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ ${D}${sysconfdir}/default/volatiles/00_core fi - if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then - sed -i -e "/\/d" ${D}${sysconfdir}/default/volatiles/00_core - fi install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ diff --git a/meta/recipes-core/systemd/systemd/00-create-volatile.conf b/meta/recipes-core/systemd/systemd/00-create-volatile.conf index c4277221a22..1ba9b836cf0 100644 --- a/meta/recipes-core/systemd/systemd/00-create-volatile.conf +++ b/meta/recipes-core/systemd/systemd/00-create-volatile.conf @@ -1,8 +1,6 @@ #This goes hand-in-hand with the base-files of OE-Core. The file must -# be sorted before 'systemd.conf' becuase this attempts to create a file +# be sorted before 'systemd.conf' because this attempts to create a file # inside /var/log. - d /run/lock 1777 - - - d /var/volatile/log - - - - -d /var/volatile/tmp 1777 - - diff --git a/meta/recipes-core/systemd/systemd_253.3.bb b/meta/recipes-core/systemd/systemd_253.3.bb index a79d6cb3ca0..09432f91926 100644 --- a/meta/recipes-core/systemd/systemd_253.3.bb +++ b/meta/recipes-core/systemd/systemd_253.3.bb @@ -291,13 +291,6 @@ do_install() { rm -rf ${D}${localstatedir}/log/journal/remote fi - # if the user requests /tmp be on persistent storage (i.e. not volatile) - # then don't use a tmpfs for /tmp - if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then - rm -f ${D}${rootlibdir}/systemd/system/tmp.mount - rm -f ${D}${rootlibdir}/systemd/system/local-fs.target.wants/tmp.mount - fi - install -d ${D}${systemd_system_unitdir}/graphical.target.wants install -d ${D}${systemd_system_unitdir}/multi-user.target.wants install -d ${D}${systemd_system_unitdir}/poweroff.target.wants diff --git a/meta/recipes-core/udev/eudev/init b/meta/recipes-core/udev/eudev/init index 477a525b212..2084de83ae3 100644 --- a/meta/recipes-core/udev/eudev/init +++ b/meta/recipes-core/udev/eudev/init @@ -79,10 +79,6 @@ case "$1" in } [ -e /dev/pts ] || mkdir -m 0755 /dev/pts [ -e /dev/shm ] || mkdir -m 1777 /dev/shm - # the automount rule for udev needs /tmp directory available, as /tmp is a symlink - # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure - # /var/volatile/tmp directory to be available. - mkdir -m 1777 -p /var/volatile/tmp # make_extra_nodes kill_udevd > "/dev/null" 2>&1 diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest index c97c0377e9c..1f873b055e5 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest @@ -2,7 +2,7 @@ cd ./test SKIP_SLOW_TESTS=yes ./test_script | sed -u -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /' -rm -rf /var/volatile/tmp/*e2fsprogs* +rm -rf /tmp/*e2fsprogs* rm -f tmp-* rm -f *.tmp rm -f *.ok diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch deleted file mode 100644 index e421ac6c801..00000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 24 Jan 2020 17:55:39 +0100 -Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths - -In oe-core, /tmp is linked to /var/volatile/tmp and -valgrind output changes accordingly - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - none/tests/fdleak_cmsg.stderr.exp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp -index 6e5a797b9..0ede1ab18 100644 ---- a/none/tests/fdleak_cmsg.stderr.exp -+++ b/none/tests/fdleak_cmsg.stderr.exp -@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null - - - FILE DESCRIPTORS: 6 open (3 std) at exit. --Open file descriptor ...: /tmp/data2 -+Open file descriptor ...: ... - ... - --Open file descriptor ...: /tmp/data1 -+Open file descriptor ...: ... - ... - - Open AF_UNIX socket ...: --- -2.17.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb index 717d82830e7..cf50a2a4386 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb @@ -33,7 +33,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ file://0001-memcheck-vgtests-remove-fullpath-after-flags.patch \ file://s390x_vec_op_t.patch \ - file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ file://0001-docs-Disable-manual-validation.patch \ file://0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch \ From patchwork Tue May 9 17:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23739 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 2FBB7C7EE24 for ; Tue, 9 May 2023 17:24:14 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web11.39289.1683653031361427637 for ; Tue, 09 May 2023 10:24:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Dx07UQH4; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-9659c5b14d8so1001447266b.3 for ; Tue, 09 May 2023 10:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653046; x=1686245046; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1BhVlhr/SnaVAzTUmt9puT7zuwZZhGbuzyBt9KnwJnU=; b=Dx07UQH4Qft60XKUqf0DOALx5UY9BNr0tRRnOZw9qsqSuhWPdE6f03G4hM/PEwjB0X zoyvcuzNQMV3msDTN/D2+Vk7h99dQbm/q0TA2Xv3zM5i/7Rtvyh56my8pBN5inczoYp/ mhKl8rADqJFOA0PGqYbkmVNZwvg3k/HZSQ+Y4Ipe10bTKKDC0YZNvBmvnIxaVSHNWCOC EyyT7wEmEoyUM3GqBOVOX5pgpAmZs1iIVYRixJZfN01WFHNMPp+9hcTHpoMgd0H62Bf6 e+QDBqzMLgkAuPZyEeayEqNOfnW6kzSqV7PggzH8zbdVjCSLDS7YL0ZxUW+bhMvsJ9Zs p4DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653046; x=1686245046; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1BhVlhr/SnaVAzTUmt9puT7zuwZZhGbuzyBt9KnwJnU=; b=Vmf7l11/T4bSvp0LZdrjFjYL685NNC07wYGG9q7WfrXhAFJ7rrjpJOXGNbXhbcAszt EEt1cwn7sG0IB/VTP1wQJ3W+heT9nxcuCrX8Pt9fL57+aW8R19jbabniRn9J4fyexbI7 wAQbNw7kGMXuzxprH6aFFlo4oi3iPk1TD5t2fF03sH2gm2q46J4MyTnP7QNZpD/Cfj4X tlCfTfsei//F+pDKpw2BWkQDmcgR9MGiTZvHChTZmQnIRQgkFQwzhpFL/IfcY1lTi4sf gjA6jjWW65p913f2LGMrXW4WQ096Nhj+8iNOKmjpJBrmqAKvpwl5ynVFGooev9g8VXPz t7cw== X-Gm-Message-State: AC+VfDxR2DUHG8hSS4cP0/nk7Vss0572x4PIY4sNUjJiG6lrweUtANFg nHxS0JZXCOVTsDtd5H18HTWVyQWYdc4= X-Google-Smtp-Source: ACHHUZ5grKP2rGfRuCmorksqFSLJaHzFfzXZZz0DypGOzTfv9Sh6C1ynSp6fFnKwVqmrYwWDdUI0DA== X-Received: by 2002:a17:907:6e07:b0:966:4033:d1dd with SMTP id sd7-20020a1709076e0700b009664033d1ddmr8451186ejc.34.1683653046110; Tue, 09 May 2023 10:24:06 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:05 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 25/27] gdb: enable python PACKAGECONFIG Date: Tue, 9 May 2023 19:23:42 +0200 Message-Id: <20230509172344.1516743-25-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181080 This is required by latest valgrind ptests. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/gdb/gdb-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index 9db61b785f3..5a41cd17dc6 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc @@ -30,7 +30,7 @@ EXTRA_OECONF = "--disable-gdbtk --disable-x --disable-werror \ --with-libgmp-prefix=${STAGING_EXECPREFIXDIR} \ " -PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" +PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)} python" # Use --without-system-readline to compile with readline 5. PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs" From patchwork Tue May 9 17:23:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23740 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 36BC0C7EE2F for ; Tue, 9 May 2023 17:24:14 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web10.39173.1683653048392299805 for ; Tue, 09 May 2023 10:24:08 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=mwoEWlea; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-965cc5170bdso875391066b.2 for ; Tue, 09 May 2023 10:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653047; x=1686245047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HY9oPqfJnK5Qw7Cq1UP/Xnx+uB3AhOHWyi3glshysxs=; b=mwoEWleavv4V397AOgcmRJzuQgXU+9bMqmuL/A1c6n/FhPwrNrMiPqwoaNFooVJTzp TC1z6w6+0/9EdP+W0U2IVJUEMLePFRsE3rOgDU4dSKGrw9HkNZGLsghzyuab4ZN7XIYy JowzLzrk7Vy3eNjuFR6pdEaduYLURbYlearN9wiMaxUChwsye+NUtZd5n5223PYf2Zup 4j5ku/N/nbXbexbO0LirKpUWjzaPXMoZIV1sjhgTvnD3UgTiOPWIdlQBJ+Ycnlp29xrs psjCtg43swtDjDIO7Af+apYeGicxGrL/dE6VsTT11i/7A/dg/xz3pyICmB/79tkYpFW6 cppQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653047; x=1686245047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HY9oPqfJnK5Qw7Cq1UP/Xnx+uB3AhOHWyi3glshysxs=; b=JPBgwB64fJ+mIKklxZVuZ9rDIeNHykMYib8+X5GNoXTj9BGotVoj4Tq2C39Fmgqobn pzHkZ1Sn/XUEevOfnsnbhp3WwhzHeLLWyBB4I5q37WkuOZ2oY/XoZCuqiVOmfKCM0mAW v6VUWZrFYYB2zHyXMUDC9Llisv3gjdoSVp/8DwlIqmnUcb/75uzgZXF0eenumBfpidBD MXmiHhteJQjxqke6fW8U5p7YnsgvT5Afy2KhzAn++lTh704PySc5mxXpEbR2Dve+zNmy As48SMkU627p37yQ5vtNF+SWfOL7kheC6ShbFYYn8Rl38c9ocMDBrbQjsEPBuiwPiXUQ eE5w== X-Gm-Message-State: AC+VfDzN3dqHkDFQa3OXAymbIsVyHHjB6u0IQhZkUTyTiXpxprEG1dLa mn6dLrxzkT6gh0iBmVkvQczzMqWbA3A= X-Google-Smtp-Source: ACHHUZ6296eFkbHlT9ciB9EEWNmkANo7S2QOVjg2rXrHvEud++ADmeYmITlbBwICZTcl4gz33nUu4w== X-Received: by 2002:a17:907:a01:b0:94a:5d5c:fe6f with SMTP id bb1-20020a1709070a0100b0094a5d5cfe6fmr11868612ejc.47.1683653046784; Tue, 09 May 2023 10:24:06 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:06 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 26/27] createrepo-c: update 0.20.1 -> 0.21.1 Date: Tue, 9 May 2023 19:23:43 +0200 Message-Id: <20230509172344.1516743-26-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181082 Signed-off-by: Alexander Kanavin --- .../0001-include-rpm-rpmstring.h.patch | 9 +++-- ...arser.c-add-a-missing-parameter-name.patch | 39 +++++++++++++++++++ ...epo-c_0.20.1.bb => createrepo-c_0.21.1.bb} | 3 +- 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.20.1.bb => createrepo-c_0.21.1.bb} (92%) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-include-rpm-rpmstring.h.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-include-rpm-rpmstring.h.patch index a249eaf5a19..b7e5710b391 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-include-rpm-rpmstring.h.patch +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-include-rpm-rpmstring.h.patch @@ -1,7 +1,7 @@ -From 8defe6aaf91613c3fcb540df65a94cd56d377367 Mon Sep 17 00:00:00 2001 +From eb66326c3fc6e942282d01ddd56659c78ed7400b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 13 Jan 2023 13:21:51 -0800 -Subject: [PATCH 1/2] include rpm/rpmstring.h +Subject: [PATCH] include rpm/rpmstring.h Its needed for rasprintf declaration @@ -11,10 +11,13 @@ on 'rasprintf'; ISO C99 and later do not support implicit function declarations Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/340] Signed-off-by: Khem Raj + --- src/xml_file.c | 1 + 1 file changed, 1 insertion(+) +diff --git a/src/xml_file.c b/src/xml_file.c +index d2400b8..871109c 100644 --- a/src/xml_file.c +++ b/src/xml_file.c @@ -19,6 +19,7 @@ @@ -23,5 +26,5 @@ Signed-off-by: Khem Raj #include +#include #include + #include #include "xml_file.h" - #include diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch new file mode 100644 index 00000000000..0d1c6b08fbc --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch @@ -0,0 +1,39 @@ +From 970b901e1999f415da8bac205f526c808ddad0ba Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 8 May 2023 10:40:43 +0200 +Subject: [PATCH] src/cmd_parser.c: add a missing parameter name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This resolves the following error with older versions of gcc: +| /srv/storage/alex/yocto/build-32/tmp/work/x86_64-linux/createrepo-c-native/0.21.1-r0/git/src/cmd_parser.c: In function ‘duplicated_nevra_option_parser’: +| /srv/storage/alex/yocto/build-32/tmp/work/x86_64-linux/createrepo-c-native/0.21.1-r0/git/src/cmd_parser.c:76:32: error: parameter name omitted +| 76 | duplicated_nevra_option_parser(const gchar *, +| | ^~~~~~~~~~~~~ +| /srv/storage/alex/yocto/build-32/tmp/work/x86_64-linux/createrepo-c-native/0.21.1-r0/git/src/cmd_parser.c:78:32: error: parameter name omitted +| 78 | gpointer, +| | ^~~~~~~~ + +Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/366] +Signed-off-by: Alexander Kanavin +--- + src/cmd_parser.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/cmd_parser.c b/src/cmd_parser.c +index 97c9ea7..63af7ea 100644 +--- a/src/cmd_parser.c ++++ b/src/cmd_parser.c +@@ -73,9 +73,9 @@ struct CmdOptions _cmd_options = { + + + gboolean +-duplicated_nevra_option_parser(const gchar *, ++duplicated_nevra_option_parser(const gchar *option_name, + const gchar *value, +- gpointer, ++ gpointer data, + GError **error) + { + if (!g_strcmp0(value, "keep")) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb similarity index 92% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb index 1c4cdd5e3c0..5080131dc1e 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-include-rpm-rpmstring.h.patch \ + file://0001-src-cmd_parser.c-add-a-missing-parameter-name.patch \ " -SRCREV = "af14e164a3e4ab9dfaef1212e852b9ecebc326a2" +SRCREV = "0652d7303ce236e596c83c29ccc9bee7868fce6e" S = "${WORKDIR}/git" From patchwork Tue May 9 17:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 23735 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 1C905C77B7C for ; Tue, 9 May 2023 17:24:14 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web11.39301.1683653038726499986 for ; Tue, 09 May 2023 10:24:08 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=swgFbxX5; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-9659e9bbff5so1113632966b.1 for ; Tue, 09 May 2023 10:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683653047; x=1686245047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v/lDEYQMIujW8pQI/yDx5oJPpmXU+AsKNC1kPrci2aE=; b=swgFbxX5TcIPQxXMMAV2v9v6PrzDJv5VBfzIzEGW64W/HyDerIKeBqxMj6hmwK668U MhJhXXLf+AunsjCR5VSWKo6RyB5ZqgyJhu0dNhwZYqmkdouWIkctUSXllifM/8yS0RIM uIXTB+mV+dkKEcDWheag+PFB6KysG0R1kKsppOytpRrfWFD/c9lrJU05S+NLPpJSgtsn R0idD9fBHAwPbfSLcjR8Z1xmHBUIua7xavlTu1DENKNq2xKcmbz/OG6jC2s2cE8obqMn IM/fQxOF0HO2CPIl1+PiSCna1GXT5GZ+nPwbLyHlnzaQ6sUMHteUVfjaISSPgetij2eq nJOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683653047; x=1686245047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v/lDEYQMIujW8pQI/yDx5oJPpmXU+AsKNC1kPrci2aE=; b=XpDXgZrxZajsv+EySz48bRCpFsHWghDWVf3ZPe8yLHVW5pvrFBErxpxp/ixiDAi+w0 ab9i8BE4UeaI6zgkN6rFQAuJJlDmfrd9K4Yz6ImNF7XulfkjcKvEvuowvXJ4+RORgvP2 uws7mTFMqbEViV4TqzMNBrcX85Ekwbz1vrMOhyVnau3vem/8kt0mR7/zbqWD1gZuusCP jA8AZ8KNlvOyhnmBOFLcIzj9MM2xhU2ZTTE0mKJgv+BAJqkxY0m18MpTz8pn1NpZRTfA hFzbl2C7xxYL8aka9gxsv01pOp/TLJZ4tYgo9TyrhEL2Tg7WRmPmGBwSjZxNM9TPHWIL rahw== X-Gm-Message-State: AC+VfDwE6XAHcQhKRs3/dQcOBG3a9JpjtUasoOST5WoLDjcY6nrqVc0v SDqd18UBMTKV1gvNl9+N0OEiAz9V7D0= X-Google-Smtp-Source: ACHHUZ5vUsJE96Xqyafv5eBfH2KmM58T8NQdIsGZWq+UfjjOu2fFWpQnCH2v0vU4oEeq1WeCxlWpAw== X-Received: by 2002:a17:906:4787:b0:94a:658e:1180 with SMTP id cw7-20020a170906478700b0094a658e1180mr14419677ejc.26.1683653047568; Tue, 09 May 2023 10:24:07 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id jz24-20020a17090775f800b0096347ef816dsm1578252ejc.64.2023.05.09.10.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 10:24:07 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 27/27] gcr: consider all versions, not only x.even.y Date: Tue, 9 May 2023 19:23:44 +0200 Message-Id: <20230509172344.1516743-27-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509172344.1516743-1-alex@linutronix.de> References: <20230509172344.1516743-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 May 2023 17:24:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181081 For example 4.1 is stable: https://gitlab.gnome.org/GNOME/gcr/-/tags Signed-off-by: Alexander Kanavin --- meta/recipes-gnome/gcr/gcr_4.1.0.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gcr/gcr_4.1.0.bb b/meta/recipes-gnome/gcr/gcr_4.1.0.bb index 0cc466b6146..239d9806cce 100644 --- a/meta/recipes-gnome/gcr/gcr_4.1.0.bb +++ b/meta/recipes-gnome/gcr/gcr_4.1.0.bb @@ -17,8 +17,7 @@ CFLAGS += "-D_GNU_SOURCE" GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" -inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg -UPSTREAM_CHECK_REGEX = "gcr-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" +inherit gnomebase gtk-icon-cache gi-docgen features_check vala gobject-introspection gettext mime mime-xdg REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}"