diff options
author | Chris Austen <austenc@us.ibm.com> | 2017-09-27 18:13:52 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-05-04 05:54:40 +0300 |
commit | 19fc09a1ad61b3a97ea662e3c8c5fac069f5ef8f (patch) | |
tree | 3af90cd62e59d03f968af52b4cf158a47a5ca96a | |
parent | 43db8413203f34f4d4fed4482147dc4277e1cfc3 (diff) | |
download | openbmc-19fc09a1ad61b3a97ea662e3c8c5fac069f5ef8f.tar.xz |
Enable use of meta-webserver layer
One use case on some systems for this layer will be to pull
in Nginx
Signed-Off-By: Chris Austen <austenc@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I1ac55bc182e7d24704d0fe3405438d8e1c97f1a4
17 files changed, 44 insertions, 13 deletions
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 b32cfffe6..f2f303681 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 @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 77f4f1605..acf659104 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 @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -11,6 +11,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -25,6 +26,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 7a4476080..03142d65d 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 @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -11,6 +11,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/import-layers/meta-raspberrypi \ @@ -21,6 +22,7 @@ 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-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-firestone/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample index 9ef4c63bf..6aabd7041 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample index 63ee0c4d8..bd894ce84 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 340cad7da..48a130175 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 @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 35147ab1c..b186e9d44 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 @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither/conf/bblayers.conf.sample index 4bcca841b..a9445994c 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -28,6 +29,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 884963420..738a4133e 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 @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample index ab8c3a54f..bab8a2c60 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-filesystems/ \ ##OEROOT##/import-layers/meta-openembedded/meta-networking/ \ ##OEROOT##/import-layers/meta-openembedded/meta-python/ \ + ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-ibm/meta-fsp2 \ ##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 b00a3a153..fcc684dab 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 @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 3dbec2259..7a06dc91e 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 @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 d6ea058a3..c35649c2a 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 @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 273971a55..8735273b6 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 @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 3f6250495..3cf9ed6c3 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 @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ 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 1669a9901..af19388da 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 @@ -12,6 +12,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ @@ -27,6 +28,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample index c137b6200..3f9182d75 100644 --- a/meta-phosphor/conf/bblayers.conf.sample +++ b/meta-phosphor/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -11,6 +11,7 @@ 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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ " @@ -20,5 +21,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-openembedded/meta-webserver \ ##OEROOT##/import-layers/meta-virtualization \ " |