diff options
Diffstat (limited to 'meta-facebook')
40 files changed, 299 insertions, 178 deletions
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index c0ca08f37..9e4cf5521 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "facebook-layer" BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT_facebook-layer := "hardknott honister" diff --git a/meta-facebook/conf/machine/include/facebook-tpm2.inc b/meta-facebook/conf/machine/include/facebook-tpm2.inc new file mode 100644 index 000000000..207f08cbc --- /dev/null +++ b/meta-facebook/conf/machine/include/facebook-tpm2.inc @@ -0,0 +1,2 @@ +MACHINE_FEATURES:append = " tpm2" +DISTRO_FEATURES:append = " tpm" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 2993dc438..d18a66bf5 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -12,6 +12,6 @@ PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" -IMAGE_FEATURES_remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-ikvm" OVERRIDES .= ":facebook" diff --git a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample index e02b182c7..3b24ed861 100644 --- a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample +++ b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample @@ -14,6 +14,7 @@ BBLAYERS ?= " \ ##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 \ @@ -28,6 +29,7 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##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 \ diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf index 505e67c68..14d320079 100644 --- a/meta-facebook/meta-bletchley/conf/layer.conf +++ b/meta-facebook/meta-bletchley/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "bletchley-layer" BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_bletchley-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT_bletchley-layer := "hardknott honister" diff --git a/meta-facebook/meta-bletchley/conf/local.conf.sample b/meta-facebook/meta-bletchley/conf/local.conf.sample index 0c5e4cd5f..7e77ead94 100644 --- a/meta-facebook/meta-bletchley/conf/local.conf.sample +++ b/meta-facebook/meta-bletchley/conf/local.conf.sample @@ -2,7 +2,9 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling @@ -85,15 +87,15 @@ DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" # # Extra image configuration defaults @@ -103,6 +105,8 @@ SANITY_TESTED_DISTROS_append ?= " *" # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -110,14 +114,14 @@ SANITY_TESTED_DISTROS_append ?= " *" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -126,18 +130,18 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -USER_CLASSES ?= "buildstats image-prelink" +USER_CLASSES ?= "buildstats" # # Runtime testing of images # # The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + # # Interactive shell configuration # @@ -162,12 +166,12 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -180,7 +184,7 @@ BB_DISKMON_DIRS = "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # @@ -195,26 +199,60 @@ BB_DISKMON_DIRS = "\ #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ #file://.* file:///some/local/dir/sstate/PATH" +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" # # Qemu configuration # -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" # Set the root password to '0penBmc' -INHERIT += "extrausers" - -EXTRA_USERS_PARAMS = " \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ - " +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf index 8de7a54d2..03af91001 100644 --- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf +++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf @@ -9,6 +9,7 @@ SPL_BINARY = "spl/u-boot-spl.bin" require conf/machine/include/facebook-nohost.inc require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/facebook-tpm2.inc SERIAL_CONSOLES = "57600;ttyS4" diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend index 2789df998..d526638c0 100644 --- a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch \ diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend index b7bdbd200..c9401d177 100644 --- a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-aspeed-sdk:" +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:" SRC_URI += " \ file://0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch \ diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf index 94db7e114..af34387cf 100644 --- a/meta-facebook/meta-tiogapass/conf/layer.conf +++ b/meta-facebook/meta-tiogapass/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "tiogapass-layer" BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_tiogapass-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT_tiogapass-layer := "hardknott honister" diff --git a/meta-facebook/meta-tiogapass/conf/local.conf.sample b/meta-facebook/meta-tiogapass/conf/local.conf.sample index 641963aed..9ea2e0413 100644 --- a/meta-facebook/meta-tiogapass/conf/local.conf.sample +++ b/meta-facebook/meta-tiogapass/conf/local.conf.sample @@ -2,7 +2,9 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling @@ -65,7 +67,7 @@ MACHINE ??= "tiogapass" # DISTRO ?= "openbmc-phosphor" # As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream +# where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not # useful to most new users. # DISTRO ?= "poky-bleeding" @@ -85,15 +87,15 @@ DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" # # Extra image configuration defaults @@ -103,6 +105,8 @@ SANITY_TESTED_DISTROS_append ?= " *" # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -110,14 +114,14 @@ SANITY_TESTED_DISTROS_append ?= " *" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -126,20 +130,18 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-prelink" +USER_CLASSES ?= "buildstats" # # Runtime testing of images # # The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + # # Interactive shell configuration # @@ -164,12 +166,12 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -182,7 +184,7 @@ BB_DISKMON_DIRS = "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # @@ -197,26 +199,60 @@ BB_DISKMON_DIRS = "\ #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ #file://.* file:///some/local/dir/sstate/PATH" +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" # # Qemu configuration # -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" # Set the root password to '0penBmc' -INHERIT += "extrausers" - -EXTRA_USERS_PARAMS = " \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ - " +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index b9bf0af2a..db85451db 100644 --- a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch" diff --git a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend index f24fe5e4f..d66a385e6 100644 --- a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend +++ b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-aspeed:" +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed:" SRC_URI += "file://0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch" diff --git a/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed_%.bbappend index 0eb088404..df490bc84 100644 --- a/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" SRC_URI += "file://tiogapass.cfg" diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf index 977d5df67..654ffabba 100644 --- a/meta-facebook/meta-yosemitev2/conf/layer.conf +++ b/meta-facebook/meta-yosemitev2/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "yosemitev2-layer" BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_yosemitev2-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT_yosemitev2-layer := "hardknott honister" diff --git a/meta-facebook/meta-yosemitev2/conf/local.conf.sample b/meta-facebook/meta-yosemitev2/conf/local.conf.sample index 297d077cc..1f4215698 100644 --- a/meta-facebook/meta-yosemitev2/conf/local.conf.sample +++ b/meta-facebook/meta-yosemitev2/conf/local.conf.sample @@ -2,7 +2,9 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling @@ -65,7 +67,7 @@ MACHINE ??= "yosemitev2" # DISTRO ?= "openbmc-phosphor" # As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream +# where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not # useful to most new users. # DISTRO ?= "poky-bleeding" @@ -85,15 +87,15 @@ DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" # # Extra image configuration defaults @@ -103,6 +105,8 @@ SANITY_TESTED_DISTROS_append ?= " *" # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -110,14 +114,14 @@ SANITY_TESTED_DISTROS_append ?= " *" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -126,20 +130,18 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-prelink" +USER_CLASSES ?= "buildstats" # # Runtime testing of images # # The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + # # Interactive shell configuration # @@ -164,12 +166,12 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -182,7 +184,7 @@ BB_DISKMON_DIRS = "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # @@ -197,26 +199,60 @@ BB_DISKMON_DIRS = "\ #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ #file://.* file:///some/local/dir/sstate/PATH" +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" # # Qemu configuration # -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" # Set the root password to '0penBmc' -INHERIT += "extrausers" - -EXTRA_USERS_PARAMS = " \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ - " +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 1c38b11ba..298738f04 100644 --- a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI +="file://0001-board-aspeed-Add-Mux-for-yosemitev2.patch" SRC_URI +="file://0002-spl-host-console-handle.patch" diff --git a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend index 9020b66fb..299aebaf2 100644 --- a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" SRC_URI += "file://yosemitev2.cfg" diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service index fdeefd417..fdeefd417 100644 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer b/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer index 148f8e4ae..148f8e4ae 100644 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf index 5a85aadb5..5a85aadb5 100644 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index 9eddafa13..9eddafa13 100644 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend index eeeea1a30..104d13b4a 100644 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://rsyslog.conf \ file://rsyslog.logrotate \ @@ -6,12 +6,12 @@ SRC_URI += "file://rsyslog.conf \ file://rotate-event-logs.timer \ " -PACKAGECONFIG_append = " imjournal" +PACKAGECONFIG:append = " imjournal" -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir} rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf } -SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service rotate-event-logs.timer" +SYSTEMD_SERVICE:${PN} += " rotate-event-logs.service rotate-event-logs.timer" diff --git a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb index 1f476adee..ee7202164 100644 --- a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb +++ b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" +FILESEXTRAPATHS:append := "${THISDIR}/files:" inherit obmc-phosphor-systemd LICENSE = "Apache-2.0" @@ -14,10 +14,10 @@ SRC_URI = "file://setup_gpio.sh \ file://LICENSE" DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "host-gpio.service host-poweron.service host-poweroff.service" +SYSTEMD_SERVICE:${PN} = "host-gpio.service host-poweron.service host-poweroff.service" do_install() { install -d ${D}/usr/sbin diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 28586a989..ceade37d2 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "58c1ca2f7cc58eacc059486bacb66d152de0631c" +SRCREV = "485f9b31cbdc8e8aebdfb18729f541f41227522d" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" @@ -15,25 +15,25 @@ DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd " inherit cmake obmc-phosphor-ipmiprovider-symlink EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" -EXTRA_OECMAKE_append_yosemitev2 = " -DBIC=1" +EXTRA_OECMAKE:append:yosemitev2 = " -DBIC=1" -EXTRA_OECMAKE_append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'" +EXTRA_OECMAKE:append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'" LIBRARY_NAMES = "libzfboemcmds.so" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" -FILES_${PN}_append = " ${datadir}/lcd-debug/post_desc.json" -FILES_${PN}_append = " ${datadir}/lcd-debug/gpio_desc.json" -FILES_${PN}_append = " ${datadir}/lcd-debug/cri_sensors.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/post_desc.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/gpio_desc.json" +FILES:${PN}:append = " ${datadir}/lcd-debug/cri_sensors.json" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" -do_install_append(){ +do_install:append(){ install -d ${D}${includedir}/fb-ipmi-oem install -m 0644 -D ${S}/include/*.hpp ${D}${includedir}/fb-ipmi-oem } diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index 6b61bba5a..d9c2abd53 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -10,7 +10,7 @@ PACKAGES = " \ ${PN}-flash \ ${PN}-system \ " -PACKAGES_append_fb-withhost = " \ +PACKAGES:append:fb-withhost = " \ ${PN}-chassis \ ${PN}-hostmgmt \ " @@ -20,31 +20,31 @@ PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-chassis = "Facebook Chassis" -RDEPENDS_${PN}-chassis = " \ +SUMMARY:${PN}-chassis = "Facebook Chassis" +RDEPENDS:${PN}-chassis = " \ x86-power-control \ " -SUMMARY_${PN}-extras_tiogapass = "Extra features for tiogapass" -RDEPENDS_${PN}-extras_tiogapass = "phosphor-nvme" +SUMMARY:${PN}-extras:tiogapass = "Extra features for tiogapass" +RDEPENDS:${PN}-extras:tiogapass = "phosphor-nvme" -SUMMARY_${PN}-fans = "Facebook Fans" -RDEPENDS_${PN}-fans = " \ +SUMMARY:${PN}-fans = "Facebook Fans" +RDEPENDS:${PN}-fans = " \ phosphor-pid-control \ " -SUMMARY_${PN}-flash = "Facebook Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "Facebook Flash" +RDEPENDS:${PN}-flash = " \ phosphor-software-manager \ " RDEPENDS_PN_SYSTEM_EXTRAS = "" -RDEPENDS_PN_SYSTEM_EXTRAS_fb-withhost = " \ +RDEPENDS_PN_SYSTEM_EXTRAS:fb-withhost = " \ fb-powerctrl \ phosphor-ipmi-ipmb \ fb-ipmi-oem \ @@ -55,8 +55,8 @@ RDEPENDS_PN_SYSTEM_EXTRAS_fb-withhost = " \ phosphor-host-postd \ " -SUMMARY_${PN}-system = "Facebook System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "Facebook System" +RDEPENDS:${PN}-system = " \ entity-manager \ dbus-sensors \ phosphor-virtual-sensor \ diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index f0a1c7be8..266614079 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" OBMC_CONSOLE_HOST_TTY = "ttyS2" -SRC_URI_append_tiogapass = " file://server.ttyS2.conf" -SRC_URI_append_yosemitev2 = " file://server.ttyS0.conf \ +SRC_URI:append:tiogapass = " file://server.ttyS2.conf" +SRC_URI:append:yosemitev2 = " file://server.ttyS0.conf \ file://server.ttyS1.conf \ file://server.ttyS2.conf \ file://server.ttyS3.conf \ @@ -11,12 +11,12 @@ SRC_URI_append_yosemitev2 = " file://server.ttyS0.conf \ file://client.2202.conf \ file://client.2203.conf" -SRC_URI_remove = "file://${BPN}.conf" +SRC_URI:remove = "file://${BPN}.conf" -SYSTEMD_SERVICE_${PN}_remove_yosemitev2 = "obmc-console-ssh.socket" -EXTRA_OECONF_append_yosemitev2 = " --enable-concurrent-servers" +SYSTEMD_SERVICE:${PN}:remove:yosemitev2 = "obmc-console-ssh.socket" +EXTRA_OECONF:append:yosemitev2 = " --enable-concurrent-servers" -do_install_append() { +do_install:append() { # Install the server configuration install -m 0755 -d ${D}${sysconfdir}/${BPN} install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/ diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 83567e906..4cdfe5a9e 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OECONF_append = " --enable-configure-dbus=yes" +EXTRA_OECONF:append = " --enable-configure-dbus=yes" diff --git a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 2d0363286..047f01970 100644 --- a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://bios-update.sh" -PACKAGECONFIG_append = " flash_bios" -RDEPENDS_${PN} += "bash" +PACKAGECONFIG:append = " flash_bios" +RDEPENDS:${PN} += "bash" -do_install_append() { +do_install:append() { install -d ${D}/${sbindir} install -m 0755 ${WORKDIR}/bios-update.sh ${D}/${sbindir}/ } diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend index 3c280ceba..8ae2e609e 100644 --- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend +++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://ttyS2.conf" -SRC_URI_append_yosemitev2 += "file://ttyS0.conf" -SRC_URI_append_yosemitev2 += "file://ttyS1.conf" -SRC_URI_append_yosemitev2 += "file://ttyS3.conf" +SRC_URI:append:yosemitev2 += "file://ttyS0.conf" +SRC_URI:append:yosemitev2 += "file://ttyS1.conf" +SRC_URI:append:yosemitev2 += "file://ttyS3.conf" -do_install_append() { +do_install:append() { # Install the configurations install -m 0755 -d ${D}${sysconfdir}/${BPN} diff --git a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend index ad9c87ae4..5755aa58b 100644 --- a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,3 +1,9 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -IMAGE_FEATURES_remove_fb-nohost = "obmc-console" +IMAGE_FEATURES:remove:fb-nohost = "obmc-console" + +OBMC_IMAGE_EXTRA_INSTALL:append = "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \ + bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'tpm2-tools', '', d), \ + '', d)} \ + " diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index 1a9d9e0a5..9557c2681 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" -SRC_URI_append = " file://ipmb-channels.json" +SRC_URI:append = " file://ipmb-channels.json" -do_install_append() { +do_install:append() { install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ ${D}/usr/share/ipmbbridge } diff --git a/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index dbcc895d4..d7953e133 100644 --- a/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PACKAGES_remove_fb-nohost = "\ +PACKAGES:remove:fb-nohost = "\ ${PN}-console \ " diff --git a/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index ac98c7ce7..ca35bcb6a 100644 --- a/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " log-threshold log-pulse" +PACKAGECONFIG:append = " log-threshold log-pulse" diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend index 95a590704..94db23f76 100644 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" -SRC_URI_append = " file://nvme_config.json" +SRC_URI:append = " file://nvme_config.json" -do_install_append() { +do_install:append() { install -m 0644 -D ${WORKDIR}/nvme_config.json \ ${D}/etc/nvme } diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 94650bab6..4487aa279 100644 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" -SRC_URI_append = " file://${MACHINE}_sensor_config.json" +SRC_URI:append = " file://${MACHINE}_sensor_config.json" -do_install_append() { +do_install:append() { install -d ${D}/usr/share/phosphor-virtual-sensor diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 2b4c4c0cb..56f43c7e7 100644 --- a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_yosemitev2 = " file://settings-manager.override.yml" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append:yosemitev2 = " file://settings-manager.override.yml" diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index b0dcd093c..970b12c6a 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}_remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_SERVICE_${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" +SYSTEMD_OVERRIDE:${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE:${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend index aa99b7e8d..c119baca9 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" EXTRA_OECMAKE += "-DCHASSIS_SYSTEM_RESET=ON" |