remove meta-poky references

Summary: meta-poky recently added an `/etc/motd` file with a big warning that it isn't intended to be used in production and Quanta noticed this warning when testing out GTT and GTI releases. Researching this, I'm removing meta-poky from both Linux Foundation upstream and our tree. See also: - https://lore.kernel.org/openbmc/ZfRypYIR-hz1hGwz@heinlein.vulture-banana.ts.net/ - https://gerrit.openbmc.org/c/openbmc/openbmc/+/70072 Test Plan: Built yosemite4 successfully. Ran bitbake processing on angelslanding and yosemite4, and compared before/after for compatibility. Reviewed By: jagpalgill Differential Revision: D54956728 fbshipit-source-id: f5eb5cefc04cff4f2e7e0a6ed0f0e78a5a525ad5
facebook · Mar 22, 2024 · 2bc14ea · 2bc14ea
1 parent e9a76af
commit 2bc14ea
Show file tree

Hide file tree

Showing 80 changed files with 47 additions and 134 deletions.
diff --git a/meta-bf/meta-mavericks/conf/templates/default/bblayers.conf.sample b/meta-bf/meta-mavericks/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-openembedded/meta-networking \
@@ -23,5 +22,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -26,5 +25,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/conf/distro/include/fb-base.inc b/meta-facebook/conf/distro/include/fb-base.inc
@@ -31,3 +31,7 @@ BB_DISKMON_DIRS ??= "\
 # We have a lot of patches that don't have an Upstream-Status, so diable this
 # QA rather than modifying all the patch files.
 ERROR_QA:remove = "patch-status"
+
+# Pick up defaults for sstate hashing from poky.conf
+BB_SIGNATURE_HANDLER ?= "OEEquivHash"
+BB_HASHSERVE ??= "auto"
diff --git a/meta-facebook/conf/distro/openbmc-fb.conf → ...cebook/conf/distro/include/fb-openbmc.inc b/meta-facebook/conf/distro/openbmc-fb.conf → ...cebook/conf/distro/include/fb-openbmc.inc
@@ -1,7 +1,6 @@
 # Facebook OpenBMC distro
 
 # Use the base poky distro, but override various parameters.
-require conf/distro/poky.conf
 require conf/distro/include/fb-base.inc
 DISTROOVERRIDES .= ":openbmc-fb"
 
@@ -48,3 +47,13 @@ CONF_VERSION ?= "1"
 HOSTTOOLS += "realpath"
 
 PREFERRED_VERSION_asd ?= "0.1"
+
+TCLIBCAPPEND = ""
+QEMU_TARGETS ?= "arm aarch64 i386 riscv32 riscv64 ppc64le x86_64"
+INIT_MANAGER ?= "sysvinit"
+
+require conf/distro/include/yocto-uninative.inc
+INHERIT += "uninative"
+
+require conf/distro/include/no-static-libs.inc
+require conf/distro/include/security_flags.inc
diff --git a/meta-facebook/conf/distro/openbmc-fb-dunfell.conf b/meta-facebook/conf/distro/openbmc-fb-dunfell.conf
@@ -0,0 +1,2 @@
+DISTRO_CODENAME="dunfell"
+require conf/distro/include/fb-openbmc.inc
diff --git a/meta-facebook/conf/distro/openbmc-fb-2.conf → ...ook/conf/distro/openbmc-fb-kirkstone.conf b/meta-facebook/conf/distro/openbmc-fb-2.conf → ...ook/conf/distro/openbmc-fb-kirkstone.conf
@@ -1,4 +1,4 @@
+DISTRO_CODENAME="kirkstone"
 # Yocto versions Honister and above need a bump to the CONF_VERSION.
 CONF_VERSION = "2"
-
-require conf/distro/openbmc-fb.conf
+require conf/distro/include/fb-openbmc.inc
diff --git a/meta-facebook/conf/distro/openbmc-fb-master.conf b/meta-facebook/conf/distro/openbmc-fb-master.conf
@@ -1,11 +1,10 @@
-require conf/distro/openbmc-fb-2.conf
+DISTRO_CODENAME="master"
+# Yocto versions Honister and above need a bump to the CONF_VERSION.
+CONF_VERSION = "2"
+require conf/distro/include/fb-openbmc.inc
 
 # Starting in Yocto-Nanbield, the CONVERSION_CMDs are no longer expected to
 # use the IMAGE_NAME_SUFFIX, but we need our `fb-openbmc-image` to support
 # both older and new Yocto.  We can set IMAGE_NAME_SUFFIX to an empty string
 # on master and satisfy both.
 IMAGE_NAME_SUFFIX=""
