From patchwork Mon May 22 17:24:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 24263 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 53D2BC7EE23 for ; Mon, 22 May 2023 17:26:45 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web11.1272.1684776398211154241 for ; Mon, 22 May 2023 10:26:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=NmDLhqVi; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-510d9218506so7916143a12.1 for ; Mon, 22 May 2023 10:26:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684776396; x=1687368396; 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=NmDLhqVizPCXWS/lpE1UmBnu1e12Z2xRL14066/AfyufAu5moa355jl5ffwWep0oRi a1WfSojrhLDCA8Xcm9K7lbz+/JdVK97r+/Xare+V1Hw5P1MrDUVCySQmP+i7ROpfjWiL rp2yFstcpJsJ8HzNMygkG+bfIaNFBbWn5/OTRRTvPXBkW0p3wUw2v7DcjR90fQjgsI5B RaSXe+tHx1auBmqCBgHcVvOA/3VHF6AdAoXetuRHdB5mftMmnCXiTSwyAcfTq6ZB7c+m vr5vLcPdyS5WkpbdXyn8rjJSt9aa8dCXFL56vWGG/Lyf772u2UaQm3z9LUavZuPwNs2E t2wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684776396; x=1687368396; 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=RkGtbByDMLjwuGc0oUmdlhge8rtRZgilLH3QCiBmka3tzShMv3Flw46elU46nCV2Dk A5VhQDUAiSmrDVzO+YQ+hoDC4TG3KKQ6z4aHkc63uQkXjN6ZQ0sS8L4Z/VIciTD6OhcW 8uOyddzv/l6bd8+V6PzsiiRzNSZcXsDkQHmEIOZhIkyIPHtwp7UEiypD1RxRjsnIH+Jt smIySnjvmuuHYZvUvXeSyE+JIvmibdoE69PM2ndezzanYJVlo6fuL3Z+BvmfAu49wacz VkAfZegFu9FJtZBvZw0Oi5i+YCnP0Gix9ykOEL6FZK36Z47crlhLRzaTWokMnyrNvI/n 3dig== X-Gm-Message-State: AC+VfDyFVXgukSPgxHZJvhQ6fVBi0Ko/17pZbIYNeJepKTiorZd8OC4s bbDfmI/nzfKQe+kqHgs6UEZHfu0KSSY= X-Google-Smtp-Source: ACHHUZ7nvwSQuvhAbkQJ7HGhjNmNW1AwpE4ffHn+3PKKJNJLfn2iKDXWRiRui7XOdQmYQ8O6cYbHPA== X-Received: by 2002:a05:6402:354e:b0:50b:c350:f9ca with SMTP id f14-20020a056402354e00b0050bc350f9camr18509072edd.10.1684776396365; Mon, 22 May 2023 10:26:36 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c9-20020aa7c989000000b0050b2f588db6sm3124350edt.16.2023.05.22.10.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:26:35 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/8] insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only) Date: Mon, 22 May 2023 19:24:56 +0200 Message-Id: <20230522172503.1651374-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 ; Mon, 22 May 2023 17:26:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181601 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 Mon May 22 17:24:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 24267 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 76963C7EE30 for ; Mon, 22 May 2023 17:26:45 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web10.1199.1684776398730992829 for ; Mon, 22 May 2023 10:26:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=maa9BBoK; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-50be17a1eceso11404268a12.2 for ; Mon, 22 May 2023 10:26:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684776397; x=1687368397; 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=maa9BBoKDsibcck0XLeontRoUf6WNXdSLI0i2CrgMQeyw12nu0/p6wJ+N3zTp5U/J8 MC/8gf+HyyxVfkXLYpDETM26EmjU7uGSamjwU3b6yVgxUI8t2GEQimAv5Fs6RZ/04GcP pLeWTBYyjaxgpfp+ld6v/j53JYMWm9+Zldt7ywAd8+UnSmyvCjRT3t84d70S9iiYbie/ /Laupza86/KY6rgyU6g01/mOy6TOw+PRawXnvm8Tf5cJpSCjWn+eQoVXYOik9l5U7v9I GgwS5q1zyLlodVAo+JM281a4ShlVYeW+xEjKTxCReCLcwfZi5lVEU9TveLk41suO0OVt FCBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684776397; x=1687368397; 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=d30hMwAfb4Icu2+ETx08ElE+FvQa12SVLQU0PKigJI4y9wZtk8vQOooWve6qf9DwL7 +zlu8BqxqZ8OdrZl+s9ivYyk2hx5LFBVoKX/qMJlH2hgUm8fJkr0xP+iXKInJCLFPo32 DATfo4xxY93Rg8L2DDVokALhXUvrTZVwTuOhlEE/PajBlO4w5B/ho7gZoUqZ/1oAG8mZ EkOu1xEtJFxcMfLigwtiBh0h1iIqLwt2bOofd0HDg15k1w3T06T17g4F4wHrtLCXt8tc XRyloye/dbaKmWXjYKHPKi9Svtaa5YMNPl0l0oM0lRnkxmm90McOZ6H4nm/IhOBicUAV bPaw== X-Gm-Message-State: AC+VfDw5PI1H6vCSTBR4+EbsjAq29m0ZFcl6L5ej1V7ZlTuXcE13iHIj BezLyB/8qIMysRujeQDJWG3+RasnpF8= X-Google-Smtp-Source: ACHHUZ7GFj/dGbFZXa2Y2aX7BvFB4xer5Ssa/4aAdYGq+bO2ZEy4U1ssL6PKn7y2DN2emgnKZlmJ+w== X-Received: by 2002:a50:ee03:0:b0:4fc:709f:7abd with SMTP id g3-20020a50ee03000000b004fc709f7abdmr9800293eds.2.1684776396925; Mon, 22 May 2023 10:26:36 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c9-20020aa7c989000000b0050b2f588db6sm3124350edt.16.2023.05.22.10.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:26:36 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/8] insane.bbclass: add a RECIPE_MAINTAINER check (oe-core recipes only) Date: Mon, 22 May 2023 19:24:57 +0200 Message-Id: <20230522172503.1651374-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522172503.1651374-1-alex@linutronix.de> References: <20230522172503.1651374-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 ; Mon, 22 May 2023 17:26:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181602 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 Mon May 22 17:24:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 24270 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 7B0F8C7EE31 for ; Mon, 22 May 2023 17:26:45 +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.web10.1201.1684776399263575333 for ; Mon, 22 May 2023 10:26:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=U0/3c5Ya; 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-50bcb4a81ceso11257851a12.2 for ; Mon, 22 May 2023 10:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684776398; x=1687368398; 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=bTqGsmTLtPHRv3R2rzpMDI52TR/p9Tqrpmv/Y2tptrk=; b=U0/3c5YaaQlI1RBOLz7UkDK0PzN4ACjFaTb+yJX0PPrLBOX0Bx9Tb4wHaOZV6wewME YHW/T0ix56PBRtuqOvGAlt1WaNtHLYU2jdWGAG4//mhzNPjT7NAT0fepwM/xJgh6SCrh G4J+dWKStpmIFOMGpG/7EZP9DZTmH/heNB4v0V7Al703htpZy+/OrHUsffjX68hFciiQ 1u/JGZ3p64s3vgy2VUVz5Qwn/P9CFQiJfVXMcMA86fJpu41eFhpjwZaS59NlsKk7ps2o Cuf4+ZqOVCTOb2L3jzBLJKMyOAjUKagATX1Zsmjr26ZOdYt1/kHHPDRGaF90LbhaGfO6 1A2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684776398; x=1687368398; 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=bTqGsmTLtPHRv3R2rzpMDI52TR/p9Tqrpmv/Y2tptrk=; b=Qz4z8Tf5mrYmyS+MruRTXb5WyiylwO3m+T0T83GQakfde/ng/puOS4+DZvGxuaPK6s RhPM5LeHd3KAZql+c8hVqFj5BsNdyFLOuiU2iFo0tx7u+7hXcVYi7UyzeoGV9b44pdZM e5D0IFBDT4dvS+ZhjZ3J2cgzonmTEFvNzKiyKxMQNdS8LN8eGDHWzDAOI9kxXmhvzF6/ 1lsr7Ai9XHor/eFTHs16bRS94yK/NQWQc/Ci/IU/Yid2apPVPvyGbOVocNxiMiKxXyQc zgbbhmHkkCX7ihohsmS/M9Xq9duHqUvdhLaBlYBSd49SW4PqxROw87Sgr41FboATTKuB Ng6A== X-Gm-Message-State: AC+VfDwAa5YXf1FEdse51oNWIDTIZ3tCeKJzGfwqhP280LGI6Qo8U8AU K1Wjc/zWaGIKzPeS4e87Wba8mRf+PU4= X-Google-Smtp-Source: ACHHUZ52upln6zKqI1U+1JgYhVW0sRy9cyScBhfhFPOE9zIQqic8xW7xrsDjTnNkvzM/PdDzJXHsWQ== X-Received: by 2002:a50:ee8f:0:b0:50c:646:cafd with SMTP id f15-20020a50ee8f000000b0050c0646cafdmr8637739edr.7.1684776397557; Mon, 22 May 2023 10:26:37 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c9-20020aa7c989000000b0050b2f588db6sm3124350edt.16.2023.05.22.10.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:26:37 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/8] apmd: remove recipe and apm MACHINE_FEATURE Date: Mon, 22 May 2023 19:24:58 +0200 Message-Id: <20230522172503.1651374-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522172503.1651374-1-alex@linutronix.de> References: <20230522172503.1651374-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 ; Mon, 22 May 2023 17:26:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181603 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 e99fbe4aefb..30d211e4b08 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 Mon May 22 17:24:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 24268 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 6A1FDC7EE2E for ; Mon, 22 May 2023 17:26:45 +0000 (UTC) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by mx.groups.io with SMTP id smtpd.web10.1202.1684776399611310043 for ; Mon, 22 May 2023 10:26:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=hQpSraoK; spf=pass (domain: gmail.com, ip: 209.85.208.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-510b6a24946so11587737a12.0 for ; Mon, 22 May 2023 10:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684776398; x=1687368398; 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=1mft5lqPJByp0PgvpeuERqEqrmlQ80U4DJYkiWHEFYM=; b=hQpSraoKwFWHDsfY6NZbHQ0/r4OHe1iOFcj0qe9OeDOrCGBEyS3GNSCMR4O3CUlSkU FqALEf4Z1bwbZA3ymqwPvcdkSWV2BcCzmexb8XMav4e2IvQjJMdCIkN7aowa3e4pRoOV 5R0JH0oANYjhQHM3W5uFvZCQOWptoxq8Z4+8/eRb88j60CcTD6IctQsoafrOwEd3kCpa VN7k3zcLG1/AszCPlJWM2ynD1//Oy9EKX6KPIn81Ks+1/P3iwt2MnwwZdxNH7ub+mK9A +/a05t8DKKtTT2bjmSMO8X4Mu0tmOrgze6uvsj4mE2OPOxOJda5J/sYTdg99Ly1SqfzP EBKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684776398; x=1687368398; 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=1mft5lqPJByp0PgvpeuERqEqrmlQ80U4DJYkiWHEFYM=; b=Xvdt8O+8NJvo4Rk8NYqs/WT2l1GAxmg4t3hXIMmNeSOIZurIhHWWDxfR6mjI/LyN14 VuwxdHMbdh2ZceVHFMgXjY3A8sx8YsMeymV5H8ufWLOO4DfH/fWXW+ALUJ872lL1vglm VOUrUiXZvrwybAjqWtdN4BZ75E3UP3gMzJYJ0MA/q9sog3WhZ9x0jFp99npih8HAW8zS BI6lrgOowcnM/PgXxpUNcfEj+l6Lpb6jjWNGBVbtPwV+Al28OS+EdWctUJJmvsO7l3Xs BSlHTMsOrLKATLH1aqrWskTO23wVQF77I7dzFcBBSBgPFy20uAGgZlNBZFqTfeJNkbpZ MutA== X-Gm-Message-State: AC+VfDwshRixOVBm7U+j3dn57nskLGKR/BIFLbvPwbAEqOV5QOKFIyjQ Ru48cfxh+ZSqXghx4bjgJ5NSz7XzSrY= X-Google-Smtp-Source: ACHHUZ7G6QE61Uis0soXSs5rD/cReYeHx78QQbNSvjOyRzOhHz9bppdkQeHZIpNrGlnV+kBe4QzutQ== X-Received: by 2002:aa7:d5d3:0:b0:506:bce0:48d6 with SMTP id d19-20020aa7d5d3000000b00506bce048d6mr8922759eds.5.1684776398048; Mon, 22 May 2023 10:26:38 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c9-20020aa7c989000000b0050b2f588db6sm3124350edt.16.2023.05.22.10.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:26:37 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/8] meson: update 1.0.1 ->1.1.0 Date: Mon, 22 May 2023 19:24:59 +0200 Message-Id: <20230522172503.1651374-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522172503.1651374-1-alex@linutronix.de> References: <20230522172503.1651374-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 ; Mon, 22 May 2023 17:26:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181604 Rebase a patch. Remove unneeded patch: Khem confirmed that upstream fixed the issue with https://github.com/mesonbuild/meson/commit/24ea1d3f1968bff52ccaaf33fcdd59e810459aa9 Signed-off-by: Alexander Kanavin --- ...for-clang-before-guessing-gcc-or-lcc.patch | 56 ------------------- ...-not-manipulate-the-environment-when.patch | 48 ++++++++-------- .../meson/{meson_1.0.1.bb => meson_1.1.0.bb} | 3 +- 3 files changed, 25 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch rename meta/recipes-devtools/meson/{meson_1.0.1.bb => meson_1.1.0.bb} (97%) 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 deleted file mode 100644 index 58fa1194398..00000000000 --- a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 8739e1c3bef653415ad4b9b9c318ccfa76c43da6 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 - -clang --version can yield a string like below when its installed into -such a directory - -clang version 14.0.0 (https://github.com/llvm/llvm-project 3f43d803382d57e3fc010ca19833077d1023e9c9) -Target: aarch64-yoe-linux -Thread model: posix -InstalledDir: /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/gnome-text-editor/42.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux - -as you can see InstallDir has 'xt-' subtring and this trips the check to -guess gcc - -if 'Free Software Foundation' in out or 'xt-' in out: - -Therefore, check if compiler is clang then there is no point of running -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 ---- 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 - version = search_version(out) - - guess_gcc_or_lcc: T.Optional[str] = None -- if 'Free Software Foundation' in out or 'xt-' in out: -- guess_gcc_or_lcc = 'gcc' -- if 'e2k' in out and 'lcc' in out: -- guess_gcc_or_lcc = 'lcc' -- if 'Microchip Technology' in out: -- # 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: -+ guess_gcc_or_lcc = 'gcc' -+ if 'e2k' in out and 'lcc' in out: -+ guess_gcc_or_lcc = 'lcc' -+ if 'Microchip Technology' in out: -+ # this output has "Free Software Foundation" in its version -+ guess_gcc_or_lcc = None - - 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 97% rename from meta/recipes-devtools/meson/meson_1.0.1.bb rename to meta/recipes-devtools/meson/meson_1.1.0.bb index fd478b21612..1190d5c34d9 100644 --- a/meta/recipes-devtools/meson/meson_1.0.1.bb +++ b/meta/recipes-devtools/meson/meson_1.1.0.bb @@ -14,9 +14,8 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0001-python-module-do-not-manipulate-the-environment-when.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ 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 Mon May 22 17:25:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 24264 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 62678C7EE2F for ; Mon, 22 May 2023 17:26:45 +0000 (UTC) Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by mx.groups.io with SMTP id smtpd.web11.1276.1684776400247554496 for ; Mon, 22 May 2023 10:26:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=RMXxPRbr; spf=pass (domain: gmail.com, ip: 209.85.208.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-50c8d87c775so9502327a12.3 for ; Mon, 22 May 2023 10:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684776399; x=1687368399; 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=7xT5KhHbXOsG6K2hGrSIbEcJLyjxd5ZMgNfD34d9Brw=; b=RMXxPRbr7kjU837LVskIky/wIzVek25VOz1uS4elDrKax9zsnJH9ueb6qEcD1MUnQ9 uI/c5KX2shUh5IJW45MtutOk3SBc0GBMAWZSm5NWVK5cXswyUkmqLSYWxHoL33/xAFcw yOtOrUqtGzLtkv4+zER8GAfgfVsrKAXLIJw2PI6czC8Ui77kTQOGS1i8kPp1U7TDUGPE 3hiF+1GA68Y5lFNZcwnYloVh6WIYvXY53ZCu/Epj2+1d633nsThHDmv7fO2sGDAixnXu M8ofsrOGy4LmUZJoXo26Cqdrz22lvrFN15BZK2GOBR4+x1S/Uap4cFoR7QI+30Aztf5N 87Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684776399; x=1687368399; 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=7xT5KhHbXOsG6K2hGrSIbEcJLyjxd5ZMgNfD34d9Brw=; b=K6ZJQgvjM7MuVAU9n9010hkm+rC0JJI2Sup+yelylxT8UXLcz+i58NWfgJBExXSV6D lbqtiLoJxmFiw6PrYXilN/Ro7QvEmxqlGbg04q9ro01gqaoJAzmLZy/+zQ3DMqdwKWCH ZdM/xSZrYGWerPF/tR50Tw9vTx6s2WSThXcGwOLRJv+tskGl+rJY8f0x6IAM1iXHHmsT hugEzCvSeboyCniBHQVeGZSS70DiOQNRcJYwQam3OLLZB9l1d0PKMIzrCeq4fUfONHef HoBJYFVNE+aw92BRxXNZQLclwoKPAl1/OvlnmiZG9qnXPd2MzX6dgUlWIlJfZjM4ZRRH 7vSw== X-Gm-Message-State: AC+VfDxT3ZBfdppzOhKJDK9Qci4040AcL4jrDmPdMvlYT/tY444wt98N MkTSm2B8EEpSNWIdMNHlSrtmmsB4B6s= X-Google-Smtp-Source: ACHHUZ5JZppK6hNfswhJyBhqlS10ltuHD/T+NpNvqrlFBuG5cpMEgATkD7qhDMl/nUnWyfGz+DvrQw== X-Received: by 2002:a05:6402:184d:b0:50d:ba93:be51 with SMTP id v13-20020a056402184d00b0050dba93be51mr9254053edy.26.1684776398639; Mon, 22 May 2023 10:26:38 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c9-20020aa7c989000000b0050b2f588db6sm3124350edt.16.2023.05.22.10.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:26:38 -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 5/8] Remove usage of /var/volatile/tmp Date: Mon, 22 May 2023 19:25:00 +0200 Message-Id: <20230522172503.1651374-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522172503.1651374-1-alex@linutronix.de> References: <20230522172503.1651374-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 ; Mon, 22 May 2023 17:26:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181605 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.20.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 314cc466625..498bca42fb6 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 279923db8ef..020bb69b168 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.20.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb index 07e50426e44..4ea173ba803 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb @@ -36,7 +36,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-drd-tests-Include-missing-cstdint.patch \ From patchwork Mon May 22 17:25:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 24266 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 61F54C7EE2D for ; Mon, 22 May 2023 17:26:45 +0000 (UTC) Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by mx.groups.io with SMTP id smtpd.web10.1204.1684776400747152820 for ; Mon, 22 May 2023 10:26:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=SUmAf/H4; spf=pass (domain: gmail.com, ip: 209.85.208.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-510b6a24946so11587765a12.0 for ; Mon, 22 May 2023 10:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684776399; x=1687368399; 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=NyOPqCq+H8AHC7pJKdWYnzhQlLaOw188aXHTYMCptnI=; b=SUmAf/H4toT0NmYnXP6Nn93SbMw1KC+SrdqJnQvmnwE9DIuOIpK/k2jzjenrdc3xxO SgZljtKAec1f8/2SSzef0t/sAiSxp0xD/FwxRxsBd02YLmja+4lDeEzod3h06N9aH2AX 8DpZTBIplPVKCsccbVOgUurtOZ9sfNzZCT5uOdxJf3fHvL31uWvudNEYi/Wqa0vCAhiL nG2nHMJnM/6c54JMZTDLAcU88kU4bs97ighPadSm+PwhcxEt6esVS6DD6tuBrSqxeqKr H9RrAzIBWekG57woUtLVXaJsQjJxL5mKcBMqEg+XB/i3UNqWIz1GPlieMTxlOcrPv2P5 9TWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684776399; x=1687368399; 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=NyOPqCq+H8AHC7pJKdWYnzhQlLaOw188aXHTYMCptnI=; b=WM0zuKuVhlhFyupfpRQtbnAtS4TiEB2356DFqcT9zjHku5fuVnFuwXZmxFq6pSloa+ skgdT6YiEkW4d8AMeDyO4uipBsucqi+nztqLsw6rVJfBHNDYTMBe+oHwc7z1wZc//I8U QMl8JEyuFqeICiGmYWaWJed8jJwXabDXFfLP9Z/hMM7aWyajCTr1OklBi45Jy9NoeVuS BrCj3u99MbEWKmtJJJDuUQEgGQFaw/SJUlME0zNI0PbLndoABVSA29VXAw8BzkBJ80bL 157sLQUYFniuZ40pZytO798lu9QO9o0eCLd7e/4kBhQYZ3SJaNese+huNBZKfaPVzlZa sWuw== X-Gm-Message-State: AC+VfDxGPRjayQi7DtDWT3gFKEcn8m0ixA1f9F3OGa1jJ2kMrV0NXGBO NIyItY6/kn043X0dkI59d6ssdNm46nw= X-Google-Smtp-Source: ACHHUZ4L4cHxZw4NW+Xsm3dEkMtS3jAmmHSQx0gykSgl5W+rvaRofUYTcFPjhuy1ZvpKrUYhHsf/GQ== X-Received: by 2002:a05:6402:1b0f:b0:510:b636:4073 with SMTP id by15-20020a0564021b0f00b00510b6364073mr8875146edb.3.1684776399175; Mon, 22 May 2023 10:26:39 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c9-20020aa7c989000000b0050b2f588db6sm3124350edt.16.2023.05.22.10.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:26:38 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/8] gdb: trim python support RDEPENDS Date: Mon, 22 May 2023 19:25:01 +0200 Message-Id: <20230522172503.1651374-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522172503.1651374-1-alex@linutronix.de> References: <20230522172503.1651374-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 ; Mon, 22 May 2023 17:26:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181606 Depending on all of python3 (which pulls in all modules) is not needed, python3-codecs is enough. 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..434ff222ba3 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc @@ -33,7 +33,7 @@ EXTRA_OECONF = "--disable-gdbtk --disable-x --disable-werror \ PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" # 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" +PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3-codecs" PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" # ncurses is already a hard DEPENDS, but would be added here if it weren't PACKAGECONFIG[tui] = "--enable-tui,--disable-tui" From patchwork Mon May 22 17:25:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 24265 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 517A0C77B73 for ; Mon, 22 May 2023 17:26:45 +0000 (UTC) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by mx.groups.io with SMTP id smtpd.web11.1277.1684776401295308002 for ; Mon, 22 May 2023 10:26:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=rJ7Nl4yx; spf=pass (domain: gmail.com, ip: 209.85.208.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-510e419d701so9929953a12.1 for ; Mon, 22 May 2023 10:26:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684776400; x=1687368400; 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=r7JWqJUrNhIp7yerwI3sNPdkVtiKAeRp+IprDf/6BT0=; b=rJ7Nl4yxr5EFIjO0qYT4OaeD9Kvky6uxRg7uM9m2UBDWL/NU3gI5zI8WpIc9PFl2MK jjNpHPv9fRRTqxEHGNeEADR9A9wd+RjtCFbM8Q0gsUHIJdRwLl1/CbR2JFD25BVP6mnb OXxClg73Gbonh3JJ9gGCvfwjFZBCRLL5H4AfRF8kRK3rTtq/IT8Rs2240M5Z8n2et/Mi Coz0FI4VV3npjX1ICp3tyhXDkqduL1i8Y0UD0XE9BZzki5OMdgallD2CfhxthmH0cJud OwhyRrPPWMbkR9qSUqI9jAKo8yEjJ//TRm1pETr7q3l+SG+3u4ZiQToDh8xU+j9Z+eeo LY6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684776400; x=1687368400; 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=r7JWqJUrNhIp7yerwI3sNPdkVtiKAeRp+IprDf/6BT0=; b=IwOo/PP3yAhoKK4DN8yvNnd/ZXLTZQnWNBb9c4e6AeXv2qjJLObdme3R/dqBeLj81y kP6XLAZ7LUTIyR5Le80PF8ftvryFvZW7t1ipIABFl4X/ZcXsdguAUEui0YUcuAzhQ3q5 LmzLFgyya10NlXWLyeRCVD0f2A7geMy/H+WHMG76Flz066Wi/uT9GDsLCR15Pp9+lXf7 10XyOKSk1i4Wts0TNCMRfnu21y0yxxRDLEfh0f2/fAuCE5z6d1ZOILwZVfdxTtkjCXi8 UlDfEdh2IytukJfdD49WxUGezaX692DGDks0jFHvWfvDTuyEbzs09RgYmLjxhUyPRHjp yU6A== X-Gm-Message-State: AC+VfDyBIsL2PCmMdrRnZ949DbjxSBXzVwABEK0ix+7DzwaLuNPG0r/D uXPZioJujeorJRlrEHgKCZ6SaHisIpI= X-Google-Smtp-Source: ACHHUZ7FUf0mEW6nkU9k9HI3dgCpWUulW8WZ5A+txgbl1lj8seObrsTJyhoXi7XDHPXp6QWAZYSdfQ== X-Received: by 2002:aa7:da0a:0:b0:510:d1e6:56ab with SMTP id r10-20020aa7da0a000000b00510d1e656abmr10020730eds.4.1684776399688; Mon, 22 May 2023 10:26:39 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c9-20020aa7c989000000b0050b2f588db6sm3124350edt.16.2023.05.22.10.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:26:39 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/8] gdb: enable python PACKAGECONFIG Date: Mon, 22 May 2023 19:25:02 +0200 Message-Id: <20230522172503.1651374-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522172503.1651374-1-alex@linutronix.de> References: <20230522172503.1651374-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 ; Mon, 22 May 2023 17:26:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181607 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 434ff222ba3..12292f03c49 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-codecs" From patchwork Mon May 22 17:25:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 24269 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 52EE2C7EE26 for ; Mon, 22 May 2023 17:26:45 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web11.1279.1684776402133031852 for ; Mon, 22 May 2023 10:26:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=pzNCWnii; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-96f6e83e12fso551340566b.1 for ; Mon, 22 May 2023 10:26:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684776400; x=1687368400; 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=oA61auFlG2c9HtJY8ylwLtxxPOk92Nqhn77gfHhChjM=; b=pzNCWniijw4eFVlXez9OY6cvts4OpkxHRSPCRzLfF0/eewEI7q42+VkxuparWF/Tt+ naUzWJzDwHQGRxljJ2xwVWT5r0TlCyhPSul1jSbbbId8uU+rrGGzunESRoEtsnERHykT tmsZTNAQV0vh/tsHuIvS7dJzFy94fzOKr49c2i4p5K12gaIkjQl25c1DX3KmRAiwDl2M z4S6Jvx2xEw8QfQNuOOqruTwHNgf5lBjn9SWrE8xz2Nez5+HG13qIfDdg9eUvAaTBDCx YFmXyAgaL8IjtK2Ml1wztw11kThpeHa7e7Ou+jxxy/UEkX9f+0nWDeGHuXYtkyoFTqbk xbeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684776400; x=1687368400; 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=oA61auFlG2c9HtJY8ylwLtxxPOk92Nqhn77gfHhChjM=; b=IlT1gzay/Gl4tJtvKWTZoGZnNMdUdlkITKuiC7Wy45kpCDy+KRTT3v1AcTliLc14uM UzqVKz5YKjvE++5iEbLWS1vW4vb8YAm+kQVQc5GwVZt66TczliZyUJsinL8B2frPww6E Tc7uu+hJ1lbGBnyQzSdyB1GafyPkxM6X+xvEsE9otbSPE9JBlgBYJKOUOl2+SaOXIJLd PPiQb/83BVk9nTD3jklZ+JqctcyDjFqDMPGlktQk4QBIiTYSleAVGPnb7gK4ZTjeXsbp tmngj8fWMtepZJdulntn6QA+Bn83HR7tNoLIIL0MsiKEuoSdzFCxTpz3nYR2osVi8kIk TYtg== X-Gm-Message-State: AC+VfDz8/7GHlYJg4KVrWNUd6DmMFVV+wYUHJs80oImLOWZHBJLh/XDi gnlBRh1BZTRrDaqh8nrchFGhcretou0= X-Google-Smtp-Source: ACHHUZ5SF31qr9ABPMCvO3whXksv0I5Z6T/RGQA7LVexU5ByTp+RGABYRHGJ9TGaaUl9C3OseILvfQ== X-Received: by 2002:a17:907:a42b:b0:96f:9cea:a346 with SMTP id sg43-20020a170907a42b00b0096f9ceaa346mr6511964ejc.1.1684776400180; Mon, 22 May 2023 10:26:40 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c9-20020aa7c989000000b0050b2f588db6sm3124350edt.16.2023.05.22.10.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:26:39 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 8/8] valgrind: update 3.20.0 -> 3.21.0 Date: Mon, 22 May 2023 19:25:03 +0200 Message-Id: <20230522172503.1651374-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522172503.1651374-1-alex@linutronix.de> References: <20230522172503.1651374-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 ; Mon, 22 May 2023 17:26:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181608 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 4ea173ba803..cf50a2a4386 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 \ @@ -38,9 +35,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://s390x_vec_op_t.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' @@ -207,13 +204,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