Remove BBLAYERS_NON_REMOVABLE variable

`BBLAYERS_NON_REMOVABLE` is obsolete and no longer required.
As it said by Yocto documentation it can be used by `Hob`
  https://www.yoctoproject.org/docs/1.5.2/ref-manual/ref-manual.html#var-BBLAYERS_NON_REMOVABLE
that already removed since Yocto-2.1
  https://www.yoctoproject.org/tools-resources/projects/hob

Change-Id: Ibc2d8268a9d837a81e9cf6b0131dba8d0a030a3f
Signed-off-by: Alexander Filippov <a.filippov@yadro.com>

26 files changed, 0 insertions, 336 deletions

diff --git a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample b/meta-amd/meta-ethanolx/conf/bblayers.conf.sample
index 2b8d624bc6..be7eb7c0f8 100644
--- a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample
+++ b/meta-amd/meta-ethanolx/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-amd \
   ##OEROOT##/meta-amd/meta-ethanolx \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-amd \
-  ##OEROOT##/meta-amd/meta-ethanolx \
-  "
diff --git a/meta-ampere/meta-jade/conf/bblayers.conf.sample b/meta-ampere/meta-jade/conf/bblayers.conf.sample
index 6e0893eb3e..6427c8b1b5 100644
--- a/meta-ampere/meta-jade/conf/bblayers.conf.sample
+++ b/meta-ampere/meta-jade/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-ampere \
   ##OEROOT##/meta-ampere/meta-jade \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-ampere \
-  ##OEROOT##/meta-ampere/meta-jade \
-  "
diff --git a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample
index 2f2b5f3777..409a775a83 100644
--- a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample
+++ b/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample
@@ -16,14 +16,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-asrock \
   ##OEROOT##/meta-asrock/meta-e3c246d4i \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-asrock \
-  ##OEROOT##/meta-asrock/meta-e3c246d4i \
-  "
diff --git a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample b/meta-bytedance/meta-g220a/conf/bblayers.conf.sample
index 370d6456fc..81b0a95f87 100644
--- a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample
+++ b/meta-bytedance/meta-g220a/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-bytedance \
   ##OEROOT##/meta-bytedance/meta-g220a \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-bytedance \
-  ##OEROOT##/meta-bytedance/meta-g220a \
-  "
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
index 83c22c5b6b..477be07f13 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
@@ -20,18 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-evb/meta-evb-aspeed \
   ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-evb \
-  ##OEROOT##/meta-evb/meta-evb-aspeed \
-  ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
-  "
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample
index de8ab1312f..145dac4f27 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2600 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2600 \
-  "
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
index ee62cea411..96c16f311e 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
@@ -19,17 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-evb/meta-evb-nuvoton \
   ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-nuvoton \
-  ##OEROOT##/meta-evb \
-  ##OEROOT##/meta-evb/meta-evb-nuvoton \
-  ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
-  "
diff --git a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample
index 6e838d799b..6c7bb92a61 100644
--- a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample
+++ b/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-raspberrypi \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-raspberrypi \
-  "
diff --git a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample
index 3b24ed8614..84dcddfbb5 100644
--- a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample
+++ b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample
@@ -20,18 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-facebook \
   ##OEROOT##/meta-facebook/meta-bletchley \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-security/meta-tpm \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-facebook \
-  ##OEROOT##/meta-facebook/meta-bletchley \
-  "
diff --git a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample
index d8d02ae939..2d4f102a87 100644
--- a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample
+++ b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample
@@ -19,17 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-facebook \
   ##OEROOT##/meta-facebook/meta-tiogapass \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-facebook \
-  ##OEROOT##/meta-facebook/meta-tiogapass \
-  "
diff --git a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample
index 18dc944721..25e19f17fb 100644
--- a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample
+++ b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample
@@ -19,17 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-facebook \
   ##OEROOT##/meta-facebook/meta-yosemitev2 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-facebook \
-  ##OEROOT##/meta-facebook/meta-yosemitev2 \
-  "
diff --git a/meta-fii/meta-kudo/conf/bblayers.conf.sample b/meta-fii/meta-kudo/conf/bblayers.conf.sample
index f8958b9505..e16dfb9fa1 100644
--- a/meta-fii/meta-kudo/conf/bblayers.conf.sample
+++ b/meta-fii/meta-kudo/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-google \
   ##OEROOT##/meta-fii/meta-kudo \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-nuvoton \
-  ##OEROOT##/meta-google \
-  ##OEROOT##/meta-fii/meta-kudo \
-  "
diff --git a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample b/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample
index ef28dc220c..d75648063e 100644
--- a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample
+++ b/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample
@@ -18,16 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-hpe \
   ##OEROOT##/meta-hpe/meta-dl360poc \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-hpe/meta-gxp \
-  ##OEROOT##/meta-hpe \
-  ##OEROOT##/meta-hpe/meta-dl360poc \
-  "
diff --git a/meta-ibm/conf/bblayers.conf.sample b/meta-ibm/conf/bblayers.conf.sample
index 11b3f59805..4f70015be4 100644
--- a/meta-ibm/conf/bblayers.conf.sample
+++ b/meta-ibm/conf/bblayers.conf.sample
@@ -18,16 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openpower \
   ##OEROOT##/meta-ibm \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security/meta-tpm \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ibm \
