diff options
Diffstat (limited to 'poky/meta/conf')
| -rw-r--r-- | poky/meta/conf/bitbake.conf | 8 | ||||
| -rw-r--r-- | poky/meta/conf/distro/include/tclibc-glibc.inc | 1 | ||||
| -rw-r--r-- | poky/meta/conf/machine/include/arm/arch-armv8-2a.inc | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 0e939aca4f..1deba8d910 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -776,10 +776,18 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" +# Git configuration + # Don't allow git to chdir up past WORKDIR so that it doesn't detect the OE # repository when building a recipe export GIT_CEILING_DIRECTORIES = "${WORKDIR}" +# Treat all directories are safe, as during fakeroot tasks git will run as +# root so recent git releases (eg 2.30.3) will refuse to work on repositories. See +# https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 for +# further details. +export GIT_CONFIG_PARAMETERS="'safe.directory=*'" + ### ### Config file processing ### diff --git a/poky/meta/conf/distro/include/tclibc-glibc.inc b/poky/meta/conf/distro/include/tclibc-glibc.inc index f4855dce11..f48d16939e 100644 --- a/poky/meta/conf/distro/include/tclibc-glibc.inc +++ b/poky/meta/conf/distro/include/tclibc-glibc.inc @@ -13,6 +13,7 @@ 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/poky/meta/conf/machine/include/arm/arch-armv8-2a.inc b/poky/meta/conf/machine/include/arm/arch-armv8-2a.inc index 30f2870811..95368b0af7 100644 --- a/poky/meta/conf/machine/include/arm/arch-armv8-2a.inc +++ b/poky/meta/conf/machine/include/arm/arch-armv8-2a.inc @@ -1,6 +1,6 @@ DEFAULTTUNE ?= "armv8-2a" -TUNEVALID[armv8-2a] = "Enable instructions for ARMv8-a" +TUNEVALID[armv8-2a] = "Enable instructions for ARMv8.2-a" TUNE_CCARGS_MARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'armv8-2a', ' -march=armv8.2-a', '', d)}" # TUNE crypto will be handled by arch-armv8a.inc below MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv8-2a', 'armv8-2a:', '', d)}" |