summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2018-10-17 09:28:03 +0300
committerDongkyun Son <dongkyun.s@samsung.com>2018-10-17 18:29:07 +0900
commit24340de95b6f1991d5482bbe90d7482708d683d3 (patch)
tree2b57238814ebcfb455de56ad638acd3ef325c40d
parent190d64daadbdd442f9388b31bff028ae87237d22 (diff)
downloadmic-sandbox/dkson95/env.tar.gz
mic-sandbox/dkson95/env.tar.bz2
mic-sandbox/dkson95/env.zip
Add %env section supportsandbox/dkson95/env
Kickstart file now may have section for environment variables setup. Section should look like %env VARIABLE1=0x1000 VARIABLE2="value" %end This environment is set up for mic process and propagated into child processes during firmware build. Change-Id: Ida45e768781faf277438e3fb591d9bd931a09a1f Signed-off-by: Slava Barinov <v.barinov@samsung.com>
-rwxr-xr-xmic/imager/baseimager.py4
-rwxr-xr-xmic/kickstart/__init__.py20
2 files changed, 24 insertions, 0 deletions
diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 0812023..107a3b8 100755
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -147,6 +147,10 @@ class BaseImageCreator(object):
# No ks provided when called by convertor, so skip the dependency check
if self.ks:
+ if hasattr(self.ks.handler, "env"):
+ for n, v in kickstart.get_env(self.ks):
+ msger.debug("Setting up envvar %s = %s" % (n, v))
+ os.environ[n] = v
# If we have btrfs partition we need to check necessary tools
for part in self.ks.handler.partition.partitions:
if part.fstype and part.fstype == "btrfs":
diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py
index fb0e4d8..3a83d2e 100755
--- a/mic/kickstart/__init__.py
+++ b/mic/kickstart/__init__.py
@@ -70,6 +70,22 @@ class AttachmentSection(kssections.Section):
def handleHeader(self, lineno, args):
kssections.Section.handleHeader(self, lineno, args)
+class EnvSection(kssections.Section):
+ sectionOpen = "%env"
+
+ def handleLine(self, line):
+ if not self.handler:
+ return
+
+ (h, s, t) = line.partition('#')
+ line = h.rstrip()
+ (n, s, v) = line.partition('=')
+ self.handler.env.append((n, v))
+
+ def handleHeader(self, lineno, args):
+ self.handler.env = []
+ kssections.Section.handleHeader(self, lineno, args)
+
def apply_wrapper(func):
def wrapper(*kargs, **kwargs):
try:
@@ -117,6 +133,7 @@ def read_kickstart(path):
ks = ksparser.KickstartParser(KSHandlers(), errorsAreFatal=False)
ks.registerSection(PrepackageSection(ks.handler))
ks.registerSection(AttachmentSection(ks.handler))
+ ks.registerSection(EnvSection(ks.handler))
try:
ks.readKickstart(path)
@@ -777,6 +794,9 @@ def convert_method_to_repo(ks):
def get_attachment(ks, required=()):
return ks.handler.attachment.packageList + list(required)
+def get_env(ks, required=()):
+ return ks.handler.env
+
def get_pre_packages(ks, required=()):
return ks.handler.prepackages.packageList + list(required)