[Pkg-sysvinit-commits] r1739 - in sysvinit/trunk/debian: . patches
Petter Reinholdtsen
pere at alioth.debian.org
Mon Sep 7 20:40:14 UTC 2009
Author: pere
Date: 2009-09-07 20:40:14 +0000 (Mon, 07 Sep 2009)
New Revision: 1739
Added:
sysvinit/trunk/debian/initscripts.install
sysvinit/trunk/debian/patches/98_installtarget.patch
sysvinit/trunk/debian/sysvinit-utils.install
sysvinit/trunk/debian/sysvinit-utils.links
sysvinit/trunk/debian/sysvinit.install
sysvinit/trunk/debian/sysvinit.links
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/patches/series
sysvinit/trunk/debian/rules
Log:
Use debhelper .install and .links files.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2009-09-07 19:30:43 UTC (rev 1738)
+++ sysvinit/trunk/debian/changelog 2009-09-07 20:40:14 UTC (rev 1739)
@@ -13,6 +13,8 @@
the common way to build the source, by moving debian/initscripts/
and debian/sysv-rc/ into debian/src/. Restructure build rules to
use debhelper more, and migrate to debhelper 7.
+ * New patch 98_installtarget.patch to improve the sysvinit install
+ target.
-- Petter Reinholdtsen <pere at debian.org> Sun, 06 Sep 2009 17:13:33 +0200
Added: sysvinit/trunk/debian/initscripts.install
===================================================================
--- sysvinit/trunk/debian/initscripts.install (rev 0)
+++ sysvinit/trunk/debian/initscripts.install 2009-09-07 20:40:14 UTC (rev 1739)
@@ -0,0 +1,2 @@
+bin/mountpoint
+usr/share/man/man1/mountpoint.1
Added: sysvinit/trunk/debian/patches/98_installtarget.patch
===================================================================
--- sysvinit/trunk/debian/patches/98_installtarget.patch (rev 0)
+++ sysvinit/trunk/debian/patches/98_installtarget.patch 2009-09-07 20:40:14 UTC (rev 1739)
@@ -0,0 +1,30 @@
+Purpose: Make sure required directories exist before installing into them.
+Authour: Petter Reinholdtsen
+Fixes: -
+Status: Should be applied upstream
+
+Index: a/src/Makefile
+===================================================================
+--- a/src/Makefile (revision 1717)
++++ a/src/Makefile (working copy)
+@@ -127,6 +127,8 @@
+ distclean: clobber
+
+ install:
++ $(INSTALL_EXEC) -d $(ROOT)/bin/ $(ROOT)/sbin/
++ $(INSTALL_EXEC) -d $(ROOT)/usr/bin/
+ for i in $(BIN); do \
+ $(STRIP) $$i ; \
+ $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
+@@ -147,7 +149,11 @@
+ if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
+ ln -sf last $(ROOT)/usr/bin/lastb; \
+ fi
++ $(INSTALL_EXEC) -d $(ROOT)/usr/include/
+ $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
++ $(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man1/
++ $(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man5/
++ $(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man8/
+ for i in $(MAN1); do \
+ $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
+ done
Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series 2009-09-07 19:30:43 UTC (rev 1738)
+++ sysvinit/trunk/debian/patches/series 2009-09-07 20:40:14 UTC (rev 1739)
@@ -12,3 +12,4 @@
94_fstab-decode.dpatch
96_shutdown_acctoff.dpatch
97_init_starttest.dpatch
+98_installtarget.patch
Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules 2009-09-07 19:30:43 UTC (rev 1738)
+++ sysvinit/trunk/debian/rules 2009-09-07 20:40:14 UTC (rev 1739)
@@ -3,7 +3,8 @@
# debian/rules file for sysvinit
#
-tmp = $(shell pwd)/debian/sysvinit
+tmp = $(shell pwd)/debian/tmp
+sysvtmp = $(shell pwd)/debian/sysvinit
utiltmp = $(shell pwd)/debian/sysvinit-utils
rctmp = $(shell pwd)/debian/sysv-rc
inittmp = $(shell pwd)/debian/initscripts
@@ -69,90 +70,53 @@
# Make a binary package (.deb file)
binary-arch: build
dh_testroot
+ dh_installdirs
#
# sysvinit package
#
- dh_installdirs -psysvinit
if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \
then \
$(INSTALL_DATA) \
debian/share/inittab.$(DEB_HOST_GNU_TYPE) \
- $(tmp)/usr/share/sysvinit/inittab ; \
+ $(sysvtmp)/usr/share/sysvinit/inittab ; \
elif test -e debian/share/inittab.$(DEB_HOST_GNU_SYSTEM) ; \
then \
$(INSTALL_DATA) \
debian/share/inittab.$(DEB_HOST_GNU_SYSTEM) \
- $(tmp)/usr/share/sysvinit/inittab ; \
+ $(sysvtmp)/usr/share/sysvinit/inittab ; \
else \
$(INSTALL_DATA) debian/share/inittab \
- $(tmp)/usr/share/sysvinit/inittab ; \
+ $(sysvtmp)/usr/share/sysvinit/inittab ; \
fi
$(INSTALL) debian/share/update-rc.d \
- $(tmp)/usr/share/sysvinit
+ $(sysvtmp)/usr/share/sysvinit
$(MAKE) -C src $(CROSS) ROOT=$(tmp) DISTRO=Debian install
+ dh_install -psysvinit
+ dh_link -psysvinit
ifeq ($(DEB_HOST_ARCH), hurd-i386)
# The Hurd has its own halt and reboot commands.
- rm -f $(tmp)/usr/share/man/man8/halt.8
- rm -f $(tmp)/usr/share/man/man8/reboot.8
- rm -f $(tmp)/sbin/halt
- rm -f $(tmp)/sbin/reboot
+ rm -f $(sysvtmp)/usr/share/man/man8/halt.8
+ rm -f $(sysvtmp)/usr/share/man/man8/reboot.8
+ rm -f $(sysvtmp)/sbin/halt
+ rm -f $(sysvtmp)/sbin/reboot
endif
- rm -f $(tmp)/usr/share/man/man8/killall5.8
- rm -f $(tmp)/usr/share/man/man8/sulogin.8
- rm -f $(tmp)/usr/share/man/man8/fstab-decode.8
- rm -f $(tmp)/usr/share/man/man8/bootlogd.8
- rm -f $(tmp)/usr/share/man/man1/last.1
- rm -f $(tmp)/usr/share/man/man1/lastb.1
- rm -f $(tmp)/usr/share/man/man1/mesg.1
- rm -f $(tmp)/usr/share/man/man8/service.8
- rm -f $(tmp)/usr/share/man/man8/pidof.8
- rm -f $(tmp)/usr/share/man/man1/mountpoint.1
- rm -f $(tmp)/sbin/killall5
- rm -f $(tmp)/sbin/sulogin
- rm -f $(tmp)/sbin/fstab-decode
- rm -f $(tmp)/sbin/bootlogd
- rm -f $(tmp)/usr/bin/last
- rm -f $(tmp)/usr/bin/lastb
- rm -f $(tmp)/usr/bin/mesg
- rm -f $(tmp)/usr/sbin/service
- rm -f $(tmp)/bin/pidof
- rm -f $(tmp)/bin/mountpoint
- rmdir $(tmp)/usr/share/man/man1
- rmdir $(tmp)/usr/sbin
- rmdir $(tmp)/usr/bin
- rmdir $(tmp)/bin
- $(INSTALL) -d $(tmp)$(overridedir)
+ $(INSTALL) -d $(sysvtmp)$(overridedir)
$(INSTALL_DATA) debian/sysvinit.lintian.overrides \
- $(tmp)$(overridedir)/sysvinit
+ $(sysvtmp)$(overridedir)/sysvinit
$(INSTALL_DATA) debian/copyright \
- $(tmp)$(doc)/sysvinit/copyright
- cat COPYRIGHT >> $(tmp)$(doc)/sysvinit/copyright
+ $(sysvtmp)$(doc)/sysvinit/copyright
+ cat COPYRIGHT >> $(sysvtmp)$(doc)/sysvinit/copyright
dh_installchangelogs -psysvinit doc/Changelog
dh_installdeb -psysvinit
- dh_shlibdeps -psysvinit $(tmp)/sbin/init
+ dh_shlibdeps -psysvinit $(sysvtmp)/sbin/init
#
# sysvinit-utils package
#
- dh_installdirs -psysvinit-utils
- $(INSTALL) src/killall5 $(utiltmp)/sbin
- $(INSTALL) src/sulogin $(utiltmp)/sbin
- $(INSTALL) src/fstab-decode $(utiltmp)/sbin
- $(INSTALL) src/bootlogd $(utiltmp)/sbin
- $(INSTALL) src/last $(utiltmp)/usr/bin
- $(INSTALL) src/mesg $(utiltmp)/usr/bin
+ dh_install -psysvinit-utils
+ dh_link -psysvinit-utils
$(MAKE) $(CROSS) -C debian/startpar DESTDIR=$(utiltmp) install
$(INSTALL) debian/service/service $(utiltmp)/usr/sbin
- ln -sf /sbin/killall5 $(utiltmp)/bin/pidof
- ln -sf last $(utiltmp)/usr/bin/lastb
- $(INSTALL_DATA) man/killall5.8 $(utiltmp)/usr/share/man/man8
- $(INSTALL_DATA) man/sulogin.8 $(utiltmp)/usr/share/man/man8
- $(INSTALL_DATA) man/bootlogd.8 $(utiltmp)/usr/share/man/man8
- $(INSTALL_DATA) man/last.1 $(utiltmp)/usr/share/man/man1
- $(INSTALL_DATA) man/lastb.1 $(utiltmp)/usr/share/man/man1
- $(INSTALL_DATA) man/mesg.1 $(utiltmp)/usr/share/man/man1
$(INSTALL_DATA) debian/service/service.8 $(utiltmp)/usr/share/man/man8
- $(INSTALL_DATA) man/pidof.8 $(utiltmp)/usr/share/man/man8
- $(INSTALL_DATA) man/fstab-decode.8 $(utiltmp)/usr/share/man/man8
$(INSTALL_DATA) debian/copyright \
$(utiltmp)$(doc)/sysvinit-utils/copyright
cat COPYRIGHT >> $(utiltmp)$(doc)/sysvinit-utils/copyright
@@ -163,14 +127,11 @@
#
# initscripts package
#
- dh_installdirs -pinitscripts
$(MAKE) -C debian/src/initscripts install DESTDIR=$(inittmp)
-
+ dh_install
ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
$(INSTALL) -d $(inittmp)/sys
endif
- $(INSTALL) src/mountpoint $(inittmp)/bin
- $(INSTALL_DATA) man/mountpoint.1 $(inittmp)/usr/share/man/man1
$(INSTALL) debian/readlink $(inittmp)/lib/init
$(INSTALL) -d $(inittmp)$(overridedir)
$(INSTALL_DATA) debian/initscripts.lintian.overrides \
Added: sysvinit/trunk/debian/sysvinit-utils.install
===================================================================
--- sysvinit/trunk/debian/sysvinit-utils.install (rev 0)
+++ sysvinit/trunk/debian/sysvinit-utils.install 2009-09-07 20:40:14 UTC (rev 1739)
@@ -0,0 +1,14 @@
+sbin/bootlogd
+sbin/fstab-decode
+sbin/killall5
+sbin/sulogin
+usr/bin/last
+usr/bin/mesg
+usr/share/man/man1/last.1
+usr/share/man/man1/lastb.1
+usr/share/man/man1/mesg.1
+usr/share/man/man8/bootlogd.8
+usr/share/man/man8/fstab-decode.8
+usr/share/man/man8/killall5.8
+usr/share/man/man8/pidof.8
+usr/share/man/man8/sulogin.8
Added: sysvinit/trunk/debian/sysvinit-utils.links
===================================================================
--- sysvinit/trunk/debian/sysvinit-utils.links (rev 0)
+++ sysvinit/trunk/debian/sysvinit-utils.links 2009-09-07 20:40:14 UTC (rev 1739)
@@ -0,0 +1,2 @@
+sbin/killall5 bin/pidof
+usr/bin/last usr/bin/lastb
Added: sysvinit/trunk/debian/sysvinit.install
===================================================================
--- sysvinit/trunk/debian/sysvinit.install (rev 0)
+++ sysvinit/trunk/debian/sysvinit.install 2009-09-07 20:40:14 UTC (rev 1739)
@@ -0,0 +1,14 @@
+sbin/init
+sbin/halt
+sbin/runlevel
+sbin/shutdown
+usr/share/man/man8/halt.8
+usr/share/man/man8/poweroff.8
+usr/share/man/man8/runlevel.8
+usr/share/man/man8/reboot.8
+usr/share/man/man8/shutdown.8
+usr/share/man/man8/telinit.8
+usr/share/man/man8/init.8
+usr/share/man/man5/initscript.5
+usr/share/man/man5/inittab.5
+usr/include/initreq.h
Added: sysvinit/trunk/debian/sysvinit.links
===================================================================
--- sysvinit/trunk/debian/sysvinit.links (rev 0)
+++ sysvinit/trunk/debian/sysvinit.links 2009-09-07 20:40:14 UTC (rev 1739)
@@ -0,0 +1,3 @@
+sbin/halt sbin/poweroff
+sbin/halt sbin/reboot
+sbin/init sbin/telinit
More information about the Pkg-sysvinit-commits
mailing list