Skip to contentSkip to conversation

sysvinit: upgrade 3.04 -> 3.10

PATCH In review Sven Reschke 5 participants 14 messages Aug 18, 2024 – Aug 30, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sysvinit: upgrade 3.04 -> 3.10

Upgrade of sysvinit to version 3.10. The upstream moved in between to github.
Removed the following patches:
1. 0001-hddown-include-libgen.h-for-basename-API.patch Is already included in upstream
2. install.patch
Referenced PR is already merged in upstream
3. sysvinit_remove_linux_fs.patch
Is already included in upstream

The remaining patches were mostly just updated, with exception to the realpath.patch Here the changes to the killall5.c source file couldn't be merged anymore.
My guess is, that the changes are already done someway in the upstream.
At least the file is now using realpath(). I didn't touch the remaining additional includes, as I don't know if they are still needed.

---
 ...wn-include-libgen.h-for-basename-API.patch | 38 --------
 ...acros.h-for-major-minor-defines-in-g.patch |  6 +-
 .../sysvinit/sysvinit/crypt-lib.patch         |  6 +-
 .../sysvinit/sysvinit/install.patch           | 97 -------------------
 .../sysvinit/pidof-add-m-option.patch         | 24 ++---
 .../sysvinit/sysvinit/realpath.patch          | 23 +----
 .../sysvinit/sysvinit_remove_linux_fs.patch   | 17 ----
 .../{sysvinit_3.04.bb => sysvinit_3.10.bb}    |  7 +-
 8 files changed, 23 insertions(+), 195 deletions(-)
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-hddown-include-libgen.h-for-basename-API.patch
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/install.patch
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch
 rename meta/recipes-core/sysvinit/{sysvinit_3.04.bb => sysvinit_3.10.bb} (93%)
meta/recipes-core/sysvinit/sysvinit/0001-hddown-include-libgen.h-for-basename-API.patch deleted +0 -38
deleted file mode 100644
index 5e4053bad1..0000000000
@@ -1,38 +0,0 @@
-From a07c1d94e79840c59563741b45e690e77d4f3dfa Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 3 Dec 2023 20:09:30 -0800
-Subject: [PATCH] hddown: include libgen.h for basename API
-
-musl has removed the non-prototype declaration of basename from string.h [1] which now results in build errors with clang-17+ compiler
-
-include libgen.h for using the posix declaration of the funciton.
-
-Fixes
-
-hddown.c:135:8: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
-  135 |                         ptr = basename(lnk);
-      |                             ^ ~~~~~~~~~~~~~
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://github.com/slicer69/sysvinit/pull/21]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/hddown.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/hddown.c b/src/hddown.c
-index 7a2cf28..3b31bc0 100644
---- a/src/hddown.c
-+++ b/src/hddown.c
-@@ -24,6 +24,7 @@ char *v_hddown = "@(#)hddown.c  1.02  22-Apr-2003  [email protected]";
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
- #endif
-+#include <libgen.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
---
-2.43.0
-
meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch +3 -3
index 60fbd87534..2c29fd81d9 100644
@@ -13,7 +13,7 @@ Upstream-Status: Pending
  3 files changed, 3 insertions(+)
 
 diff --git a/src/bootlogd.c b/src/bootlogd.c
-index 787db87..8b07903 100644
+index a323a76..343cbbe 100644
 --- a/src/bootlogd.c
 +++ b/src/bootlogd.c
 @@ -29,6 +29,7 @@
@@ -25,7 +25,7 @@ index 787db87..8b07903 100644
  #include <sys/utsname.h>
  #include <time.h>
 diff --git a/src/mountpoint.c b/src/mountpoint.c
-index 5f20522..94df7a1 100644
+index c55b0df..5920e13 100644
 --- a/src/mountpoint.c
 +++ b/src/mountpoint.c
 @@ -25,6 +25,7 @@
@@ -37,7 +37,7 @@ index 5f20522..94df7a1 100644
  #include <stdlib.h>
  #include <string.h>
 diff --git a/src/shutdown.c b/src/shutdown.c
-index b744a2c..40b7faf 100644
+index 89b63a5..7730e53 100644
 --- a/src/shutdown.c
 +++ b/src/shutdown.c
 @@ -40,6 +40,7 @@
meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +3 -3
index 5c39fb001b..cc3df8887b 100644
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [configuration]
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 5b1a5a2..b686394 100644
+index 21cbb2e..a2c103c 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -97,15 +97,8 @@ else
- endif
+@@ -95,15 +95,8 @@ endif
+ ROOT	?= $(DESTDIR)
 
  # Additional libs for GNU libc.
 -ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
meta/recipes-core/sysvinit/sysvinit/install.patch deleted +0 -97

97 lines not on this page · raw message

meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch +12 -12
index 8ef292ed12..01df5e6ee4 100644
@@ -45,17 +45,17 @@ index 6866cb3..a87d878 100644
  .TP
  .B 0
 diff --git a/src/killall5.c b/src/killall5.c
-index b0728fa..72289e3 100644
+index 6f7528a..34d656b 100644
 --- a/src/killall5.c
 +++ b/src/killall5.c
 @@ -121,6 +121,7 @@ typedef struct _s_nfs
 
  /* List of processes. */
- PROC *plist;
-+PROC *olist;
+ PROC *plist = NULL;
++PROC *olist = NULL;
 
  /* List of processes to omit. */
- OMIT *omit;
+ OMIT *omit = NULL;
 @@ -356,6 +357,20 @@ static void clear_mnt(void)
  	}
  }
@@ -85,7 +85,7 @@ index b0728fa..72289e3 100644
  	struct dirent	*d;
  	char		path[PATH_MAX+1];
  	char		buf[PATH_MAX+1];
-@@ -670,6 +686,17 @@ int readproc()
+@@ -671,6 +687,17 @@ int readproc()
  		p->next = plist;
  		plist = p;
  		p->pid = pid;
@@ -103,7 +103,7 @@ index b0728fa..72289e3 100644
  	}
  	closedir(dir);
 
-@@ -870,6 +897,26 @@ PIDQ_HEAD *pidof(char *prog)
+@@ -877,6 +904,26 @@ PIDQ_HEAD *pidof(char *prog)
  	return q;
  }
 
