[oe-commits] Randy Witt : testimage.bbclass: Don't require an image manifest
git at git.openembedded.org
git at git.openembedded.org
Wed Sep 23 08:55:59 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 78f5c3cb3971c31a950deb5cab8992f3ba577440
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=78f5c3cb3971c31a950deb5cab8992f3ba577440
Author: Randy Witt <randy.e.witt at linux.intel.com>
Date: Wed Sep 16 14:45:49 2015 -0700
testimage.bbclass: Don't require an image manifest
Sometimes an "image" may not actually have a manifest file such as when
using a "baremetal kernel". This change allows for a user to set a
IMAGE_NO_MANIFEST flag to 1 in order to inform the code that there is no
corresponding manifest that should exist for an image.
Signed-off-by: Randy Witt <randy.e.witt at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/testimage.bbclass | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index a1918ba..70e2800 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -279,14 +279,20 @@ def testimage_main(d):
self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split()
self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split()
manifest = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + ".manifest")
+ nomanifest = d.getVar("IMAGE_NO_MANIFEST", True)
+
self.sigterm = False
self.origsigtermhandler = signal.getsignal(signal.SIGTERM)
signal.signal(signal.SIGTERM, self.sigterm_exception)
- try:
- with open(manifest) as f:
- self.pkgmanifest = f.read()
- except IOError as e:
- bb.fatal("No package manifest file found. Did you build the image?\n%s" % e)
+
+ if nomanifest is None or nomanifest != "1":
+ try:
+ with open(manifest) as f:
+ self.pkgmanifest = f.read()
+ except IOError as e:
+ bb.fatal("No package manifest file found. Did you build the image?\n%s" % e)
+ else:
+ self.pkgmanifest = ""
def sigterm_exception(self, signum, stackframe):
bb.warn("TestImage received SIGTERM, shutting down...")
More information about the Openembedded-commits
mailing list