Skip to contentSkip to conversation

buildhistory.bbclass: fix shell syntax when using dash

PATCH New Martin Jansa 1 participant 2 messages Jun 7, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 buildhistory.bbclass: fix shell syntax when using dash

* fix:
run.buildhistory_get_image_installed.791888: 198: [: unexpected operator

introduced in:
commit 82e6172c1df378dff4e503aa878501c08937b5bb
Author: Andres Beltran <[email protected]>
Date: Tue Oct 5 00:34:15 2021 +0000

buildhistory: Fix package output files for SDKs

---
 meta/classes/buildhistory.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/buildhistory.bbclass +1 -1
index e0853f1abe..0cb81e80c4 100644
@@ -508,7 +508,7 @@ buildhistory_get_installed() {
 
 	# Set correct pkgdatadir
 	pkgdatadir=${PKGDATA_DIR}
-	if [ "$2" == "sdk" ] && [ "$3" == "host" ]; then
+	if [ "$2" = "sdk" ] && [ "$3" = "host" ] ; then
 		pkgdatadir="${PKGDATA_DIR_SDK}"
 	fi
 
Signature · 1 line
2.35.1
#1 lore raw

PATCH 2/2 rootfs.py: close kernel_abi_ver_file

* fixes:
oe-core/meta/lib/oe/rootfs.py:331: ResourceWarning: unclosed file <_io.TextIOWrapper name='pkgdata/mach/kernel-depmod/kernel-abiversion' mode='r' encoding='UTF-8'> kernel_ver = open(kernel_abi_ver_file).read().strip(' \n')

---
 meta/lib/oe/rootfs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/lib/oe/rootfs.py +3 -1
index 61ccf369f1..9e6b411fb6 100644
@@ -328,7 +328,9 @@ class Rootfs(object, metaclass=ABCMeta):
         if not os.path.exists(kernel_abi_ver_file):
             bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file)
 
-        kernel_ver = open(kernel_abi_ver_file).read().strip(' \n')
+        with open(kernel_abi_ver_file) as f:
+            kernel_ver = f.read().strip(' \n')
+
         versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver)
 
         bb.utils.mkdirhier(versioned_modules_dir)
Signature · 1 line
2.35.1