poky: subtree update:b5763b2f48..f468a73523

Adrian Bunk (13):
      iproute2: Remove -fcommon
      libxcrypt2: Remove -fcommon
      xorg-xserver: Remove -fcommon
      mesa: Remove -fcommon
      at-spi2-atk: Remove -fcommon
      menu-cache: Replace -fcommon with fix
      matchbox-wm: Replace -fcommon with fix
      llvm: Remove -fcommon
      vte: Remove workaround for gcc 4.8
      python-numpy: Remove workaround for host gcc < 5
      libtasn1: Remove workaround for host gcc < 5
      nettle: Remove workaround for gcc < 5
      wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29

Alejandro Hernandez (1):
      connman: Include vpn-script in FILES

Alexander Kanavin (30):
      libinput: add ptest
      libinput: update 1.15.2 -> 1.15.5
      avahi: merge avahi-ui into the main recipe
      avahi: update to 0.8
      testsdkext/devtool: initialize the test component's git repo
      git: update to 2.26.2
      libcap: update to 2.33
      libhandy: add a recipe from meta-oe
      libdazzle: update to 3.36.0
      epiphany: update to 3.36.1
      patchelf: switch to git
      powertop: switch to Arjan's git
      meson: fix upstream version check
      rpcsvc-proto: update to 1.4.1
      vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0
      vulkan-loader: upgrade 1.1.126.0 -> 1.2.135.0
      vulkan-tools: upgrade 1.1.126.0 -> 1.2.135.0
      vulkan-demos: upgrade to latest revision
      e2fsprogs: update to 1.45.6
      build-compare: update to latest revision
      ovmf: update to 202002
      cdrtools-native: fix upstream version check
      re2c: correct upstream location
      vte: add icu dependency
      mesa: enable x11 for native/nativesdk
      runqemu: set host DRI driver path for all instances of virgl usage
      libepoxy: do not strip RUNPATH from native/nativesdk
      virgl: skip test on Debian 9
      runqemu: force software x11 renderer for SDL when GL is not in use
      gcr: correct a build race between vapi files

Andrej Valek (1):
      icu: upgrade 66.1 -> 67.1

Anton Eliasson (1):
      meson.bbclass: Close the log file after reading

Bartosz Golaszewski (1):
      busybox: disable i2ctransfer

Changqing Li (2):
      rpm: fix file conflicts for MIPS64 N32
      lib/oe/package_manager: update default rpm config %_prefer_color

Jacob Kroon (1):
      pseudo: Fix enum typedef

Joe Slater (1):
      wget: improve reproducible build

Joshua Watt (3):
      libnewt: Backport patch to fix reproducibility
      bitbake.conf: Prevent git from detecting parent repo in recipe
      classes/kernel: Generate reproducible kernel module tarball

Kai Kang (1):
      python3-git: 3.0.5 -> 3.1.2

Khem Raj (9):
      avahi: Cover gtk packageconfig with x11/wayland distro features
      tunes: Add new tune files for cortexa55 and cortexa73-cortexa53
      gcc-runtime: Avoid march conflicts with newer cortex-a55 CPUs
      gcc10: Update to GCC 10.1 Release
      glibc: Update to latest on 2.31 branch
      gcc10: Default back to -fcommon
      gcc10: Revert using __getauxval in libgcc
      glib-2.0: Fix stpcpy detection for mingw
      wayland: fix condition for strndup detection

Konrad Weihmann (2):
      pypi.bbclass: mind package suffix on version check
      file: add PACKAGECONFIG for auto options

Mingli Yu (1):
      python3-setuptools: add the missing rdepends

Peter Kjellerstedt (2):
      sstate.bbclass: Do not fail if files cannot be touched
      file: Remove unneccessary override of PACKAGECONFIG for native

Pierre-Jean Texier (1):
      sysklogd: upgrade 2.1.1 -> 2.1.2

Richard Leitner (6):
      gdbm: add patch to fix link failure against gcc 10
      dtc: update to 1.6.0
      libtirpc: remove extra "-fcommon" from CFLAGS
      libcomps: update to 0.1.15
      binutils: add patch to fix issues with gcc 10
      cpio: add patch to fix issues with gcc 10

Richard Purdie (4):
      recipes: Remove remaining INC_PR variables
      insane: Promote warnings into errors
      poky: We now match OE-Core's error/warning config so simplify
      poky.conf: Post release version bump

Robert P. J. Day (1):
      documentation.conf: Add variables supported by features_check.bbclass

Tim Orling (1):
      pypi.bbclass: use new pypi UPSTREAM_CHECK_URI

Wang Mingyu (1):
      nettle: upgrade 3.5.1 -> 3.6