-
-# We need the manifold mirror to pull from the lf-master branch.
-# Set this after all the `requires` so it doesn't get overwritten by poky's.
-DISTRO_CODENAME="master"
diff --git a/meta-facebook/conf/distro/openbmc-fb-rocko.conf b/meta-facebook/conf/distro/openbmc-fb-rocko.conf
@@ -0,0 +1,3 @@
+DISTRO_CODENAME="rocko"
+BB_SIGNATURE_HANDLER ?= "OEBasicHash"
+require conf/distro/include/fb-openbmc.inc
diff --git a/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
@@ -28,5 +27,4 @@ BBLAYERS ?= " \
 
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-churchillmono/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-churchillmono/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -24,5 +23,4 @@ BBLAYERS ?= " \
 
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-churchillmono/conf/templates/default/local.conf.sample b/meta-facebook/meta-churchillmono/conf/templates/default/local.conf.sample
@@ -7,4 +7,4 @@ OLDEST_KERNEL = "5.10"
 MACHINE ??= "churchillmono"
 
 # OpenBMC distro settings - Keeping as openbmc-fb to avoid incompatibilities
-DISTRO ?= "openbmc-fb-2"
+DISTRO ?= "openbmc-fb-kirkstone"
diff --git a/meta-facebook/meta-clearcreek/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-clearcreek/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,5 +20,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-cloudripper/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-cloudripper/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -23,5 +22,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-cloudripper/conf/templates/default/local.conf.sample b/meta-facebook/meta-cloudripper/conf/templates/default/local.conf.sample
@@ -7,4 +7,4 @@ OLDEST_KERNEL = "5.10"
 MACHINE ??= "cloudripper"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-cmm/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-cmm/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -20,5 +19,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-cmm/conf/templates/default/local.conf.sample b/meta-facebook/meta-cmm/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "cmm"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-elbert/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-elbert/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -23,5 +22,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-elbert/conf/templates/default/local.conf.sample b/meta-facebook/meta-elbert/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "elbert"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-fbal/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbal/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,5 +20,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fbdarwin/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbdarwin/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -24,5 +23,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fbdarwin/conf/templates/default/local.conf.sample b/meta-facebook/meta-fbdarwin/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "fbdarwin"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb-2"
+DISTRO ?= "openbmc-fb-kirkstone"
diff --git a/meta-facebook/meta-fbep/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbep/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,5 +20,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fbsp/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbsp/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,5 +20,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fbtp/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbtp/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-oe \
@@ -22,5 +21,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fbtp/conf/templates/default/local.conf.sample b/meta-facebook/meta-fbtp/conf/templates/default/local.conf.sample
@@ -8,7 +8,7 @@ MACHINE ??= "fbtp"
 # MACHINE ??= "fbtp-ubu"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).

diff --git a/meta-facebook/meta-fbttn/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbttn/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-oe \
@@ -22,5 +21,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fbttn/conf/templates/default/local.conf.sample b/meta-facebook/meta-fbttn/conf/templates/default/local.conf.sample
@@ -6,7 +6,7 @@
 MACHINE ??= "fbttn"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).

diff --git a/meta-facebook/meta-fbttn/meta-fbttn2/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbttn/meta-fbttn2/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -20,5 +19,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fby2/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby2/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-networking \
@@ -21,5 +20,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fby2/conf/templates/default/local.conf.sample b/meta-facebook/meta-fby2/conf/templates/default/local.conf.sample
@@ -4,11 +4,11 @@
 
 # Machine Selection
 MACHINE ??= "fby2"
-# select uncomment the following line to use pliot uboot upgrade 
+# select uncomment the following line to use pliot uboot upgrade
 # MACHINE = "fby2-ubu"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).

diff --git a/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-oe \
@@ -23,5 +22,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/local.conf.sample b/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/local.conf.sample
@@ -6,7 +6,7 @@
 MACHINE ??= "fbgp2"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).

diff --git a/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-oe \
@@ -23,5 +22,4 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   "
diff --git a/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/local.conf.sample b/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/local.conf.sample
@@ -6,7 +6,7 @@
 MACHINE ??= "fby2-kernel"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).