From 85c9169e33bf86b021a8b3f05089a3de3897a7c4 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sun, 16 May 2004 19:03:41 +0000 Subject: [PATCH] Alejandro Mery: updated runit-1.0.2 improved runit to not need sysvinit's install_init sysvinit's install_init aligned [2004050202425010551] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2901 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/sysvinit/parse-config | 4 ++-- package/mnemoc/runit/parse-config | 31 +++++++++++++++++++++++++++++- package/mnemoc/runit/runit.cache | 14 +++++++------- package/mnemoc/runit/runit.desc | 4 ++-- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/package/base/sysvinit/parse-config b/package/base/sysvinit/parse-config index a2eb3ab1a..3e9fcd767 100644 --- a/package/base/sysvinit/parse-config +++ b/package/base/sysvinit/parse-config @@ -33,8 +33,8 @@ then -D"D_prefix=/$prefix" -D"D_sysconfdir=$sysconfdir" \ -D"D_docdir=$docdir" -D"D_localstatedir=$localstatedir" \ -D"D_datadir=$datadir" -D"D_infodir=$infodir" \ - -D"D_bindir=$bindir" -D"D_sbindir=$sbindir" \ - -D"D_libdir=$libdir" -D"D_mandir=$mandir" \ + -D"D_bindir=$bindir" -D"D_sbindir=$sbindir" \ + -D"D_libdir=$libdir" -D"D_mandir=$mandir" \ $base/package/base/sysvinit/init_macros.m4 \ $file > $initdir/init.d/$name chmod +x $initdir/init.d/$name diff --git a/package/mnemoc/runit/parse-config b/package/mnemoc/runit/parse-config index 510bef3c8..7070fc875 100644 --- a/package/mnemoc/runit/parse-config +++ b/package/mnemoc/runit/parse-config @@ -76,6 +76,7 @@ if pkgcheck runit X; then } runitconfdir=$base/package/mnemoc/runit + runit_has_script=0 for x in $( cd $runitconfdir/packages; ls -1 $pkg-*.txt 2> /dev/null ); do y=${x#$pkg-}; y=${y%.txt}; y=${y//_/\/} if [ "${y#runit-}" != "$y" ]; then @@ -84,6 +85,7 @@ if pkgcheck runit X; then y=\$sysconfdir/$y fi echo_status "runit: Setting conf to install $y" + runit_has_script=1 case "${y##*/}" in run|finish) runitxmode=1 ;; *) runitxmode= ;; @@ -94,7 +96,34 @@ if pkgcheck runit X; then runit_substitute $y; \ ${runitxmode:+chmod 755 $y;}" done - unset runitconfdir runitxmode + + # fake ROCK' standard install_init if sysvinit will not be built + if ! pkgcheck sysvinit X; then + if [ $runit_has_script -eq 1 ]; then + install_init() { + # i have already installed the script + true + } + else + install_init() { + name=$1 ; file=$2 ; initdir="$root/etc/rc.d" + + echo -n "Install SysV Init script '$name' (xx/xx): " + m4 -Dinitstyle=$ROCKCFG_PKG_SYSVINIT_INITSTYLE \ + -D"D_prefix=/$prefix" -D"D_sysconfdir=$sysconfdir" \ + -D"D_docdir=$docdir" -D"D_localstatedir=$localstatedir" \ + -D"D_datadir=$datadir" -D"D_infodir=$infodir" \ + -D"D_bindir=$bindir" -D"D_sbindir=$sbindir" \ + -D"D_libdir=$libdir" -D"D_mandir=$mandir" \ + $base/package/base/sysvinit/init_macros.m4 \ + $file > $initdir/init.d/$name + chmod +x $initdir/init.d/$name + echo " done." + } + fi + fi + + unset runitconfdir runitxmode runit_has_script # minimal services case "$pkg" in diff --git a/package/mnemoc/runit/runit.cache b/package/mnemoc/runit/runit.cache index 6556aa3d7..be46ee3a3 100644 --- a/package/mnemoc/runit/runit.cache +++ b/package/mnemoc/runit/runit.cache @@ -6,7 +6,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/mnemoc/runit/runit.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by @@ -20,14 +20,14 @@ [COPY] [COPY] --- ROCK-COPYRIGHT-NOTE-END --- -[TIMESTAMP] 1077236965 Thu Feb 19 21:29:25 2004 -[CONFIG-ID] 2.0.0-rc5-x86-pentium4-32-mnemosyne-expert -[ROCKVER] 2.0.0-rc5 +[TIMESTAMP] 1083397409 Sat May 1 03:43:29 2004 +[CONFIG-ID] 2.0.1-x86-pentium4-32-mnemosyne-expert +[ROCKVER] 2.0.1 -[LOGS] 1-runit.log 5-runit.log 9-runit.log +[LOGS] 1-runit.log 5-runit.log -[BUILDTIME] 1825 (9) -[SIZE] 1.86 MB, 130 files +[BUILDTIME] 2298 (5) +[SIZE] 1.84 MB, 131 files [DEP] 00-dirtree bash binutils bzip2 ccache coreutils gcc33 glibc23 grep [DEP] gzip linux24-header make patch sed sysfiles tar diff --git a/package/mnemoc/runit/runit.desc b/package/mnemoc/runit/runit.desc index e0f12ad1a..a8a53d697 100644 --- a/package/mnemoc/runit/runit.desc +++ b/package/mnemoc/runit/runit.desc @@ -40,10 +40,10 @@ [L] OpenSource [S] Stable -[V] 1.0.0 +[V] 1.0.2 [P] O -1---5---9 700.000 [CV-URL] http://smarden.org/runit/install.html -[D] 3475171302 runit-1.0.0.tar.gz http://smarden.org/runit/ +[D] 1975530150 runit-1.0.2.tar.gz http://smarden.org/runit/