From patchwork Tue Nov 28 11:43:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 35305 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 D607FC4167B for ; Tue, 28 Nov 2023 11:43:45 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30704.1701171817545123557 for ; Tue, 28 Nov 2023 03:43:37 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0E690C15; Tue, 28 Nov 2023 03:44:24 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C43263F73F; Tue, 28 Nov 2023 03:43:35 -0800 (PST) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH] genericx86: remove redundant assignments Date: Tue, 28 Nov 2023 11:43:33 +0000 Message-Id: <20231128114333.1591098-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 28 Nov 2023 11:43:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191361 From: Ross Burton GLIBC_ADDONS was removed from the glibc recipe in 2018 (oe-core 9dc9983). matchbox-panel-2 uses the ACPI battery by default if the machine has the 'acpi' feature, which genericx86 has. Signed-off-by: Ross Burton --- meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index e0cb7157135..f6a030b1844 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -16,10 +16,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" -GLIBC_ADDONS = "nptl" - -EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" - IMAGE_FSTYPES += "wic wic.bmap" WKS_FILE ?= "mkefidisk.wks.in" EFI_PROVIDER ??= "grub-efi"