treewide: remove meta-poky usage

Upstream poky made a commit that adds an `/etc/motd` with a strong
warning that meta-poky is not intended to be used for production
purposes.  There isn't anything we use directly from meta-poky anymore,
so clean up all references to it.

See poky commit a226865c8683398b5f58628ba2ec5aee1ee6c19d for additional
context.

We could potentially switch from using the `poky` subtree to picking
up OECore directly, but right now it also provides us a qualified set of
OECore + bitbake.

Tested: Built yosemite4 and confirmed `motd` output is absent when
SSHing in.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I9c08650d2278b3ba26794c009adad3e593767f58

32 files changed, 0 insertions, 40 deletions

diff --git a/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
index 409a775a83..330ca8a456 100644
--- a/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
+++ b/meta-asrock/meta-e3c246d4i/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 \
diff --git a/meta-asrock/meta-e3c256d4i/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-e3c256d4i/conf/templates/default/bblayers.conf.sample
index 0d8e82cfd4..4bac68181a 100644
--- a/meta-asrock/meta-e3c256d4i/conf/templates/default/bblayers.conf.sample
+++ b/meta-asrock/meta-e3c256d4i/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 \
diff --git a/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
index fe3ebafe49..7490bcc451 100644
--- a/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
+++ b/meta-asrock/meta-romed8hm3/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 \
diff --git a/meta-asrock/meta-spc621d8hm3/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-spc621d8hm3/conf/templates/default/bblayers.conf.sample
index 1f6e4ab8b2..0df52d8519 100644
--- a/meta-asrock/meta-spc621d8hm3/conf/templates/default/bblayers.conf.sample
+++ b/meta-asrock/meta-spc621d8hm3/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 \
diff --git a/meta-delta/meta-ahe50dc/conf/templates/default/bblayers.conf.sample b/meta-delta/meta-ahe50dc/conf/templates/default/bblayers.conf.sample
index 58e86935a4..d5328966dd 100644
--- a/meta-delta/meta-ahe50dc/conf/templates/default/bblayers.conf.sample
+++ b/meta-delta/meta-ahe50dc/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 \
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
index 08b767f491..d5e5c297af 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/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 \
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
index 04e4ebbaa6..cd266bbe0b 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/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 \
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
index 25854dc74f..86a2761c94 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/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 \
diff --git a/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
index e6405c50c2..65117170ea 100644
--- a/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-raspberrypi/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 \
diff --git a/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
index e15c7b25e2..8e7a6f2294 100644
--- 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-python \
diff --git a/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
index ce12406418..714356de84 100644
--- a/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-greatlakes/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 \
diff --git a/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample
index b3cff8409a..a9ef56ecf1 100644
--- a/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-harma/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 \
diff --git a/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample
index f4ffbada8f..7b31c83bf5 100644
--- a/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-minerva/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 \
diff --git a/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
index 33f0d49103..82f1b85341 100644
--- a/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-tiogapass/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 \
diff --git a/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample
index 0447cee030..8b15a52b4c 100644
--- a/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-yosemite4/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 \
diff --git a/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
index a655f24355..8a31526398 100644
--- a/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-yosemitev2/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 \
diff --git a/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample b/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample
index d951ea0361..f03cff6d54 100644
--- a/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample
+++ b/meta-hpe/meta-dl385-g11/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 \
@@ -21,7 +20,6 @@ BBLAYERS ?= " \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
diff --git a/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample b/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample
index c3afdeb4be..112076d905 100644
--- a/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample
+++ b/meta-ibm/meta-genesis3/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 \
diff --git a/meta-ibm/meta-sbp1/conf/templates/default/bblayers.conf.sample b/meta-ibm/meta-sbp1/conf/templates/default/bblayers.conf.sample
index bd4b2c9e39..5d0a5aab31 100644
--- a/meta-ibm/meta-sbp1/conf/templates/default/bblayers.conf.sample
+++ b/meta-ibm/meta-sbp1/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 \
diff --git a/meta-ibm/meta-system1/conf/templates/default/bblayers.conf.sample b/meta-ibm/meta-system1/conf/templates/default/bblayers.conf.sample
index 29b7f043bd..4bc7b481d0 100644
--- a/meta-ibm/meta-system1/conf/templates/default/bblayers.conf.sample
+++ b/meta-ibm/meta-system1/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 \
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
index aeedde9bff..2bfdc1bbbe 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/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 \
diff --git a/meta-inventec/meta-starscream/conf/templates/default/bblayers.conf.sample b/meta-inventec/meta-starscream/conf/templates/default/bblayers.conf.sample
index 95ea73c121..c863bce35d 100755
--- a/meta-inventec/meta-starscream/conf/templates/default/bblayers.conf.sample
+++ b/meta-inventec/meta-starscream/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 \
diff --git a/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample b/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
index 72d1ffec07..a32b511795 100755
--- a/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
+++ b/meta-inventec/meta-transformers/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 \
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index b830453274..6061ffff09 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -4,14 +4,6 @@ require conf/distro/include/phosphor-pkg-tweaks.inc
 # Match the distro codename from upstream poky.
 DISTRO_CODENAME ?= "scarthgap"
 
-# Override these in poky based distros
-POKY_DEFAULT_DISTRO_FEATURES = "opengl ptest multiarch wayland vulkan"
-POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
-POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
-
-DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
-DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
-
 DISTROOVERRIDES .= ":openbmc-phosphor"
 
 TCLIBCAPPEND = ""
diff --git a/meta-phosphor/conf/templates/default/bblayers.conf.sample b/meta-phosphor/conf/templates/default/bblayers.conf.sample
index 53243e32b9..de21ac1390 100644
--- a/meta-phosphor/conf/templates/default/bblayers.conf.sample
+++ b/meta-phosphor/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 \
diff --git a/meta-poky b/meta-poky
deleted file mode 120000
index 65b9a73283..0000000000
--- a/meta-poky
+++ /dev/null
@@ -1 +0,0 @@
-poky/meta-poky/
\ No newline at end of file
diff --git a/meta-qualcomm/conf/templates/default/bblayers.conf.sample b/meta-qualcomm/conf/templates/default/bblayers.conf.sample
index c4544fbcc2..da842cdb6b 100644
--- a/meta-qualcomm/conf/templates/default/bblayers.conf.sample
+++ b/meta-qualcomm/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 \
diff --git a/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample b/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
index 3118d5068e..c414b59b16 100644
--- a/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
+++ b/meta-quanta/meta-s6q/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 \
diff --git a/meta-skeleton b/meta-skeleton
deleted file mode 120000
index b9eb654b03..0000000000
--- a/meta-skeleton
+++ /dev/null
@@ -1 +0,0 @@
-poky/meta-skeleton
\ No newline at end of file
diff --git a/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample b/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
index 09488d4dd2..2b47ec9d6c 100644
--- a/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
+++ b/meta-supermicro/meta-x11spi/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 \
diff --git a/meta-ufispace/meta-ncplite/conf/templates/default/bblayers.conf.sample b/meta-ufispace/meta-ncplite/conf/templates/default/bblayers.conf.sample
index 8010e1ec03..ab7b33d0e0 100644
--- a/meta-ufispace/meta-ncplite/conf/templates/default/bblayers.conf.sample
+++ b/meta-ufispace/meta-ncplite/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 \
diff --git a/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample b/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
index 65e21c9082..b8c694fbd4 100644
--- a/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
+++ b/meta-wistron/meta-lannister/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 \