@@ -130,7 +130,7 @@ index b0728fa..72289e3 100644
  /* Give usage message and exit. */
  void usage(void)
  {
-@@ -920,6 +967,7 @@ void nsyslog(int pri, char *fmt, ...)
+@@ -927,6 +974,7 @@ void nsyslog(int pri, char *fmt, ...)
  #define PIDOF_OMIT	0x02
  #define PIDOF_NETFS	0x04
  #define PIDOF_QUIET     0x08
@@ -138,7 +138,7 @@ index b0728fa..72289e3 100644
 
  /*
   *	Pidof functionality.
-@@ -937,6 +985,7 @@ int main_pidof(int argc, char **argv)
+@@ -944,6 +992,7 @@ int main_pidof(int argc, char **argv)
  	char		tmp[512];
          char            sep = ' ';
 
@@ -146,7 +146,7 @@ index b0728fa..72289e3 100644
  	omit = (OMIT*)0;
  	nlist = (NFS*)0;
  	opterr = 0;
-@@ -944,7 +993,7 @@ int main_pidof(int argc, char **argv)
+@@ -951,7 +1000,7 @@ int main_pidof(int argc, char **argv)
  	if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0))
  		flags |= PIDOF_NETFS;
 
@@ -155,7 +155,7 @@ index b0728fa..72289e3 100644
  		case '?':
  			nsyslog(LOG_ERR,"invalid options on command line!\n");
  			closelog();
-@@ -995,6 +1044,9 @@ int main_pidof(int argc, char **argv)
+@@ -1002,6 +1051,9 @@ int main_pidof(int argc, char **argv)
                  case 'z':
                          list_dz_processes = TRUE;
                          break;
@@ -165,7 +165,7 @@ index b0728fa..72289e3 100644
  		case 'n':
  			flags |= PIDOF_NETFS;
  			break;
-@@ -1026,10 +1078,13 @@ int main_pidof(int argc, char **argv)
+@@ -1033,10 +1085,13 @@ int main_pidof(int argc, char **argv)
  			pid_t spid = 0;
  			while ((p = get_next_from_pid_q(q))) {
  				if ((flags & PIDOF_OMIT) && omit) {
@@ -181,7 +181,7 @@ index b0728fa..72289e3 100644
  					}
 
  					/*
-@@ -1071,6 +1126,7 @@ int main_pidof(int argc, char **argv)
+@@ -1078,6 +1133,7 @@ int main_pidof(int argc, char **argv)
  		printf("\n");
          }
 
meta/recipes-core/sysvinit/sysvinit/realpath.patch +3 -20
index b559aa3b49..78bf870612 100644
@@ -12,29 +12,12 @@ Upstream-Status: Inappropriate [Linux specific]
 Signed-off-by: Khem Raj <[email protected]>
 
 ---
- src/killall5.c   | 4 ++--
  src/mountpoint.c | 1 +
  src/wall.c       | 1 +
- 3 files changed, 4 insertions(+), 2 deletions(-)
+ 2 files changed, 2 insertions(+)
 
-diff --git a/src/killall5.c b/src/killall5.c
-index a664954..9798423 100644
---- a/src/killall5.c
-+++ b/src/killall5.c
-@@ -977,9 +977,9 @@ int matches(PROC *o, PROC *p)
- 	char *oargv1, *pargv1;
- 	if ((o->argv0 && p->argv0 && !strcmp(o->argv0,p->argv0))) {
- 		if (o->argv1 && p->argv1) {
--			if ((oargv1 = canonicalize_file_name(o->argv1)) == NULL)
-+			if ((oargv1 = realpath(o->argv1, NULL)) == NULL)
- 				oargv1 = strdup(o->argv1);
--			if ((pargv1 = canonicalize_file_name(p->argv1)) == NULL)
-+			if ((pargv1 = realpath(p->argv1, NULL)) == NULL)
- 				pargv1 = strdup(p->argv1);
- 			if (! strcmp(oargv1, pargv1)) {
- 				ret = 1;
 diff --git a/src/mountpoint.c b/src/mountpoint.c
-index b24335e..5f20522 100644
+index 184b1f6..c55b0df 100644
 --- a/src/mountpoint.c
 +++ b/src/mountpoint.c
 @@ -23,6 +23,7 @@
@@ -46,7 +29,7 @@ index b24335e..5f20522 100644
  #include <unistd.h>
  #include <stdlib.h>
 diff --git a/src/wall.c b/src/wall.c
-index d3a2c70..00826e9 100644
+index e527613..1d363ca 100644
 --- a/src/wall.c
 +++ b/src/wall.c
 @@ -30,6 +30,7 @@
meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch deleted +0 -17
deleted file mode 100644
index 89d65c23b7..0000000000
@@ -1,17 +0,0 @@
-# From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and
-# <sys/mount.h> (included from glibc) are no longer compatible:
-# https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
---- sysvinit-3.04/src/sulogin.c.orig	2022-08-07 23:07:42.952576274 +0200
-+++ sysvinit-3.04/src/sulogin.c	2022-08-07 23:08:26.511470983 +0200
-@@ -51,7 +51,6 @@
- #ifdef __linux__
- #  include <sys/statfs.h>
- #  include <sys/mount.h>
--#  include <linux/fs.h>
- #  include <linux/magic.h>
- #  include <linux/major.h>
- #  ifndef TMPFS_MAGIC
meta/recipes-core/sysvinit/sysvinit_3.10.bb renamed from meta/recipes-core/sysvinit/sysvinit_3.04.bb +2 -5
similarity index 93%
rename from meta/recipes-core/sysvinit/sysvinit_3.04.bb
rename to meta/recipes-core/sysvinit/sysvinit_3.10.bb
index fb9d00891c..89281f9fb3 100644
@@ -9,21 +9,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 
 RDEPENDS:${PN} = "${PN}-inittab"
 
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \
-           file://install.patch \
+SRC_URI = "https://github.com/slicer69/sysvinit/releases/download/${PV}/sysvinit-${PV}.tar.xz \
            file://crypt-lib.patch \
            file://pidof-add-m-option.patch \
            file://realpath.patch \
            file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \
-           file://sysvinit_remove_linux_fs.patch \
            file://rcS-default \
            file://rc \
            file://rcS \
            file://bootlogd.init \
            file://01_bootlogd \
-           file://0001-hddown-include-libgen.h-for-basename-API.patch \
            "
-SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2b7e3a5"
+SRC_URI[sha256sum] = "c52d22f63e187a1247ad491b6a3a049561b887400a166d6b04fc9d67705c4da6"
 
 S = "${WORKDIR}/sysvinit-${PV}"
 
#1 lore raw

Hmm... I used git send-email to send the email. Still seems to be strangly formatted. Here's another try from the web reply:

From cc397d48b4b8dad419cd4790601b07bc71aa0976 Mon Sep 17 00:00:00 2001
From: Sven Reschke <[email protected]>
Date: Sun, 18 Aug 2024 10:46:34 +0200
Subject: [PATCH] sysvinit: upgrade 3.04 -> 3.10
Upgrade    of sysvinit to version 3.10. The upstream moved    in between to github. Removed    the following patches:
1. 0001-hddown-include-libgen.h-for-basename-API.patch
Is already included in upstream
2. install.patch
Referenced PR is already merged in upstream
3. sysvinit_remove_linux_fs.patch
Is already included in upstream
The remaining patches were mostly just updated, with exception to the realpath.patch Here the changes to the killall5.c source file couldn't be merged anymore.
My guess is, that the changes are already done someway in the upstream.
At least the file is now using realpath(). I didn't touch the remaining additional includes, as I don't know if they are still needed.

---
...wn-include-libgen.h-for-basename-API.patch | 38 -------- ...acros.h-for-major-minor-defines-in-g.patch |  6 +- .../sysvinit/sysvinit/crypt-lib.patch         |  6 +- .../sysvinit/sysvinit/install.patch           | 97 ------------------- .../sysvinit/pidof-add-m-option.patch         | 24 ++--- .../sysvinit/sysvinit/realpath.patch          | 23 +---- .../sysvinit/sysvinit_remove_linux_fs.patch   | 17 ---- .../{sysvinit_3.04.bb => sysvinit_3.10.bb}    |  7 +-

8 files changed, 23 insertions(+), 195 deletions(-)

delete mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-hddown-include-libgen.h-for-basename-API.patch delete mode 100644 meta/recipes-core/sysvinit/sysvinit/install.patch
delete mode 100644 meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch rename meta/recipes-core/sysvinit/{sysvinit_3.04.bb => sysvinit_3.10.bb} (93%)

meta/recipes-core/sysvinit/sysvinit/0001-hddown-include-libgen.h-for-basename-API.patch deleted +0 -38
deleted file mode 100644
index 5e4053bad1..0000000000
@@ -1,38 +0,0 @@
-From a07c1d94e79840c59563741b45e690e77d4f3dfa Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 3 Dec 2023 20:09:30 -0800
-Subject: [PATCH] hddown: include libgen.h for basename API
-
-musl has removed the non-prototype declaration of basename from string.h [1] which now results in build errors with clang-17+ compiler
-
-include libgen.h for using the posix declaration of the funciton.
-
-Fixes
-
-hddown.c:135:8: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
-  135 |                         ptr = basename(lnk);
-      |                             ^ ~~~~~~~~~~~~~
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://github.com/slicer69/sysvinit/pull/21]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/hddown.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/hddown.c b/src/hddown.c
-index 7a2cf28..3b31bc0 100644
---- a/src/hddown.c
-+++ b/src/hddown.c
-@@ -24,6 +24,7 @@ char *v_hddown = "@(#)hddown.c  1.02  22-Apr-2003  [email protected]";
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
- #endif
-+#include <libgen.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
---
-2.43.0
-
meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch +0 -0
index 60fbd87534..2c29fd81d9 100644
@@ -13,7 +13,7 @@ Upstream-Status: Pending
3 files changed, 3 insertions(+)
src/bootlogd.c +0 -0

-index 787db87..8b07903 100644
+index a323a76..343cbbe 100644

src/bootlogd.c +0 -0
@@ -29,6 +29,7 @@
@@ -25,7 +25,7 @@ index 787db87..8b07903 100644

#include <sys/utsname.h>
#include <time.h>

src/mountpoint.c +0 -0

-index 5f20522..94df7a1 100644
+index c55b0df..5920e13 100644

src/mountpoint.c +0 -0
@@ -25,6 +25,7 @@
@@ -37,7 +37,7 @@ index 5f20522..94df7a1 100644

#include <stdlib.h>
#include <string.h>

src/shutdown.c +0 -0

-index b744a2c..40b7faf 100644
+index 89b63a5..7730e53 100644

src/shutdown.c +0 -0
@@ -40,6 +40,7 @@
meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +0 -0
index 5c39fb001b..cc3df8887b 100644
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [configuration]
1 file changed, 2 insertions(+), 9 deletions(-)
src/Makefile +0 -0

-index 5b1a5a2..b686394 100644
+index 21cbb2e..a2c103c 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -97,15 +97,8 @@ else
- endif
+@@ -95,15 +95,8 @@ endif
+ ROOT    ?= $(DESTDIR)

# Additional libs for GNU libc.
-ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)

meta/recipes-core/sysvinit/sysvinit/install.patch deleted +0 -97

97 lines not on this page · raw message

meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch +0 -0
index 8ef292ed12..01df5e6ee4 100644
@@ -45,17 +45,17 @@ index 6866cb3..a87d878 100644

.TP
.B 0

src/killall5.c +0 -0

-index b0728fa..72289e3 100644
+index 6f7528a..34d656b 100644

src/killall5.c +0 -0
@@ -121,6 +121,7 @@ typedef struct _s_nfs
 

/* List of processes. */
- PROC *plist;
-+PROC *olist;
+ PROC *plist = NULL;
++PROC *olist = NULL;

/* List of processes to omit. */
- OMIT *omit;
+ OMIT *omit = NULL;
@@ -356,6 +357,20 @@ static void clear_mnt(void)
}
}
@@ -85,7 +85,7 @@ index b0728fa..72289e3 100644
struct dirent    *d;
char        path[PATH_MAX+1];
char        buf[PATH_MAX+1];
-@@ -670,6 +686,17 @@ int readproc()
+@@ -671,6 +687,17 @@ int readproc()
p->next = plist;
plist = p;
p->pid = pid;
@@ -103,7 +103,7 @@ index b0728fa..72289e3 100644
}
closedir(dir);

