Skip to contentSkip to conversation

kernel.bbclass: make do_symlink_kernelsrc reentrant

PATCH Etienne Cordonnier 1 participant 1 message Dec 16, 2023 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

patch v2: fixed commit title format

Quoted 53 lines · Etienne Cordonnier via lists.openembedded.org

From: Etienne Cordonnier <[email protected]>

The function do_symlink_kernsrc is not reentrant in the case where S is defined
to a non-default value. This causes build-failures e.g. when building linux-yocto, then updating
poky to a commit which modifies kernel.bbclass, and then building linux-yocto again.

Bugzilla:
https://urldefense.proofpoint.com/v2/url?u=https-3A__bugzilla.yoctoproject.org_show-5Fbug.cgi-3Fid-3D15325&d=DwIDAg&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=jt6YiS6E6i9e41ybWHwIDnQjJnbIg07KQZQBm5Obxl5_hRIXQQ6Yh8rNM7xAkzJi&s=VEQXVXbX9PUylLXpjvdMaNLjg7TIojyrvYA6INKcJLk&e=

---
 meta/classes-recipe/kernel.bbclass | 5 +++++
 1 file changed, 5 insertions(+)
meta/classes-recipe/kernel.bbclass +2 -0
index 9ff37f5c38..130bedd901 100644
@@ -194,6 +194,11 @@ python do_symlink_kernsrc () {
             os.symlink(s, kernsrc)
         else:
             import shutil
+            if os.path.islink(s):
+                # this happens for instance when a poky update forces

symlink_kernsrc to run again

meta/classes-recipe/kernel.bbclass +2 -0
+                # after s was already moved to kernsrc
+                bb.warn("%s is already a symlink! Not symlinking kernel

sources" % s)
+ return 0
shutil.move(s, kernsrc)
os.symlink(kernsrc, s)
}
--
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#192564):
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_192564&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=jt6YiS6E6i9e41ybWHwIDnQjJnbIg07KQZQBm5Obxl5_hRIXQQ6Yh8rNM7xAkzJi&s=4PpcOB2owGFWjvPhD-XD2iHuk3B8OeCjlnUVG2Q_b-E&e=
Mute This Topic:
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_103208527_7048771&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=jt6YiS6E6i9e41ybWHwIDnQjJnbIg07KQZQBm5Obxl5_hRIXQQ6Yh8rNM7xAkzJi&s=a8388EZCsGeWCuCCtQNu9x8UE3soxZ_xr17coBWUVPM&e=
Group Owner: [email protected] Unsubscribe:
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=jt6YiS6E6i9e41ybWHwIDnQjJnbIg07KQZQBm5Obxl5_hRIXQQ6Yh8rNM7xAkzJi&s=AVhaS6PSPRkhIynLZKzh1Y7hmb7XX3ZyJKg-3oloVaY&e=
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-