run-postinsts: use 'flock --fcntl' instead of separate fcntl-lock binary

Since v2.41, util-linux flock has understood the --fcntl option,
making it use fcntl(F_OFD_SETLK[W]) instead of flock().

Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
index 1f3e692029c09919a997a24c46c988b5495cdf7d..a94a769b590d13155ac3d385d9e2918f64204d41 100755 (executable)
--- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
+++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
@@ -81,7 +81,7 @@ remove_rcsd_link=1
 if $pm_installed; then
        case $pm in
                "ipk")
-                       if ! `fcntl-lock --wait 30 /run/opkg.lock true`; then
+                       if ! `flock --fcntl --wait 30 /run/opkg.lock true`; then
                                eval echo "Unable to obtain the opkg lock, deadlock?" $append_log
                        fi
                        if ! eval "opkg configure $append_log"; then

diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
index 5486f89ae756884c3d36377377238ee9c6ac1975..f581ff36368f1028c61d037373b02ddd534f3904 100644 (file)
--- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
+++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
@@ -12,7 +12,7 @@ S = "${UNPACKDIR}"
 
 inherit allarch systemd update-rc.d
 
-RDEPENDS:${PN} = "util-linux-fcntl-lock"
+RDEPENDS:${PN} = "util-linux-flock"
 
 INITSCRIPT_NAME = "run-postinsts"
 INITSCRIPT_PARAMS = "start 99 S ."