summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2021-08-08 14:11:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-26 08:32:13 +0100
commit4a936d9bf5cf7599b1ec667015410547d93aa63f (patch)
treec2f394b74c129c099c7443ddbb147fe5cf4a812c
parent6be03cbbfd013d8cda4245c95a4adfcc1ec214bd (diff)
downloadpoky-4a936d9bf5cf7599b1ec667015410547d93aa63f.tar.gz
sstate.bbclass: fix error handling when sstate mirrors is ro
The commit dd555537fc35c5f934af09d601d70772eb5955ae 'sstate.bbclass: fix errors about read-only sstate mirrors' adds an additional exception handler to silently mask read only rootfs errors thrown during the touch. The exception handler checks the error type with the python module errno but this module needs to be imported as it don't exist. Example of the error: File: 'exec_python_func() autogenerated', lineno: 2, function: <module> 0001: *** 0002:sstate_task_postfunc(d) 0003: File: '/home/builder/src/base/poky/meta/classes/sstate.bbclass', lineno: 778, function: sstate_task_postfunc 0774: 0775: omask = os.umask(0o002) 0776: if omask != 0o002: 0777: bb.note("Using umask 0o002 (not %0o) for sstate packaging" % omask) *** 0778: sstate_package(shared_state, d) 0779: os.umask(omask) 0780: 0781: sstateinst = d.getVar("SSTATE_INSTDIR") 0782: d.setVar('SSTATE_FIXMEDIR', shared_state['fixmedir']) File: '/home/builder/src/base/poky/meta/classes/sstate.bbclass', lineno: 708, function: sstate_package 0704: except PermissionError: 0705: pass 0706: except OSError as e: 0707: # Handle read-only file systems gracefully *** 0708: if e.errno != errno.EROFS: 0709: raise e 0710: 0711: return 0712: Exception: NameError: name 'errno' is not defined (From OE-Core rev: 2e5cf13aa46f25d8976ece55fcb4129bfd75659f) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 15f30ad144fbe25e9a5e71bc7e42e746d2039992) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 5c7a98839f..4bf087b4e8 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -705,6 +705,7 @@ def sstate_package(ss, d):
705 pass 705 pass
706 except OSError as e: 706 except OSError as e:
707 # Handle read-only file systems gracefully 707 # Handle read-only file systems gracefully
708 import errno
708 if e.errno != errno.EROFS: 709 if e.errno != errno.EROFS:
709 raise e 710 raise e
710 711
@@ -1152,6 +1153,7 @@ python sstate_eventhandler() {
1152 pass 1153 pass
1153 except OSError as e: 1154 except OSError as e:
1154 # Handle read-only file systems gracefully 1155 # Handle read-only file systems gracefully
1156 import errno
1155 if e.errno != errno.EROFS: 1157 if e.errno != errno.EROFS:
1156 raise e 1158 raise e
1157 1159