-@@ -870,6 +897,26 @@ PIDQ_HEAD *pidof(char *prog) +@@ -877,6 +904,26 @@ PIDQ_HEAD *pidof(char *prog) return q;
}

@@ -130,7 +130,7 @@ index b0728fa..72289e3 100644 /* Give usage message and exit. */
void usage(void)
{
-@@ -920,6 +967,7 @@ void nsyslog(int pri, char *fmt, ...) +@@ -927,6 +974,7 @@ void nsyslog(int pri, char *fmt, ...) #define PIDOF_OMIT    0x02
#define PIDOF_NETFS    0x04
#define PIDOF_QUIET     0x08
@@ -138,7 +138,7 @@ index b0728fa..72289e3 100644

/*
*    Pidof functionality.
-@@ -937,6 +985,7 @@ int main_pidof(int argc, char **argv) +@@ -944,6 +992,7 @@ int main_pidof(int argc, char **argv) char        tmp[512];
char            sep = ' ';

@@ -146,7 +146,7 @@ index b0728fa..72289e3 100644
omit = (OMIT*)0;
nlist = (NFS*)0;
opterr = 0;
-@@ -944,7 +993,7 @@ int main_pidof(int argc, char **argv) +@@ -951,7 +1000,7 @@ int main_pidof(int argc, char **argv) if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0)) flags |= PIDOF_NETFS;

@@ -155,7 +155,7 @@ index b0728fa..72289e3 100644 case '?':
nsyslog(LOG_ERR,"invalid options on command line!\n"); closelog();
-@@ -995,6 +1044,9 @@ int main_pidof(int argc, char **argv) +@@ -1002,6 +1051,9 @@ int main_pidof(int argc, char **argv) case 'z':
list_dz_processes = TRUE;
break;
@@ -165,7 +165,7 @@ index b0728fa..72289e3 100644 case 'n':
flags |= PIDOF_NETFS;
break;
-@@ -1026,10 +1078,13 @@ int main_pidof(int argc, char **argv) +@@ -1033,10 +1085,13 @@ int main_pidof(int argc, char **argv) pid_t spid = 0;
while ((p = get_next_from_pid_q(q))) {
if ((flags & PIDOF_OMIT) && omit) {
@@ -181,7 +181,7 @@ index b0728fa..72289e3 100644
}

/*
-@@ -1071,6 +1126,7 @@ int main_pidof(int argc, char **argv) +@@ -1078,6 +1133,7 @@ int main_pidof(int argc, char **argv) printf("\n");
}

meta/recipes-core/sysvinit/sysvinit/realpath.patch +0 -0
index b559aa3b49..78bf870612 100644
@@ -12,29 +12,12 @@ Upstream-Status: Inappropriate [Linux specific]

---
- src/killall5.c   | 4 ++-- src/mountpoint.c | 1 +
src/wall.c       | 1 +
- 3 files changed, 4 insertions(+), 2 deletions(-)
+ 2 files changed, 2 insertions(+)

-diff --git a/src/killall5.c b/src/killall5.c
-index a664954..9798423 100644
---- a/src/killall5.c
-+++ b/src/killall5.c
-@@ -977,9 +977,9 @@ int matches(PROC *o, PROC *p)
-     char *oargv1, *pargv1;
-     if ((o->argv0 && p->argv0 && !strcmp(o->argv0,p->argv0))) {
-         if (o->argv1 && p->argv1) {
--            if ((oargv1 = canonicalize_file_name(o->argv1)) == NULL) -+            if ((oargv1 = realpath(o->argv1, NULL)) == NULL)
-                 oargv1 = strdup(o->argv1);
--            if ((pargv1 = canonicalize_file_name(p->argv1)) == NULL) -+            if ((pargv1 = realpath(p->argv1, NULL)) == NULL)
-                 pargv1 = strdup(p->argv1);
-             if (! strcmp(oargv1, pargv1)) {
-                 ret = 1;

src/mountpoint.c +0 -0

-index b24335e..5f20522 100644
+index 184b1f6..c55b0df 100644

src/mountpoint.c +0 -0
@@ -23,6 +23,7 @@
@@ -46,7 +29,7 @@ index b24335e..5f20522 100644

#include <unistd.h>
#include <stdlib.h>

src/wall.c +0 -0

-index d3a2c70..00826e9 100644
+index e527613..1d363ca 100644

src/wall.c +0 -0
@@ -30,6 +30,7 @@
meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch deleted +0 -17
deleted file mode 100644
index 89d65c23b7..0000000000
@@ -1,17 +0,0 @@
-# From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and
-# <sys/mount.h> (included from glibc) are no longer compatible:
-# https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
---- sysvinit-3.04/src/sulogin.c.orig    2022-08-07 23:07:42.952576274 +0200
-+++ sysvinit-3.04/src/sulogin.c    2022-08-07 23:08:26.511470983 +0200
-@@ -51,7 +51,6 @@
- #ifdef __linux__
- #  include <sys/statfs.h>
- #  include <sys/mount.h>
--#  include <linux/fs.h>
- #  include <linux/magic.h>
- #  include <linux/major.h>
- #  ifndef TMPFS_MAGIC
meta/recipes-core/sysvinit/sysvinit_3.10.bb renamed from meta/recipes-core/sysvinit/sysvinit_3.04.bb +0 -0
similarity index 93%
rename from meta/recipes-core/sysvinit/sysvinit_3.04.bb
rename to meta/recipes-core/sysvinit/sysvinit_3.10.bb
index fb9d00891c..89281f9fb3 100644
@@ -9,21 +9,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 

RDEPENDS:${PN} = "${PN}-inittab"

-SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \
-           file://install.patch \
+SRC_URI = "https://github.com/slicer69/sysvinit/releases/download/${PV}/sysvinit-${PV}.tar.xz \
file://crypt-lib.patch \
file://pidof-add-m-option.patch \
file://realpath.patch \
file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \
-           file://sysvinit_remove_linux_fs.patch \
file://rcS-default \
file://rc \
file://rcS \
file://bootlogd.init \
file://01_bootlogd \
-           file://0001-hddown-include-libgen.h-for-basename-API.patch \
"
-SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2b7e3a5" +SRC_URI[sha256sum] = "c52d22f63e187a1247ad491b6a3a049561b887400a166d6b04fc9d67705c4da6"

S = "${WORKDIR}/sysvinit-${PV}"

#2 lore raw

Aaand forgot to mention:

Test build created with scarthgap (here the UNPACKDIR were replaced again with the WORKDIR variable in the recipe) for x86. Deployed the build image on my root-server, without issues.

Best regards,
Sven

#3 lore raw
In reply to Sven Reschke

Hello,

I'm sorry but I've tried multiple times to apply this patch but it doesn't apply cleanly and I can't fix it. Maybe you can put it on a branch somewhere?

Quoted 435 lines · Sven Reschke via lists.openembedded.org

Upgrade of sysvinit to version 3.10. The upstream moved in between to github.
Removed the following patches:
1. 0001-hddown-include-libgen.h-for-basename-API.patch Is already included in upstream
2. install.patch
Referenced PR is already merged in upstream
3. sysvinit_remove_linux_fs.patch
Is already included in upstream

The remaining patches were mostly just updated, with exception to the realpath.patch Here the changes to the killall5.c source file couldn't be merged anymore.
My guess is, that the changes are already done someway in the upstream.
At least the file is now using realpath(). I didn't touch the remaining additional includes, as I don't know if they are still needed.

---
 ...wn-include-libgen.h-for-basename-API.patch | 38 --------
 ...acros.h-for-major-minor-defines-in-g.patch |  6 +-
 .../sysvinit/sysvinit/crypt-lib.patch         |  6 +-
 .../sysvinit/sysvinit/install.patch           | 97 -------------------
 .../sysvinit/pidof-add-m-option.patch         | 24 ++---
 .../sysvinit/sysvinit/realpath.patch          | 23 +----
 .../sysvinit/sysvinit_remove_linux_fs.patch   | 17 ----
 .../{sysvinit_3.04.bb => sysvinit_3.10.bb}    |  7 +-
 8 files changed, 23 insertions(+), 195 deletions(-)
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-hddown-include-libgen.h-for-basename-API.patch
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/install.patch
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch
 rename meta/recipes-core/sysvinit/{sysvinit_3.04.bb => sysvinit_3.10.bb} (93%)
meta/recipes-core/sysvinit/sysvinit/0001-hddown-include-libgen.h-for-basename-API.patch deleted +0 -38
deleted file mode 100644
index 5e4053bad1..0000000000
@@ -1,38 +0,0 @@
-From a07c1d94e79840c59563741b45e690e77d4f3dfa Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 3 Dec 2023 20:09:30 -0800
-Subject: [PATCH] hddown: include libgen.h for basename API
-
-musl has removed the non-prototype declaration of basename from string.h [1] which now results in build errors with clang-17+ compiler
-
-include libgen.h for using the posix declaration of the funciton.
-
-Fixes
-
-hddown.c:135:8: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
-  135 |                         ptr = basename(lnk);
-      |                             ^ ~~~~~~~~~~~~~
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://github.com/slicer69/sysvinit/pull/21]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/hddown.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/hddown.c b/src/hddown.c
-index 7a2cf28..3b31bc0 100644
---- a/src/hddown.c
-+++ b/src/hddown.c
-@@ -24,6 +24,7 @@ char *v_hddown = "@(#)hddown.c  1.02  22-Apr-2003  [email protected]";
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
- #endif
-+#include <libgen.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
---
-2.43.0
-
meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch +3 -3
index 60fbd87534..2c29fd81d9 100644
@@ -13,7 +13,7 @@ Upstream-Status: Pending
  3 files changed, 3 insertions(+)
 
 diff --git a/src/bootlogd.c b/src/bootlogd.c
-index 787db87..8b07903 100644
+index a323a76..343cbbe 100644
 --- a/src/bootlogd.c
 +++ b/src/bootlogd.c
 @@ -29,6 +29,7 @@
@@ -25,7 +25,7 @@ index 787db87..8b07903 100644
  #include <sys/utsname.h>
  #include <time.h>
 diff --git a/src/mountpoint.c b/src/mountpoint.c
-index 5f20522..94df7a1 100644
+index c55b0df..5920e13 100644
 --- a/src/mountpoint.c
 +++ b/src/mountpoint.c
 @@ -25,6 +25,7 @@
@@ -37,7 +37,7 @@ index 5f20522..94df7a1 100644
  #include <stdlib.h>
  #include <string.h>
 diff --git a/src/shutdown.c b/src/shutdown.c
-index b744a2c..40b7faf 100644
+index 89b63a5..7730e53 100644
 --- a/src/shutdown.c
 +++ b/src/shutdown.c
 @@ -40,6 +40,7 @@
meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +3 -3
index 5c39fb001b..cc3df8887b 100644
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [configuration]
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 5b1a5a2..b686394 100644
+index 21cbb2e..a2c103c 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -97,15 +97,8 @@ else
- endif
+@@ -95,15 +95,8 @@ endif
+ ROOT	?= $(DESTDIR)
 
  # Additional libs for GNU libc.
 -ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
meta/recipes-core/sysvinit/sysvinit/install.patch deleted +0 -97
deleted file mode 100644
index bc6d493c2b..0000000000
@@ -1,97 +0,0 @@
-From 5e35aa105e7a2e85db2a89fee4114090b1ac55be Mon Sep 17 00:00:00 2001
-From: Qing He <[email protected]>
-Date: Fri, 18 Jun 2010 09:40:30 +0800
-Subject: [PATCH] sysvinit: upgrade to version 2.88dsf
-
-Upstream-Status: Submitted [https://github.com/slicer69/sysvinit/pull/13]
-
----
- src/Makefile | 53 +++++++++++++++++++++++++++++-----------------------
- 1 file changed, 30 insertions(+), 23 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 1b368dc..5b1a5a2 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -77,7 +77,14 @@ else
-   INSTALL_DATA	= install -m 644
- endif
- INSTALL_DIR	= install -m 755 -d
--MANDIR		= /usr/share/man
-+
-+ROOT         ?=
-+base_bindir  ?= /bin
-+base_sbindir ?= /sbin
-+bindir       ?= /usr/bin
-+sysconfdir   ?= /etc
-+includedir   ?= /usr/include
-+mandir       ?= /usr/share/man
-
- ifeq ($(WITH_SELINUX),yes)
-   SELINUX_DEF	=  -DWITH_SELINUX
-@@ -191,43 +198,43 @@ clobber:	cleanobjs
- distclean:	clobber
-
- install:	all
--		$(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
--		$(INSTALL_DIR) $(ROOT)/usr/bin/
-+		$(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/
-+		$(INSTALL_DIR) $(ROOT)$(bindir)/
- 		for i in $(BIN); do \
--			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
-+			$(INSTALL_EXEC) $$i $(ROOT)$(base_bindir)/ ; \
- 		done
- 		for i in $(SBIN); do \
--			$(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
-+			$(INSTALL_EXEC) $$i $(ROOT)$(base_sbindir)/ ; \
- 		done
- 		for i in $(USRBIN); do \
--			$(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
-+			$(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \
- 		done
- 		# $(INSTALL_DIR) $(ROOT)/etc/
- 		$(INSTALL_DIR) $(ROOT)/etc/inittab.d
- 		# $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
--		ln -sf halt $(ROOT)/sbin/reboot
--		ln -sf halt $(ROOT)/sbin/poweroff
--		ln -sf init $(ROOT)/sbin/telinit
--		ln -sf /sbin/killall5 $(ROOT)/bin/pidof
--		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
--			ln -sf last $(ROOT)/usr/bin/lastb; \
-+		ln -sf halt $(ROOT)$(base_sbindir)/reboot
-+		ln -sf halt $(ROOT)$(base_sbindir)/poweroff
-+		ln -sf init $(ROOT)$(base_sbindir)/telinit
-+		ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof
-+		if [ ! -f $(ROOT)$(bindir)/lastb ]; then \
-+			ln -sf last $(ROOT)$(bindir)/lastb; \
- 		fi
--		$(INSTALL_DIR) $(ROOT)/usr/include/
--		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
--		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
--		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
--		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
-+		$(INSTALL_DIR) $(ROOT)$(includedir)/
-+		$(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/
-+		$(INSTALL_DIR) $(ROOT)$(mandir)/man1/
-+		$(INSTALL_DIR) $(ROOT)$(mandir)/man5/
-+		$(INSTALL_DIR) $(ROOT)$(mandir)/man8/
- 		for man in $(MAN1); do \
--			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/; \
--			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man1/$$man ; \
-+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man1/; \
-+			sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man1/$$man ; \
- 		done
- 		for man in $(MAN5); do \
--			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/; \
--			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \
-+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man5/; \
-+			sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man5/$$man ; \
- 		done
- 		for man in $(MAN8); do \
--			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/; \
--			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \
-+			$(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man8/; \
-+			sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man8/$$man ; \
- 		done
- ifeq ($(ROOT),)
- 		#
meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch +12 -12
index 8ef292ed12..01df5e6ee4 100644
@@ -45,17 +45,17 @@ index 6866cb3..a87d878 100644
  .TP
  .B 0
 diff --git a/src/killall5.c b/src/killall5.c
-index b0728fa..72289e3 100644
+index 6f7528a..34d656b 100644
 --- a/src/killall5.c
 +++ b/src/killall5.c
 @@ -121,6 +121,7 @@ typedef struct _s_nfs
 
  /* List of processes. */
- PROC *plist;
-+PROC *olist;
+ PROC *plist = NULL;
++PROC *olist = NULL;
 
  /* List of processes to omit. */
- OMIT *omit;
+ OMIT *omit = NULL;
 @@ -356,6 +357,20 @@ static void clear_mnt(void)
  	}
  }
