From f42becf48a22f8f40e4076d962693e18d38aa264 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Mon, 15 Sep 2025 10:51:35 +0200 Subject: [PATCH] util-linux: remove fcntl-lock Since upstream util-linux's flock command now supports the --fcntl flag, there is no longer any reason to keep building the separate fcntl-lock binary. Signed-off-by: Rasmus Villemoes Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 1 - .../util-linux/util-linux/fcntl-lock.c | 332 ------------------ .../util-linux/util-linux_2.41.1.bb | 8 - 3 files changed, 341 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/fcntl-lock.c diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4c1105b6aec..e7a3c5be9fe 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -16,7 +16,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://fcntl-lock.c \ file://0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch \ file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \ file://0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch \ diff --git a/meta/recipes-core/util-linux/util-linux/fcntl-lock.c b/meta/recipes-core/util-linux/util-linux/fcntl-lock.c deleted file mode 100644 index 966d8c5ecb6..00000000000 --- a/meta/recipes-core/util-linux/util-linux/fcntl-lock.c +++ /dev/null @@ -1,332 +0,0 @@ -// From https://github.com/magnumripper/fcntl-lock -// SPDX-License-Identifier: MIT -/* ----------------------------------------------------------------------- * - * - * Copyright 2003-2005 H. Peter Anvin - All Rights Reserved - * Copyright 2015 magnum (fcntl version) - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * ----------------------------------------------------------------------- */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define PACKAGE_STRING "magnum" -#define _(x) (x) - -static const struct option long_options[] = { - { "shared", 0, NULL, 's' }, - { "exclusive", 0, NULL, 'x' }, - { "unlock", 0, NULL, 'u' }, - { "nonblocking", 0, NULL, 'n' }, - { "nb", 0, NULL, 'n' }, - { "timeout", 1, NULL, 'w' }, - { "wait", 1, NULL, 'w' }, - { "close", 0, NULL, 'o' }, - { "help", 0, NULL, 'h' }, - { "version", 0, NULL, 'V' }, - { 0, 0, 0, 0 } -}; - -const char *program; - -static void usage(int ex) -{ - fputs("fcntl-lock (" PACKAGE_STRING ")\n", stderr); - fprintf(stderr, - _("Usage: %1$s [-sxun][-w #] fd#\n" - " %1$s [-sxon][-w #] file [-c] command...\n" - " %1$s [-sxon][-w #] directory [-c] command...\n" - " -s --shared Get a shared lock\n" - " -x --exclusive Get an exclusive lock\n" - " -u --unlock Remove a lock\n" - " -n --nonblock Fail rather than wait\n" - " -w --timeout Wait for a limited amount of time\n" - " -o --close Close file descriptor before running command\n" - " -c --command Run a single command string through the shell\n" - " -h --help Display this text\n" - " -V --version Display version\n"), - program); - exit(ex); -} - - -static sig_atomic_t timeout_expired = 0; - -static void timeout_handler(int sig) -{ - (void)sig; - - timeout_expired = 1; -} - - -static char * strtotimeval(const char *str, struct timeval *tv) -{ - char *s; - long fs; /* Fractional seconds */ - int i; - - tv->tv_sec = strtol(str, &s, 10); - fs = 0; - - if ( *s == '.' ) { - s++; - - for ( i = 0 ; i < 6 ; i++ ) { - if ( !isdigit(*s) ) - break; - - fs *= 10; - fs += *s++ - '0'; - } - - for ( ; i < 6; i++ ) - fs *= 10; - - while ( isdigit(*s) ) - s++; - } - - tv->tv_usec = fs; - return s; -} - -int main(int argc, char *argv[]) -{ - struct itimerval timeout, old_timer; - int have_timeout = 0; - int type = F_WRLCK; - int block = F_SETLKW; - int fd = -1; - int opt, ix; - int do_close = 0; - int err; - int status; - char *eon; - char **cmd_argv = NULL, *sh_c_argv[4]; - struct flock lock; - const char *filename = NULL; - struct sigaction sa, old_sa; - - program = argv[0]; - - if ( argc < 2 ) - usage(EX_USAGE); - - memset(&timeout, 0, sizeof timeout); - - optopt = 0; - while ( (opt = getopt_long(argc, argv, "+sexnouw:hV?", long_options, &ix)) != EOF ) { - switch(opt) { - case 's': - type = F_RDLCK; - break; - case 'e': - case 'x': - type = F_WRLCK; - break; - case 'u': - type = F_UNLCK; - break; - case 'o': - do_close = 1; - break; - case 'n': - block = F_SETLK; - break; - case 'w': - have_timeout = 1; - eon = strtotimeval(optarg, &timeout.it_value); - if ( *eon ) - usage(EX_USAGE); - break; - case 'V': - printf("fcntl-lock (%s)\n", PACKAGE_STRING); - exit(0); - default: - /* optopt will be set if this was an unrecognized option, i.e. *not* 'h' or '?' */ - usage(optopt ? EX_USAGE : 0); - break; - } - } - - if ( argc > optind+1 ) { - /* Run command */ - - if ( !strcmp(argv[optind+1], "-c") || - !strcmp(argv[optind+1], "--command") ) { - - if ( argc != optind+3 ) { - fprintf(stderr, _("%s: %s requires exactly one command argument\n"), - program, argv[optind+1]); - exit(EX_USAGE); - } - - cmd_argv = sh_c_argv; - - cmd_argv[0] = getenv("SHELL"); - if ( !cmd_argv[0] || !*cmd_argv[0] ) - cmd_argv[0] = _PATH_BSHELL; - - cmd_argv[1] = "-c"; - cmd_argv[2] = argv[optind+2]; - cmd_argv[3] = 0; - } else { - cmd_argv = &argv[optind+1]; - } - - filename = argv[optind]; - fd = open(filename, O_RDWR|O_NOCTTY|O_CREAT, 0666); - /* Linux doesn't like O_CREAT on a directory, even though it should be a - no-op */ - if (fd < 0 && errno == EISDIR) - fd = open(filename, O_RDONLY|O_NOCTTY); - - if ( fd < 0 ) { - err = errno; - fprintf(stderr, _("%s: cannot open lock file %s: %s\n"), - program, argv[optind], strerror(err)); - exit((err == ENOMEM||err == EMFILE||err == ENFILE) ? EX_OSERR : - (err == EROFS||err == ENOSPC) ? EX_CANTCREAT : - EX_NOINPUT); - } - - } else if (optind < argc) { - /* Use provided file descriptor */ - - fd = (int)strtol(argv[optind], &eon, 10); - if ( *eon || !argv[optind] ) { - fprintf(stderr, _("%s: bad number: %s\n"), program, argv[optind]); - exit(EX_USAGE); - } - - } else { - /* Bad options */ - - fprintf(stderr, _("%s: requires file descriptor, file or directory\n"), - program); - exit(EX_USAGE); - } - - - if ( have_timeout ) { - if ( timeout.it_value.tv_sec == 0 && - timeout.it_value.tv_usec == 0 ) { - /* -w 0 is equivalent to -n; this has to be special-cased - because setting an itimer to zero means disabled! */ - - have_timeout = 0; - block = F_SETLK; - } else { - memset(&sa, 0, sizeof sa); - - sa.sa_handler = timeout_handler; - sa.sa_flags = SA_RESETHAND; - sigaction(SIGALRM, &sa, &old_sa); - - setitimer(ITIMER_REAL, &timeout, &old_timer); - } - } - - memset(&lock, 0, sizeof(lock)); - lock.l_type = type; - while ( fcntl(fd, block, &lock) ) { - switch( (err = errno) ) { - case EAGAIN: /* -n option set and failed to lock */ - case EACCES: /* -n option set and failed to lock */ - exit(1); - case EINTR: /* Signal received */ - if ( timeout_expired ) - exit(1); /* -w option set and failed to lock */ - continue; /* otherwise try again */ - default: /* Other errors */ - if ( filename ) - fprintf(stderr, "%s: %s: %s\n", program, filename, strerror(err)); - else - fprintf(stderr, "%s: %d: %s\n", program, fd, strerror(err)); - exit((err == ENOLCK||err == ENOMEM) ? EX_OSERR : EX_DATAERR); - } - } - - if ( have_timeout ) { - setitimer(ITIMER_REAL, &old_timer, NULL); /* Cancel itimer */ - sigaction(SIGALRM, &old_sa, NULL); /* Cancel signal handler */ - } - - status = 0; - - if ( cmd_argv ) { - pid_t w, f; - - /* Clear any inherited settings */ - signal(SIGCHLD, SIG_DFL); - f = fork(); - - if ( f < 0 ) { - err = errno; - fprintf(stderr, _("%s: fork failed: %s\n"), program, strerror(err)); - exit(EX_OSERR); - } else if ( f == 0 ) { - if ( do_close ) - close(fd); - err = errno; - execvp(cmd_argv[0], cmd_argv); - /* execvp() failed */ - fprintf(stderr, "%s: %s: %s\n", program, cmd_argv[0], strerror(err)); - _exit((err == ENOMEM) ? EX_OSERR: EX_UNAVAILABLE); - } else { - do { - w = waitpid(f, &status, 0); - if (w == -1 && errno != EINTR) - break; - } while ( w != f ); - - if (w == -1) { - err = errno; - status = EXIT_FAILURE; - fprintf(stderr, "%s: waitpid failed: %s\n", program, strerror(err)); - } else if ( WIFEXITED(status) ) - status = WEXITSTATUS(status); - else if ( WIFSIGNALED(status) ) - status = WTERMSIG(status) + 128; - else - status = EX_OSERR; /* WTF? */ - } - } - - return status; -} diff --git a/meta/recipes-core/util-linux/util-linux_2.41.1.bb b/meta/recipes-core/util-linux/util-linux_2.41.1.bb index 41fb3e59513..b591680c1ed 100644 --- a/meta/recipes-core/util-linux/util-linux_2.41.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.41.1.bb @@ -17,7 +17,6 @@ LICENSE:${PN}-colcrt = "BSD-4-Clause-UC" LICENSE:${PN}-colrm = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" LICENSE:${PN}-column = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" LICENSE:${PN}-coresched = "EUPL-1.2 & ${LIBCOMMON_LICENSES}" -LICENSE:${PN}-fcntl-lock = "MIT" LICENSE:${PN}-fdisk = "GPL-1.0-or-later & ${DEFAULT_LICENSES}" LICENSE:${PN}-fsfreeze = "GPL-1.0-or-later" LICENSE:${PN}-hexdump = "BSD-4-Clause-UC & ${LIBCOMMON_LICENSES}" @@ -227,11 +226,6 @@ do_compile:prepend () { [ -e ${S}/libsmartcols/src/filter-parser.c ] && touch ${S}/libsmartcols/src/filter-parser.c } -do_compile:append () { - cp ${UNPACKDIR}/fcntl-lock.c ${S}/fcntl-lock.c - ${CC} ${CFLAGS} ${LDFLAGS} ${S}/fcntl-lock.c -o ${B}/fcntl-lock -} - do_install:append () { mkdir -p ${D}${base_bindir} @@ -261,8 +255,6 @@ do_install:append () { echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall rm -f ${D}${bindir}/chkdupexe - - install -m 0755 ${B}/fcntl-lock ${D}${bindir} } do_install:append:class-target () { -- 2.47.3