mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

meta/lib/oe/rootfs.py: separate first boot deferral logic into a separate function

Browse Source 
(From OE-Core rev: 4612291411ad788df88d5fc6dde98ff53fd91002)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2018-01-29 14:01:29 +02:00
committed by Richard Purdie
parent cb63b4bfa0
commit 4c808e31ea
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/rootfs.py
+19 -16
View File
@@ -293,6 +293,24 @@ class Rootfs(object, metaclass=ABCMeta):
# Remove the package manager data files # Remove the package manager data files
self.pm.remove_packaging_data() self.pm.remove_packaging_data()
def _postpone_to_first_boot(self, postinst_intercept_hook):
with open(postinst_intercept_hook) as intercept:
registered_pkgs = None
for line in intercept.read().split("\n"):
m = re.match("^##PKGS:(.*)", line)
if m is not None:
registered_pkgs = m.group(1).strip()
break
if registered_pkgs is not None:
bb.warn("The postinstalls for the following packages "
"will be postponed for first boot: %s" %
registered_pkgs)
# call the backend dependent handler
self._handle_intercept_failure(registered_pkgs)
def _run_intercepts(self): def _run_intercepts(self):
intercepts_dir = os.path.join(self.d.getVar('WORKDIR'), intercepts_dir = os.path.join(self.d.getVar('WORKDIR'),
"intercept_scripts") "intercept_scripts")
@@ -314,22 +332,7 @@ class Rootfs(object, metaclass=ABCMeta):
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
bb.warn("The postinstall intercept hook '%s' failed, details in log.do_rootfs" % script) bb.warn("The postinstall intercept hook '%s' failed, details in log.do_rootfs" % script)
bb.note("Exit code %d. Output:\n%s" % (e.returncode, e.output.decode("utf-8"))) bb.note("Exit code %d. Output:\n%s" % (e.returncode, e.output.decode("utf-8")))
self._postpone_to_first_boot(script_full)
with open(script_full) as intercept:
registered_pkgs = None
for line in intercept.read().split("\n"):
m = re.match("^##PKGS:(.*)", line)
if m is not None:
registered_pkgs = m.group(1).strip()
break
if registered_pkgs is not None:
bb.warn("The postinstalls for the following packages "
"will be postponed for first boot: %s" %
registered_pkgs)
# call the backend dependent handler
self._handle_intercept_failure(registered_pkgs)
def _run_ldconfig(self): def _run_ldconfig(self):
if self.d.getVar('LDCONFIGDEPEND'): if self.d.getVar('LDCONFIGDEPEND'):