From 5372e1acdd68367e64d13e19d1beb2d7b3e3c224 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 Dec 2019 16:43:57 +0100 Subject: sysvinit: update 2.88dsf -> 2.96 Remove 0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch, the problem has been fixed upstream. Rebase the other patches. License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...an-issue-that-clang-reports-about-mutlipl.patch | 52 ---------- ...-sysmacros.h-for-major-minor-defines-in-g.patch | 14 +-- .../recipes-core/sysvinit/sysvinit/crypt-lib.patch | 31 ++++-- meta/recipes-core/sysvinit/sysvinit/install.patch | 47 +++++---- .../sysvinit/sysvinit/pidof-add-m-option.patch | 64 ++++++------ meta/recipes-core/sysvinit/sysvinit/realpath.patch | 85 ++++++---------- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 110 -------------------- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 112 +++++++++++++++++++++ 8 files changed, 236 insertions(+), 279 deletions(-) delete mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch delete mode 100644 meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb create mode 100644 meta/recipes-core/sysvinit/sysvinit_2.96.bb diff --git a/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch b/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch deleted file mode 100644 index f35c15cb31..0000000000 --- a/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 36ac97bfe51797458442a6035219a504a42e703a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 21 Aug 2015 10:56:40 -0700 -Subject: [PATCH] This fixes an issue that clang reports about mutliple output - files - -Issue is that we are passing .h file to link step as seen below. - -| arm-oe-linux-gnueabi-clang -march=armv7-a -mthumb -mfloat-abi=hard --mfpu=neon-vfpv4 -mtune=cortex-a7 -D__extern_always_inline=inline --no-integrated-as ---sysroot=/mnt/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-glibc/sysroots/raspberrypi2 --Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed halt.o ifdown.o hddown.o -utmp.o reboot.h -o halt -| clang-3.7: error: cannot specify -o when generating multiple output -files - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index e77ed5f..a6f9f40 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -103,9 +103,9 @@ all: $(BIN) $(SBIN) $(USRBIN) - init: LDLIBS += $(INITLIBS) $(STATIC) - init: init.o init_utmp.o - --halt: halt.o ifdown.o hddown.o utmp.o reboot.h -+halt: halt.o ifdown.o hddown.o utmp.o - --last: last.o oldutmp.h -+last: last.o - - mesg: mesg.o - -@@ -120,7 +120,7 @@ sulogin: sulogin.o - - wall: dowall.o wall.o - --shutdown: dowall.o shutdown.o utmp.o reboot.h -+shutdown: dowall.o shutdown.o utmp.o - - bootlogd: LDLIBS += -lutil - bootlogd: bootlogd.o --- -2.1.4 - diff --git a/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch b/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch index e13ac9d06b..60fbd87534 100644 --- a/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch +++ b/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch @@ -1,4 +1,4 @@ -From 3c29a86f351ea4827dc445bb8e6cb774543c9be6 Mon Sep 17 00:00:00 2001 +From c710a3accd1fabdb671274e1a458405282d51e0c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Aug 2018 15:38:58 -0700 Subject: [PATCH] include sys/sysmacros.h for major/minor definitions @@ -13,10 +13,10 @@ Upstream-Status: Pending 3 files changed, 3 insertions(+) diff --git a/src/bootlogd.c b/src/bootlogd.c -index 570d382..68d62f3 100644 +index 787db87..8b07903 100644 --- a/src/bootlogd.c +++ b/src/bootlogd.c -@@ -35,6 +35,7 @@ +@@ -29,6 +29,7 @@ #include #include #include @@ -25,7 +25,7 @@ index 570d382..68d62f3 100644 #include #include diff --git a/src/mountpoint.c b/src/mountpoint.c -index 9e3dd9c..91f74ed 100644 +index 5f20522..94df7a1 100644 --- a/src/mountpoint.c +++ b/src/mountpoint.c @@ -25,6 +25,7 @@ @@ -37,7 +37,7 @@ index 9e3dd9c..91f74ed 100644 #include #include diff --git a/src/shutdown.c b/src/shutdown.c -index 7e997da..17de58d 100644 +index b744a2c..40b7faf 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -40,6 +40,7 @@ @@ -46,5 +46,5 @@ index 7e997da..17de58d 100644 #include +#include #include - #include - #include + #ifdef __linux__ + #include /* brought in my LFS patch */ diff --git a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch index 7b342901e1..bd4444b81b 100644 --- a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +++ b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch @@ -1,3 +1,8 @@ +From 7276275d9a08d5ae268fb263027bbc60bc0ab2e8 Mon Sep 17 00:00:00 2001 +From: Jeff Dike +Date: Wed, 14 Jul 2010 14:35:52 -0400 +Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a + Upstream-Status: Inappropriate [configuration] # The src Makefile was checking for libcrypt.a on the host, not in the @@ -5,21 +10,27 @@ Upstream-Status: Inappropriate [configuration] # and uses it if it's there. # - jdike@linux.intel.com -Index: sysvinit-2.88dsf/src/Makefile -=================================================================== ---- sysvinit-2.88dsf.orig/src/Makefile -+++ sysvinit-2.88dsf/src/Makefile -@@ -85,9 +85,13 @@ else +--- + src/Makefile | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 1380d7f..628e77f 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -97,13 +97,8 @@ else endif # Additional libs for GNU libc. +-ifneq ($(wildcard /usr/lib*/libcrypt.*),) +- SULOGINLIBS += -lcrypt +-endif +- +-# Additional libs for GNU libc / multiarch on Debian based systems. +-ifneq ($(wildcard /usr/lib/*/libcrypt.*),) +- SULOGINLIBS += -lcrypt +ifneq ($(LCRYPT),) + SULOGINLIBS += $(LCRYPT) -+else - ifneq ($(wildcard /usr/lib*/libcrypt.a),) - SULOGINLIBS += -lcrypt endif -+endif all: $(BIN) $(SBIN) $(USRBIN) - diff --git a/meta/recipes-core/sysvinit/sysvinit/install.patch b/meta/recipes-core/sysvinit/sysvinit/install.patch index 6c4225a678..2930fb0195 100644 --- a/meta/recipes-core/sysvinit/sysvinit/install.patch +++ b/meta/recipes-core/sysvinit/sysvinit/install.patch @@ -1,10 +1,19 @@ +From b6cc66ab245ceb6bca0116dff7a41f6d7677b96a Mon Sep 17 00:00:00 2001 +From: Qing He +Date: Fri, 18 Jun 2010 09:40:30 +0800 +Subject: [PATCH] sysvinit: upgrade to version 2.88dsf + Upstream-Status: Pending +--- + src/Makefile | 53 +++++++++++++++++++++++++++++----------------------- + 1 file changed, 30 insertions(+), 23 deletions(-) + diff --git a/src/Makefile b/src/Makefile -index e2b8028..3e11e92 100644 +index 9f9f09e..1380d7f 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -65,7 +65,14 @@ else +@@ -77,7 +77,14 @@ else INSTALL_DATA = install -m 644 endif INSTALL_DIR = install -m 755 -d @@ -20,10 +29,10 @@ index e2b8028..3e11e92 100644 ifeq ($(WITH_SELINUX),yes) SELINUX_DEF = -DWITH_SELINUX -@@ -138,39 +145,39 @@ clobber: cleanobjs +@@ -189,42 +196,42 @@ clobber: cleanobjs distclean: clobber - install: + install: all - $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/ - $(INSTALL_DIR) $(ROOT)/usr/bin/ + $(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/ @@ -40,16 +49,14 @@ index e2b8028..3e11e92 100644 - $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \ + $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \ done -- # $(INSTALL_DIR) $(ROOT)/etc/ -- # $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/ + # $(INSTALL_DIR) $(ROOT)/etc/ + # $(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; \ -+ # $(INSTALL_DIR) $(ROOT)$(sysconfdir)/ -+ # $(INSTALL_EXEC) initscript.sample $(ROOT)$(sysconfdir)/ + ln -sf halt $(ROOT)$(base_sbindir)/reboot + ln -sf halt $(ROOT)$(base_sbindir)/poweroff + ln -sf init $(ROOT)$(base_sbindir)/telinit @@ -67,17 +74,23 @@ index e2b8028..3e11e92 100644 + $(INSTALL_DIR) $(ROOT)$(mandir)/man1/ + $(INSTALL_DIR) $(ROOT)$(mandir)/man5/ + $(INSTALL_DIR) $(ROOT)$(mandir)/man8/ - for i in $(MAN1); do \ -- $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \ -+ $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man1/; \ + 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 i in $(MAN5); do \ -- $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man5/; \ -+ $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man5/; \ + 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 i in $(MAN8); do \ -- $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man8/; \ -+ $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man8/; \ + 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),) # diff --git a/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch b/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch index 5b5dfdc001..494aa0e012 100644 --- a/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch +++ b/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch @@ -1,4 +1,7 @@ -pidof: add -m option +From 6c490ea6579a132fabb7dbd25387bb521f820371 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 24 Jul 2013 17:07:22 +0800 +Subject: [PATCH] pidof: add -m option When used with -o, will also omit any processes that have the same argv[0] and argv[1] as any explicitly omitted process ids. This can be @@ -11,23 +14,25 @@ Upstream-Status: backport Imported patch from: https://bugzilla.redhat.com/attachment.cgi?id=658166 Signed-off-by: Hongxu Jia + --- - man/pidof.8 | 6 ++++++ - src/killall5.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + man/pidof.8 | 6 +++++ + src/killall5.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/man/pidof.8 b/man/pidof.8 +index ebe5f55..2fdc4d3 100644 --- a/man/pidof.8 +++ b/man/pidof.8 -@@ -24,6 +24,7 @@ pidof -- find the process ID of a running program. - .RB [ \-c ] +@@ -25,6 +25,7 @@ pidof -- find the process ID of a running program. .RB [ \-n ] .RB [ \-x ] + .RB [ \-z ] +.RB [ \-m ] .RB [ \-o - .IR omitpid[,omitpid..] ] + .IR omitpid[,omitpid...] ] .RB [ \-o -@@ -63,6 +64,11 @@ shells running the named scripts. +@@ -76,6 +77,11 @@ is shown. The default separator is a space. Tells \fIpidof\fP to omit processes with that process id. The special pid \fB%PPID\fP can be used to name the parent process of the \fIpidof\fP program, in other words the calling shell or shell script. @@ -40,10 +45,10 @@ diff --git a/man/pidof.8 b/man/pidof.8 .TP .B 0 diff --git a/src/killall5.c b/src/killall5.c -index 5937d98..e73885e 100644 +index 8b5cb38..a664954 100644 --- a/src/killall5.c +++ b/src/killall5.c -@@ -118,6 +118,7 @@ typedef struct _s_nfs +@@ -126,6 +126,7 @@ typedef struct _s_nfs /* List of processes. */ PROC *plist; @@ -51,7 +56,7 @@ index 5937d98..e73885e 100644 /* List of processes to omit. */ OMIT *omit; -@@ -345,6 +346,20 @@ static void clear_mnt(void) +@@ -361,6 +362,20 @@ static void clear_mnt(void) } } @@ -70,9 +75,9 @@ index 5937d98..e73885e 100644 +} + /* - * Check if path is ia shadow off a NFS partition. + * Check if path is a shadow off a NFS partition. */ -@@ -452,6 +467,7 @@ int readproc(int do_stat) +@@ -486,6 +501,7 @@ int readproc(int do_stat) DIR *dir; FILE *fp; PROC *p, *n; @@ -80,7 +85,7 @@ index 5937d98..e73885e 100644 struct dirent *d; struct stat st; char path[PATH_MAX+1]; -@@ -624,6 +640,17 @@ int readproc(int do_stat) +@@ -733,6 +749,17 @@ int readproc(int do_stat) p->next = plist; plist = p; p->pid = pid; @@ -98,7 +103,7 @@ index 5937d98..e73885e 100644 } closedir(dir); -@@ -813,6 +840,26 @@ PIDQ_HEAD *pidof(char *prog) +@@ -944,6 +971,26 @@ PIDQ_HEAD *pidof(char *prog) return q; } @@ -125,42 +130,42 @@ index 5937d98..e73885e 100644 /* Give usage message and exit. */ void usage(void) { -@@ -845,6 +892,7 @@ void nsyslog(int pri, char *fmt, ...) - #define PIDOF_SINGLE 0x01 +@@ -994,6 +1041,7 @@ void nsyslog(int pri, char *fmt, ...) #define PIDOF_OMIT 0x02 #define PIDOF_NETFS 0x04 + #define PIDOF_QUIET 0x08 +#define PIDOF_OMIT_OMIT_MATCHES 0x08 /* * Pidof functionality. -@@ -861,6 +909,7 @@ int main_pidof(int argc, char **argv) - struct stat st; +@@ -1011,6 +1059,7 @@ int main_pidof(int argc, char **argv) char tmp[512]; + char sep = ' '; + olist = (PROC*)0; omit = (OMIT*)0; nlist = (NFS*)0; opterr = 0; -@@ -868,7 +917,7 @@ int main_pidof(int argc, char **argv) +@@ -1018,7 +1067,7 @@ int main_pidof(int argc, char **argv) if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0)) flags |= PIDOF_NETFS; -- while ((opt = getopt(argc,argv,"hco:sxn")) != EOF) switch (opt) { -+ while ((opt = getopt(argc,argv,"hcmo:sxn")) != EOF) switch (opt) { +- while ((opt = getopt(argc,argv,"qhco:d:sxzn")) != EOF) switch (opt) { ++ while ((opt = getopt(argc,argv,"qhcmo:d:sxzn")) != EOF) switch (opt) { case '?': nsyslog(LOG_ERR,"invalid options on command line!\n"); closelog(); -@@ -907,6 +956,9 @@ int main_pidof(int argc, char **argv) - case 'x': - scripts_too++; - break; +@@ -1069,6 +1118,9 @@ int main_pidof(int argc, char **argv) + case 'z': + list_dz_processes = TRUE; + break; + case 'm': + flags |= PIDOF_OMIT_OMIT_MATCHES; + break; case 'n': flags |= PIDOF_NETFS; break; -@@ -938,10 +990,13 @@ int main_pidof(int argc, char **argv) +@@ -1100,10 +1152,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) { @@ -176,14 +181,11 @@ index 5937d98..e73885e 100644 } /* -@@ -977,6 +1032,7 @@ int main_pidof(int argc, char **argv) - if (!first) +@@ -1145,6 +1200,7 @@ int main_pidof(int argc, char **argv) printf("\n"); + } + clear_omit(); clear_mnt(); closelog(); --- -1.8.1.2 - diff --git a/meta/recipes-core/sysvinit/sysvinit/realpath.patch b/meta/recipes-core/sysvinit/sysvinit/realpath.patch index 5e0dca3bf1..859fd8baad 100644 --- a/meta/recipes-core/sysvinit/sysvinit/realpath.patch +++ b/meta/recipes-core/sysvinit/sysvinit/realpath.patch @@ -1,4 +1,8 @@ -Fix build on musl use realpath() API its available on all libcs +From eb158c97f19d473d01befe96359a7f93ae834517 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 19 Nov 2015 00:10:03 +0000 +Subject: [PATCH] Fix build on musl use realpath() API its available on all + libcs realpath() API doesnt work on systems with PATH_MAX set to be unlimited e.g. GNU/Hurd However for Linux it should always work @@ -7,52 +11,17 @@ Upstream-Status: Inappropriate[Linux specific] Signed-off-by: Khem Raj -Index: sysvinit-2.88dsf/src/ifdown.c -=================================================================== ---- sysvinit-2.88dsf.orig/src/ifdown.c 2010-03-23 07:37:01.000000000 -0700 -+++ sysvinit-2.88dsf/src/ifdown.c 2014-04-02 00:43:43.675437029 -0700 -@@ -26,11 +26,11 @@ - #include - #include - #include -+#include - - #include - #include - #include --#include - - #include - #include -Index: sysvinit-2.88dsf/src/init.c -=================================================================== ---- sysvinit-2.88dsf.orig/src/init.c 2014-04-02 00:42:10.488770162 -0700 -+++ sysvinit-2.88dsf/src/init.c 2014-04-02 00:42:59.432103823 -0700 -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - #include - #include - -Index: sysvinit-2.88dsf/src/mountpoint.c -=================================================================== ---- sysvinit-2.88dsf.orig/src/mountpoint.c 2009-09-10 01:28:49.000000000 -0700 -+++ sysvinit-2.88dsf/src/mountpoint.c 2014-04-02 00:44:18.248770942 -0700 -@@ -23,6 +23,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include - #include - #include - #include -Index: sysvinit-2.88dsf/src/killall5.c -=================================================================== ---- sysvinit-2.88dsf.orig/src/killall5.c 2014-03-26 00:49:52.982668074 -0700 -+++ sysvinit-2.88dsf/src/killall5.c 2014-04-02 00:46:45.838771653 -0700 -@@ -846,9 +846,9 @@ +--- + src/killall5.c | 4 ++-- + src/mountpoint.c | 1 + + src/wall.c | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) + +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) { @@ -64,14 +33,26 @@ Index: sysvinit-2.88dsf/src/killall5.c pargv1 = strdup(p->argv1); if (! strcmp(oargv1, pargv1)) { ret = 1; -Index: sysvinit-2.88dsf/src/wall.c -=================================================================== ---- sysvinit-2.88dsf.orig/src/wall.c 2009-11-22 14:05:53.000000000 -0800 -+++ sysvinit-2.88dsf/src/wall.c 2014-04-02 00:49:15.258772217 -0700 -@@ -29,6 +29,7 @@ +diff --git a/src/mountpoint.c b/src/mountpoint.c +index b24335e..5f20522 100644 +--- a/src/mountpoint.c ++++ b/src/mountpoint.c +@@ -23,6 +23,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include + #include #include + #include +diff --git a/src/wall.c b/src/wall.c +index d3a2c70..00826e9 100644 +--- a/src/wall.c ++++ b/src/wall.c +@@ -30,6 +30,7 @@ #include #include + #include +#include #include "init.h" diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb deleted file mode 100644 index 8fd6df9d6b..0000000000 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ /dev/null @@ -1,110 +0,0 @@ -SUMMARY = "System-V like init" -DESCRIPTION = "This package is required to boot in most configurations. It provides the /sbin/init program. This is the first process started on boot, and the last process terminated before the system halts." -HOMEPAGE = "http://savannah.nongnu.org/projects/sysvinit/" -SECTION = "base" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" -PR = "r14" - -RDEPENDS_${PN} = "${PN}-inittab" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.bz2 \ - file://install.patch \ - file://crypt-lib.patch \ - file://pidof-add-m-option.patch \ - file://0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch \ - file://realpath.patch \ - file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ - file://rcS-default \ - file://rc \ - file://rcS \ - file://bootlogd.init \ - file://01_bootlogd \ -" - -SRC_URI[md5sum] = "6eda8a97b86e0a6f59dabbf25202aa6f" -SRC_URI[sha256sum] = "60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519" - -S = "${WORKDIR}/sysvinit-${PV}" -B = "${S}/src" - -inherit update-alternatives features_check -DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" - -REQUIRED_DISTRO_FEATURES = "sysvinit" - -ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" - -ALTERNATIVE_PRIORITY = "200" - -ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" -ALTERNATIVE_PRIORITY[init] = "50" - -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" -ALTERNATIVE_PRIORITY[mountpoint] = "20" - -ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt" -ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" -ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" -ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" -ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" - -ALTERNATIVE_${PN}-pidof = "pidof" -ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" - -ALTERNATIVE_${PN}-sulogin = "sulogin" -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" - -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" - -ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" -ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" -ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" -ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" -ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" -ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" -ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" - -PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" -FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" -FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" -FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" - -RDEPENDS_${PN} += "sysvinit-pidof initd-functions" - -CFLAGS_prepend = "-D_GNU_SOURCE " -export LCRYPT = "-lcrypt" -EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ - 'base_sbindir=${base_sbindir}' \ - 'bindir=${bindir}' \ - 'sbindir=${sbindir}' \ - 'sysconfdir=${sysconfdir}' \ - 'includedir=${includedir}' \ - 'mandir=${mandir}'" - -do_install () { - oe_runmake 'ROOT=${D}' install - - install -d ${D}${sysconfdir} \ - ${D}${sysconfdir}/default \ - ${D}${sysconfdir}/init.d - for level in S 0 1 2 3 4 5 6; do - install -d ${D}${sysconfdir}/rc$level.d - done - - install -m 0644 ${WORKDIR}/rcS-default ${D}${sysconfdir}/default/rcS - install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd - ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd - - update-rc.d -r ${D} bootlogd start 07 S . - update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles - - chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown - chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown -} diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb new file mode 100644 index 0000000000..2b146b1ef8 --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -0,0 +1,112 @@ +SUMMARY = "System-V like init" +DESCRIPTION = "This package is required to boot in most configurations. It provides the /sbin/init program. This is the first process started on boot, and the last process terminated before the system halts." +HOMEPAGE = "http://savannah.nongnu.org/projects/sysvinit/" +SECTION = "base" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ + " + +RDEPENDS_${PN} = "${PN}-inittab" + +SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ + file://install.patch \ + 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://rcS-default \ + file://rc \ + file://rcS \ + file://bootlogd.init \ + file://01_bootlogd \ + " +SRC_URI[md5sum] = "48cebffebf2a96ab09bec14bf9976016" +SRC_URI[sha256sum] = "2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587" + +S = "${WORKDIR}/sysvinit-${PV}" +B = "${S}/src" + +inherit update-alternatives features_check +DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" + +REQUIRED_DISTRO_FEATURES = "sysvinit" + +ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" + +ALTERNATIVE_PRIORITY = "200" + +ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" +ALTERNATIVE_PRIORITY[init] = "50" + +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_PRIORITY[mountpoint] = "20" + +ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt" +ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" +ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" +ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" +ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" + +ALTERNATIVE_${PN}-pidof = "pidof" +ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" + +ALTERNATIVE_${PN}-sulogin = "sulogin" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" + +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" + +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" +ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" + +PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" +FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" +FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" +FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" + +RDEPENDS_${PN} += "sysvinit-pidof initd-functions" + +CFLAGS_prepend = "-D_GNU_SOURCE " +export LCRYPT = "-lcrypt" +EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ + 'base_sbindir=${base_sbindir}' \ + 'bindir=${bindir}' \ + 'sbindir=${sbindir}' \ + 'sysconfdir=${sysconfdir}' \ + 'includedir=${includedir}' \ + 'mandir=${mandir}' \ + MNTPOINT=yes" + +do_install () { + oe_runmake 'ROOT=${D}' install + + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d + for level in S 0 1 2 3 4 5 6; do + install -d ${D}${sysconfdir}/rc$level.d + done + + install -m 0644 ${WORKDIR}/rcS-default ${D}${sysconfdir}/default/rcS + install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd + ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd + + update-rc.d -r ${D} bootlogd start 07 S . + update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles + + chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown + chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown + + # Already provided by e2fsprogs; sysvinit's version is a copy from there + rm ${D}${base_sbindir}/logsave +} -- cgit 1.2.3-korg