diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-08-11 02:26:43 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-08-14 02:27:47 +0300 |
| commit | 3c2460a7575e5f3cf54cee45633dfa51ab1f091c (patch) | |
| tree | f6836f3e3bc0f0dd8004192e896b22033454617b /meta-phosphor/recipes-phosphor/images | |
| parent | 3132c98e22edf2a0128adfa77ccf1ed4b6de5909 (diff) | |
| download | openbmc-3c2460a7575e5f3cf54cee45633dfa51ab1f091c.tar.xz | |
obmc-phosphor-image: avoid distro override
FOO_df-bar += "baz"
and
FOO += "${@bb.utils.contains('DISTRO_FEATURES', 'bar', 'baz', '', d)"
accomplish the same thing but the latter is the convention upstream and
also makes it easy to grep for things conditional on DISTRO_FEATURES.
(From meta-phosphor rev: 36aaf57d28c456762156cdc64fad46bdb47bda1d)
Change-Id: I6386f727acdf68370593ae1ee6dee2c0d88f700e
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/images')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index ccd24beea..d224d70b0 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -23,12 +23,12 @@ IMAGE_FEATURES += " \ obmc-software \ obmc-system-mgmt \ obmc-user-mgmt \ + ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'read-only-rootfs', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'phosphor-mmc', 'read-only-rootfs', '', d)} \ ssh-server-dropbear \ obmc-debug-collector \ obmc-network-mgmt \ obmc-settings-mgmt \ " -IMAGE_FEATURES_append_df-obmc-ubi-fs = " read-only-rootfs" -IMAGE_FEATURES_append_df-phosphor-mmc = " read-only-rootfs" inherit obmc-phosphor-image |