From 7d06e4e30b39a901a3d0b263d5de43f954c3270b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 28 Nov 2023 11:43:48 +0000 Subject: genericx86: remove redundant assignments 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. (From meta-yocto rev: 0e50dbf558fda7595f5cb13667cbe0a01481a9f5) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 e3badebf86..24d427a360 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 ?= "genericx86.wks.in" EFI_PROVIDER ??= "grub-efi" -- cgit v1.2.3-54-g00ecf