diff options
| author | Slava Barinov <v.barinov@samsung.com> | 2018-10-17 10:11:05 +0300 |
|---|---|---|
| committer | Dongkyun Son <dongkyun.s@samsung.com> | 2018-11-30 08:13:48 +0900 |
| commit | b4eecfd244d9c78d07954075e2aacfd1d5ba1cd9 (patch) | |
| tree | db68f9b4355a27cd294e7251caf85f28eed2eba7 | |
| parent | 13d5bf8eeacf710c68febc37408f985e58ed12f7 (diff) | |
| download | kickstarter-b4eecfd244d9c78d07954075e2aacfd1d5ba1cd9.tar.gz kickstarter-b4eecfd244d9c78d07954075e2aacfd1d5ba1cd9.tar.bz2 kickstarter-b4eecfd244d9c78d07954075e2aacfd1d5ba1cd9.zip | |
Add support for %env sectionsubmit/tizen/20181130.063616
Env-scripts support are required for building certain firmware configurations,
e.g. sanitized firmwares and can be used for setting up environment variables
for firmware build.
Change-Id: I95b3443132fd7087728cd257da7f84dc0aee1677
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
Signed-off-by: Dongkyun Son <dongkyun.s@samsung.com>
| -rw-r--r-- | kickstart/kickstart.tmpl | 4 | ||||
| -rw-r--r-- | kswriter/KSWriter.py | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl index 301e3c0..54c9a8b 100644 --- a/kickstart/kickstart.tmpl +++ b/kickstart/kickstart.tmpl @@ -87,6 +87,10 @@ repo --name=${r} --baseurl=${rr.Url} ${options_repo} #end for #end for +%env +${metadata.Env} +%end + #if $metadata.has_key("PackageArgs") %packages --${metadata.PackageArgs} #else diff --git a/kswriter/KSWriter.py b/kswriter/KSWriter.py index bae1e36..a15ed63 100644 --- a/kswriter/KSWriter.py +++ b/kswriter/KSWriter.py @@ -92,7 +92,7 @@ class KSWriter(): plat = copy.copy(self.image_meta[img['Platform']]) conf.update(plat) conf.update(img) - lval = ['Repos', 'Groups', 'PostScripts', 'NoChrootScripts', 'RemovePackages', 'ExtraPackages', 'RunScripts'] + lval = ['Repos', 'Groups', 'PostScripts', 'NoChrootScripts', 'RemovePackages', 'ExtraPackages', 'RunScripts', 'EnvScripts'] lvald = {} for l in lval: full = [] @@ -135,6 +135,16 @@ class KSWriter(): else: raise KSMetaError('%s/scripts/%s.run not found, aborting.' %(meta_root, scr )) + envscript = "" + for scr in conf['EnvScripts']: + if os.path.exists('%s/scripts/%s.env' %(meta_root,scr)): + f = open('%s/scripts/%s.env' %(meta_root, scr ), 'r') + envscript += f.read() + envscript += "\n" + f.close() + else: + raise KSMetaError('%s/scripts/%s.env not found, aborting.' %(meta_root, scr )) + ptab = "" for g in [ plat, img ]: if g.has_key("Part"): @@ -156,6 +166,7 @@ class KSWriter(): conf['Post'] = postscript conf['NoChroot'] = nochrootscript conf['Run'] = runscript + conf['Env'] = envscript return conf def process_files(self, meta, repos): |