Attachment #212175 for bug #295817

View | Details | Raw Unified | Return to bug 295817
Collapse All | Expand All




CROSS=
#CROSS=arm-linux-
LDFLAGS=-s
MANDIR=/usr/share/man

path = $(subst :, ,$(PATH))
diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))

msvc: msvc.o
minit-update: minit-update.o split.o openreadclose.o
serdo: serdo.o

shutdown: shutdown.o split.o openreadclose.o opendevconsole.o
pidfilehack: pidfilehack.o
hard-reboot: hard-reboot.o
write_proc: write_proc.o
killall5: killall5.o

%.o: %.c
	$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<

test: test.c
	gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a

pidfilehack: pidfilehack.c
	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^

hard-reboot: hard-reboot.c
	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^

write_proc: write_proc.c
	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^

killall5: killall5.c
	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^

install-files:
	install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin $(DESTDIR)$(MANDIR)/man8
	install minit killall5 pidfilehack $(DESTDIR)/sbin
	install write_proc hard-reboot minit-update $(DESTDIR)/sbin
	install listpids $(DESTDIR)/sbin/minit-list
	install msvc serdo $(DESTDIR)/bin
	install -m 4750 shutdown $(DESTDIR)/sbin
	test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init

Lines 10-15 Link Here

(-)minit-0.10.orig/serdo.c (+1 lines)
10	#define MAXENV 256	10	#define MAXENV 256
11	char* envp[MAXENV+2];	11	char* envp[MAXENV+2];
12	int envc;	12	int envc;
		13	extern char **environ;
13		14
14	int continueonerror;	15	int continueonerror;
15		16

Return to bug 295817

Lines 7-13 Link Here

(-)minit-0.10.orig/Makefile (-16 / +7 lines)
7	CROSS=	7	CROSS=
8	#CROSS=arm-linux-	8	#CROSS=arm-linux-
9	LDFLAGS=-s	9	LDFLAGS=-s
10	MANDIR=/usr/man	10	MANDIR=/usr/share/man
11		11
12	path = $(subst :, ,$(PATH))	12	path = $(subst :, ,$(PATH))
13	diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))	13	diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
Lines 44-52 Link Here
44	msvc: msvc.o	44	msvc: msvc.o
45	minit-update: minit-update.o split.o openreadclose.o	45	minit-update: minit-update.o split.o openreadclose.o
46	serdo: serdo.o	46	serdo: serdo.o
47
48	shutdown: shutdown.o split.o openreadclose.o opendevconsole.o	47	shutdown: shutdown.o split.o openreadclose.o opendevconsole.o
49	$(DIET) $(CROSS)$(CC) $(LDFLAGS) -o shutdown $^	48	pidfilehack: pidfilehack.o
		49	hard-reboot: hard-reboot.o
		50	write_proc: write_proc.o
		51	killall5: killall5.o
50		52
51	%.o: %.c	53	%.o: %.c
52	$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<	54	$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
Lines 61-82 Link Here
61	test: test.c	63	test: test.c
62	gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a	64	gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a
63		65
64	pidfilehack: pidfilehack.c
65	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
66
67	hard-reboot: hard-reboot.c
68	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
69
70	write_proc: write_proc.c
71	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
72
73	killall5: killall5.c
74	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
75
76	install-files:	66	install-files:
77	install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin $(DESTDIR)$(MANDIR)/man8	67	install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin $(DESTDIR)$(MANDIR)/man8
78	install minit pidfilehack $(DESTDIR)/sbin	68	install minit killall5 pidfilehack $(DESTDIR)/sbin
79	install write_proc hard-reboot minit-update $(DESTDIR)/sbin	69	install write_proc hard-reboot minit-update $(DESTDIR)/sbin
		70	install listpids $(DESTDIR)/sbin/minit-list
80	install msvc serdo $(DESTDIR)/bin	71	install msvc serdo $(DESTDIR)/bin
81	install -m 4750 shutdown $(DESTDIR)/sbin	72	install -m 4750 shutdown $(DESTDIR)/sbin
82	test -f $(DESTDIR)/sbin/init \|\| ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init	73	test -f $(DESTDIR)/sbin/init \|\| ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init