diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-16 23:42:12 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-16 23:42:12 +0300 |
| commit | 8a4275672b3463ef77bf9090d61a9aba45be9d3a (patch) | |
| tree | 06dead3d17836e41388eee1c996a1138c0830e22 /meta-phosphor/conf | |
| parent | e34bf49e742be2f94a54795b794b88b4452e89a5 (diff) | |
| parent | bd7c9e235facf05eff4493ebaf2c43f90ed34f92 (diff) | |
| download | openbmc-8a4275672b3463ef77bf9090d61a9aba45be9d3a.tar.xz | |
Merge commit 'bd7c9e235facf05eff4493ebaf2c43f90ed34f92' into HEAD
Diffstat (limited to 'meta-phosphor/conf')
| -rw-r--r-- | meta-phosphor/conf/distro/openbmc-phosphor.conf | 4 | ||||
| -rw-r--r-- | meta-phosphor/conf/local.conf.sample | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index 94f17526b..f1e50dcc6 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -3,8 +3,10 @@ require conf/distro/poky.conf DISTRO = "openbmc-phosphor" DISTRO_NAME = "Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" DISTRO_VERSION = "0.1.0" +TARGET_VENDOR="-openbmc" IMAGE_FSTYPES += "cpio.gz" +IMAGE_LINGUAS = "en-us" VIRTUAL-RUNTIME_keymaps = "" @@ -29,3 +31,5 @@ DISTRO_FEATURES = "\ MACHINE_FEATURES += " \ ${OBMC_MACHINE_FEATURES} \ " + +DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel" diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample index 6a919278d..4f18ca17c 100644 --- a/meta-phosphor/conf/local.conf.sample +++ b/meta-phosphor/conf/local.conf.sample @@ -115,7 +115,8 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.6" +SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" +" # # Extra image configuration defaults # |