@@ -85,7 +85,7 @@ index b0728fa..72289e3 100644
  	struct dirent	*d;
  	char		path[PATH_MAX+1];
  	char		buf[PATH_MAX+1];
-@@ -670,6 +686,17 @@ int readproc()
+@@ -671,6 +687,17 @@ int readproc()
  		p->next = plist;
  		plist = p;
  		p->pid = pid;
@@ -103,7 +103,7 @@ index b0728fa..72289e3 100644
  	}
  	closedir(dir);
 
-@@ -870,6 +897,26 @@ PIDQ_HEAD *pidof(char *prog)
+@@ -877,6 +904,26 @@ PIDQ_HEAD *pidof(char *prog)
  	return q;
  }
 
@@ -130,7 +130,7 @@ index b0728fa..72289e3 100644
  /* Give usage message and exit. */
  void usage(void)
  {
-@@ -920,6 +967,7 @@ void nsyslog(int pri, char *fmt, ...)
+@@ -927,6 +974,7 @@ void nsyslog(int pri, char *fmt, ...)
  #define PIDOF_OMIT	0x02
  #define PIDOF_NETFS	0x04
  #define PIDOF_QUIET     0x08
@@ -138,7 +138,7 @@ index b0728fa..72289e3 100644
 
  /*
   *	Pidof functionality.
-@@ -937,6 +985,7 @@ int main_pidof(int argc, char **argv)
+@@ -944,6 +992,7 @@ int main_pidof(int argc, char **argv)
  	char		tmp[512];
          char            sep = ' ';
 
@@ -146,7 +146,7 @@ index b0728fa..72289e3 100644
  	omit = (OMIT*)0;
  	nlist = (NFS*)0;
  	opterr = 0;
-@@ -944,7 +993,7 @@ int main_pidof(int argc, char **argv)
+@@ -951,7 +1000,7 @@ int main_pidof(int argc, char **argv)
  	if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0))
  		flags |= PIDOF_NETFS;
 
@@ -155,7 +155,7 @@ index b0728fa..72289e3 100644
  		case '?':
  			nsyslog(LOG_ERR,"invalid options on command line!\n");
  			closelog();
-@@ -995,6 +1044,9 @@ int main_pidof(int argc, char **argv)
+@@ -1002,6 +1051,9 @@ int main_pidof(int argc, char **argv)
                  case 'z':
                          list_dz_processes = TRUE;
                          break;
@@ -165,7 +165,7 @@ index b0728fa..72289e3 100644
  		case 'n':
  			flags |= PIDOF_NETFS;
  			break;
-@@ -1026,10 +1078,13 @@ int main_pidof(int argc, char **argv)
+@@ -1033,10 +1085,13 @@ int main_pidof(int argc, char **argv)
  			pid_t spid = 0;
  			while ((p = get_next_from_pid_q(q))) {
  				if ((flags & PIDOF_OMIT) && omit) {
@@ -181,7 +181,7 @@ index b0728fa..72289e3 100644
  					}
 
  					/*
-@@ -1071,6 +1126,7 @@ int main_pidof(int argc, char **argv)
+@@ -1078,6 +1133,7 @@ int main_pidof(int argc, char **argv)
  		printf("\n");
          }
 
meta/recipes-core/sysvinit/sysvinit/realpath.patch +3 -20
index b559aa3b49..78bf870612 100644
@@ -12,29 +12,12 @@ Upstream-Status: Inappropriate [Linux specific]
 Signed-off-by: Khem Raj <[email protected]>
 
 ---
- src/killall5.c   | 4 ++--
  src/mountpoint.c | 1 +
  src/wall.c       | 1 +
- 3 files changed, 4 insertions(+), 2 deletions(-)
+ 2 files changed, 2 insertions(+)
 
-diff --git a/src/killall5.c b/src/killall5.c
-index a664954..9798423 100644
---- a/src/killall5.c
-+++ b/src/killall5.c
-@@ -977,9 +977,9 @@ int matches(PROC *o, PROC *p)
- 	char *oargv1, *pargv1;
- 	if ((o->argv0 && p->argv0 && !strcmp(o->argv0,p->argv0))) {
- 		if (o->argv1 && p->argv1) {
--			if ((oargv1 = canonicalize_file_name(o->argv1)) == NULL)
-+			if ((oargv1 = realpath(o->argv1, NULL)) == NULL)
- 				oargv1 = strdup(o->argv1);
--			if ((pargv1 = canonicalize_file_name(p->argv1)) == NULL)
-+			if ((pargv1 = realpath(p->argv1, NULL)) == NULL)
- 				pargv1 = strdup(p->argv1);
- 			if (! strcmp(oargv1, pargv1)) {
- 				ret = 1;
 diff --git a/src/mountpoint.c b/src/mountpoint.c
-index b24335e..5f20522 100644
+index 184b1f6..c55b0df 100644
 --- a/src/mountpoint.c
 +++ b/src/mountpoint.c
 @@ -23,6 +23,7 @@
@@ -46,7 +29,7 @@ index b24335e..5f20522 100644
  #include <unistd.h>
  #include <stdlib.h>
 diff --git a/src/wall.c b/src/wall.c
-index d3a2c70..00826e9 100644
+index e527613..1d363ca 100644
 --- a/src/wall.c
 +++ b/src/wall.c
 @@ -30,6 +30,7 @@
meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch deleted +0 -17
deleted file mode 100644
index 89d65c23b7..0000000000
@@ -1,17 +0,0 @@
-# From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and
-# <sys/mount.h> (included from glibc) are no longer compatible:
-# https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
---- sysvinit-3.04/src/sulogin.c.orig	2022-08-07 23:07:42.952576274 +0200
-+++ sysvinit-3.04/src/sulogin.c	2022-08-07 23:08:26.511470983 +0200
-@@ -51,7 +51,6 @@
- #ifdef __linux__
- #  include <sys/statfs.h>
- #  include <sys/mount.h>
--#  include <linux/fs.h>
- #  include <linux/magic.h>
- #  include <linux/major.h>
- #  ifndef TMPFS_MAGIC
meta/recipes-core/sysvinit/sysvinit_3.10.bb renamed from meta/recipes-core/sysvinit/sysvinit_3.04.bb +2 -6
similarity index 93%
rename from meta/recipes-core/sysvinit/sysvinit_3.04.bb
rename to meta/recipes-core/sysvinit/sysvinit_3.10.bb
index fb9d00891c..89281f9fb3 100644
@@ -9,21 +9,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 
 RDEPENDS:${PN} = "${PN}-inittab"
 
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \
-           file://install.patch \
+SRC_URI = "https://github.com/slicer69/sysvinit/releases/download/${PV}/sysvinit-${PV}.tar.xz \
            file://crypt-lib.patch \
            file://pidof-add-m-option.patch \
            file://realpath.patch \
            file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \
-           file://sysvinit_remove_linux_fs.patch \
            file://rcS-default \
            file://rc \
            file://rcS \
            file://bootlogd.init \
            file://01_bootlogd \
-           file://0001-hddown-include-libgen.h-for-basename-API.patch \
            "
-SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2b7e3a5"
+SRC_URI[sha256sum] = "c52d22f63e187a1247ad491b6a3a049561b887400a166d6b04fc9d67705c4da6"
 
 S = "${WORKDIR}/sysvinit-${PV}"
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#203476): https://lists.openembedded.org/g/openembedded-core/message/203476
Mute This Topic: https://lists.openembedded.org/mt/107960881/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

Also please rebase on top of my sysvinit source adjustment patch (was just sent here today).

Alex

Quoted 452 lines · Alexandre Belloni via lists.openembedded.org

Hello,

I'm sorry but I've tried multiple times to apply this patch but it doesn't apply cleanly and I can't fix it. Maybe you can put it on a branch somewhere?

Quoted 419 lines · Sven Reschke via lists.openembedded.org

Upgrade of sysvinit to version 3.10. The upstream moved in between to github.
Removed the following patches:
1. 0001-hddown-include-libgen.h-for-basename-API.patch Is already included in upstream
2. install.patch
Referenced PR is already merged in upstream
3. sysvinit_remove_linux_fs.patch
Is already included in upstream

The remaining patches were mostly just updated, with exception to the realpath.patch Here the changes to the killall5.c source file couldn't be merged anymore.
My guess is, that the changes are already done someway in the upstream.
At least the file is now using realpath(). I didn't touch the remaining additional includes, as I don't know if they are still needed.

---
 ...wn-include-libgen.h-for-basename-API.patch | 38 --------
 ...acros.h-for-major-minor-defines-in-g.patch |  6 +-
 .../sysvinit/sysvinit/crypt-lib.patch         |  6 +-
 .../sysvinit/sysvinit/install.patch           | 97 -------------------
 .../sysvinit/pidof-add-m-option.patch         | 24 ++---
 .../sysvinit/sysvinit/realpath.patch          | 23 +----
 .../sysvinit/sysvinit_remove_linux_fs.patch   | 17 ----
 .../{sysvinit_3.04.bb => sysvinit_3.10.bb}    |  7 +-
 8 files changed, 23 insertions(+), 195 deletions(-)
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-hddown-include-libgen.h-for-basename-API.patch
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/install.patch
 delete mode 100644 meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch
 rename meta/recipes-core/sysvinit/{sysvinit_3.04.bb => sysvinit_3.10.bb} (93%)
meta/recipes-core/sysvinit/sysvinit/0001-hddown-include-libgen.h-for-basename-API.patch deleted +0 -38
deleted file mode 100644
index 5e4053bad1..0000000000
@@ -1,38 +0,0 @@
-From a07c1d94e79840c59563741b45e690e77d4f3dfa Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 3 Dec 2023 20:09:30 -0800
-Subject: [PATCH] hddown: include libgen.h for basename API
-
-musl has removed the non-prototype declaration of basename from string.h [1] which now results in build errors with clang-17+ compiler
-
-include libgen.h for using the posix declaration of the funciton.
-
-Fixes
-
-hddown.c:135:8: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
-  135 |                         ptr = basename(lnk);
-      |                             ^ ~~~~~~~~~~~~~
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://github.com/slicer69/sysvinit/pull/21]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/hddown.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/hddown.c b/src/hddown.c
-index 7a2cf28..3b31bc0 100644
---- a/src/hddown.c
-+++ b/src/hddown.c
-@@ -24,6 +24,7 @@ char *v_hddown = "@(#)hddown.c  1.02  22-Apr-2003  [email protected]";
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
- #endif
-+#include <libgen.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
---
-2.43.0
-
meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch +3 -3
index 60fbd87534..2c29fd81d9 100644
@@ -13,7 +13,7 @@ Upstream-Status: Pending
  3 files changed, 3 insertions(+)
 
 diff --git a/src/bootlogd.c b/src/bootlogd.c
-index 787db87..8b07903 100644
+index a323a76..343cbbe 100644
 --- a/src/bootlogd.c
 +++ b/src/bootlogd.c
 @@ -29,6 +29,7 @@
@@ -25,7 +25,7 @@ index 787db87..8b07903 100644
  #include <sys/utsname.h>
  #include <time.h>
 diff --git a/src/mountpoint.c b/src/mountpoint.c
-index 5f20522..94df7a1 100644
+index c55b0df..5920e13 100644
 --- a/src/mountpoint.c
 +++ b/src/mountpoint.c
 @@ -25,6 +25,7 @@
@@ -37,7 +37,7 @@ index 5f20522..94df7a1 100644
  #include <stdlib.h>
  #include <string.h>
 diff --git a/src/shutdown.c b/src/shutdown.c
-index b744a2c..40b7faf 100644
+index 89b63a5..7730e53 100644
 --- a/src/shutdown.c
 +++ b/src/shutdown.c
 @@ -40,6 +40,7 @@
meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +3 -3
index 5c39fb001b..cc3df8887b 100644
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [configuration]
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 5b1a5a2..b686394 100644
+index 21cbb2e..a2c103c 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -97,15 +97,8 @@ else
- endif
+@@ -95,15 +95,8 @@ endif
+ ROOT        ?= $(DESTDIR)
 
  # Additional libs for GNU libc.
 -ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
meta/recipes-core/sysvinit/sysvinit/install.patch deleted +0 -97
deleted file mode 100644
index bc6d493c2b..0000000000
@@ -1,97 +0,0 @@
-From 5e35aa105e7a2e85db2a89fee4114090b1ac55be Mon Sep 17 00:00:00 2001
-From: Qing He <[email protected]>
-Date: Fri, 18 Jun 2010 09:40:30 +0800
-Subject: [PATCH] sysvinit: upgrade to version 2.88dsf
-
-Upstream-Status: Submitted [https://github.com/slicer69/sysvinit/pull/13]
-
----
- src/Makefile | 53 +++++++++++++++++++++++++++++-----------------------
- 1 file changed, 30 insertions(+), 23 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 1b368dc..5b1a5a2 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -77,7 +77,14 @@ else
-   INSTALL_DATA      = install -m 644
- endif
- INSTALL_DIR = install -m 755 -d
--MANDIR              = /usr/share/man
-+
-+ROOT         ?=
-+base_bindir  ?= /bin
-+base_sbindir ?= /sbin
-+bindir       ?= /usr/bin
-+sysconfdir   ?= /etc
-+includedir   ?= /usr/include
-+mandir       ?= /usr/share/man
-
- ifeq ($(WITH_SELINUX),yes)
-   SELINUX_DEF       =  -DWITH_SELINUX
-@@ -191,43 +198,43 @@ clobber:       cleanobjs
- distclean:  clobber
-
- install:    all
--            $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
--            $(INSTALL_DIR) $(ROOT)/usr/bin/
-+            $(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/
-+            $(INSTALL_DIR) $(ROOT)$(bindir)/
-             for i in $(BIN); do \
--                    $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
-+                    $(INSTALL_EXEC) $$i $(ROOT)$(base_bindir)/ ; \
-             done
-             for i in $(SBIN); do \
--                    $(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
-+                    $(INSTALL_EXEC) $$i $(ROOT)$(base_sbindir)/ ; \
-             done
-             for i in $(USRBIN); do \
--                    $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
-+                    $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \
-             done
-             # $(INSTALL_DIR) $(ROOT)/etc/
-             $(INSTALL_DIR) $(ROOT)/etc/inittab.d
-             # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
--            ln -sf halt $(ROOT)/sbin/reboot
--            ln -sf halt $(ROOT)/sbin/poweroff
--            ln -sf init $(ROOT)/sbin/telinit
--            ln -sf /sbin/killall5 $(ROOT)/bin/pidof
--            if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
--                    ln -sf last $(ROOT)/usr/bin/lastb; \
-+            ln -sf halt $(ROOT)$(base_sbindir)/reboot
-+            ln -sf halt $(ROOT)$(base_sbindir)/poweroff
-+            ln -sf init $(ROOT)$(base_sbindir)/telinit
-+            ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof
-+            if [ ! -f $(ROOT)$(bindir)/lastb ]; then \
-+                    ln -sf last $(ROOT)$(bindir)/lastb; \
-             fi
--            $(INSTALL_DIR) $(ROOT)/usr/include/
--            $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
--            $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
--            $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
--            $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
-+            $(INSTALL_DIR) $(ROOT)$(includedir)/
-+            $(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/
-+            $(INSTALL_DIR) $(ROOT)$(mandir)/man1/
-+            $(INSTALL_DIR) $(ROOT)$(mandir)/man5/
-+            $(INSTALL_DIR) $(ROOT)$(mandir)/man8/
-             for man in $(MAN1); do \
--                    $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/; \
--                    sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man1/$$man ; \
-+                    $(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man1/; \
-+                    sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man1/$$man ; \
-             done
-             for man in $(MAN5); do \
--                    $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/; \
--                    sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \
-+                    $(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man5/; \
-+                    sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man5/$$man ; \
-             done
-             for man in $(MAN8); do \
--                    $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/; \
--                    sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \
-+                    $(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man8/; \
-+                    sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man8/$$man ; \
-             done
- ifeq ($(ROOT),)
-             #
meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch +12 -12
index 8ef292ed12..01df5e6ee4 100644
@@ -45,17 +45,17 @@ index 6866cb3..a87d878 100644
  .TP
  .B 0
 diff --git a/src/killall5.c b/src/killall5.c
-index b0728fa..72289e3 100644
+index 6f7528a..34d656b 100644
 --- a/src/killall5.c
 +++ b/src/killall5.c
 @@ -121,6 +121,7 @@ typedef struct _s_nfs
 
  /* List of processes. */
- PROC *plist;
-+PROC *olist;
+ PROC *plist = NULL;
++PROC *olist = NULL;
 
  /* List of processes to omit. */
- OMIT *omit;
+ OMIT *omit = NULL;
 @@ -356,6 +357,20 @@ static void clear_mnt(void)
      }
  }
