Gentoo Archives: gentoo-commits

From: "Victor Ostorga (vostorga)" <vostorga@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-process/minit/files: minit-0.10-fixes.diff
Date: Sun, 30 Aug 2009 12:30:59
Message-Id: E1MhoNf-0003bd-Kz@stork.gentoo.org
1 vostorga 09/08/30 17:39:55
2
3 Added: minit-0.10-fixes.diff
4 Log:
5 Adding Andreas Wiese <aw@××××××××××××××.net> and myself as maintainers, Fixing build , bugs #248443 and #270144 , patch thanks to Andreas Wiese
6 (Portage version: 2.1.6.13/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 sys-process/minit/files/minit-0.10-fixes.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-process/minit/files/minit-0.10-fixes.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-process/minit/files/minit-0.10-fixes.diff?rev=1.1&content-type=text/plain
13
14 Index: minit-0.10-fixes.diff
15 ===================================================================
16 diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile
17 --- minit-0.10.orig/Makefile 2005-04-08 19:24:04.000000000 +0200
18 +++ minit-0.10/Makefile 2008-11-27 23:05:57.000000000 +0100
19 @@ -7,7 +7,7 @@
20 CROSS=
21 #CROSS=arm-linux-
22 LDFLAGS=-s
23 -MANDIR=/usr/man
24 +MANDIR=/usr/share/man
25
26 path = $(subst :, ,$(PATH))
27 diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
28 @@ -44,9 +44,11 @@
29 msvc: msvc.o
30 minit-update: minit-update.o split.o openreadclose.o
31 serdo: serdo.o
32 -
33 shutdown: shutdown.o split.o openreadclose.o opendevconsole.o
34 - $(DIET) $(CROSS)$(CC) $(LDFLAGS) -o shutdown $^
35 +pidfilehack: pidfilehack.o
36 +hard-reboot: hard-reboot.o
37 +write_proc: write_proc.o
38 +killall5: killall5.o
39
40 %.o: %.c
41 $(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
42 @@ -61,22 +63,11 @@
43 test: test.c
44 gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a
45
46 -pidfilehack: pidfilehack.c
47 - $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
48 -
49 -hard-reboot: hard-reboot.c
50 - $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
51 -
52 -write_proc: write_proc.c
53 - $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
54 -
55 -killall5: killall5.c
56 - $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
57 -
58 install-files:
59 install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin $(DESTDIR)$(MANDIR)/man8
60 - install minit pidfilehack $(DESTDIR)/sbin
61 + install minit killall5 pidfilehack $(DESTDIR)/sbin
62 install write_proc hard-reboot minit-update $(DESTDIR)/sbin
63 + install listpids $(DESTDIR)/sbin/minit-list
64 install msvc serdo $(DESTDIR)/bin
65 install -m 4750 shutdown $(DESTDIR)/sbin
66 test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init
67 diff -ru minit-0.10.orig/serdo.c minit-0.10/serdo.c
68 --- minit-0.10.orig/serdo.c 2005-02-26 18:00:22.000000000 +0100
69 +++ minit-0.10/serdo.c 2008-11-27 23:02:57.000000000 +0100
70 @@ -10,6 +10,7 @@
71 #define MAXENV 256
72 char* envp[MAXENV+2];
73 int envc;
74 +extern char **environ;
75
76 int continueonerror;