From patchwork Sun Nov 13 08:28:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Lauer X-Patchwork-Id: 15411 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 CFFD6C433FE for ; Sun, 13 Nov 2022 08:29:22 +0000 (UTC) Received: from mout.web.de (mout.web.de [217.72.192.78]) by mx.groups.io with SMTP id smtpd.web08.915.1668328157679607727 for ; Sun, 13 Nov 2022 00:29:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@email.de header.s=s29768273 header.b=l06O2teN; spf=pass (domain: email.de, ip: 217.72.192.78, mailfrom: christoph.lauer@email.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=email.de; s=s29768273; t=1668328152; bh=znFGgGCYgGdv5ICyrJeieDKnlBOnuxaGmKiyGtV4VC4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=l06O2teNgR8mhNZTBHaKm0fElqOc6ydzG9MbNkLi+jCIkkb7ZROd9k8FxTkr2CvJQ wreVTpXeSeW+ppfLSSyJDVKtfH+9Ij/gbUl1uhzROFkm8mZQpqDwBGErmHv+/jk3Fz IT3C7CWALZ6CJFVkbDT/OF0zfaeO99YZCv6vI9uXFAu8rI7V8CmxX3ikRmAlHeN3Zk hGj3vSHrK7+qHcsLoYVvydzr5UTYLsh3IbvML4WB0C3xt2UnusIEH/A8aliDY6NiqU lWf525P1DDJ9kjBJcmQzsqb59GWb449CVcYwVLMLE29mQc+hnTQ/LDjvnPOAfnWlri vbZDUIWhs3SKw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from xtr-acuyocto-p01.xtronic-net.com ([178.251.90.190]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1Mq1CC-1pGWcc2dXe-00mysN; Sun, 13 Nov 2022 09:29:12 +0100 From: Christoph Lauer To: openembedded-core@lists.openembedded.org Cc: Christoph Lauer Subject: [meta-oe][PATCH v2 1/2] initial configs: set PREFERRED_PROVIDERs as weaker defaults Date: Sun, 13 Nov 2022 08:28:23 +0000 Message-Id: <20221113082824.17041-1-christoph.lauer@email.de> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:3wOcJE3yexweXC9GL71ModOdPNdB7JG+80Bw7Gk0wK4sysS2TMc ex8n2QVBmFrE8WAQmL3oLddK0rfeEgPxIlfXsXoFd7KdX3Moh5vztNJO0HniEUYtwfXaHb8 tiOweTBm2fro2N1l/YvARDoeeCXoZI9MCAPMcfzlb3/BYUZtDe4pzW8eXtjCKlXbrAtspIt 6Zm2hy9OxzlkPn+X99RBA== UI-OutboundReport: notjunk:1;M01:P0:EPshW0eJma8=;p3i087FNDiWFdH/3gb0S74eDJ80 WAL/B+8JY4vTY3/ycxw4MAVhFpg5PykNSKh60A5vRaDEWPwAJbXlNVuR01vIdWThDtdMJu22e oPFgn945SY9EbFrs1NrKKoT4h2bjmofbm/o4pNMIbA8smtPXIET4tfbmC1bzuUBro6I7VWuiF S/nVZX5lk6OO7Uw0MbLWzmpbo26tHUMukDYeHOhUJoJ1L3YFvVb1HZV6tjdeL8Tcj+LXouvCe G81nqCzTAw2CoGCS2sqW4Ue6YR/3wBNQckNkobLHhjMHuxfHUXmOWwfXXn+BtvL4K0Nx/hYFI zschwU1ekJcZekjRgzEvv2T/jBWGo7pK7d37kT12q5g61Gem4aTBEi6x7QTBO4eO1IAxjcBfU pQfU2PCeF9WfbqBnX+pg0VyLDrVICPs5AMNannJ9aLWfppGkNsT3kxRA4RdAx+4ugOTGBGtLB nlv2CC9rxtKw6o6YWGP1UiVjjg7Uk0Ot+amprvMwxr+4JazjRFjy1gyvQA1sJ2GJsu4w1KKJM TdJE6wWrguR8mvqrgxT0XSgyGJ/SfImHajPQ64j7o1lam9xhcCwh3raeZeYokLcTe0fI3WTUj chM2ZwNG7I+Cby8hO+ZF00B14S7UIQRl3MWKGgW29Kn3GESPnmYmu0i3Dw9sN9qYDHu5gJsni nSyByWWmzzHaabQyURNc6d/0b1bHKhw8KBIti5hRZtD0kv+Se784FKeJOipH3aKEGs/qqyhKv 1M8WywLJlx0CoJRnnRcdUpL4EyT/pwBXngPl+AS/yotLNruJ/NMHiR3Z4KE2bHPuxzd3B4RTZ AzEo/QTgc3IKPYko/16gCZ8vNG7D0Tj4QMstLRdJhwA6azGdaMKBblddyjgrbt5uvF8ASuFPX iOsrbBJGjXvn8r12W7q/ws0NDXTRxNVrI2u38YtaDeM7IQ07pMV0FTr2AT7lUcKQ4zyJ/v8zz tAiTL9+TRxokdzebOtEb0UNJU3k= 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 ; Sun, 13 Nov 2022 08:29:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173184 From: Christoph Lauer This gives BSP creators the flexibility to change PREFERRED_PROVIDERs with weak defaults Signed-off-by: Christoph Lauer --- meta/conf/bitbake.conf | 2 +- .../conf/distro/include/default-providers.inc | 82 +++++++++---------- meta/conf/distro/include/tclibc-baremetal.inc | 10 +-- meta/conf/distro/include/tclibc-glibc.inc | 16 ++-- meta/conf/distro/include/tclibc-musl.inc | 14 ++-- meta/conf/distro/include/tclibc-newlib.inc | 10 +-- meta/conf/distro/include/tcmode-default.inc | 20 ++--- meta/conf/machine/include/qemu.inc | 12 +-- meta/conf/machine/include/riscv/qemuriscv.inc | 2 +- meta/conf/machine/qemux86-64.conf | 10 +-- meta/conf/machine/qemux86.conf | 10 +-- 11 files changed, 94 insertions(+), 94 deletions(-) -- 2.17.1 diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index a1f0f624e9..dea573986d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -758,7 +758,7 @@ FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATE FAKEROOTNOENV = "PSEUDO_UNLOAD=1" FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" FAKEROOTLOGS = "${WORKDIR}/pseudo/pseudo.log" -PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" +PREFERRED_PROVIDER_virtual/fakeroot-native ??= "pseudo-native" ################################################################## # Not sure about the rest of this yet. diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 6defdca12d..95f02e1c98 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -1,23 +1,23 @@ # # Default virtual providers # -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/egl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native" -PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" -PREFERRED_PROVIDER_virtual/mesa ?= "mesa" -PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils" -PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" -PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" -PREFERRED_PROVIDER_virtual/make ?= "make" -PREFERRED_PROVIDER_virtual/make-native ?= "make-native" +PREFERRED_PROVIDER_virtual/xserver ??= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver-xf86 ??= "xserver-xorg" +PREFERRED_PROVIDER_virtual/egl ??= "mesa" +PREFERRED_PROVIDER_virtual/libgl ??= "mesa" +PREFERRED_PROVIDER_virtual/libgl-native ??= "mesa-native" +PREFERRED_PROVIDER_virtual/nativesdk-libgl ??= "nativesdk-mesa" +PREFERRED_PROVIDER_virtual/libgles1 ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles2 ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles3 ??= "mesa" +PREFERRED_PROVIDER_virtual/mesa ??= "mesa" +PREFERRED_PROVIDER_virtual/update-alternatives ??= "opkg-utils" +PREFERRED_PROVIDER_virtual/update-alternatives-native ??= "opkg-utils-native" +PREFERRED_PROVIDER_virtual/libx11 ??= "libx11" +PREFERRED_PROVIDER_virtual/base-utils ??= "busybox" +PREFERRED_PROVIDER_xf86-video-intel ??= "xf86-video-intel" +PREFERRED_PROVIDER_virtual/make ??= "make" +PREFERRED_PROVIDER_virtual/make-native ??= "make-native" # # Default virtual runtime providers @@ -33,29 +33,29 @@ VIRTUAL-RUNTIME_base-utils-syslog ?= "busybox-syslog" # # Default recipe providers # -PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" -PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" -PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" -PREFERRED_PROVIDER_libgcc ?= "libgcc" -PREFERRED_PROVIDER_nativesdk-libgcc ?= "nativesdk-libgcc" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" -PREFERRED_PROVIDER_nativesdk-linux-libc-headers ?= "nativesdk-linux-libc-headers" -PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" -PREFERRED_PROVIDER_opkg ?= "opkg" -PREFERRED_PROVIDER_opkg-native ?= "opkg-native" -PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" -PREFERRED_PROVIDER_console-tools ?= "kbd" -PREFERRED_PROVIDER_gzip-native ?= "pigz-native" -PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" +PREFERRED_PROVIDER_dbus-glib ??= "dbus-glib" +PREFERRED_PROVIDER_dbus-glib-native ??= "dbus-glib-native" +PREFERRED_PROVIDER_gdk-pixbuf ??= "gdk-pixbuf" +PREFERRED_PROVIDER_libgcc ??= "libgcc" +PREFERRED_PROVIDER_nativesdk-libgcc ??= "nativesdk-libgcc" +PREFERRED_PROVIDER_linux-libc-headers ??= "linux-libc-headers" +PREFERRED_PROVIDER_nativesdk-linux-libc-headers ??= "nativesdk-linux-libc-headers" +PREFERRED_PROVIDER_matchbox-panel ??= "matchbox-panel-2" +PREFERRED_PROVIDER_opkg ??= "opkg" +PREFERRED_PROVIDER_opkg-native ??= "opkg-native" +PREFERRED_PROVIDER_nativesdk-opkg ??= "nativesdk-opkg" +PREFERRED_PROVIDER_console-tools ??= "kbd" +PREFERRED_PROVIDER_gzip-native ??= "pigz-native" +PREFERRED_PROVIDER_udev ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb -PREFERRED_PROVIDER_ltp ?= "ltp" -PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" -PREFERRED_PROVIDER_openssl ?= "openssl" -PREFERRED_PROVIDER_openssl-native ?= "openssl-native" -PREFERRED_PROVIDER_nativesdk-openssl ?= "nativesdk-openssl" -PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig" -PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig" -PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native" -PREFERRED_RPROVIDER_initd-functions ?= "initscripts" +PREFERRED_PROVIDER_ltp ??= "ltp" +PREFERRED_PROVIDER_getopt ??= "util-linux-getopt" +PREFERRED_PROVIDER_openssl ??= "openssl" +PREFERRED_PROVIDER_openssl-native ??= "openssl-native" +PREFERRED_PROVIDER_nativesdk-openssl ??= "nativesdk-openssl" +PREFERRED_PROVIDER_pkgconfig ??= "pkgconfig" +PREFERRED_PROVIDER_nativesdk-pkgconfig ??= "nativesdk-pkgconfig" +PREFERRED_PROVIDER_pkgconfig-native ??= "pkgconfig-native" +PREFERRED_RPROVIDER_initd-functions ??= "initscripts" -PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" +PREFERRED_PROVIDER_nativesdk-mesa ??= "nativesdk-mesa" diff --git a/meta/conf/distro/include/tclibc-baremetal.inc b/meta/conf/distro/include/tclibc-baremetal.inc index f3d27bbaae..2eaafb8bdd 100644 --- a/meta/conf/distro/include/tclibc-baremetal.inc +++ b/meta/conf/distro/include/tclibc-baremetal.inc @@ -8,11 +8,11 @@ LIBCOVERRIDE = ":libc-baremetal" ASSUME_PROVIDED += "virtual/libc virtual/libiconv virtual/crypt" -PREFERRED_PROVIDER_virtual/libc ?= "musl" -PREFERRED_PROVIDER_virtual/libiconv ?= "musl" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/libc ??= "musl" +PREFERRED_PROVIDER_virtual/libiconv ??= "musl" +PREFERRED_PROVIDER_virtual/libintl ??= "gettext" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ??= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ??= "nativesdk-glibc" USE_NLS ?= "no" IMAGE_LINGUAS = "" diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index f48d16939e..df58259323 100644 --- a/meta/conf/distro/include/tclibc-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -6,14 +6,14 @@ LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}" LIBCOVERRIDE = ":libc-glibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale" -PREFERRED_PROVIDER_virtual/crypt ?= "libxcrypt" +PREFERRED_PROVIDER_virtual/libiconv ??= "glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ??= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ??= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/libintl ??= "glibc" +PREFERRED_PROVIDER_virtual/libc ??= "glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libc ??= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/libc-locale ??= "glibc-locale" +PREFERRED_PROVIDER_virtual/crypt ??= "libxcrypt" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc index 98d7a801ac..1dfa63ddfd 100644 --- a/meta/conf/distro/include/tclibc-musl.inc +++ b/meta/conf/distro/include/tclibc-musl.inc @@ -6,13 +6,13 @@ LIBCEXTENSION = "-musl" LIBCOVERRIDE = ":libc-musl" -PREFERRED_PROVIDER_virtual/libc ?= "musl" -PREFERRED_PROVIDER_virtual/libiconv ?= "musl" -PREFERRED_PROVIDER_virtual/libintl ?= "musl" -PREFERRED_PROVIDER_virtual/crypt ?= "musl" -PREFERRED_PROVIDER_virtual/libc-locale ?= "musl-locales" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/libc ??= "musl" +PREFERRED_PROVIDER_virtual/libiconv ??= "musl" +PREFERRED_PROVIDER_virtual/libintl ??= "musl" +PREFERRED_PROVIDER_virtual/crypt ??= "musl" +PREFERRED_PROVIDER_virtual/libc-locale ??= "musl-locales" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ??= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ??= "nativesdk-glibc" DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig" diff --git a/meta/conf/distro/include/tclibc-newlib.inc b/meta/conf/distro/include/tclibc-newlib.inc index 238b430e49..4ecb1d13c7 100644 --- a/meta/conf/distro/include/tclibc-newlib.inc +++ b/meta/conf/distro/include/tclibc-newlib.inc @@ -5,11 +5,11 @@ LIBCEXTENSION = "-newlib" LIBCOVERRIDE = ":libc-newlib" -PREFERRED_PROVIDER_virtual/libc ?= "newlib" -PREFERRED_PROVIDER_virtual/libiconv ?= "newlib" -PREFERRED_PROVIDER_virtual/libintl ?= "newlib" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/libc ??= "newlib" +PREFERRED_PROVIDER_virtual/libiconv ??= "newlib" +PREFERRED_PROVIDER_virtual/libintl ??= "newlib" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ??= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ??= "nativesdk-glibc" DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig" diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 154a9a4ab0..d467aeb785 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -2,16 +2,16 @@ # Default toolchain configuration # -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross-${TARGET_ARCH}" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross-${TARGET_ARCH}" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" -PREFERRED_PROVIDER_gdb = "gdb" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils ??= "binutils-cross-${TARGET_ARCH}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc ??= "gcc-cross-${TARGET_ARCH}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ ??= "gcc-cross-${TARGET_ARCH}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs ??= "gcc-runtime" +PREFERRED_PROVIDER_gdb ??= "gdb" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ??= "binutils-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc ??= "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ ??= "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs ??= "nativesdk-gcc-runtime" # Default libc config PREFERRED_PROVIDER_virtual/gettext ??= "gettext" @@ -68,7 +68,7 @@ PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}" # Bootstrap Go using a binary release from golang.org. If you want to bootstrap # from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use # go-native. -PREFERRED_PROVIDER_go-native ?= "go-binary-native" +PREFERRED_PROVIDER_go-native ??= "go-binary-native" PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}" PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}" PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 0d71bcbbad..d9bed7708d 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -1,9 +1,9 @@ -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/egl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" +PREFERRED_PROVIDER_virtual/xserver ??= "xserver-xorg" +PREFERRED_PROVIDER_virtual/egl ??= "mesa" +PREFERRED_PROVIDER_virtual/libgl ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles1 ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles2 ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles3 ??= "mesa" XSERVER ?= "xserver-xorg \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index 1d32b4a582..0b399ac1f9 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc @@ -1,4 +1,4 @@ -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot" require conf/machine/include/qemu.inc require conf/machine/include/riscv/tune-riscv.inc diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 8640867911..fc0456c16b 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -2,11 +2,11 @@ #@NAME: QEMU x86-64 machine #@DESCRIPTION: Machine configuration for running an x86-64 system on QEMU -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" +PREFERRED_PROVIDER_virtual/xserver ??= "xserver-xorg" +PREFERRED_PROVIDER_virtual/libgl ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles1 ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles2 ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles3 ??= "mesa" require conf/machine/include/qemu.inc DEFAULTTUNE ?= "core2-64" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 1e072e1ae2..778d94379c 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -2,11 +2,11 @@ #@NAME: QEMU x86 machine #@DESCRIPTION: Machine configuration for running an x86 system on QEMU -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" +PREFERRED_PROVIDER_virtual/xserver ??= "xserver-xorg" +PREFERRED_PROVIDER_virtual/libgl ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles1 ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles2 ??= "mesa" +PREFERRED_PROVIDER_virtual/libgles3 ??= "mesa" require conf/machine/include/qemu.inc DEFAULTTUNE ?= "core2-32" From patchwork Sun Nov 13 08:28:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Lauer X-Patchwork-Id: 15412 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 8FE92C433FE for ; Sun, 13 Nov 2022 08:29:32 +0000 (UTC) Received: from mout.web.de (mout.web.de [217.72.192.78]) by mx.groups.io with SMTP id smtpd.web11.864.1668328156189059570 for ; Sun, 13 Nov 2022 00:29:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@email.de header.s=s29768273 header.b=WhCqnlBi; spf=pass (domain: email.de, ip: 217.72.192.78, mailfrom: christoph.lauer@email.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=email.de; s=s29768273; t=1668328154; bh=79fKZqh3CspqxYm1e1lX1LwXh2cFFgoKiTiVswSng68=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=WhCqnlBiinCh7OvCnSFOnko2Rm6+ntm2JYEgSLcywnaOCYpSTGn8bDW6z5PjdTFu+ cSPAOyIA+8yFHca2aRcmN04VJYBnTA6Ywc/8Kw6sp1IPRa8ql4orYYhCfu4FFHngUC KRJr/FLPFiXCc4qu1f1yBCNMYV0ETI1YTkk+OQ50t7Hd1T8uRSpa+kvb6lCp088rvJ ZasRUJ2vk4DDm7jFv/WSz3fWGOxUYXMUEoMlFI7kpcEo7X7sxZPnck8fRrz1/+ascq fZMV4X/cnJQSL+FvWhgWpDzgxOGGh5W5nQLDKmdQlMo27rgNzQqQBWk950v+I8Ar9v V+UMJgAYbs+9g== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from xtr-acuyocto-p01.xtronic-net.com ([178.251.90.190]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MgibW-1pS6fG0Sk8-00gubl; Sun, 13 Nov 2022 09:29:14 +0100 From: Christoph Lauer To: openembedded-core@lists.openembedded.org Cc: Christoph Lauer Subject: [meta-oe][PATCH v2 2/2] initial configs: set initial {DISTRO|MACHINE|IMAGE}FEATUREs as weak as possible Date: Sun, 13 Nov 2022 08:28:24 +0000 Message-Id: <20221113082824.17041-2-christoph.lauer@email.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221113082824.17041-1-christoph.lauer@email.de> References: <20221113082824.17041-1-christoph.lauer@email.de> X-Provags-ID: V03:K1:9mL8xM9yCOgugtNanb/Z1HhX5RU4Nc8reOOor4WoOzcMj4EQp4k 2N+YT3I5p7g1xvKH5Wxy2+1YFoicrxWuj1CTqeQYYaINOP4ShynQFJhAx5/caaTocZTG0Mp lVxzPWyEaNTCYPOF/1/Va7OVf4SJnzO4qL/+aE698t557mw+KPzgaYCwVw398g4d00MvTjH ccLQNlkWamapuZCrtLmkw== UI-OutboundReport: notjunk:1;M01:P0:Vr1bJ+l2YMU=;hf75Y7xhcOOz/DRysjKBhDvoViK Dnf/ORJjGHZvMobaweDNPV9ZCnIQzrQujA1MvYNzZNpGsD7SUVX2ihKO7ebdaQ8+tDeFRSq/n s3MFkREMzWYPCBp/gQ0YVlj8wHqRDBb5kyEfCibVCkuo8vNWm02Tqo8Mnlx+9cnT29JRcdzvD JHahfvS73FVkSP6r1XQb3+EPPnbjjJv3pqatEAz2iutgITRPjC76yGwH5LjF8cPZPpocM5aat cxVAYJlcdl+RWCwYnXxwKMfziddjg1JTxDXbVTN02SAy0bl4abn251V9UW5+J4jtYKDH0uGDI 6zicDEnjHJ5fTTxl1GbL5O7xD7YEAMvIQfTRBuYPkF5ju2OgCcunzVfDHMycxHuill+pTGpKp PeFRv53tBq1ypeRFOzH6Jq4mjhZ8OucDHk1vz3XTb0SUTYjCIeBK1BziUDPEPDl7pP5cv47HB frOBLB26VAZ+fm6ePEFSbp/lUv/l/hFwdIX0W5uP2dQ4kadqgnZyHu2BCdeuZX2BGUHsgyZRj g6iV9q+aP+Ckjs1GGiDpS9gWTpXI/8wuCCfEdE/2fT8vsLGOGhAuvY+p6cP0PYWcCQL96oBTc ivgoJzdnSwF+CvKPknWeNn7s/+F+GU/fKMKzbCGqBduIZ0A+uJ3YK/YZG8LFsQ7ng7jIp4DY9 EtlgxKEKOjzMlw787qvlzabHtviYJEYvhvBxAepJCfBgnFFaczUAke15WbVfAn8IeLgV8iNTa WeFh3gUOQWUFAG1SRWaxCPhtFPKj6oEYFhXfTwgCDhwAs99IbW3lTzH65MNOsoMoFPjo7u/iZ jqxC3+em0OQ4JULtEArnx3ywKuF7HrO+zPqOc3RVYBB64V8qoL1J0sr+tPVt/rdA4qf/+1LXj ExgCW/pJ5qpqTmPWfQNXsPrbl4S/eposCNfget5OHzEEvDMfuhcBXLu5BvEVIExE9iAVWD31a HnWsArDPHU5fayW2YsrpYyr+X2s= 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 ; Sun, 13 Nov 2022 08:29:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173183 From: Christoph Lauer This gives BSP creators the flexibility to change features with weak defaults Signed-off-by: Christoph Lauer --- meta/conf/bitbake.conf | 28 +++++++++---------- .../distro/include/default-distrovars.inc | 6 ++-- meta/conf/machine/include/qemu.inc | 2 +- meta/conf/machine/include/riscv/qemuriscv.inc | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) -- 2.17.1 diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index dea573986d..b2540bb3f5 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -885,31 +885,31 @@ OES_BITBAKE_CONF = "1" # Machine properties and packagegroup-base stuff ################################################################## -MACHINE_FEATURES ?= "" -DISTRO_FEATURES ?= "" +MACHINE_FEATURES ??= "" +DISTRO_FEATURES ??= "" -DISTRO_EXTRA_RDEPENDS ?= "" -DISTRO_EXTRA_RRECOMMENDS ?= "" -MACHINE_EXTRA_RDEPENDS ?= "" -MACHINE_EXTRA_RRECOMMENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +DISTRO_EXTRA_RDEPENDS ??= "" +DISTRO_EXTRA_RRECOMMENDS ??= "" +MACHINE_EXTRA_RDEPENDS ??= "" +MACHINE_EXTRA_RRECOMMENDS ??= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ??= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ??= "" EXTRA_IMAGE_FEATURES ??= "" IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" # Native distro features (will always be used for -native, even if they # are not enabled for target) -DISTRO_FEATURES_NATIVE ?= "x11 ipv6 xattr" -DISTRO_FEATURES_NATIVESDK ?= "x11" +DISTRO_FEATURES_NATIVE ??= "x11 ipv6 xattr" +DISTRO_FEATURES_NATIVESDK ??= "x11" # Normally target distro features will not be applied to native builds: # Native distro features on this list will use the target feature value -DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl wayland" -DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl wayland" +DISTRO_FEATURES_FILTER_NATIVE ??= "api-documentation debuginfod opengl wayland" +DISTRO_FEATURES_FILTER_NATIVESDK ??= "api-documentation debuginfod opengl wayland" -DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig" -MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" +DISTRO_FEATURES_BACKFILL ??= "pulseaudio sysvinit gobject-introspection-data ldconfig" +MACHINE_FEATURES_BACKFILL ??= "rtc qemu-usermode" COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index abf48f79f0..3b3d439ad3 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -19,9 +19,9 @@ DISTRO_FEATURES_DEFAULT:remove:arc = "seccomp" # seccomp is not yet ported to microblaze DISTRO_FEATURES_DEFAULT:remove:microblaze = "seccomp" -DISTRO_FEATURES_DEFAULT ?= "acl alsa bluetooth debuginfod ext2 ipv4 ipv6 pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp" -DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}" -IMAGE_FEATURES ?= "" +DISTRO_FEATURES_DEFAULT ??= "acl alsa bluetooth debuginfod ext2 ipv4 ipv6 pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp" +DISTRO_FEATURES ??= "${DISTRO_FEATURES_DEFAULT}" +IMAGE_FEATURES ??= "" COMMERCIAL_AUDIO_PLUGINS ?= "" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index d9bed7708d..04ffe55309 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -10,7 +10,7 @@ XSERVER ?= "xserver-xorg \ xf86-video-fbdev \ " -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" +MACHINE_FEATURES ??= "alsa bluetooth usbgadget screen vfat" MACHINEOVERRIDES =. "qemuall:" diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index 0b399ac1f9..f5f9f89a9f 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot" require conf/machine/include/qemu.inc require conf/machine/include/riscv/tune-riscv.inc -MACHINE_FEATURES = "screen keyboard ext2 ext3 serial" +MACHINE_FEATURES ?= "screen keyboard ext2 ext3 serial" KERNEL_IMAGETYPE = "Image" KERNEL_IMAGETYPES += "uImage"