From 840ade6da7fbc61e308ef3fc0a4b6af370bf5db7 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sun, 18 Jan 2015 23:20:08 +0100 Subject: [PATCH] Bump version for next release, fix `make dist` and rename NEWS --> CHANGELOG - Bump version for coming 1.11 release - Update `make dist` to use Kentzo's `git-archive-all` from https://github.com/Kentzo/git-archive-all - Rename NEWS --> CHANGELOG and update for coming release - Update CHANGELOG with info on the libuEv migration Signed-off-by: Joachim Nilsson --- CHANGELOG | 1 + NEWS.md => CHANGELOG.md | 109 +++++++++++++++++++++++++++------------- Makefile | 19 +++++-- NEWS | 1 - 4 files changed, 89 insertions(+), 41 deletions(-) create mode 120000 CHANGELOG rename NEWS.md => CHANGELOG.md (72%) delete mode 120000 NEWS diff --git a/CHANGELOG b/CHANGELOG new file mode 120000 index 00000000..83b69470 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1 @@ +CHANGELOG.md \ No newline at end of file diff --git a/NEWS.md b/CHANGELOG.md similarity index 72% rename from NEWS.md rename to CHANGELOG.md index b6c8db60..67fc7797 100644 --- a/NEWS.md +++ b/CHANGELOG.md @@ -1,10 +1,25 @@ -NEWS -==== +ChangeLog +========= +All notable changes to the project are documented in this file. -1.10 (2014-11-27) ------------------ +[1.11] - UNRELEASED +------------------- +The [libuEv] release. +### Changes + * Now using the asynchronous libuEv library for handling all events: + signals, timers and listening to sockets or file descriptors. + * Rename NEWS.md --> CHANGELOG.md, with symlinks for `make install` + * Attempt to align with http://keepachangelog.com/ for this file. + +### Fixes + * Fix bug with finit dying when no `tty` is defined in `finit.conf`, + now even the fallback shell has control over its TTY. + + +[1.10] - 2014-11-27 +------------------- Major bug fix release. * Project now relies on static code analysis from Coverity, so this @@ -27,8 +42,8 @@ Major bug fix release. * Serious update to README and slight pruning of finished TODO items. -1.9 (2014-04-21) ----------------- +[1.9] - 2014-04-21 +------------------ * Bug fixes, code cleanup * Add support for an include directive to `.conf` files @@ -38,8 +53,8 @@ Major bug fix release. * Misc. major (memleak) and minor fixes and additions to `libite/lite.h` -1.8 (2013-06-07) ----------------- +[1.8] - 2013-06-07 +------------------ * Support for runlevels, with a bootstrap runlevel 'S' * Support for saving previous and current runlevel to UTMP @@ -50,8 +65,8 @@ Major bug fix release. * Bugfixes to libite -1.7 (2012-10-08) ----------------- +[1.7] - 2012-10-08 +------------------ * Show `__FILE__` in `_d()` debug messages, useful for plugins with similarily named callbacks. Also, only in debug mode anyway @@ -62,8 +77,8 @@ Major bug fix release. altogether? -1.6 (2012-10-06) ----------------- +[1.6] - 2012-10-06 +------------------ * Skip . and .. in plugin loader and display error on failed plugins * Support for overriding `/etc/finit.d` with `runparts DIR` in @@ -74,16 +89,16 @@ Major bug fix release. * Minor fix to alsa-utils plugin to silence on non-existing cards -1.5 (2012-10-03) ----------------- +[1.5] - 2012-10-03 +------------------ * Use bootmisc plugin to setup standard FHS 2.3 structure in `/var` * Added `FLOG_WARN()` syslog macro, for plugins * Add plugin dependency resolver. Checks `plugin_t` for `.depends` -1.4 (2012-10-02) ----------------- +[1.4] - 2012-10-02 +------------------ * Fix I/O plugin watcher and load plugins earlier for a new hook * Start refactoring helpers.c into a libite.so (-lite). This means @@ -96,8 +111,8 @@ Major bug fix release. * And more ... see the GIT log for more details. -1.3 (2012-09-28) ----------------- +[1.3] - 2012-09-28 +------------------ * Cleanup public plugin API a bit and add new pid/pidfile funcs * Add plugin hook to end of service startup @@ -115,22 +130,22 @@ Major bug fix release. * Note change in `$PLUGIN_DIR` environemnt variable to `$plugindir` -1.2 (2012-09-27) ----------------- +[1.2] - 2012-09-27 +------------------ * Fix installation paths encoded in finit binary * Update README with section on building and enviroment variables -1.1 (2012-09-27) ----------------- +[1.1] - 2012-09-27 +------------------ * Build fixes for ARM eabi/uClibc * Rename signal.[ch]-->sig.[ch] to avoid name clash w/ system headers -1.0 (2012-09-26) ----------------- +[1.0] - 2012-09-26 +------------------ * New plugin based system for all odd extensions * New service monitor that restarts services if they die @@ -139,8 +154,8 @@ Major bug fix release. * New focus: embedded systems and small headless servers -0.6 (2010-06-14) ----------------- +[0.6] - 2010-06-14 +------------------ * don't start consolekit manually, dbus starts it (rtp) * unmount all filesystems before rebooting @@ -149,8 +164,8 @@ Major bug fix release. * remove extra sleep in finit-alt before calling services.sh (caio) -0.5 (2008-08-21) ----------------- +[0.5] - 2008-08-21 +------------------ * add option to start dbus and consolekit before the X server * finit-alt listens to `/dev/initctl` to work with `reboot(8)` (smurfy) @@ -161,8 +176,8 @@ Major bug fix release. * add support to `/var/run/resolvconf` in Mandriva (blino) -O.4 (2008-05-16) ----------------- +[0.4] - 2008-05-16 +------------------ * default username for finit-alt configurable in Makefile * create loopback device node in finit-alt (for squashfs) @@ -176,8 +191,8 @@ O.4 (2008-05-16) * run getty with openvt on the virtual terminal -0.3 (2008-02-23) ----------------- +[0.3] - 2008-02-23 +------------------ * Change poweroff method to `reboot(RB_POWER_OFF)` (Metalshark) * Remove duplicate `unionctl()` reimplementation error @@ -185,10 +200,10 @@ O.4 (2008-05-16) * Mount `/var/lock` and `/var/run` as tmpfs -0.2 (2008-02-19) ----------------- +[0.2] - 2008-02-19 +------------------ - * replace` system("touch")` with `touch()` in finit-mod (Metalshark) + * replace `system("touch")` with `touch()` in finit-mod (Metalshark) * disable `NO_HCTOSYS` by default to match stock Eeepc kernel * drop `system("rm -f")` to clean `/tmp`, its a fresh mounted tmpfs * write ACPI sleep state to `/sys/power/state` instead of @@ -199,8 +214,30 @@ O.4 (2008-05-16) * replace `system("echo;cat")` to draw shutdown splash with C calls -0.1 (2008-02-14) +0.1 - 2008-02-14 ---------------- * initial release +[libuEv]: https://github.com/troglobit/libuev +[1.11]: https://github.com/troglobit/finit/compare/1.10...HEAD +[1.10]: https://github.com/troglobit/finit/compare/1.9...1.10 +[1.9]: https://github.com/troglobit/finit/compare/1.8...1.9 +[1.8]: https://github.com/troglobit/finit/compare/1.7...1.8 +[1.7]: https://github.com/troglobit/finit/compare/1.6...1.7 +[1.6]: https://github.com/troglobit/finit/compare/1.5...1.6 +[1.5]: https://github.com/troglobit/finit/compare/1.4...1.5 +[1.4]: https://github.com/troglobit/finit/compare/1.3...1.4 +[1.3]: https://github.com/troglobit/finit/compare/1.2...1.3 +[1.2]: https://github.com/troglobit/finit/compare/1.1...1.2 +[1.1]: https://github.com/troglobit/finit/compare/1.0...1.1 +[1.0]: https://github.com/troglobit/finit/compare/0.9...1.0 +[0.9]: https://github.com/troglobit/finit/compare/0.8...0.9 +[0.8]: https://github.com/troglobit/finit/compare/0.7...0.8 +[0.7]: https://github.com/troglobit/finit/compare/0.6...0.7 +[0.6]: https://github.com/troglobit/finit/compare/0.5...0.6 +[0.5]: https://github.com/troglobit/finit/compare/0.4...0.5 +[0.4]: https://github.com/troglobit/finit/compare/0.3...0.4 +[0.3]: https://github.com/troglobit/finit/compare/0.2...0.3 +[0.2]: https://github.com/troglobit/finit/compare/0.1...0.2 + diff --git a/Makefile b/Makefile index 40430ef2..965b4f7f 100644 --- a/Makefile +++ b/Makefile @@ -26,14 +26,16 @@ uninstall-exec uninstall-data uninstall-dev #VERSION ?= $(shell git tag -l | tail -1) -VERSION ?= 1.10 +VERSION ?= 1.11 NAME = finit PKG = $(NAME)-$(VERSION) DEV = $(NAME)-dev +ARCHTOOL = `which git-archive-all` ARCHIVE = $(PKG).tar.xz +ARCHIVEZ = ../$(ARCHIVE).xz EXEC = finit reboot HEADERS = plugin.h svc.h helpers.h queue.h -DISTFILES = LICENSE README NEWS finit.conf services +DISTFILES = LICENSE README CHANGELOG finit.conf services OBJS = finit.o conf.o helpers.o sig.o svc.o plugin.o tty.o SRCS = $(OBJS:.o=.c) DEPS = $(addprefix .,$(SRCS:.c=.d)) @@ -149,9 +151,18 @@ check: $(CHECK) *.c plugins/*.c libite/*.c dist: + @if [ x"$(ARCHTOOL)" = x"" ]; then \ + echo "Missing git-archive-all from https://github.com/Kentzo/git-archive-all"; \ + exit 1; \ + fi + @if [ -e $(ARCHIVEZ) ]; then \ + echo "Distribution already exists."; \ + exit 1; \ + fi @echo "Building xz tarball of $(PKG) in parent dir..." - git archive --format=tar --prefix=$(PKG)/ $(VERSION) | xz >../$(ARCHIVE) - @(cd ..; md5sum $(ARCHIVE) | tee $(ARCHIVE).md5) + @$(ARCHTOOL) ../$(ARCHIVE) + @xz ../$(ARCHIVE) + @md5sum $(ARCHIVEZ) | tee $(ARCHIVEZ).md5 dev: distclean @echo "Building unstable xz $(DEV) in parent dir..." diff --git a/NEWS b/NEWS deleted file mode 120000 index 7b97b997..00000000 --- a/NEWS +++ /dev/null @@ -1 +0,0 @@ -NEWS.md \ No newline at end of file