From f7ea135d0342e3aaa1c5078c64597f8960f70696 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 8 Aug 2018 21:25:42 -0400 Subject: remove use of meta-virtualization Remove meta-virtualization from any bblayer.conf.samples. It was originally added for the python-pyyaml and python-gevent recipes but better maintained versions of these recipes are provided by meta-python. Before this can be done the python-gevent bbappend in the phosphor layer must be removed. The version scope was wildcarded to any version but the patches don't apply to python-gevent_1.2.2, which becomes the default from meta-python when meta-virt is removed. Drop the bbappend. Change-Id: I6658a163460e3c8e63dc7371ffff803a7b6915b5 Signed-off-by: Brad Bishop --- .../meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample | 2 -- .../meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample | 2 -- .../meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample | 2 -- .../meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample | 2 -- .../meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample | 2 -- .../meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample | 2 -- .../meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample | 2 -- .../meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample | 2 -- .../meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample | 2 -- .../meta-rackspace/meta-barreleye/conf/bblayers.conf.sample | 2 -- .../meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample | 1 - .../meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample | 2 -- .../meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample | 1 - .../meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample | 2 -- 14 files changed, 26 deletions(-) (limited to 'meta-openbmc-machines') diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample index ccd209947..811368ca4 100644 --- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-arm \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-arm \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample index 8b1910b2c..b428881e0 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample @@ -12,7 +12,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-evb \ @@ -26,7 +25,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-evb \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample index fa35e4d3d..454e217d7 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample @@ -11,7 +11,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-oe \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \ ##OEROOT##/meta-openbmc-machines/meta-evb \ @@ -24,7 +23,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-oe \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \ ##OEROOT##/meta-openbmc-machines/meta-evb \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample index 03142d65d..d70b2b1aa 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample @@ -12,7 +12,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/import-layers/meta-raspberrypi \ " @@ -23,7 +22,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/import-layers/meta-raspberrypi \ " diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample index 89d3549a8..9be37e679 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample index b06f6a28c..57513206a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample index 18a97de55..aa8a2b365 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample index 4be9f2685..d5504265e 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample index cf49c35c5..baddd56d9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample @@ -12,7 +12,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -26,7 +25,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample index 306b0f93f..e3c6dacfa 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample index 1f4bbcaaf..586bf2fc3 100644 --- a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ diff --git a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample index 2dcafab42..d0da209f3 100644 --- a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ diff --git a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample index ff145b0a7..8e9c81dfd 100644 --- a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune \ diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample index 86c3a2298..94effa217 100644 --- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ -- cgit v1.2.1