commit: ef5d2d04637a845ec3fe26d7356cbb335c91db3f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 18:35:26 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 18:35:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5d2d04
sys-process/minit: scrub-patch
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-process/minit/files/minit-0.10-fixes.diff | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/sys-process/minit/files/minit-0.10-fixes.diff
b/sys-process/minit/files/minit-0.10-fixes.diff
index 5c80091f84f3..49b67c67a282 100644
--- a/sys-process/minit/files/minit-0.10-fixes.diff
+++ b/sys-process/minit/files/minit-0.10-fixes.diff
@@ -1,13 +1,12 @@
-diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile
---- minit-0.10.orig/Makefile 2005-04-08 19:24:04.000000000 +0200
-+++ minit-0.10/Makefile 2008-11-27 23:05:57.000000000 +0100
+--- a/Makefile
++++ b/Makefile
@@ -7,7 +7,7 @@
CROSS=
#CROSS=arm-linux-
LDFLAGS=-s
-MANDIR=/usr/man
+MANDIR=/usr/share/man
-
+
path = $(subst :, ,$(PATH))
diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
@@ -44,9 +44,11 @@
@@ -21,13 +20,13 @@ diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile
+hard-reboot: hard-reboot.o
+write_proc: write_proc.o
+killall5: killall5.o
-
+
%.o: %.c
$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
@@ -61,22 +63,11 @@
test: test.c
gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o
../dietlibc/dietlibc.a
-
+
-pidfilehack: pidfilehack.c
- $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
-
@@ -49,14 +48,13 @@ diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile
install msvc serdo $(DESTDIR)/bin
install -m 4750 shutdown $(DESTDIR)/sbin
test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit
$(DESTDIR)/sbin/init
-diff -ru minit-0.10.orig/serdo.c minit-0.10/serdo.c
---- minit-0.10.orig/serdo.c 2005-02-26 18:00:22.000000000 +0100
-+++ minit-0.10/serdo.c 2008-11-27 23:02:57.000000000 +0100
+--- a/serdo.c
++++ b/serdo.c
@@ -10,6 +10,7 @@
#define MAXENV 256
char* envp[MAXENV+2];
int envc;
+extern char **environ;
-
+
int continueonerror;
-
+
