commit de013385c2b03fe687bc09414575219eb2b42f25
parent 8eb783b2d7c0c75ed347531da50a10eade8a690e
Author: Gerrit Pape <pape@smarden.org>
Date: Fri, 11 Oct 2002 11:05:23 +0000
new debian package, debian policy conform.
Diffstat:
9 files changed, 172 insertions(+), 290 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
@@ -1,7 +1,6 @@
runit for Debian
----------------
-If you do not want sysvinit to replace /sbin/init on upgrade, use
-# dpkg-divert --add --package runit /sbin/init
+<possible notes regarding this package - if none, delete this file>
- -- Gerrit Pape <pape@smarden.org>, Tue, 29 Jan 2002 19:54:06 +0100
+ -- Gerrit Pape <pape@smarden.org>, Fri, 11 Oct 2002 10:13:39 +0200
diff --git a/debian/changelog b/debian/changelog
@@ -1,94 +0,0 @@
-runit (0.7.0-1) sarge; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
- * preinst: new; create hardlink /sbin/runit.old -> /sbin/runit on
- upgrade.
-
- -- Gerrit Pape <pape@smarden.org> Mon, 7 Oct 2002 11:25:47 +0200
-
-runit (0.6.0-1) sarge; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
-
- -- Gerrit Pape <pape@smarden.org> Fri, 27 Sep 2002 16:35:53 +0200
-
-runit (0.5.2-1) sarge; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
-
- -- Gerrit Pape <pape@smarden.org> Mon, 23 Sep 2002 12:06:09 +0200
-
-runit (0.5.0-1) sarge; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
-
- -- Gerrit Pape <pape@smarden.org> Wed, 28 Aug 2002 13:23:11 +0200
-
-runit (0.4.1-1) woody; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
-
- -- Gerrit Pape <pape@smarden.org> Mon, 24 Jun 2002 16:07:53 +0200
-
-runit (0.4.0-1) woody; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
- * build and install the utmpset program.
-
- -- Gerrit Pape <pape@smarden.org> Sun, 19 May 2002 12:31:09 +0200
-
-runit (0.3.2-2) woody; urgency=low
-
- * getty service directory /etc/runit/getty-tty5 moved to
- /etc/runit/getty-5 according to updated doc/replaceinit.html.
- * compiled with dietlibc 0.16.
-
- -- Gerrit Pape <pape@smarden.org> Sat, 30 Mar 2002 13:05:28 +0100
-
-runit (0.3.2-1) woody; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
-
- -- Gerrit Pape <pape@smarden.org> Wed, 13 Feb 2002 10:56:17 +0100
-
-runit (0.3.1-1) woody; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
-
- -- Gerrit Pape <pape@smarden.org> Sun, 3 Feb 2002 16:30:55 +0100
-
-runit (0.3.0-1) woody; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
-
- -- Gerrit Pape <pape@smarden.org> Tue, 29 Jan 2002 19:54:06 +0100
-
-runit (0.2.7-1) woody; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
-
- -- Gerrit Pape <pape@smarden.org> Tue, 1 Jan 2002 16:20:14 +0100
-
-runit (0.2.6-1) woody; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
- * manpages svwait*.8 installed.
-
- -- Gerrit Pape <pape@smarden.org> Sun, 30 Dec 2001 17:29:29 +0100
-
-runit (0.2.3-1) woody; urgency=low
-
- * See /package/admin/runit/package/CHANGES.
- * Build-Depends on dietlibc, uses diet to compile programs.
-
- -- Gerrit Pape <pape@smarden.org> Sat, 22 Dec 2001 20:37:03 +0100
-
-runit (0.1.1-1) woody; urgency=low
-
- * Initial Release.
-
- -- Gerrit Pape <pape@smarden.org> Tue, 20 Nov 2001 11:56:58 +0100
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/conffiles b/debian/conffiles
@@ -1,4 +0,0 @@
-/etc/runit/1
-/etc/runit/2
-/etc/runit/3
-/etc/runit/ctrlaltdel
diff --git a/debian/control b/debian/control
@@ -2,19 +2,39 @@ Source: runit
Section: admin
Priority: optional
Maintainer: Gerrit Pape <pape@smarden.org>
-Build-Depends: debhelper (>> 3.0.0), dietlibc-dev
+Build-Depends: dietlibc-dev, debhelper (>> 3.0.0)
Standards-Version: 3.5.2
Package: runit
-Architecture: any
-Suggests: daemontools
-Description: UNIX init scheme with service supervision
- runit is a daemontools package alike replacement for sysvinit and other
- init schemes. runit currently runs on Debian GNU/Linux, FreeBSD, OpenBSD,
- and may be easily adapted to other unix operating systems. If runit runs
- for you on any other operating system or linux distribution, please let
- me know.
+Architecture: i386 alpha arm powerpc sparc mips mipsel s390 hppa
+Suggests: runit-run
+Description: a UNIX init scheme with service supervision
+ runit is a daemontools alike replacement for SysV-init and other init
+ schemes. runit currently runs on Debian GNU/Linux, OpenBSD, FreeBSD,
+ and may be easily adapted to other unix operating systems. runit
+ implements a simple three-stage concept. Stage 1 performs the system's
+ one-time initialization tasks. Stage 2 starts the system's uptime
+ services (via the runsvdir program). Stage 3 handles the tasks necessary
+ to shutdown and halt or reboot.
.
- Warning: Replacing sysvinit can cause the system's boot to fail. Make
- sure you are able to recover and repair your system, for example if you
- run a bootloader, it should be able to pass init=/bin/sh to the kernel.
+ See http://smarden.org/runit/ for more information.
+ .
+ This package does not replace the /sbin/init binary. To do so you need
+ to follow the documentation or install the runit-run package.
+
+Package: runit-run
+Architecture: all
+Depends: runit, sysvinit (>> 2.84-0)
+Description: a UNIX init scheme with service supervision
+ runit is a daemontools alike replacement for SysV-init and other init
+ schemes. runit currently runs on Debian GNU/Linux, OpenBSD, FreeBSD,
+ and may be easily adapted to other unix operating systems. runit
+ implements a simple three-stage concept. Stage 1 performs the system's
+ one-time initialization tasks. Stage 2 starts the system's uptime
+ services (via the runsvdir program). Stage 3 handles the tasks necessary
+ to shutdown and halt or reboot.
+ .
+ See http://smarden.org/runit/ for more information.
+ .
+ This package replaces the /sbin/init binary and configures runit to run
+ as process no 1 after the next reboot.
diff --git a/debian/dirs b/debian/dirs
@@ -1,5 +0,0 @@
-command
-package
-sbin
-etc/runit
-etc/runit/getty-5
diff --git a/debian/docs b/debian/docs
@@ -1,5 +0,0 @@
-package/README
-package/CHANGES
-package/THANKS
-doc/
-etc/
diff --git a/debian/postinst b/debian/postinst
@@ -1,48 +0,0 @@
-#! /bin/sh
-# postinst script for runit
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
- configure)
- ( \
- cd /package/admin/runit-0.7.0
- package/upgrade
- )
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/preinst b/debian/preinst
@@ -1,39 +0,0 @@
-#! /bin/sh
-# preinst script for runit
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- install|upgrade)
- if [ -n "$2" ]; then
- # upgrading
- rm -f /sbin/runit.old
- ln /sbin/runit /sbin/runit.old
- fi
- ;;
- abort-upgrade)
- ;;
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
@@ -1,52 +1,68 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 by Joey Hess.
+#
+# This version is for a hypothetical package that builds an
+# architecture-dependant package, as well as an architecture-independent
+# package.
+
+# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
+# This is the debhelper compatibility version to use.
export DH_COMPAT=3
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
-
+
touch configure-stamp
-build: configure-stamp build-stamp
-build-stamp:
+build-arch: configure-stamp build-arch-stamp
+build-arch-stamp:
dh_testdir
- # Add here commands to compile the package.
+ # Add here command to compile/build the package.
# $(MAKE)
- #/usr/bin/docbook-to-man debian/runit.sgml > runit.1
tar xfzvp runit-0.7.0.tar.gz
( \
- cd admin/runit-0.7.0 ; \
- echo 'diet gcc -O2 -Wall' > src/conf-cc ; \
- echo 'diet gcc -s -Os -pipe' > src/conf-ld ; \
- package/compile ; \
- echo "/package/admin/runit-0.7.0" > compile/home ; \
- rm -f compile/src ; \
- ln -s /package/admin/runit-0.7.0/src compile/src ; \
+ cd admin/runit-0.7.0/src; \
+ ln -s runit-0.7.0 runit; mv runit ../..; \
+ echo 'diet gcc -O2 -Wall' >conf-cc; \
+ echo 'diet gcc -s -Os -pipe' >conf-ld; \
+ $(MAKE); \
+ $(MAKE) runsvstat runsvctrl; \
)
- touch build-stamp
+
+ touch build-arch-stamp
+
+build-indep: configure-stamp build-indep-stamp
+build-indep-stamp:
+ dh_testdir
+
+ # Add here command to compile/build the arch indep package.
+ # It's ok not to do anything here, if you don't need to build
+ # anything for this package.
+ #/usr/bin/docbook-to-man debian/runit.sgml > runit.1
+
+ touch build-indep-stamp
+
+build: build-arch build-indep
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-arch-stamp build-indep-stamp configure-stamp
# Add here commands to clean up after the build process.
# -$(MAKE) clean
-
rm -rf admin
- rm -f debian/links
+
dh_clean
+install: DH_OPTIONS=
install: build
dh_testdir
dh_testroot
@@ -56,71 +72,113 @@ install: build
# Add here commands to install the package into debian/runit.
# $(MAKE) install DESTDIR=$(CURDIR)/debian/runit
- chmod 1755 debian/runit/package
- cp -a admin debian/runit/package/
- rm -rf debian/runit/package/admin/runit-0.7.0/compile
- cp -a debian/runit/package/admin/runit-0.7.0/man .
- rm -rf debian/runit/package/admin/runit-0.7.0/man
- cp -a debian/runit/package/admin/runit-0.7.0/doc .
- rm -rf debian/runit/package/admin/runit-0.7.0/doc
- cp -a debian/runit/package/admin/runit-0.7.0/etc .
- rm -rf debian/runit/package/admin/runit-0.7.0/etc
- cp -a debian/runit/package/admin/runit-0.7.0/package .
-
- # /etc/runit
- cp -p admin/runit-0.7.0/etc/debian/[123] \
- debian/runit/etc/runit/
- cp -p admin/runit-0.7.0/etc/debian/ctrlaltdel \
- debian/runit/etc/runit/
- cp -p admin/runit-0.7.0/etc/debian/getty-tty5/run \
- debian/runit/etc/runit/getty-5/run
-
- # runit programs
- cp -p debian/runit/package/admin/runit-0.7.0/command/runit* \
- debian/runit/sbin/
-
- # cleanup
- rm -rf debian/runit/package/admin/runit-0.7.0/compile
-
- # create debian/links
- rm -f debian/links
- for i in \
- `cat debian/runit/package/admin/runit-0.7.0/package/commands` ; \
- do \
- echo "/package/admin/runit/command/$$i /command/$$i" \
- >> debian/links ; \
- done
- for i in \
- `cat debian/runit/package/admin/runit-0.7.0/package/commands` ; \
- do \
- echo "/command/$$i /usr/local/bin/$$i" \
- >> debian/links ; \
- done
-
+ # runit
+ install -m0500 admin/runit-0.7.0/src/runit \
+ $(CURDIR)/debian/runit/sbin/runit
+ install -m0500 admin/runit-0.7.0/src/runit-init \
+ $(CURDIR)/debian/runit/sbin/runit-init
+ install -m0755 admin/runit-0.7.0/src/runsvdir \
+ $(CURDIR)/debian/runit/usr/bin/runsvdir
+ install -m0755 admin/runit-0.7.0/src/runsv \
+ $(CURDIR)/debian/runit/usr/bin/runsv
+ install -m0755 admin/runit-0.7.0/src/runsvchdir \
+ $(CURDIR)/debian/runit/usr/sbin/runsvchdir
+ install -m0755 admin/runit-0.7.0/src/svwaitdown \
+ $(CURDIR)/debian/runit/usr/bin/svwaitdown
+ install -m0755 admin/runit-0.7.0/src/svwaitup \
+ $(CURDIR)/debian/runit/usr/bin/svwaitup
+ install -m0755 admin/runit-0.7.0/src/utmpset \
+ $(CURDIR)/debian/runit/usr/sbin/utmpset
+
+ install -m0755 admin/runit-0.7.0/src/runsvstat \
+ $(CURDIR)/debian/runit/usr/bin/runsvstat
+ install -m0755 admin/runit-0.7.0/src/runsvctrl \
+ $(CURDIR)/debian/runit/usr/bin/runsvctrl
+
+ install -m0700 admin/runit/etc/debian/1 \
+ $(CURDIR)/debian/runit/etc/runit/1
+ sed -e 's}^PATH=/command:}PATH=}g;\
+ s}^runsvdir /service}runsvdir /var/service}g' \
+ <admin/runit/etc/debian/2 >$(CURDIR)/debian/runit/etc/runit/2
+ chmod 0700 $(CURDIR)/debian/runit/etc/runit/2
+ sed -e 's}^PATH=.*}PATH=/sbin:/bin:/usr/sbin:/usr/bin}g' \
+ <admin/runit/etc/debian/3 >$(CURDIR)/debian/runit/etc/runit/3
+ chmod 0700 $(CURDIR)/debian/runit/etc/runit/3
+ install -m0700 admin/runit/etc/debian/ctrlaltdel \
+ $(CURDIR)/debian/runit/etc/runit/ctrlaltdel
+ sed -e 's}^/command/utmpset}utmpset}g' \
+ <admin/runit/etc/debian/getty-tty5/run \
+ >$(CURDIR)/debian/runit/etc/runit/getty-5/run
+ chmod 0755 $(CURDIR)/debian/runit/etc/runit/getty-5/run
+
+ # lintian overrides
+ install -m0755 -d $(CURDIR)/debian/runit/usr/share/lintian/overrides
+ install -m0644 debian/runit.lintian \
+ $(CURDIR)/debian/runit/usr/share/lintian/overrides/runit
+
+ # runit-run
+ ( \
+ cd runit-run; \
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/runit-run; \
+ )
# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
binary-indep: build install
-# We have nothing to do by default.
+ dh_testdir -i
+ dh_testroot -i
+# dh_installdebconf -i
+ dh_installdocs -i
+# dh_installexamples -i
+# dh_installmenu -i
+# dh_installlogrotate -i
+# dh_installemacsen -i
+# dh_installpam -i
+# dh_installmime -i
+# dh_installinit -i
+# dh_installcron -i
+# dh_installman -i
+# dh_installinfo -i
+# dh_undocumented -i
+ dh_installchangelogs -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+# dh_perl -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installman man/run*.8 man/svwait*.8 man/utmpset.8
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms -X/package
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_testdir -a
+ dh_testroot -a
+# dh_installdebconf -a
+ dh_installdocs -a
+# dh_installexamples -a
+# dh_installmenu -a
+# dh_installlogrotate -a
+# dh_installemacsen -a
+# dh_installpam -a
+# dh_installmime -a
+# dh_installinit -a
+# dh_installcron -a
+ dh_installman -a admin/runit/man/*.8 debian/runsv*.8
+# dh_installinfo -a
+# dh_undocumented -a
+ dh_installchangelogs -a admin/runit-0.7.0/package/CHANGES
+ dh_strip -a
+# dh_link -a
+ dh_compress -a
+ dh_fixperms -a -X/sbin
+# dh_makeshlibs -a
+ dh_installdeb -a
+# dh_perl -a
+# dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
