Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

6 files changed, 57 insertions, 56 deletions

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 828e54c..dd326e6 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=2.1.1
-pkgrel=25
+pkgrel=26
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
@@ -18,7 +18,6 @@ build() {
   cd $startdir/src/runitscripts
   install -d $startdir/pkg/etc/
   install -d $startdir/pkg/etc/runit/
-  install -d $startdir/pkg/var/service
   install -d $startdir/pkg/etc/sv
   install -d $startdir/pkg/sbin
   install -d $startdir/pkg/etc/rc.d/functions.d
diff --git a/abs/core/runit-scripts/runit.install b/abs/core/runit-scripts/runit.install
index 813d9f2..b98574f 100755
--- a/abs/core/runit-scripts/runit.install
+++ b/abs/core/runit-scripts/runit.install
@@ -1,29 +1,9 @@
 # arg 1:  the new package version
 
-pre_install () {
-if [ ! -f /sbin/halt-init ]
-then
-   mv /sbin/halt  /sbin/halt-init
-   rm -f /sbin/reboot
-   rm -f /sbin/poweroff
-fi
-
-}
-
-pre_upgrade () {
-if [ ! -f /sbin/halt-init ]
-then
-   mv /sbin/halt  /sbin/halt-init
-   rm -f /sbin/reboot
-   rm -f /sbin/poweroff
-fi
-
-}
-
 post_install () {
  
   [ -e /service ] ||  mkdir /service
-  servicelist="acpid cron  frontend  lircd ntpd alsa-utils  avahi   dbus     sshd syslog-ng tty2 tty3"
+  servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus sshd syslog-ng tty2 tty3"
   for i in $servicelist
   do
    ln -s /etc/sv/$i /service/$i
diff --git a/abs/core/runit/PKGBUILD b/abs/core/runit/PKGBUILD
index a3b202e..f1b1bb2 100644
--- a/abs/core/runit/PKGBUILD
+++ b/abs/core/runit/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit
 pkgver=2.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision"
 url="http://smarden.org/runit/"
 license=('BSD')
@@ -46,18 +46,8 @@ package() {
   install -m0644 ../man/*.8 $pkgdir/usr/man/man8
   gzip -9 $pkgdir/usr/man/man8/*.8 || return 1
 
-#  rsync -a --exclude=.svn $startdir/runitscripts $srcdir
-#  cd $srcdir/runitscripts
-
   install -d $pkgdir/etc/
   install -d $pkgdir/etc/runit/
-  install -d $pkgdir/var/service
-
-#  install -m0700 1 2 3 ctrlaltdel $pkgdir/etc/runit
-#  install -m0755 reboot-runit halt-runit logger $pkgdir/sbin
-
- # install -d $pkgdir/etc/sv
- # rsync -a --exclude=.svn services/* $pkgdir/etc/sv
 
   cd $startdir
   install -d $pkgdir/usr/bin
diff --git a/abs/core/runit/runit.install b/abs/core/runit/runit.install
index 392d7be..b62e94e 100755
--- a/abs/core/runit/runit.install
+++ b/abs/core/runit/runit.install
@@ -1,38 +1,58 @@
 # arg 1:  the new package version
 
 pre_install () {
-if [ ! -f /sbin/halt-init ]
-then
-   mv /sbin/halt  /sbin/halt-init
-   mv /sbin/shutdown  /sbin/shutdown-init
+if [ ! -L /sbin/halt ] ; then
+  if [ -f /sbin/halt ] ; then
+    mv /sbin/halt /sbin/halt-init
+  fi
+fi
+
+if [ ! -L /sbin/shutdown ] ; then
+  if [ -f /sbin/shutdown ] ; then
+    mv /sbin/shutdown /sbin/shutdown-init
+  fi
+fi
+
+if [ -e /sbin/reboot ] ; then
+  rm -f /sbin/reboot
+fi
+
+if [ -e /sbin/poweroff ] ; then
+  rm -f /sbin/poweroff
 fi
-   rm -f /sbin/reboot
-   rm -f /sbin/poweroff
 
 }
 
 pre_upgrade () {
-if [ ! -f /sbin/halt-init ]
-then
-   mv /sbin/halt  /sbin/halt-init
+if [ ! -f /sbin/halt-init ] ; then
+  if [ ! -L /sbin/halt ] ; then
+    mv /sbin/halt /sbin/halt-init
+  fi
+fi
+
+if [ ! -f /sbin/shutdown-init ] ; then
+  if [ ! -L /sbin/shutdown ] ; then
+    mv /sbin/shutdown  /sbin/shutdown-init
+  fi
+fi
+
+if [ -e /sbin/reboot ] ; then
+  rm -f /sbin/reboot
 fi
 
-if [ ! -f /sbin/shutdown-init ]
-then
-   mv /sbin/shutdown  /sbin/shutdown-init
+if [ -e /sbin/poweroff ] ; then
+  rm -f /sbin/poweroff
 fi
-   rm -f /sbin/reboot
-   rm -f /sbin/poweroff
 
 }
 
 post_install () {
-   [ -e /sbin/halt ] || ln -s /sbin/halt.script /sbin/halt
-   [ -e /sbin/reboot ] || ln -s /sbin/reboot.script /sbin/reboot
-   [ -e /sbin/poweroff ] ||  ln -s /sbin/poweroff.script /sbin/poweroff
-   [ -e /sbin/reboot.init ] || ln -s /sbin/halt-init /sbin/reboot.init
-   [ -e /sbin/poweroff.init ] || ln -s /sbin/halt-init /sbin/poweroff.init
-   [ -e /sbin/shutdown ] || ln -s /sbin/shutdown.script /sbin/shutdown
+   [ -e /sbin/halt ] || ln -sf /sbin/halt.script /sbin/halt
+   [ -e /sbin/reboot ] || ln -sf /sbin/reboot.script /sbin/reboot
+   [ -e /sbin/poweroff ] ||  ln -sf /sbin/poweroff.script /sbin/poweroff
+   [ -e /sbin/reboot.init ] || ln -sf /sbin/halt-init /sbin/reboot.init
+   [ -e /sbin/poweroff.init ] || ln -sf /sbin/halt-init /sbin/poweroff.init
+   [ -e /sbin/shutdown ] || ln -sf /sbin/shutdown.script /sbin/shutdown
 }
 
 # arg 1:  the new package version
diff --git a/abs/core/sysvinit/PKGBUILD b/abs/core/sysvinit/PKGBUILD
index 110d93c..3be24b0 100644
--- a/abs/core/sysvinit/PKGBUILD
+++ b/abs/core/sysvinit/PKGBUILD
@@ -4,14 +4,13 @@
 
 pkgname=sysvinit
 pkgver=2.88
-pkgrel=3
+pkgrel=4
 pkgdesc="Linux System V Init"
 arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/sysvinit"
 license=('GPL')
 groups=('base')
 depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk')
-install=sysvinit.install
 source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2 halt-init.patch)
 
 build() {
@@ -23,6 +22,13 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}dsf"
   make ROOT="${pkgdir}" install
+
+  # Rename some stuff so it does not bigfoot changes needed for runit
+  cd "${pkgdir}/sbin"
+  rm -f reboot poweroff
+  mv halt halt-init
+  mv shutdown shutdown-init
+
 }
 md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f'
          'cd4c5767f63ca5881e3e1f1c4f10f896')
diff --git a/abs/core/sysvinit/__changelog b/abs/core/sysvinit/__changelog
index 9dc0b73..2a93469 100644
--- a/abs/core/sysvinit/__changelog
+++ b/abs/core/sysvinit/__changelog
@@ -18,3 +18,9 @@ patch halt to work with runit
          *      Get flags
          */
 
+
+# mjh 08-17-2011
+* mv halt to halt-init
+* mv shutdown shutdown-init
+* rm -f reboot poweroff
+* remove sysvinit.install