From 35a774200999ac2fca48693c1c169bf99d2f63ea Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Tue, 26 May 2020 13:25:03 -0400
Subject: reset upstream subtrees to HEAD

Reset the following subtrees on HEAD:

  poky: ed3bdd7fbc(dunfell)
  meta-raspberrypi: 8066fac91d(dunfell)
  meta-security: d83f7cb0c9(dunfell)
  meta-openembedded: e413c1ef62(dunfell)

Change-Id: Ifd3228663b08911c890d7631310294cccb3dd232
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 poky/documentation/ref-manual/ref-variables.xml | 26 +++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'poky/documentation/ref-manual/ref-variables.xml')

diff --git a/poky/documentation/ref-manual/ref-variables.xml b/poky/documentation/ref-manual/ref-variables.xml
index 9ebe72cbd0..b44fdcb73f 100644
--- a/poky/documentation/ref-manual/ref-variables.xml
+++ b/poky/documentation/ref-manual/ref-variables.xml
@@ -6638,6 +6638,7 @@
      cpio.lzma
      cpio.xz
      cramfs
+     elf
      ext2
      ext2.bz2
      ext2.gz
@@ -6661,7 +6662,6 @@
      tar.gz
      tar.lz4
      tar.xz
-     tar.zst
      ubi
      ubifs
      wic
@@ -10292,6 +10292,28 @@
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-PACKAGE_GROUP'><glossterm>PACKAGE_GROUP</glossterm>
+            <info>
+                PACKAGE_GROUP[doc] = "Defines one or more packages to include in an image when a specific item is included in IMAGE_FEATURES."
+            </info>
+            <glossdef>
+                <para role="glossdeffirst">
+<!--                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> -->
+                    The <filename>PACKAGE_GROUP</filename> variable has been
+                    renamed to
+                    <link linkend='var-FEATURE_PACKAGES'><filename>FEATURE_PACKAGES</filename></link>.
+                    See the variable description for
+                    <filename>FEATURE_PACKAGES</filename> for information.
+                </para>
+
+                <para>
+                    If if you use the <filename>PACKAGE_GROUP</filename>
+                    variable, the OpenEmbedded build system issues a warning
+                    message.
+                </para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-PACKAGE_INSTALL'><glossterm>PACKAGE_INSTALL</glossterm>
             <info>
                 PACKAGE_INSTALL[doc] = "List of the packages to be installed into the image. The variable is generally not user-defined and uses IMAGE_INSTALL as part of the list."
@@ -14011,7 +14033,7 @@
                 <para>
                     When pointing to sstate build artifacts on another machine
                     that uses a different GCC version for native builds,
-                    you must configure <filename>SSTATE_MIRRORS</filename>
+                    you must configure <filename>SSTATE_MIRROR</filename>
                     with a regular expression that maps local search paths
                     to server paths.
                     The paths need to take into account
-- 
cgit v1.2.3