@@ -85,7 +85,7 @@ index b0728fa..72289e3 100644
      struct dirent   *d;
      char            path[PATH_MAX+1];
      char            buf[PATH_MAX+1];
-@@ -670,6 +686,17 @@ int readproc()
+@@ -671,6 +687,17 @@ int readproc()
              p->next = plist;
              plist = p;
              p->pid = pid;
@@ -103,7 +103,7 @@ index b0728fa..72289e3 100644
      }
      closedir(dir);
 
-@@ -870,6 +897,26 @@ PIDQ_HEAD *pidof(char *prog)
+@@ -877,6 +904,26 @@ PIDQ_HEAD *pidof(char *prog)
      return q;
  }
 
@@ -130,7 +130,7 @@ index b0728fa..72289e3 100644
  /* Give usage message and exit. */
  void usage(void)
  {
-@@ -920,6 +967,7 @@ void nsyslog(int pri, char *fmt, ...)
+@@ -927,6 +974,7 @@ void nsyslog(int pri, char *fmt, ...)
  #define PIDOF_OMIT  0x02
  #define PIDOF_NETFS 0x04
  #define PIDOF_QUIET     0x08
@@ -138,7 +138,7 @@ index b0728fa..72289e3 100644
 
  /*
   *  Pidof functionality.
-@@ -937,6 +985,7 @@ int main_pidof(int argc, char **argv)
+@@ -944,6 +992,7 @@ int main_pidof(int argc, char **argv)
      char            tmp[512];
          char            sep = ' ';
 
@@ -146,7 +146,7 @@ index b0728fa..72289e3 100644
      omit = (OMIT*)0;
      nlist = (NFS*)0;
      opterr = 0;
-@@ -944,7 +993,7 @@ int main_pidof(int argc, char **argv)
+@@ -951,7 +1000,7 @@ int main_pidof(int argc, char **argv)
      if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0))
              flags |= PIDOF_NETFS;
 
@@ -155,7 +155,7 @@ index b0728fa..72289e3 100644
              case '?':
                      nsyslog(LOG_ERR,"invalid options on command line!\n");
                      closelog();
-@@ -995,6 +1044,9 @@ int main_pidof(int argc, char **argv)
+@@ -1002,6 +1051,9 @@ int main_pidof(int argc, char **argv)
                  case 'z':
                          list_dz_processes = TRUE;
                          break;
@@ -165,7 +165,7 @@ index b0728fa..72289e3 100644
              case 'n':
                      flags |= PIDOF_NETFS;
                      break;
-@@ -1026,10 +1078,13 @@ int main_pidof(int argc, char **argv)
+@@ -1033,10 +1085,13 @@ int main_pidof(int argc, char **argv)
                      pid_t spid = 0;
                      while ((p = get_next_from_pid_q(q))) {
                              if ((flags & PIDOF_OMIT) && omit) {
@@ -181,7 +181,7 @@ index b0728fa..72289e3 100644
                                      }
 
                                      /*
-@@ -1071,6 +1126,7 @@ int main_pidof(int argc, char **argv)
+@@ -1078,6 +1133,7 @@ int main_pidof(int argc, char **argv)
              printf("\n");
          }
 
meta/recipes-core/sysvinit/sysvinit/realpath.patch +3 -20
index b559aa3b49..78bf870612 100644
@@ -12,29 +12,12 @@ Upstream-Status: Inappropriate [Linux specific]
 Signed-off-by: Khem Raj <[email protected]>
 
 ---
- src/killall5.c   | 4 ++--
  src/mountpoint.c | 1 +
  src/wall.c       | 1 +
- 3 files changed, 4 insertions(+), 2 deletions(-)
+ 2 files changed, 2 insertions(+)
 
-diff --git a/src/killall5.c b/src/killall5.c
-index a664954..9798423 100644
---- a/src/killall5.c
-+++ b/src/killall5.c
-@@ -977,9 +977,9 @@ int matches(PROC *o, PROC *p)
-     char *oargv1, *pargv1;
-     if ((o->argv0 && p->argv0 && !strcmp(o->argv0,p->argv0))) {
-             if (o->argv1 && p->argv1) {
--                    if ((oargv1 = canonicalize_file_name(o->argv1)) == NULL)
-+                    if ((oargv1 = realpath(o->argv1, NULL)) == NULL)
-                             oargv1 = strdup(o->argv1);
--                    if ((pargv1 = canonicalize_file_name(p->argv1)) == NULL)
-+                    if ((pargv1 = realpath(p->argv1, NULL)) == NULL)
-                             pargv1 = strdup(p->argv1);
-                     if (! strcmp(oargv1, pargv1)) {
-                             ret = 1;
 diff --git a/src/mountpoint.c b/src/mountpoint.c
-index b24335e..5f20522 100644
+index 184b1f6..c55b0df 100644
 --- a/src/mountpoint.c
 +++ b/src/mountpoint.c
 @@ -23,6 +23,7 @@
@@ -46,7 +29,7 @@ index b24335e..5f20522 100644
  #include <unistd.h>
  #include <stdlib.h>
 diff --git a/src/wall.c b/src/wall.c
-index d3a2c70..00826e9 100644
+index e527613..1d363ca 100644
 --- a/src/wall.c
 +++ b/src/wall.c
 @@ -30,6 +30,7 @@
meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch deleted +0 -17
deleted file mode 100644
index 89d65c23b7..0000000000
@@ -1,17 +0,0 @@
-# From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and
-# <sys/mount.h> (included from glibc) are no longer compatible:
-# https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
---- sysvinit-3.04/src/sulogin.c.orig 2022-08-07 23:07:42.952576274 +0200
-+++ sysvinit-3.04/src/sulogin.c      2022-08-07 23:08:26.511470983 +0200
-@@ -51,7 +51,6 @@
- #ifdef __linux__
- #  include <sys/statfs.h>
- #  include <sys/mount.h>
--#  include <linux/fs.h>
- #  include <linux/magic.h>
- #  include <linux/major.h>
- #  ifndef TMPFS_MAGIC
meta/recipes-core/sysvinit/sysvinit_3.10.bb renamed from meta/recipes-core/sysvinit/sysvinit_3.04.bb +1 -3
similarity index 93%
rename from meta/recipes-core/sysvinit/sysvinit_3.04.bb
rename to meta/recipes-core/sysvinit/sysvinit_3.10.bb
index fb9d00891c..89281f9fb3 100644
@@ -9,21 +9,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 
 RDEPENDS:${PN} = "${PN}-inittab"
 
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \
-           file://install.patch \
+SRC_URI = "https://github.com/slicer69/sysvinit/releases/download/${PV}/sysvinit-${PV}.tar.xz \
            file://crypt-lib.patch \
            file://pidof-add-m-option.patch \
            file://realpath.patch \
            file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \
-           file://sysvinit_remove_linux_fs.patch \
            file://rcS-default \
            file://rc \

meta/recipes-core/sysvinit/sysvinit_3.10.bb LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ · line 26

Quoted 10 lines
meta/recipes-core/sysvinit/sysvinit_3.10.bb renamed from meta/recipes-core/sysvinit/sysvinit_3.04.bb +1 -2
            file://rcS \
            file://bootlogd.init \
            file://01_bootlogd \
-           file://0001-hddown-include-libgen.h-for-basename-API.patch \
            "
-SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2b7e3a5"
+SRC_URI[sha256sum] = "c52d22f63e187a1247ad491b6a3a049561b887400a166d6b04fc9d67705c4da6"
 
 S = "${WORKDIR}/sysvinit-${PV}"
 

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#203652): https://lists.openembedded.org/g/openembedded-core/message/203652
Mute This Topic: https://lists.openembedded.org/mt/107960881/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw
In reply to Alexandre Belloni

Hi Alexandre,

Yes I see your problem and I'm really sorry for my incompetence.
It seems like both of my patches are malformed (but at least the email I got for my initial patch, seems to be fine, although the representation in this thread is off somehow).

What do you mean with creating a branch somewhere?
Do you mean I should clone the repo and create a branch with my changes? I could also just upload the patchfile somehow, where it shouldn't be malformed.

Best regards,
Sven

#6 lore raw
Quoted 5 lines · Sven Reschke via lists.openembedded.org

Yes I see your problem and I'm really sorry for my incompetence.
It seems like both of my patches are malformed (but at least the email I got for my initial patch, seems to be fine, although the representation in this thread is off somehow).

What do you mean with creating a branch somewhere?
Do you mean I should clone the repo and create a branch with my changes?

Yes, for example on github.

Alex

#8 lore raw
Quoted 5 lines · Sven Reschke via lists.openembedded.org

Hi Alex and Alexandre,

sorry for the delay.
I've created a PR on Github on top of your latest changes:
https://github.com/Nanowires/oe-core-clone/pull/1

I did try this on our automated testing and there were some issues:

musl build failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9440/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9456/steps/11/logs/stdio

systemd+sysvinit build failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/9431/steps/25/logs/stdio

Cheers,

Richard

#9 lore raw
Quoted 11 lines · Richard Purdie via lists.openembedded.org
Quoted 5 lines · Sven Reschke via lists.openembedded.org

Hi Alex and Alexandre,

sorry for the delay.
I've created a PR on Github on top of your latest changes:
https://github.com/Nanowires/oe-core-clone/pull/1

I did try this on our automated testing and there were some issues:

Quoted 8 lines

musl build failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9440/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9456/steps/11/logs/stdio

systemd+sysvinit build failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/9431/steps/25/logs/stdio

If you want to replicate these for fixing, the configurations are here:
https://git.yoctoproject.org/yocto-autobuilder-helper/tree/config.json

Alex

#10 lore raw
In reply to Richard Purdie
Quoted 9 lines · Richard Purdie via lists.openembedded.org
Quoted 5 lines · Sven Reschke via lists.openembedded.org

Hi Alex and Alexandre,

sorry for the delay.
I've created a PR on Github on top of your latest changes:
https://github.com/Nanowires/oe-core-clone/pull/1

Quoted 6 lines

I did try this on our automated testing and there were some issues:

musl build failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9440/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9456/steps/11/logs/stdio

This can be fixed by using realpath(path, NULL) API instead of canonicalize_file_name(path), we have done such changes in few packages e.g. elfutils

https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=06263dda990be6778a4beb33481cfd39ce60c623;hp=fd0cee63fb02455a5021ca298da8dadb4df63a9a

there is a meta-oe patch for ssiapi
https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch

Quoted 18 lines

systemd+sysvinit build failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/9431/steps/25/logs/stdio

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#203905): https://lists.openembedded.org/g/openembedded-core/message/203905
Mute This Topic: https://lists.openembedded.org/mt/107960881/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#11 lore raw
Quoted 26 lines
Quoted 9 lines · Richard Purdie via lists.openembedded.org
Quoted 5 lines · Sven Reschke via lists.openembedded.org

Hi Alex and Alexandre,

sorry for the delay.
I've created a PR on Github on top of your latest changes:
https://github.com/Nanowires/oe-core-clone/pull/1

Quoted 7 lines

I did try this on our automated testing and there were some issues:

musl build failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9440/steps/11/logs/stdio

https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9456/steps/11/logs/stdio

This can be fixed by using realpath(path, NULL) API instead of canonicalize_file_name(path), we have done such changes in few packages e.g. elfutils

Quoted 8 lines

https://sourceware.org/git/?p=elfutils.git ;a=commitdiff;h=06263dda990be6778a4beb33481cfd39ce60c623;hp=fd0cee63fb02455a5021ca298da8dadb4df63a9a

there is a meta-oe patch for ssiapi
https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch

first of all: Thanks for the automated testing :-)
Yes, I broke the realpath.patch with my update. I've pushed a fix, which should solve this issue.

Quoted 9 lines

systemd+sysvinit build failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/9431/steps/25/logs/stdio

Cheers,

Richard

For this I fixed the install.patch (which I removed in the first place). Could you re-run the tests with my latest commits? ;-)

Best regards,
Sven

#12 lore raw

Note that putting patches on GitHub really makes reviews very difficult for everyone. It’s okay to ask ppl to take your patch from there once but if you need to do fix ups and follow-ups you really should fix your email sending.

Alex

Quoted 64 lines · Sven Reschke via lists.openembedded.org

On Thu, Aug 29, 2024 at 1:52 AM Richard Purdie via lists.openembedded.org <richard.purdie=linuxfoundation.org@...> wrote:

On Mon, 2024-08-26 at 12:01 -0700, Sven Reschke via lists.openembedded.org wrote:

Hi Alex and Alexandre,

sorry for the delay.
I've created a PR on Github on top of your latest changes:
https://github.com/Nanowires/oe-core-clone/pull/1

I did try this on our automated testing and there were some issues:

musl build failures:

https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9440/steps/11/logs/stdio

https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9456/steps/11/logs/stdio

This can be fixed by using realpath(path, NULL) API instead of canonicalize_file_name(path), we have done such changes in few packages e.g. elfutils

https://sourceware.org/git/?p=elfutils.git
;a=commitdiff;h=06263dda990be6778a4beb33481cfd39ce60c623;hp=fd0cee63fb02455a5021ca298da8dadb4df63a9a

there is a meta-oe patch for ssiapi

https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch

first of all: Thanks for the automated testing :-)
Yes, I broke the realpath.patch with my update. I've pushed a fix, which should solve this issue.

systemd+sysvinit build failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/9431/steps/25/logs/stdio

Cheers,

Richard

For this I fixed the install.patch (which I removed in the first place). Could you re-run the tests with my latest commits? ;-)

Best regards,
Sven

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#203946):
https://lists.openembedded.org/g/openembedded-core/message/203946
Mute This Topic: https://lists.openembedded.org/mt/107960881/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#13 lore raw
In reply to Sven Reschke
Quoted 32 lines · Sven Reschke via lists.openembedded.org
Quoted 20 lines
Quoted 7 lines · Richard Purdie via lists.openembedded.org
Quoted 5 lines · Sven Reschke via lists.openembedded.org

Hi Alex and Alexandre,

sorry for the delay.
I've created a PR on Github on top of your latest changes:
https://github.com/Nanowires/oe-core-clone/pull/1

Quoted 6 lines

I did try this on our automated testing and there were some issues:

musl build failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9440/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9456/steps/11/logs/stdio

This can be fixed by using realpath(path, NULL) API instead of canonicalize_file_name(path), we have done such changes in few packages e.g. elfutils

Quoted 5 lines

https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=06263dda990be6778a4beb33481cfd39ce60c623;hp=fd0cee63fb02455a5021ca298da8dadb4df63a9a

there is a meta-oe patch for ssiapi
https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch

first of all: Thanks for the automated testing :-)
Yes, I broke the realpath.patch with my update. I've pushed a fix, which should solve this issue.

Quoted 2 lines

systemd+sysvinit build failure:

Quoted 7 lines
Quoted 5 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/9431/steps/25/logs/stdio

Cheers,

Richard

For this I fixed the install.patch (which I removed in the first place). Could you re-run the tests with my latest commits? ;-)

I can't just test one persons changes so there are multiple patches causing multiple issues in this build but there still seem to be sysvinit issues:

https://autobuilder.yoctoproject.org/typhoon/#/builders/113/builds/5903/steps/12/logs/stdio

There are probably other issues in there too.

As Alex says, pulling patches from github subverts our review process so whilst I did it as a one off, I can't do this on a regular basis.

Cheers,

Richard