From f034379238f980a8c5ec4295288448eab2a3d015 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 18 Nov 2020 10:42:21 -0600 Subject: Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470"" This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673. A fix has been put up for openbmc/openbmc#3720 so we can bring this back now Signed-off-by: Andrew Geissler Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6 --- .../bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst') diff --git a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst index 019afd22f..d74e768f6 100644 --- a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst +++ b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst @@ -315,7 +315,7 @@ any ``DEFAULT_PREFERENCE`` setting. ``DEFAULT_PREFERENCE`` is often used to mark newer and more experimental recipe versions until they have undergone sufficient testing to be considered stable. -When there are multiple “versions” of a given recipe, BitBake defaults +When there are multiple "versions" of a given recipe, BitBake defaults to selecting the most recent version, unless otherwise specified. If the recipe in question has a :term:`DEFAULT_PREFERENCE` set lower than @@ -325,7 +325,7 @@ to specify their preference for the default selected version. Additionally, the user can specify their preferred version. If the first recipe is named ``a_1.1.bb``, then the -:term:`PN` variable will be set to “a”, and the +:term:`PN` variable will be set to "a", and the :term:`PV` variable will be set to 1.1. Thus, if a recipe named ``a_1.2.bb`` exists, BitBake will choose 1.2 by -- cgit v1.2.3