[yocto] [auh][PATCH 15/21] Do not require configuration options that aren't necessary for running ptests

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
---
 README           |  6 ++----
 upgradehelper.py | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/README b/README
index 27b0977..acb22ac 100644
--- a/README
+++ b/README
@@ -122,10 +122,8 @@ file:
 --------------- snip ---------------
 INHERIT += "testimage"
 
-DISTRO_FEATURES_append = " ptest"
-EXTRA_IMAGE_FEATURES = "debug-tweaks package-management ptest-pkgs"
-# testimage/ptest only work with rpm
-PACKAGE_CLASSES = "package_rpm"
+# Add the following if your distro does not enable by default (poky does)
+#DISTRO_FEATURES_append = " ptest"
 --------------- snip ---------------
 
 Also if you are running in a server without X11 session, you need to start
diff --git a/upgradehelper.py b/upgradehelper.py
index cb48c47..5659735 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -251,21 +251,6 @@ class Updater(object):
                       " conf/local.conf.")
                     exit(1)
 
-                if not "package-management" in self.base_env['EXTRA_IMAGE_FEATURES']:
-                    E(" testimage requires package-management in EXTRA_IMAGE_FEATURES"\
-                      " please add to conf/local.conf.")
-                    exit(1)
-
-                if not "ptest-pkgs" in self.base_env['EXTRA_IMAGE_FEATURES']:
-                    E(" testimage/ptest requires ptest-pkgs in EXTRA_IMAGE_FEATURES"\
-                      " please add to conf/local.conf.")
-                    exit(1)
-
-                if not "package_rpm" == self.base_env["PACKAGE_CLASSES"]:
-                    E(" testimage/ptest requires PACKAGE_CLASSES set to package_rpm"\
-                      " please add to conf/local.conf.")
-                    exit(1)
-
                 enabled = True
             else:
                 E(" testimage was enabled in upgrade-helper.conf"\
-- 
2.15.1