From d3b5d01a7bd649880c04687287edf00f44aab922 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Tue, 30 Sep 2025 22:18:38 +1300 Subject: [PATCH] daemonize: update to latest revision Drop a patch that has been incorporated into this version. (That is also the changelog - the only change is the accepted patch) Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj (cherry picked from commit a5cfc39eceb8d5bd0e563458e2d55e7c51cd6beb) Signed-off-by: Ankur Tyagi Signed-off-by: Gyorgy Sarvari --- ...-many-arguments-to-function-write-er.patch | 46 ------------------- .../daemonize/daemonize_git.bb | 3 +- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch diff --git a/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch b/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch deleted file mode 100644 index 3a79dba682..0000000000 --- a/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c47fdcc0a900aea93b1967c20db42743171ab1ac Mon Sep 17 00:00:00 2001 -From: "mark.yang" -Date: Thu, 27 Mar 2025 16:46:42 +0900 -Subject: [PATCH] fix getopt.c too many arguments to function 'write' error in - gcc-15.0.1 - -In the original code, write() was declared as 'extern int write();', -which is interpreted as a function taking no parameters. -This caused errors when actually calling it with 3 parameters. -The current fix to declare it as 'extern int write(int, const void *, unsigned);' -is the correct solution. -This properly defines the write function to accept 3 parameters. - -../git/getopt.c: In function 'x_getopt': -../git/getopt.c:51:16: error: too many arguments to function 'write'; expected 0, have 3 - 51 | (void) write(2, argv[0], (unsigned)strlen(argv[0]));\ - | ^~~~~ ~ -../git/getopt.c:78:17: note: in expansion of macro 'ERR' - 78 | ERR(": illegal option -- ", c); - | ^~~ -../git/getopt.c:48:20: note: declared here - 48 | extern int write();\ - | ^~~~~ - -Upstream-Status: Submitted [https://github.com/bmc/daemonize/pull/37] -Signed-off-by: mark.yang ---- - getopt.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/getopt.c b/getopt.c -index 3f37c55..f298da7 100644 ---- a/getopt.c -+++ b/getopt.c -@@ -45,7 +45,7 @@ - #include - - #define ERR(s, c) if(x_opterr){\ -- extern int write();\ -+ extern int write(int, const void *, unsigned);\ - char errbuf[2];\ - errbuf[0] = c; errbuf[1] = '\n';\ - (void) write(2, argv[0], (unsigned)strlen(argv[0]));\ --- -2.34.1 - diff --git a/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-oe/recipes-support/daemonize/daemonize_git.bb index b0712e521b..f0b083c37e 100644 --- a/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-oe/recipes-support/daemonize/daemonize_git.bb @@ -6,10 +6,9 @@ PV = "1.7.8" inherit autotools -SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c" +SRCREV = "58237626e6999e68b9583ed1b4b08136f118f68c" SRC_URI = " \ git://github.com/bmc/daemonize.git;branch=master;protocol=https \ - file://0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch \ " S = "${WORKDIR}/git"