From 5fd1efc6263a3d537a645dafa8537fa04f395f22 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Thu, 28 Feb 2019 16:29:21 -0300 Subject: [PATCH] recipes: boot/sysvinit: upgraded to version 2.94 --- ...ed-1.patch => sysvinit-2.94-dragora_consolidated-1.patch} | 12 ++++++------ recipes/boot/sysvinit/post-install | 8 ++++++++ recipes/boot/sysvinit/recipe | 6 +++--- sources/SOURCELIST.txt | 2 +- sources/sysvinit-2.93.tar.xz.sha256 | 1 - sources/sysvinit-2.94.tar.xz.sha256 | 1 + 6 files changed, 19 insertions(+), 11 deletions(-) rename patches/sysvinit/{sysvinit-2.93-dragora_consolidated-1.patch => sysvinit-2.94-dragora_consolidated-1.patch} (87%) delete mode 100644 sources/sysvinit-2.93.tar.xz.sha256 create mode 100644 sources/sysvinit-2.94.tar.xz.sha256 diff --git a/patches/sysvinit/sysvinit-2.93-dragora_consolidated-1.patch b/patches/sysvinit/sysvinit-2.94-dragora_consolidated-1.patch similarity index 87% rename from patches/sysvinit/sysvinit-2.93-dragora_consolidated-1.patch rename to patches/sysvinit/sysvinit-2.94-dragora_consolidated-1.patch index 38e495fe..87752d5c 100644 --- a/patches/sysvinit/sysvinit-2.93-dragora_consolidated-1.patch +++ b/patches/sysvinit/sysvinit-2.94-dragora_consolidated-1.patch @@ -1,9 +1,9 @@ ---- sysvinit-2.93/src/Makefile.orig 2018-11-24 13:38:12.000000000 -0300 -+++ sysvinit-2.93/src/Makefile 2018-11-24 16:08:39.042099643 -0300 +--- sysvinit-2.94/src/Makefile.orig 2019-02-24 20:26:33.000000000 -0300 ++++ sysvinit-2.94/src/Makefile 2019-02-28 16:13:38.917036402 -0300 @@ -24,18 +24,18 @@ # For some known distributions we do not build all programs, otherwise we do. BIN = - SBIN = init halt shutdown runlevel killall5 fstab-decode + SBIN = init halt shutdown runlevel killall5 fstab-decode logsave -USRBIN = last mesg readbootlog +USRBIN = readbootlog @@ -12,7 +12,7 @@ MAN5 = initscript.5 inittab.5 initctl.5 -MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8 +MAN8 = halt.8 init.8 killall5.8 poweroff.8 reboot.8 runlevel.8 - MAN8 += shutdown.8 telinit.8 fstab-decode.8 + MAN8 += shutdown.8 telinit.8 fstab-decode.8 logsave.8 ifeq ($(DISTRO),) -SBIN += sulogin bootlogd @@ -47,7 +47,7 @@ all: $(BIN) $(SBIN) $(USRBIN) -@@ -197,10 +197,10 @@ +@@ -206,10 +206,10 @@ ln -sf halt $(ROOT)/sbin/reboot ln -sf halt $(ROOT)/sbin/poweroff ln -sf init $(ROOT)/sbin/telinit @@ -62,7 +62,7 @@ $(INSTALL_DIR) $(ROOT)/usr/include/ $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/ -@@ -222,8 +222,8 @@ +@@ -231,8 +231,8 @@ # # This part is skipped on Debian systems, the # debian.preinst script takes care of it. diff --git a/recipes/boot/sysvinit/post-install b/recipes/boot/sysvinit/post-install index c6676028..13ef883e 100644 --- a/recipes/boot/sysvinit/post-install +++ b/recipes/boot/sysvinit/post-install @@ -1,6 +1,14 @@ cd etc/rc.d && ln -sf rc.shutdown rc.reboot +echo "Creating ${rootdir}/run/initctl interface, if needed ..." +if test ! -p "${rootdir}/run/initctl" +then + mkdir -p -- "${rootdir}/run" + rm -f -- "${rootdir}/run/initctl" + mknod -m 600 -- "${rootdir}/run/initctl" p +fi + # Reload init(8) init U || kill -s HUP 1 diff --git a/recipes/boot/sysvinit/recipe b/recipes/boot/sysvinit/recipe index e8ea045a..73613265 100644 --- a/recipes/boot/sysvinit/recipe +++ b/recipes/boot/sysvinit/recipe @@ -1,6 +1,6 @@ # Build recipe for sysvinit. # -# Copyright (c) 2018 Matias Fonzo, . +# Copyright (c) 2018-2019 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ # limitations under the License. program=sysvinit -version=2.93 +version=2.94 release=1 # Set 'outdir' for a nice and well-organized output directory @@ -57,7 +57,7 @@ build() patch -p0 < "${worktree}/patches/sysvinit/sysvinit-adjust_paths.h.diff" # Remove several programs installed by other packages - patch -p1 < "${worktree}/patches/sysvinit/sysvinit-2.93-dragora_consolidated-1.patch" + patch -p1 < "${worktree}/patches/sysvinit/sysvinit-2.94-dragora_consolidated-1.patch" make -j${jobs} CFLAGS="$QICFLAGS" STATIC="-static" make -j${jobs} ROOT="$destdir" install diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt index d64c2907..3716ef36 100644 --- a/sources/SOURCELIST.txt +++ b/sources/SOURCELIST.txt @@ -70,7 +70,7 @@ http://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.8.tar.lz http://download.savannah.gnu.org/releases/moe/moe-1.10.tar.lz http://download.savannah.gnu.org/releases/zutils/zutils-1.8.tar.lz http://download.savannah.nongnu.org/releases/man-db/man-db-2.8.5.tar.xz -http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-2.93.tar.xz +http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-2.94.tar.xz http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.44.5.tar.gz http://downloads.sourceforge.net/freeglut/freeglut-3.0.0.tar.gz http://downloads.sourceforge.net/infozip/unzip60.tar.gz diff --git a/sources/sysvinit-2.93.tar.xz.sha256 b/sources/sysvinit-2.93.tar.xz.sha256 deleted file mode 100644 index 54c016d2..00000000 --- a/sources/sysvinit-2.93.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -472d460e233d981488509a167125a82925c8c9aba6b5608cb22598fdf326a8ff sysvinit-2.93.tar.xz diff --git a/sources/sysvinit-2.94.tar.xz.sha256 b/sources/sysvinit-2.94.tar.xz.sha256 new file mode 100644 index 00000000..efa14587 --- /dev/null +++ b/sources/sysvinit-2.94.tar.xz.sha256 @@ -0,0 +1 @@ +7e09c5641fe5436ad3e158720acd2e6e0d4eba074abb9b53bce3ca989f839a17 sysvinit-2.94.tar.xz -- 2.11.4.GIT