-  "
diff --git a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
index b5c268c649..750b4763cf 100644
--- a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
+++ b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openpower \
   ##OEROOT##/meta-ibm/meta-palmetto \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ibm/meta-palmetto \
-  "
diff --git a/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-ibm/meta-romulus/conf/bblayers.conf.sample
index 1bb30353e9..bf1f4e986f 100644
--- a/meta-ibm/meta-romulus/conf/bblayers.conf.sample
+++ b/meta-ibm/meta-romulus/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openpower \
   ##OEROOT##/meta-ibm/meta-romulus \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ibm/meta-romulus \
-  "
diff --git a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
index 3ee6152473..7a4e18983b 100644
--- a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
+++ b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
@@ -18,16 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-ingrasys \
   ##OEROOT##/meta-ingrasys/meta-zaius \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ingrasys \
-  ##OEROOT##/meta-ingrasys/meta-zaius \
-  "
diff --git a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample
index 9f5c27cd4e..b3fc4469f1 100644
--- a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample
+++ b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample
@@ -19,17 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-inspur \
   ##OEROOT##/meta-inspur/meta-fp5280g2\
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-inspur \
-  ##OEROOT##/meta-inspur/meta-fp5280g2 \
-  "
diff --git a/meta-inventec/meta-transformers/conf/bblayers.conf.sample b/meta-inventec/meta-transformers/conf/bblayers.conf.sample
index c779683e2c..783c90e88e 100755
--- a/meta-inventec/meta-transformers/conf/bblayers.conf.sample
+++ b/meta-inventec/meta-transformers/conf/bblayers.conf.sample
@@ -20,19 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-inventec \
   ##OEROOT##/meta-inventec/meta-transformers \
 "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-x86 \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-inventec \
-  ##OEROOT##/meta-inventec/meta-transformers \
-"
-
diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample
index 4c0c52e8ce..d10e530a41 100644
--- a/meta-phosphor/conf/bblayers.conf.sample
+++ b/meta-phosphor/conf/bblayers.conf.sample
@@ -15,13 +15,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-security \
   ##OEROOT##/meta-phosphor \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  "
diff --git a/meta-quanta/meta-f0b/conf/bblayers.conf.sample b/meta-quanta/meta-f0b/conf/bblayers.conf.sample
index db7f86a0d6..252c26bc37 100644
--- a/meta-quanta/meta-f0b/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-f0b/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-quanta \
   ##OEROOT##/meta-quanta/meta-f0b \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-quanta \
-  ##OEROOT##/meta-quanta/meta-f0b \
-  "
diff --git a/meta-quanta/meta-gbs/conf/bblayers.conf.sample b/meta-quanta/meta-gbs/conf/bblayers.conf.sample
index 9038332588..22757391ff 100644
--- a/meta-quanta/meta-gbs/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-gbs/conf/bblayers.conf.sample
@@ -18,16 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-quanta \
   ##OEROOT##/meta-quanta/meta-gbs \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-nuvoton \
-  ##OEROOT##/meta-google \
-  ##OEROOT##/meta-quanta \
-  ##OEROOT##/meta-quanta/meta-gbs \
-  "
diff --git a/meta-quanta/meta-gsj/conf/bblayers.conf.sample b/meta-quanta/meta-gsj/conf/bblayers.conf.sample
index 1c895ea005..2746d9af15 100644
--- a/meta-quanta/meta-gsj/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-gsj/conf/bblayers.conf.sample
@@ -18,16 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-quanta \
   ##OEROOT##/meta-quanta/meta-gsj \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-nuvoton \
-  ##OEROOT##/meta-google \
-  ##OEROOT##/meta-quanta \
-  ##OEROOT##/meta-quanta/meta-gsj \
-  "
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample
index f7b4c2210e..eb6cb80594 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample
@@ -18,16 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-quanta \
   ##OEROOT##/meta-quanta/meta-olympus-nuvoton \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-nuvoton \
-  ##OEROOT##/meta-google \
-  ##OEROOT##/meta-quanta \
-  ##OEROOT##/meta-quanta/meta-olympus-nuvoton \
-  "
diff --git a/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-quanta/meta-q71l/conf/bblayers.conf.sample
index 880ce33b11..b4411a4e0b 100644
--- a/meta-quanta/meta-q71l/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-q71l/conf/bblayers.conf.sample
@@ -19,17 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-quanta \
   ##OEROOT##/meta-quanta/meta-q71l \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-x86 \
-  ##OEROOT##/meta-quanta \
-  ##OEROOT##/meta-quanta/meta-q71l \
-  "
diff --git a/meta-yadro/meta-nicole/conf/bblayers.conf.sample b/meta-yadro/meta-nicole/conf/bblayers.conf.sample
index 776b1a90ba..3ceae4949f 100644
--- a/meta-yadro/meta-nicole/conf/bblayers.conf.sample
+++ b/meta-yadro/meta-nicole/conf/bblayers.conf.sample
@@ -18,16 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-yadro \
   ##OEROOT##/meta-yadro/meta-nicole \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-security \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-yadro \
-  ##OEROOT##/meta-yadro/meta-nicole \
-  "