added sysvinit patch by Oscar Pedro

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@3200 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 74 insertions, 13 deletions

diff --git a/rules/sysvinit.make b/rules/sysvinit.make
index 83ef582c7..8c10f0249 100644
--- a/rules/sysvinit.make
+++ b/rules/sysvinit.make
@@ -2,7 +2,8 @@
 # $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
-#          
+# Copyright (C) 2005 by Oscar Peredo
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -19,12 +20,16 @@ endif
 #
 # Paths and names
 #
-SYSVINIT_VERSION	= 2.85
+SYSVINIT_VERSION	= 2.86
 SYSVINIT		= sysvinit-$(SYSVINIT_VERSION)
 SYSVINIT_SUFFIX		= tar.gz
-SYSVINIT_URL		= ftp://ftp.cistron.nl/pub/people/miquels/software/$(SYSVINIT).$(SYSVINIT_SUFFIX)
+SYSVINIT_URL		= ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/$(SYSVINIT).$(SYSVINIT_SUFFIX)
 SYSVINIT_SOURCE		= $(SRCDIR)/$(SYSVINIT).$(SYSVINIT_SUFFIX)
-SYSVINIT_DIR		= $(BUILDDIR)/$(SYSVINIT)/src
+SYSVINIT_DIR		= $(BUILDDIR)/$(SYSVINIT)
+
+BSDINIT_URL		= http://www.exis.cl/ptxdist/bsdinit-1.0.tar.gz
+BSDINIT_SOURCE		= $(SRCDIR)/bsdinit-1.0.tar.gz
+BSDINIT_DIR		= $(BUILDDIR)/bsdinit-1.0
 
 # ----------------------------------------------------------------------------
 # Get
@@ -72,13 +77,21 @@ sysvinit_prepare_deps = \
 
 SYSVINIT_PATH	=  PATH=$(CROSS_PATH)
 SYSVINIT_ENV 	=  $(CROSS_ENV)
-#SYSVINIT_ENV	+=
+SYSVINIT_ENV	+= PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig
+
+#
+# autoconf
+#
+SYSVINIT_AUTOCONF =  $(CROSS_AUTOCONF)
+SYSVINIT_AUTOCONF += --prefix=$(CROSS_LIB_DIR)
 
 $(STATEDIR)/sysvinit.prepare: $(sysvinit_prepare_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(SYSVINIT_DIR)/config.cache)
-	cd $(SYSVINIT_DIR) && $(SYSVINIT_PATH) \
-		perl -i -p -e 's/CC.*=.*//g' $(SYSVINIT_DIR)/Makefile
+#	cd $(SYSVINIT_DIR) && \
+#		$(SYSVINIT_PATH) $(SYSVINIT_ENV) \
+#		./configure $(SYSVINIT_AUTOCONF)
+
 	$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -91,7 +104,8 @@ sysvinit_compile_deps = $(STATEDIR)/sysvinit.prepare
 
 $(STATEDIR)/sysvinit.compile: $(sysvinit_compile_deps)
 	@$(call targetinfo, $@)
-	cd $(SYSVINIT_DIR) && $(SYSVINIT_PATH) $(SYSVINIT_ENV) make
+	cd $(SYSVINIT_DIR)/src && \
+		$(SYSVINIT_PATH) $(SYSVINIT_ENV) make
 	$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -102,7 +116,6 @@ sysvinit_install: $(STATEDIR)/sysvinit.install
 
 $(STATEDIR)/sysvinit.install: $(STATEDIR)/sysvinit.compile
 	@$(call targetinfo, $@)
-#	$(SYSVINIT_PATH) make -C $(SYSVINIT_DIR) install
 	$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -121,13 +134,61 @@ $(STATEDIR)/sysvinit.targetinstall: $(sysvinit_targetinstall_deps)
 	@$(call install_fixup,PRIORITY,optional)
 	@$(call install_fixup,VERSION,$(SYSVINIT_VERSION))
 	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,AUTHOR,"Oscar Peredo <oscar\@exis.cl>")
 	@$(call install_fixup,DEPENDS,)
 	@$(call install_fixup,DESCRIPTION,missing)
 
-	# FIXME: this should be fixed
-	$(SYSVINIT_PATH) ROOT=$(ROOTDIR) make -C $(SYSVINIT_DIR) install
-	$(SYSVINIT_PATH) ROOT=$(IMAGEIR)/ipkg make -C $(SYSVINIT_DIR) install
+ifdef PTXCONF_SYSVINIT_INIT
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/init, /sbin/init)
+	@$(call install_link, init, /sbin/telinit)
+endif
+ifdef PTXCONF_SYSVINIT_HALT
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/halt, /sbin/halt)
+	@$(call install_link, halt, /sbin/poweroff)
+	@$(call install_link, halt, /sbin/reboot)
+endif
+ifdef PTXCONF_SYSVINIT_SHUTDOWN
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/shutdown, /sbin/shutdown)
+endif
+ifdef PTXCONF_SYSVINIT_RUNLEVEL
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/runlevel, /sbin/runlevel)
+endif
+ifdef PTXCONF_SYSVINIT_KILLALL5
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/killall5, /sbin/killall5)
+	
+endif
+ifdef PTXCONF_SYSVINIT_SULOGIN
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/sulogin, /sbin/sulogin)
+endif
+ifdef PTXCONF_SYSVINIT_BOOTLOGD
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/bootlogd, /sbin/bootlogd)
+endif
+ifdef PTXCONF_SYSVINIT_WALL
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/wall, /usr/bin/wall)
+endif
+ifdef PTXCONF_SYSVINIT_LAST
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/last, /usr/bin/last)
+endif
+ifdef PTXCONF_SYSVINIT_MESG
+	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/mesg, /usr/bin/mesg)
+endif
+ifdef PTXCONF_SYSVINIT_BSDINIT
+	@$(call clean, $(BSDINIT_DIR))
+	@$(call get, $(BSDINIT_URL))
+	@$(call extract, $(BSDINIT_SOURCE))
+	@$(call install_copy, 0, 0, 0644, $(BSDINIT_DIR)/inittab, /etc/inittab, n)
+	@$(call install_copy, 0, 0, 0755, /etc/rc.d)
+	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.0, /etc/rc.d/rc.0, n)
+	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.1, /etc/rc.d/rc.1, n)
+	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.2, /etc/rc.d/rc.2, n)
+	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.5, /etc/rc.d/rc.5, n)
+	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.sysinit, /etc/rc.d/rc.sysinit, n) 
+	@$(call install_link, rc.2, /etc/rc.d/rc.3)
+	@$(call install_link, rc.2, /etc/rc.d/rc.4)
+	@$(call install_link, rc.0, /etc/rc.d/rc.6)
+endif
+	# FIXME: RSC: this should be done by udev?
+	@$(call install_node, 0, 0, 0600, p, m, m, /dev/initctl)
 
 	@$(call install_finish)