Re: [oe] [meta-oe][PATCH] usleep: fix compile errors

2024-06-05 Thread Khem Raj
On Wed, Jun 5, 2024 at 10:02 PM Kai Kang via lists.openembedded.org
 wrote:
>
> From: Kai Kang 
>
> Update usleep.c to fix following compile error:
>
> | usleep.c: In function 'main':
> | usleep.c:47:43: error: passing argument 3 of 'poptGetContext' from 
> incompatible pointer type [-Wincompatible-pointer-types]
> |47 |   optCon = poptGetContext("usleep", argc, argv, options,0);
> |   |   ^~~~
> |   |   |
> |   |   char **
> | In file included from usleep.c:29:
> | 
> /path_to/tmp-glibc/work/core2-64-wrs-linux/usleep/1.2/recipe-sysroot/usr/include/popt.h:217:41:
>  note: expected 'const char **' but argument is of type 'char **'
> |   217 | int argc, const char ** argv,
> |   |   ~~^~~~
> | usleep.c:68:12: warning: assignment discards 'const' qualifier from pointer 
> target type [-Wdiscarded-qualifiers]
> |68 |   countStr = poptGetArg(optCon);
> |   |^
>

What is the upstream status of this patch ?

> Signed-off-by: Kai Kang 
> ---
>  meta-oe/recipes-core/usleep/files/usleep.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-core/usleep/files/usleep.c 
> b/meta-oe/recipes-core/usleep/files/usleep.c
> index a5e7d9d715..dfa52ec19a 100644
> --- a/meta-oe/recipes-core/usleep/files/usleep.c
> +++ b/meta-oe/recipes-core/usleep/files/usleep.c
> @@ -34,7 +34,7 @@ int main(int argc, char **argv) {
>int showVersion = 0;
>int showOot = 0;
>int rc;
> -  char * countStr = NULL;
> +  const char * countStr = NULL;
>struct poptOption options[] = {
>  { "version", 'v', POPT_ARG_NONE, &showVersion, 0,
> "Display the version of this program, and exit" },
> @@ -44,7 +44,7 @@ int main(int argc, char **argv) {
>  { 0, 0, 0, 0, 0 }
>  };
>
> -  optCon = poptGetContext("usleep", argc, argv, options,0);
> +  optCon = poptGetContext("usleep", argc, (const char **)argv, options,0);
>/*poptReadDefaultConfig(optCon, 1);*/
>poptSetOtherOptionHelp(optCon, "[microseconds]");
>
> --
> 2.42.0
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110708): 
https://lists.openembedded.org/g/openembedded-devel/message/110708
Mute This Topic: https://lists.openembedded.org/mt/106517953/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][PATCH] usleep: fix compile errors

2024-06-05 Thread Kai Kang via lists.openembedded.org
From: Kai Kang 

Update usleep.c to fix following compile error:

| usleep.c: In function 'main':
| usleep.c:47:43: error: passing argument 3 of 'poptGetContext' from 
incompatible pointer type [-Wincompatible-pointer-types]
|47 |   optCon = poptGetContext("usleep", argc, argv, options,0);
|   |   ^~~~
|   |   |
|   |   char **
| In file included from usleep.c:29:
| 
/path_to/tmp-glibc/work/core2-64-wrs-linux/usleep/1.2/recipe-sysroot/usr/include/popt.h:217:41:
 note: expected 'const char **' but argument is of type 'char **'
|   217 | int argc, const char ** argv,
|   |   ~~^~~~
| usleep.c:68:12: warning: assignment discards 'const' qualifier from pointer 
target type [-Wdiscarded-qualifiers]
|68 |   countStr = poptGetArg(optCon);
|   |^

Signed-off-by: Kai Kang 
---
 meta-oe/recipes-core/usleep/files/usleep.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/usleep/files/usleep.c 
b/meta-oe/recipes-core/usleep/files/usleep.c
index a5e7d9d715..dfa52ec19a 100644
--- a/meta-oe/recipes-core/usleep/files/usleep.c
+++ b/meta-oe/recipes-core/usleep/files/usleep.c
@@ -34,7 +34,7 @@ int main(int argc, char **argv) {
   int showVersion = 0;
   int showOot = 0;
   int rc;
-  char * countStr = NULL;
+  const char * countStr = NULL;
   struct poptOption options[] = {
 { "version", 'v', POPT_ARG_NONE, &showVersion, 0, 
"Display the version of this program, and exit" },
@@ -44,7 +44,7 @@ int main(int argc, char **argv) {
 { 0, 0, 0, 0, 0 }
 };
 
-  optCon = poptGetContext("usleep", argc, argv, options,0);
+  optCon = poptGetContext("usleep", argc, (const char **)argv, options,0);
   /*poptReadDefaultConfig(optCon, 1);*/
   poptSetOtherOptionHelp(optCon, "[microseconds]");
 
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110707): 
https://lists.openembedded.org/g/openembedded-devel/message/110707
Mute This Topic: https://lists.openembedded.org/mt/106517953/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [PATCH 1/2] cmpi-bindings: ignore incompatible-pointer-types errors for now.

2024-06-05 Thread leimaohui via lists.openembedded.org
Thank you very much, I got it. I'll get methods from upstream instead of ignore 
the error.

> -Original Message-
> From: Martin Jansa 
> Sent: Wednesday, June 5, 2024 5:11 PM
> To: Lei, Maohui 
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [PATCH 1/2] cmpi-bindings: ignore
> incompatible-pointer-types errors for now.
> 
> There is already patch covering all such cases detected in my world builds,
> see "pidgin pidgin-sipe pidgin uw-imap rrdtool cmpi-bindings
> libdbd-mysql-perl daq" and
> "catch2 openldap microsoft-gsl scsirastools pam-ssh-agent-auth sblim-sfcb
> cker.."
> commits in:
> https://git.openembedded.org/meta-openembedded/log/?h=master-next
> 
> They weren't merged because I think khem wants to motivate people to fix
> these issues instead of just ignoring them and these 2 are just to keep world
> builds cleaner while incrementally working on detected issues.
> 
> Please check if upstream already has a fix in newer version and backport that
> or submit fix to upstream and add it to meta-oe.
> 
> Major distributions are now switching to gcc-14 as well so it is getting 
> easier
> to find already created patches in upstream or distros, e.g. gentoo tracker:
> https://bugs.gentoo.org/showdependencytree.cgi?id=870412
> 
> On Wed, Jun 5, 2024 at 10:27 AM leimaohui via lists.openembedded.org
>  wrote:
> >
> > Hi
> >
> > It seems there are many recipes have the same issue. I found there are two
> methods that fix this issue from git log of poky.
> > One is ignore incompatible-pointer-types, the other is submitting a patch of
> source code.
> > I'm not sure which method is more popular...
> >
> >
> > Best regards
> > Lei
> >
> >
> > > -Original Message-
> > > From: openembedded-devel@lists.openembedded.org
> > >  On Behalf Of leimaohui
> > > via lists.openembedded.org
> > > Sent: Wednesday, June 5, 2024 2:40 PM
> > > To: openembedded-devel@lists.openembedded.org
> > > Cc: Lei, Maohui 
> > > Subject: [oe] [PATCH 1/2] cmpi-bindings: ignore
> > > incompatible-pointer-types errors for now.
> > >
> > > From: Lei Maohui 
> > >
> > > GCC 14 implicitly turns a warning into a compiler error:
> > >
> > > |
> > > /build-ubinux-daily/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.
> > > 4/git/
> > > swig/python/../../src/target_python.c:168:21: error: passing
> > > argument 1 of 'Py_SetProgramName' from incompatible pointer type
> > > [-Wincompatible-pointer-types]
> > > |   168 |   Py_SetProgramName("cmpi_swig");
> > > |   | ^~~
> > > |   | |
> > > |   | char *
> > >
> > > Signed-off-by: Lei Maohui 
> > > ---
> > >  meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb | 2
> > > +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git
> > > a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> > > b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> > > index 781dc83da9..d062e46bb9 100644
> > > --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> > > +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> > > @@ -27,7 +27,7 @@ EXTRA_OECMAKE = "-DLIB='${baselib}' \  # With
> > > Ninja it fails with:
> > >  # ninja: error: build.ninja:282: bad $-escape (literal $ must be
> > > written as $$) OECMAKE_GENERATOR = "Unix Makefiles"
> > > -
> > > +CFLAGS += "-Wno-error=incompatible-pointer-types"
> > >  FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so
> > > ${PYTHON_SITEPACKAGES_DIR}/*"
> > >  FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so"
> > >
> > > --
> > > 2.34.1
> >
> >
> > 
> >

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110706): 
https://lists.openembedded.org/g/openembedded-devel/message/110706
Mute This Topic: https://lists.openembedded.org/mt/106498591/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][PATCH] sexpect: add new recipe

2024-06-05 Thread bar...@tkos.co.il via lists.openembedded.org
sexpect is an expect like utility that is designed in the client/server
model. This makes it suitable for use in shell script to control
multiple interactive programs from a single script.

Signed-off-by: Baruch Siach 
---
 meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb | 12 
 1 file changed, 12 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb

diff --git a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb 
b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb
new file mode 100644
index ..1b064faf160c
--- /dev/null
+++ b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb
@@ -0,0 +1,12 @@
+SUMMARY = "sexpect is another implementation of Expect which is specifically 
designed for Shell scripts"
+HOMEPAGE = "https://github.com/clarkwang/sexpect";
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+
+BRANCH = "master"
+SRC_URI = "git://github.com/clarkwang/sexpect;branch=${BRANCH};protocol=https"
+SRCREV = "532a52d36aae442b7fe1ce20a59effd1dbc6e6fe"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110705): 
https://lists.openembedded.org/g/openembedded-devel/message/110705
Mute This Topic: https://lists.openembedded.org/mt/106508288/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-networking][PATCH] mdns: Upgrade 2200.100.94.0.2 -> 2200.120.24

2024-06-05 Thread Alex Kiernan
Drop 0015-Add-missing-limits.h.patch (equivalent patch merged upstream),
rebase other patches.

Signed-off-by: Alex Kiernan 
---
 ...utine-for-cleaning-recent-interfaces.patch | 16 +--
 ...0001-Fix-SIGSEGV-during-DumpStateLog.patch |  5 +---
 ...01-Handle-interface-without-ifa_addr.patch | 14 +-
 .../0001-dns-sd-Include-missing-headers.patch | 12 
 ...outine-for-tearing-down-an-interface.patch | 16 +--
 ...ke-Set-libdns_sd.so-soname-correctly.patch | 14 +-
 .../0003-Track-interface-socket-family.patch  | 22 +++
 ...cate-loopback-interface-to-mDNS-core.patch | 20 ++---
 ...-Separate-TLS-targets-from-libraries.patch | 12 
 ...0005-Use-list-for-changed-interfaces.patch | 28 +--
 ...-mDNSCore-Fix-broken-debug-parameter.patch | 13 -
 .../0006-Handle-noisy-netlink-sockets.patch   | 18 ++--
 .../0006-make-Add-top-level-Makefile.patch| 11 
 ...-deleted-interfaces-as-being-changed.patch | 14 +-
 ...0008-Handle-errors-from-socket-calls.patch | 20 ++---
 .../mdns/0009-remove-unneeded-headers.patch   | 10 +++
 .../mdns/mdns/0015-Add-missing-limits.h.patch | 23 ---
 ...2200.100.94.0.2.bb => mdns_2200.120.24.bb} |  3 +-
 18 files changed, 122 insertions(+), 149 deletions(-)
 delete mode 100644 
meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch
 rename meta-networking/recipes-protocols/mdns/{mdns_2200.100.94.0.2.bb => 
mdns_2200.120.24.bb} (98%)

diff --git 
a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
 
b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
index f5d424d58f4e..68a395d69eef 100644
--- 
a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
+++ 
b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
@@ -1,7 +1,7 @@
-From c1f3e19d3cb0aa948248616eb1684a1e80aa39b4 Mon Sep 17 00:00:00 2001
+From 1fefe289d0c907392382eb2fa2f1f0ecac02f85d Mon Sep 17 00:00:00 2001
 From: Nate Karstens 
 Date: Wed, 28 Jun 2017 17:30:00 -0500
-Subject: [PATCH 1/8] Create subroutine for cleaning recent interfaces
+Subject: [PATCH] Create subroutine for cleaning recent interfaces
 
 Moves functionality for cleaning the list of recent
 interfaces into its own subroutine.
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan 
  mDNSPosix/mDNSPosix.c | 24 ++--
  1 file changed, 14 insertions(+), 10 deletions(-)
 
-Index: mDNSResponder/mDNSPosix/mDNSPosix.c
-===
 mDNSResponder.orig/mDNSPosix/mDNSPosix.c
-+++ mDNSResponder/mDNSPosix/mDNSPosix.c
-@@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockadd
+diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
+index 3b761d04e3c4..5aa220cf694e 100644
+--- a/mDNSPosix/mDNSPosix.c
 b/mDNSPosix/mDNSPosix.c
+@@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, 
mDNSIPPort port, int interf
  return err;
  }
  
@@ -38,7 +38,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c
  // Creates a PosixNetworkInterface for the interface whose IP address is
  // intfAddr and whose name is intfName and registers it with mDNS core.
  mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, 
struct sockaddr *intfMask,
-@@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c
+@@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m)
  
  // Clean up.
  if (intfList != NULL) freeifaddrs(intfList);
diff --git 
a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
 
b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
index 4b0227f1dc38..abf82b1e02f7 100644
--- 
a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
+++ 
b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
@@ -1,4 +1,4 @@
-From 14cc53bb09a3d8adf301f3842c765598467e63e1 Mon Sep 17 00:00:00 2001
+From 2db1f5bc941e4b4cd1721e361a47cfe288b07a76 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan 
 Date: Thu, 1 Feb 2024 14:07:03 +
 Subject: [PATCH] Fix SIGSEGV during DumpStateLog()
@@ -25,6 +25,3 @@ index 7a4ca19eff6d..d449dde320f6 100644
  {
  return;
  }
--- 
-2.39.0
-
diff --git 
a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
 
b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
index 7e76f07c0eb3..7ec5996013f3 100644
--- 
a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
+++ 
b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
@@ -1,4 +1,4 @@
-From 1cc54320306e07c1fc0eed98e7fbcbb07a2f3b28 Mon Sep 17 

[oe] [meta-networking][PATCH] frr: update 9.1 to 10.0

2024-06-05 Thread Jonas Gorski
Update FRR from version 9.1 to newest 10.0.

Signed-off-by: Jonas Gorski 
---
 .../recipes-protocols/frr/{frr_9.1.bb => frr_10.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-protocols/frr/{frr_9.1.bb => frr_10.0.bb} (98%)

diff --git a/meta-networking/recipes-protocols/frr/frr_9.1.bb 
b/meta-networking/recipes-protocols/frr/frr_10.0.bb
similarity index 98%
rename from meta-networking/recipes-protocols/frr/frr_9.1.bb
rename to meta-networking/recipes-protocols/frr/frr_10.0.bb
index b1c9153becf2..bdc359667a7e 100644
--- a/meta-networking/recipes-protocols/frr/frr_9.1.bb
+++ b/meta-networking/recipes-protocols/frr/frr_10.0.bb
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = 
"file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a
 
file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c"
 
 
-SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 
\
+SRC_URI = 
"git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \
file://frr.pam \

file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \
"
 
-SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5"
+SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02"
 
 UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P\d+(\.\d+)+)$"
 
-- 
2.45.1


-- 
BISDN GmbH
Körnerstraße 7-10
10785 Berlin
Germany


Phone: 
+49-30-6108-1-6100


Managing Directors: 
Dr.-Ing. Hagen Woesner, Andreas 
Köpsel


Commercial register: 
Amtsgericht Berlin-Charlottenburg HRB 141569 
B
VAT ID No: DE283257294


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110703): 
https://lists.openembedded.org/g/openembedded-devel/message/110703
Mute This Topic: https://lists.openembedded.org/mt/106501872/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [PATCH 1/2] cmpi-bindings: ignore incompatible-pointer-types errors for now.

2024-06-05 Thread Martin Jansa
There is already patch covering all such cases detected in my world builds, see
"pidgin pidgin-sipe pidgin uw-imap rrdtool cmpi-bindings
libdbd-mysql-perl daq" and
"catch2 openldap microsoft-gsl scsirastools pam-ssh-agent-auth
sblim-sfcb cker.."
commits in:
https://git.openembedded.org/meta-openembedded/log/?h=master-next

They weren't merged because I think khem wants to motivate people to
fix these issues instead of just ignoring them and these 2 are just to
keep world builds cleaner while incrementally working on detected
issues.

Please check if upstream already has a fix in newer version and
backport that or submit fix to upstream and add it to meta-oe.

Major distributions are now switching to gcc-14 as well so it is
getting easier to find already created patches in upstream or distros,
e.g. gentoo tracker:
https://bugs.gentoo.org/showdependencytree.cgi?id=870412

On Wed, Jun 5, 2024 at 10:27 AM leimaohui via lists.openembedded.org
 wrote:
>
> Hi
>
> It seems there are many recipes have the same issue. I found there are two 
> methods that fix this issue from git log of poky.
> One is ignore incompatible-pointer-types, the other is submitting a patch of 
> source code.
> I'm not sure which method is more popular...
>
>
> Best regards
> Lei
>
>
> > -Original Message-
> > From: openembedded-devel@lists.openembedded.org
> >  On Behalf Of leimaohui via
> > lists.openembedded.org
> > Sent: Wednesday, June 5, 2024 2:40 PM
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Lei, Maohui 
> > Subject: [oe] [PATCH 1/2] cmpi-bindings: ignore incompatible-pointer-types
> > errors for now.
> >
> > From: Lei Maohui 
> >
> > GCC 14 implicitly turns a warning into a compiler error:
> >
> > |
> > /build-ubinux-daily/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.4/git/
> > swig/python/../../src/target_python.c:168:21: error: passing argument 1 of
> > 'Py_SetProgramName' from incompatible pointer type
> > [-Wincompatible-pointer-types]
> > |   168 |   Py_SetProgramName("cmpi_swig");
> > |   | ^~~
> > |   | |
> > |   | char *
> >
> > Signed-off-by: Lei Maohui 
> > ---
> >  meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> > b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> > index 781dc83da9..d062e46bb9 100644
> > --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> > +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> > @@ -27,7 +27,7 @@ EXTRA_OECMAKE = "-DLIB='${baselib}' \  # With Ninja
> > it fails with:
> >  # ninja: error: build.ninja:282: bad $-escape (literal $ must be written 
> > as $$)
> > OECMAKE_GENERATOR = "Unix Makefiles"
> > -
> > +CFLAGS += "-Wno-error=incompatible-pointer-types"
> >  FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so
> > ${PYTHON_SITEPACKAGES_DIR}/*"
> >  FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so"
> >
> > --
> > 2.34.1
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110702): 
https://lists.openembedded.org/g/openembedded-devel/message/110702
Mute This Topic: https://lists.openembedded.org/mt/106498591/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [PATCH 1/2] cmpi-bindings: ignore incompatible-pointer-types errors for now.

2024-06-05 Thread leimaohui via lists.openembedded.org
Hi

It seems there are many recipes have the same issue. I found there are two 
methods that fix this issue from git log of poky.
One is ignore incompatible-pointer-types, the other is submitting a patch of 
source code.
I'm not sure which method is more popular...


Best regards
Lei


> -Original Message-
> From: openembedded-devel@lists.openembedded.org
>  On Behalf Of leimaohui via
> lists.openembedded.org
> Sent: Wednesday, June 5, 2024 2:40 PM
> To: openembedded-devel@lists.openembedded.org
> Cc: Lei, Maohui 
> Subject: [oe] [PATCH 1/2] cmpi-bindings: ignore incompatible-pointer-types
> errors for now.
> 
> From: Lei Maohui 
> 
> GCC 14 implicitly turns a warning into a compiler error:
> 
> |
> /build-ubinux-daily/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.4/git/
> swig/python/../../src/target_python.c:168:21: error: passing argument 1 of
> 'Py_SetProgramName' from incompatible pointer type
> [-Wincompatible-pointer-types]
> |   168 |   Py_SetProgramName("cmpi_swig");
> |   | ^~~
> |   | |
> |   | char *
> 
> Signed-off-by: Lei Maohui 
> ---
>  meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> index 781dc83da9..d062e46bb9 100644
> --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
> @@ -27,7 +27,7 @@ EXTRA_OECMAKE = "-DLIB='${baselib}' \  # With Ninja
> it fails with:
>  # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as 
> $$)
> OECMAKE_GENERATOR = "Unix Makefiles"
> -
> +CFLAGS += "-Wno-error=incompatible-pointer-types"
>  FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so
> ${PYTHON_SITEPACKAGES_DIR}/*"
>  FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so"
> 
> --
> 2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110701): 
https://lists.openembedded.org/g/openembedded-devel/message/110701
Mute This Topic: https://lists.openembedded.org/mt/106498591/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][PATCH v4 1/3] rrdtool: fix compilation with GCC 14

2024-06-05 Thread Dmitry Baryshkov
Import patch from the rrdtool's git to fix building with GCC 14. Note,
it also requires fixing other tools (like lmsensors) in a similar way.

Signed-off-by: Dmitry Baryshkov 
---

With this patchset the rrdtool and recipes depending on it (lm-sensors,
ntopng, collectd) can be built w/o errors.

---
 ...3c578f1e9f582e9c28f50d82b1f569602075.patch | 1583 +
 .../recipes-extended/rrdtool/rrdtool_1.8.0.bb |1 +
 2 files changed, 1584 insertions(+)
 create mode 100644 
meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch

diff --git 
a/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch
 
b/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch
new file mode 100644
index ..7f54a3723d55
--- /dev/null
+++ 
b/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch
@@ -0,0 +1,1583 @@
+From b76e3c578f1e9f582e9c28f50d82b1f569602075 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20Such=C3=A1nek?= 
+Date: Fri, 5 Jan 2024 15:31:48 +0100
+Subject: [PATCH] Constify argv, fix warnings. (#1242)
+
+* Fix perl warnings
+
+ - cast POPs to void to avoid unused value warning
+ - declare functions that don't set RETVAL as returning void
+
+Signed-off-by: Michal Suchanek 
+
+* Constify argv
+
+rrd has no business modifying the string pointed to by passed agrv, and
+as far as gcc can see it does indeed not modify them because it compiles
+with const argv.
+
+This fixes warnings when passing const strings into rrd, and avoids the
+need to duplicate all strings in the tcl bindings.
+
+This fixes warnings like these:
+[3s] prog/sensord/rrd.c: In function 'rrdInit':
+[3s] prog/sensord/rrd.c:302:40: warning: cast discards 'const' qualifier 
from pointer target type [-Wcast-qual]
+[3s]   302 | ret = rrd_create(argc, (char**) argv);
+[3s]   |^
+[3s] prog/sensord/rrd.c: In function 'rrdUpdate':
+[3s] prog/sensord/rrd.c:458:42: warning: cast discards 'const' qualifier 
from pointer target type [-Wcast-qual]
+[3s]   458 | if ((ret = rrd_update(3, (char **) /* WEAK */ 
argv))) {
+[3s]   |  ^
+
+Signed-off-by: Michal Suchanek 
+
+* tcl: Do not duplicate const strings
+
+-
+
+Signed-off-by: Michal Suchanek 
+Upstream-Status: Backport 
[https://github.com/oetiker/rrdtool-1.x/commit/b76e3c578f1e9f582e9c28f50d82b1f569602075]
+---
+ CHANGES |  3 ++
+ bindings/lua/rrdlua.c   | 25 +-
+ bindings/perl-shared/RRDs.xs| 36 +++---
+ bindings/python/rrdtoolmodule.c | 38 +++
+ bindings/ruby/main.c| 10 ++--
+ bindings/tcl/tclrrd.c   | 84 -
+ src/optparse.c  | 14 +++---
+ src/optparse.h  |  6 +--
+ src/rrd.h   | 38 +++
+ src/rrd_cgi.c   | 24 +-
+ src/rrd_create.c|  2 +-
+ src/rrd_daemon.c| 12 ++---
+ src/rrd_dump.c  |  4 +-
+ src/rrd_fetch.c |  2 +-
+ src/rrd_first.c |  2 +-
+ src/rrd_flushcached.c   |  2 +-
+ src/rrd_graph.c |  6 +--
+ src/rrd_graph.h |  4 +-
+ src/rrd_graph_helper.c  |  2 +-
+ src/rrd_info.c  |  2 +-
+ src/rrd_last.c  |  2 +-
+ src/rrd_lastupdate.c|  2 +-
+ src/rrd_list.c  |  6 +--
+ src/rrd_modify.c|  2 +-
+ src/rrd_modify.h|  2 +-
+ src/rrd_resize.c|  4 +-
+ src/rrd_restore.c   |  2 +-
+ src/rrd_tool.c  | 26 +-
+ src/rrd_tune.c  |  2 +-
+ src/rrd_update.c|  4 +-
+ src/rrd_xport.c |  2 +-
+ src/rrdupdate.c |  7 +--
+ 32 files changed, 168 insertions(+), 209 deletions(-)
+
+diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
+index d1a700641..2095c3b5b 100644
+--- a/bindings/lua/rrdlua.c
 b/bindings/lua/rrdlua.c
+@@ -37,8 +37,8 @@
+ extern void rrd_freemem(void *mem);
+ 
+ extern int luaopen_rrd (lua_State * L);
+-typedef int (*RRD_FUNCTION)(int, char **);
+-typedef rrd_info_t *(RRD_FUNCTION_V)(int, char **);
++typedef int (*RRD_FUNCTION)(int, const char **);
++typedef rrd_info_t *(RRD_FUNCTION_V)(int, const char **);
+ 
+ /**/
+ 
+@@ -49,9 +49,9 @@ static void reset_rrd_state(void)
+ rrd_clear_error();
+ }
+ 
+-static char **make_argv(const char *cmd, lua_State * L)
++static const char **make_argv(const char *cmd, lua_State * L)
+ {
+-  char **argv;
++  const char **argv;
+   int i;
+   int argc = lua_gettop(L) + 1;
+ 
+@@ -60,13 +60,12 @@ static char **make_argv(const char *cmd, lua_State * L)
+ luaL_error(L, "Can'

[oe] [meta-oe][PATCH v4 2/3] lmsensors: fix building with GCC 14

2024-06-05 Thread Dmitry Baryshkov
GCC 14 is more strict regarding const pointers conversion. Fix
conversion to let lmsensors build with GCC 14.

Signed-off-by: Dmitry Baryshkov 
---
 .../0001-Fix-building-with-GCC-14.patch   | 36 +++
 .../recipes-bsp/lm_sensors/lmsensors_3.6.0.bb |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 
meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch

diff --git 
a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch 
b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
new file mode 100644
index ..0ff8b3801b95
--- /dev/null
+++ 
b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
@@ -0,0 +1,36 @@
+From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov 
+Date: Fri, 24 May 2024 14:16:21 +0300
+Subject: [PATCH] Fix building with GCC 14
+
+Signed-off-by: Dmitry Baryshkov 
+Upstream-Status: Submitted [https://github.com/lm-sensors/lm-sensors/pull/497]
+---
+ prog/sensord/rrd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
+index a531362bddd5..36d685fce514 100644
+--- a/prog/sensord/rrd.c
 b/prog/sensord/rrd.c
+@@ -299,7 +299,7 @@ int rrdInit(void)
+   argv[argc++] = rraBuff;
+   argv[argc] = NULL;
+ 
+-  ret = rrd_create(argc, (char**) argv);
++  ret = rrd_create(argc, (const char**) argv);
+   if (ret == -1) {
+   sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
+ sensord_args.rrdFile, rrd_get_error());
+@@ -455,7 +455,7 @@ int rrdUpdate(void)
+   const char *argv[] = {
+   "sensord", sensord_args.rrdFile, rrdBuff, NULL
+   };
+-  if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
++  if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) {
+   sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
+ sensord_args.rrdFile, rrd_get_error());
+   }
+-- 
+2.39.2
+
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb 
b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
index f956224e1820..07027225c58b 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
@@ -14,6 +14,7 @@ SRC_URI = 
"git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=mast
file://fancontrol.init \
file://sensord.init \
file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
+   file://0001-Fix-building-with-GCC-14.patch \
 "
 SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
 
-- 
2.39.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110698): 
https://lists.openembedded.org/g/openembedded-devel/message/110698
Mute This Topic: https://lists.openembedded.org/mt/106499227/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][PATCH v4 3/3] ntopng: fix building with GCC 14

2024-06-05 Thread Dmitry Baryshkov
GCC 14 is more strict regarding const pointers conversion. Fix
conversion to let ntpong build with GCC 14 and updated rrdtool. The
patch is not submitted upstream yet, the project requires singing of
CLA.

Signed-off-by: Dmitry Baryshkov 
---
 .../0001-Follow-rrd-post-1.8-change.patch | 32 +++
 .../recipes-support/ntopng/ntopng_5.2.1.bb|  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 
meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch

diff --git 
a/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch
 
b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch
new file mode 100644
index ..eefd4e1ab2ef
--- /dev/null
+++ 
b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch
@@ -0,0 +1,32 @@
+From a3bd9efe78f9c381f19b99c8ceb7f52b4c2a52b8 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov 
+Date: Wed, 5 Jun 2024 09:40:17 +0300
+Subject: [PATCH] Follow rrd post-1.8 change
+
+Git version of rrdtool has changed rrd_tune argument from char pointer
+to const char pointer. GCC 14 is more strict regarding the pointer
+constantness checks and errors out in such a case. Update rrd_tune
+invokation.
+
+Signed-off-by: Dmitry Baryshkov 
+Upstream-Status: Pending [CLA is not signed on our side]
+---
+ src/LuaEngineNtop.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp
+index bd2de79e3021..dd00f1608f78 100644
+--- a/src/LuaEngineNtop.cpp
 b/src/LuaEngineNtop.cpp
+@@ -5427,7 +5427,7 @@ static int ntop_rrd_tune(lua_State* vm) {
+   filename = argv[1];
+ 
+   reset_rrd_state();
+-  status = rrd_tune(argc, (char**)argv);
++  status = rrd_tune(argc, (const char**)argv);
+ 
+   if(status != 0) {
+ char *err = rrd_get_error();
+-- 
+2.39.2
+
diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb 
b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
index a9ace9b41267..9bb93910f89a 100644
--- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
+++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
@@ -19,6 +19,7 @@ SRC_URI = 
"git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \
file://0001-autogen.sh-generate-configure.ac-only.patch \
file://0001-configure.ac.in-not-check-clang-on-host.patch \

file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \
+   file://0001-Follow-rrd-post-1.8-change.patch \
file://ntopng.service \
"
 
-- 
2.39.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110699): 
https://lists.openembedded.org/g/openembedded-devel/message/110699
Mute This Topic: https://lists.openembedded.org/mt/106499229/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][PATCH] sdbus-c++-libsystemd: Refresh patches to work with systemd 255.6

2024-06-05 Thread Khem Raj
Signed-off-by: Khem Raj 
---
 ...-not-disable-buffer-in-writing-files.patch | 119 ++
 ...22-avoid-missing-LOCK_EX-declaration.patch |  11 +-
 2 files changed, 38 insertions(+), 92 deletions(-)

diff --git 
a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch
 
b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch
index 66be79077e..c23d9b7551 100644
--- 
a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch
+++ 
b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch
@@ -46,11 +46,9 @@ Signed-off-by: Chen Qi 
  src/vconsole/vconsole-setup.c|  2 +-
  22 files changed, 50 insertions(+), 51 deletions(-)
 
-diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index d2be79622f..e65fecb68d 100644
 --- a/src/basic/cgroup-util.c
 +++ b/src/basic/cgroup-util.c
-@@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *path) {
+@@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *p
  if (r < 0)
  return r;
  
@@ -59,7 +57,7 @@ index d2be79622f..e65fecb68d 100644
  if (r < 0)
  return r;
  
-@@ -843,7 +843,7 @@ int cg_install_release_agent(const char *controller, const 
char *agent) {
+@@ -843,7 +843,7 @@ int cg_install_release_agent(const char
  
  sc = strstrip(contents);
  if (isempty(sc)) {
@@ -68,7 +66,7 @@ index d2be79622f..e65fecb68d 100644
  if (r < 0)
  return r;
  } else if (!path_equal(sc, agent))
-@@ -861,7 +861,7 @@ int cg_install_release_agent(const char *controller, const 
char *agent) {
+@@ -861,7 +861,7 @@ int cg_install_release_agent(const char
  
  sc = strstrip(contents);
  if (streq(sc, "0")) {
@@ -77,7 +75,7 @@ index d2be79622f..e65fecb68d 100644
  if (r < 0)
  return r;
  
-@@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const char *controller) {
+@@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const cha
  if (r < 0)
  return r;
  
@@ -86,7 +84,7 @@ index d2be79622f..e65fecb68d 100644
  if (r < 0)
  return r;
  
-@@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const char *controller) {
+@@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const cha
  if (r < 0)
  return r;
  
@@ -95,7 +93,7 @@ index d2be79622f..e65fecb68d 100644
  if (r < 0)
  return r;
  
-@@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *controller, const char 
*path, const char *attri
+@@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *control
  if (r < 0)
  return r;
  
@@ -104,11 +102,9 @@ index d2be79622f..e65fecb68d 100644
  }
  
  int cg_get_attribute(const char *controller, const char *path, const char 
*attribute, char **ret) {
-diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
-index 2101f617ad..63817bae17 100644
 --- a/src/basic/namespace-util.c
 +++ b/src/basic/namespace-util.c
-@@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, const char 
*gid_map) {
+@@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map,
  freeze();
  
  xsprintf(path, "/proc/" PID_FMT "/uid_map", pid);
@@ -123,11 +119,9 @@ index 2101f617ad..63817bae17 100644
  if (r < 0)
  return log_error_errno(r, "Failed to write GID map: %m");
  
-diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
-index 6cb0ddf575..247cf9e1d1 100644
 --- a/src/basic/procfs-util.c
 +++ b/src/basic/procfs-util.c
-@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
+@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi
   * decrease it, as threads-max is the much more relevant sysctl. */
  if (limit > pid_max-1) {
  sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 
is not a valid PID */
@@ -143,11 +137,9 @@ index 6cb0ddf575..247cf9e1d1 100644
  if (r < 0) {
  uint64_t threads_max;
  
-diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c
-index b66a6622ae..8d1c93008a 100644
 --- a/src/basic/sysctl-util.c
 +++ b/src/basic/sysctl-util.c
-@@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) {
+@@ -58,7 +58,7 @@ int sysctl_write(const char *property, c
  
  log_debug("Setting '%s' to '%s'", p, value);
  
@@ -156,8 +148,6 @@ index b66a6622ae..8d1c93008a 100644
  }
  
  int sysctl_writef(const char *property, const char *format, ...) {
-diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
-index d21f3f79ff..258607cc7e 100644
 --- a/src/binfmt/binfmt.c
 +++ b/src/binfmt/binfmt.c
 @@ -30,7 +30,7 @@ static bool arg_unregister = false;
@@ -169,7 +159,7 @@ index d21f3f79ff..258607cc7e 100644
  }
  
  static int apply_rule(const ch