Yeoh Ee Peng (1):
      selftest/imagefeatures: Enable sanity test for IMAGE_GEN_DEBUGFS

Yi Zhao (1):
      opkg-keyrings: check if opkg-key exists before run postinst

Zoltan Boszormenyi (4):
      libva: Factor out base parts into an include file
      libva-initial: New bootstrap recipe
      mesa: Add PACKAGECONFIG knob to enable VAAPI
      mesa: Add PACKAGECONFIG knob to enable VDPAU state tracker and drivers

jan (1):
      scripts/tiny/ksize: Fix for more recent kernels

wenlin.kang@windriver.com (1):
      populate_sdk_base.bbclass: fix warning: name not matched

Change-Id: Icd73153270a6cb7ab63257211350aa564867c2db
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/poky/meta/conf/documentation.conf b/poky/meta/conf/documentation.conf
index c6544b9..eee3c43 100644
--- a/poky/meta/conf/documentation.conf
+++ b/poky/meta/conf/documentation.conf
@@ -64,6 +64,9 @@
 ALTERNATIVE_LINK_NAME[doc] = "Used by the alternatives system to map duplicated commands to actual locations."
 ALTERNATIVE_PRIORITY[doc] = "Used by the alternatives system to create default priorities for duplicated commands."
 ALTERNATIVE_TARGET[doc] = "Used by the alternatives system to create default link locations for duplicated commands."
+ANY_OF_COMBINED_FEATURES[doc] = "When a recipe inherits the features_check class, at least one item in this variable must be included in COMBINED_FEATURES."
+ANY_OF_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check class, at least one item in this variable must be included in DISTRO_FEATURES."
+ANY_OF_MACHINE_FEATURES[doc] = "When a recipe inherits the features_check class, at least one item in this variable must be included in MACHINE_FEATURES."
 ASSUME_PROVIDED[doc] = "List of packages (recipes actually) that are assumed to be implicitly available. BitBake does not build these packages."
 ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED, for which automatic shlib dependency tracking does not work."
 AUTHOR[doc] = "Email address used to contact the original author(s) in order to send patches and forward bugs."
@@ -114,7 +117,9 @@
 COMPLEMENTARY_GLOB[doc] = "Defines wildcards to match when installing a list of complementary packages for all the packages installed in an image."
 CONFFILES[doc] = "Identifies editable or configurable files that are part of a package."
 CONFIG_SITE[doc] = "A list of files that contains autoconf test results relevant to the current build. This variable is used by the Autotools utilities when running configure."
-CONFLICT_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check class, this variable identifies distribution features that would be in conflict should the recipe be built."
+CONFLICT_COMBINED_FEATURES[doc] = "When a recipe inherits the features_check class, no item in this variable can be included in COMBINED_FEATURES."
+CONFLICT_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check class, no item in this variable can be included in DISTRO_FEATURES."
+CONFLICT_MACHINE_FEATURES[doc] = "When a recipe inherits the features_check class, no item in this variable can be included in MACHINE_FEATURES."
 CORE_IMAGE_EXTRA_INSTALL[doc] = "Specifies the list of packages to be added to the image. You should only set this variable in the conf/local.conf file in the Build Directory."
 COREBASE[doc] = "Specifies the parent directory of the OpenEmbedded Core Metadata layer (i.e. meta)."
 CONF_VERSION[doc] = "Tracks the version of local.conf.  Increased each time build/conf/ changes incompatibly."
@@ -344,7 +349,9 @@
 
 RCONFLICTS[doc] = "The list of packages that conflict with another package. Note that the package will not be installed if the conflicting packages are not first removed."
 RDEPENDS[doc] = "Lists a package's runtime dependencies (i.e. other packages) that must be installed for the package to be built. They must be the names of other packages as listed in the PACKAGES variable, not recipe names (PN)."
-REQUIRED_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check class, this variable identifies distribution features that must exist in the current configuration in order for the OpenEmbedded build system to build the recipe."
+REQUIRED_COMBINED_FEATURES[doc] = "When a recipe inherits the features_check class, all items in this variable must be included in COMBINED_FEATURES."
+REQUIRED_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check class, all items in this variable must be included in DISTRO_FEATURES."
+REQUIRED_MACHINE_FEATURES[doc] = "When a recipe inherits the features_check class, all items in this variable must be included in MACHINE_FEATURES."
 RM_WORK_EXCLUDE[doc] = "With rm_work enabled, this variable specifies a list of packages whose work directories should not be removed."
 ROOTFS[doc] = "Indicates a filesystem image to include as the root filesystem."
 ROOTFS_POSTPROCESS_COMMAND[doc] = "Added by classes to run post processing commands once the OpenEmbedded build system has created the root filesystem."