From 5006df61371188221b82807339f9217b331fc7a1 Mon Sep 17 00:00:00 2001 From: Philip Lorenz Date: Fri, 22 Mar 2024 16:54:12 +0100 Subject: busybox: Fix wrapper creation `PACKAGEBUILDPKGD` was dropped in Yocto 4.2 and `PACKAGE_PREPROCESS_FUNCS` should be used instead. The only requirement for wrapper creation is that it is executed before any of the `update-alternatives` hooks are executed. This continues to hold as the call to `create_sh_wrapper_reset_alternative_vars` is prepended only after the `update-alternatives` class has been inherited. Additionally, this also fixes a race condition leading to non-deterministic buildhistory entries in busybox's `sysroot` files. The race condition was caused by the creation of the wrapper files inside `D` (i.e. the image directory) which is also consumed by other tasks such as `do_populate_sysroot` which may be executing in parallel to `do_package`. Signed-off-by: Philip Lorenz Signed-off-by: Joe MacDonald --- recipes-core/busybox/busybox_selinux.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-core/busybox/busybox_selinux.inc b/recipes-core/busybox/busybox_selinux.inc index ded8007..740980f 100644 --- a/recipes-core/busybox/busybox_selinux.inc +++ b/recipes-core/busybox/busybox_selinux.inc @@ -8,7 +8,7 @@ python create_sh_wrapper_reset_alternative_vars () { # We need to load the full set of busybox provides from the /etc/busybox.links # Use this to see the update-alternatives with the right information - dvar = d.getVar('D') + dvar = d.getVar('PKGD') pn = d.getVar('PN') base_bindir = d.getVar('base_bindir') @@ -55,9 +55,9 @@ python create_sh_wrapper_reset_alternative_vars () { create_sh_alternative_vars("/etc/busybox.links.suid", "%s/busybox.suid" % base_bindir, 0o4755) } -# Add to PACKAGEBUILDPKGD so it could override the alternatives, which are set in +# Add to PACKAGE_PREPROCESS_FUNCS so it could override the alternatives, which are set in # do_package:prepend() section of busybox_*.bb. -PACKAGEBUILDPKGD:prepend = "create_sh_wrapper_reset_alternative_vars " +PACKAGE_PREPROCESS_FUNCS:prepend = "create_sh_wrapper_reset_alternative_vars " # Use sh wrappers instead of links pkg_postinst:${PN} () { -- cgit v1.2.3-54-g00ecf