remove sample.inc include from local.conf.example
sample.inc has been reduced to simply appending some
server related machine features.
For the sake of correctness, don't assume anything about
the machine features desired to be simulated by the phosphor
layer client. Accomplish this by removing sample.inc from
local.conf(.sample).
To simulate additional machine features on fake platforms
like evaluation boards or the default qemu models, append
additional features to OBMC_MACHINE_FEATURES in local.conf.
Change-Id: I8bf3e0b428a3d0c20136340720aa500e1312607e
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample
index a94b9c2..e0bd596 100644
--- a/meta-phosphor/conf/local.conf.sample
+++ b/meta-phosphor/conf/local.conf.sample
@@ -243,5 +243,3 @@
EXTRA_USERS_PARAMS = " \
usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
"
-
-require conf/machine/include/sample.inc
diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc
deleted file mode 100644
index 4a1b17f..0000000
--- a/meta-phosphor/conf/machine/include/sample.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-OBMC_MACHINE_FEATURES += "\
- obmc-phosphor-fan-mgmt \
- obmc-phosphor-chassis-mgmt \
- obmc-phosphor-sensor-mgmt \
- obmc-phosphor-flash-mgmt \
- obmc-host-ipmi \
- "