diff --git a/Changelog b/Changelog index 62067301..42628cab 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -0.5 () +0.5 (20080821) - add option to start dbus and consolekit before the X server - finit-alt listens to /dev/initctl to work with reboot(8) (smurfy) - write runlevel to utmp, needed by Printerdrake (Pascal Terjan) diff --git a/Makefile b/Makefile index d9643594..c89ce367 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ CFLAGS = -Os -Wall -DVERSION=\"$(VERSION)\" -DWHOAMI=\"`whoami`@`hostname`\" LD = gcc LDFLAGS = LIBS = -VERSION = 0.5-pre +VERSION = 0.5 PKG = finit-$(VERSION) DFILES = Makefile README finit.c finit-mod.c finit-alt.c helpers.c helpers.h \ - patches/*patch contrib/services.sh* + patches/*patch contrib/services.sh* Makefile.gdium BINS = finit-mod finit-alt finit-mdv #finit-exb diff --git a/README b/README index b593ddde..856f894f 100644 --- a/README +++ b/README @@ -40,3 +40,9 @@ Finit handles SIGUSR1 and SIGUSR2 for reboot and halt, and listens to /dev/initctl so standard Linux reboot and halt commands should also work. + +Debugging +--------- + +Add finit_debug to the kernel parameter line to enable trace messages +and to run a shell after the X server. diff --git a/contrib/Makefile.gdium b/contrib/Makefile.gdium new file mode 100644 index 00000000..bac09d0c --- /dev/null +++ b/contrib/Makefile.gdium @@ -0,0 +1,88 @@ +CC = gcc +CFLAGS = -Os -Wall -DVERSION=\"$(VERSION)\" -DWHOAMI=\"`whoami`@`hostname`\" +LD = gcc +LDFLAGS = +LIBS = +VERSION = 0.5-pre +PKG = finit-$(VERSION) +DFILES = Makefile README finit.c finit-mod.c finit-alt.c helpers.c helpers.h \ + patches/*patch contrib/services.sh* +BINS = finit-mod finit-alt finit-mdv #finit-exb + + + +#### Configurable parameters + +# Default user for finit-alt if not "user" +#DEFUSER = fred + +# Use -march=pentium-m to build for Eeepc +#CFLAGS += -march=pentium-m + +# Omit the first /sbin/hwclock if CONFIG_RTC_HCTOSYS is enabled in the kernel +CFLAGS += -DNO_HCTOSYS + +# Append -directisa to /sbin/hwclock lines if the user has disabled +# CONFIG_GENRTC and enabled CONFIG_RTC but not enabled CONFIG_HPET_TIMER +# and CONFIG_HPET_RTC_IRQ. +#CFLAGS += -DDIRECTISA + +# Use built-in run-parts instead of /bin/run-parts +CFLAGS += -DBUILTIN_RUNPARTS + +#### End of configurable parameters + + + +ifneq ($(DEFUSER),) +CFLAGS += -DDEFUSER=\"$(DEFUSER)\" +endif + +.c.o: + $(CC) -c $(CFLAGS) -o $*.o $< + +all: $(BINS) + +finit: finit.o + $(LD) $(LDFLAGS) -o $@ $+ $(LIBS) + strip $@ + +finit-mod: finit-mod.o helpers.o + $(LD) $(LDFLAGS) -o $@ $+ $(LIBS) + strip $@ + +finit-alt: finit-alt.o helpers.o + $(LD) $(LDFLAGS) -o $@ $+ $(LIBS) + strip $@ + +finit-mdv: finit-mdv.o helpers.o + $(LD) $(LDFLAGS) -o $@ $+ $(LIBS) + strip $@ + +finit-mdv.o: finit-alt.c Makefile + $(CC) -c $(CFLAGS) -DDIST_MDV -o $@ finit-alt.c + +finit-exb: finit-exb.o helpers.o + $(LD) $(LDFLAGS) -o $@ $+ $(LIBS) + strip $@ + +finit-exb.o: finit-alt.c Makefile + $(CC) -c $(CFLAGS) -DDIST_EEEXUBUNTU -o $@ finit-alt.c + +clean: + rm -f *.o core *~ $(BINS) + +finit.o: finit.c Makefile + +finit-mod.o: finit-mod.c Makefile + +helpers.o: helpers.c Makefile + +dist: + rm -Rf $(PKG) + mkdir -p $(PKG)/contrib $(PKG)/patches + for i in $(DFILES); do cp $$i $(PKG)/`dirname $$i`; done + tar cf - $(PKG) | gzip -c > $(PKG).tar.gz + rm -Rf $(PKG) + ls -l $(PKG).tar.gz +