From: Stefan Agner <ste...@agner.ch>
Ångström distribution has a different location for distro version,
support "angstrom" as distro too.
Signed-off-by: Stefan Agner <ste...@agner.ch>
---
.../site-packages/autobuilder/buildsteps/GetDistroVersion.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/lib/python2.7/site-packages/autobuilder/buildsteps/GetDistroVersion.py
b/lib/python2.7/site-packages/autobuilder/buildsteps/GetDistroVersion.py
index 3d4f314..2555e62 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/GetDistroVersion.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/GetDistroVersion.py
@@ -32,10 +32,13 @@ class GetDistroVersion(ShellCommand):
def start(self):
buildername=self.getProperty("buildername")
+ distroconf=self.slaveworkdir + "/" + buildername
if 'poky' in self.distro:
- distroconf=self.slaveworkdir + "/" + buildername +
"/build/meta-yocto/conf/distro/poky.conf|grep 'DISTRO_VERSION = \"'"
+ distroconf+="/build/meta-yocto/conf/distro/poky.conf|grep
'DISTRO_VERSION = \"'"
elif 'oecore' in self.distro:
- distroconf=self.slaveworkdir + "/" + buildername +
"/build/meta/conf/distro/include/default-distrovars.inc|grep 'DISTRO_VERSION '"
+
distroconf+="/build/meta/conf/distro/include/default-distrovars.inc|grep
'DISTRO_VERSION '"
+ elif 'angstrom' in self.distro:
+ distroconf+="/build/meta-angstrom/conf/distro/angstrom-*.conf|grep
'DISTRO_VERSION = \"'"
else:
self.finished(FAILURE)
cmd = 'cat ' + distroconf
--
1.9.0
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
