[yocto] [yocto-autobuilder][PATCH 2/6] CreateAutoConf.py: add initmgr option
Stefan Stanacar
stefanx.stanacar at intel.com
Wed Apr 24 15:29:12 PDT 2013
Add an option to set the init manager used. This is used
for building images with systemd. The order used is important
as it decides the primary init system.
Signed-off-by: Stefan Stanacar <stefanx.stanacar at intel.com>
---
.../autobuilder/buildsteps/CreateAutoConf.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
index 3a4b9f9..fd73a3d 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py
@@ -36,6 +36,7 @@ class CreateAutoConf(ShellCommand):
self.adtdev=False
self.factory = factory
self.buildappsrcrev = "${AUTOREV}"
+ self.initmgr=None
self.kwargs = kwargs
for k, v in argdict.iteritems():
if type(v) is bool:
@@ -112,13 +113,25 @@ class CreateAutoConf(ShellCommand):
fout = fout + 'BUILDHISTORY_COMMIT = "1"\n'
fout = fout + 'BUILDHISTORY_DIR = "' + os.environ.get('BUILD_HISTORY_DIR') + '/' + self.getProperty("buildername") + '/poky-buildhistory"\n'
fout = fout + 'BUILDHISTORY_PUSH_REPO = "' + os.environ.get('BUILD_HISTORY_REPO') + ' ' + self.getProperty("buildername") + ':' + self.getProperty("buildername") + '"\n'
- if self.getProperty("branch_poky") != "danny" and self.getProperty("distroversion"):
+ if "danny" not in self.getProperty("branch_poky") and self.getProperty("distroversion"):
if self.adtdev == "True":
adtrepo_url=os.environ.get("ADTREPO_DEV_URL")
fout=fout+'ADTREPO = "' + adtrepo_url + '/' + self.getProperty("distroversion") + '-' + self.getProperty("got_revision_poky") + '-' + self.getProperty("branch_poky") + '"\n'
else:
adtrepo_url=os.environ.get("ADTREPO_URL")
fout=fout+'ADTREPO = "' + adtrepo_url + '/' + self.getProperty("distroversion") + '"\n'
+ if self.initmgr and "danny" not in self.getProperty("branch_poky"):
+ # we don't neet to test sysvinit only, because that's the default
+ if self.initmgr == "systemd":
+ fout = fout + 'DISTRO_FEATURES_append = " systemd"\n'
+ fout = fout + 'VIRTUAL-RUNTIME_init_manager = "systemd"\n'
+ fout = fout + 'DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"\n'
+ if self.initmgr == "systemd sysvinit":
+ fout = fout + 'DISTRO_FEATURES_append = " systemd"\n'
+ fout = fout + 'VIRTUAL-RUNTIME_init_manager = "systemd"\n'
+ if self.initmgr == "sysvinit systemd":
+ fout = fout + 'DISTRO_FEATURES_append = " systemd"\n'
+ fout = fout + 'VIRTUAL-RUNTIME_init_manager = "sysvinit"\n'
if self.atextappend:
fout = fout + self.atextappend
--
1.8.1.4
More information about the yocto
mailing list