Skip to contentSkip to conversation

kernel: Fix path comparison in kernel staging dir symlinking

PATCH New Staffan Rydén 1 participant 1 message Jul 20, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel: Fix path comparison in kernel staging dir symlinking

Due to an oversight in the do_symlink_kernsrc function, the path comparison between "S" and "STAGING_KERNEL_DIR" is broken. The code obtains both variables, but modifies the local copy of "S" before comparing them, causing the comparison to always return false.

This can cause the build to fail when the EXTERNALSRC flag is enabled, since the code will try to create a symlink even if one already exists.

This patch resolves the issue by comparing the variables before they are modified.

---
 meta/classes-recipe/kernel.bbclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/classes-recipe/kernel.bbclass +4 -3
index 2aedf3a31b..ea0ab491f0 100644
@@ -181,13 +181,14 @@ do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILD
 do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
 python do_symlink_kernsrc () {
     s = d.getVar("S")
-    if s[-1] == '/':
-        # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as directory name and fail
-        s=s[:-1]
     kernsrc = d.getVar("STAGING_KERNEL_DIR")
     if s != kernsrc:
         bb.utils.mkdirhier(kernsrc)
         bb.utils.remove(kernsrc, recurse=True)
+        if s[-1] == '/':
+            # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as
+            # directory name and fail
+            s = s[:-1]
         if d.getVar("EXTERNALSRC"):
             # With EXTERNALSRC S will not be wiped so we can symlink to it
             os.symlink(s, kernsrc)
Signature · 1 line
2.30.2