================================
initscripts:source=8.12-3.3 (previous: 0-0.1)
cvc rdiff initscripts -1 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/8.12-3.3
================================
8.12-3.3 Ken VanDine ([EMAIL PROTECTED]) Thu May 25 22:03:14 2006
Use replace instead of sed
initscripts.recipe: changed
Index: initscripts.recipe
====================================================================
contents(size sha1)
inode(mtime owner group)
--- initscripts.recipe /[EMAIL PROTECTED]:devel//[EMAIL PROTECTED]:desktop/0-0.1
+++ initscripts.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/8.12-3.2
@@ -3,10 +3,114 @@
# All rights reserved
#
-class Initscripts(RedirectRecipe):
+class Initscripts(PackageRecipe):
name = 'initscripts'
- version = '0'
+ version = '8.12'
+
+ buildRequires = [ 'glib:devel', 'popt:devel', 'gettext:runtime',
+ 'pkgconfig:devel', 'kudzu:devel', 'pciutils:devel' ]
def setup(r):
- r.addRedirect('initscripts', '[EMAIL PROTECTED]:devel')
-
+ srpm =
'http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/initscripts-8.12-3.src.rpm'
+
+ r.addArchive('initscripts-%(version)s.tar.bz2', rpm=srpm)
+ r.addPatch('initscripts-s390.patch', rpm=srpm, use=Arch.s390)
+
+ r.addPatch('initscripts-7.53-generic.patch')
+ r.addPatch('fastboot.patch', backup='.fast')
+ r.addPatch('initscripts-pidof.patch')
+
+ # don't re-make initscripts.pot
+ r.addAction("sed -i '/^all: /s/$(NLSPACKAGE).pot//' po/Makefile")
+ # add a newline to the end of rc.d/rc
+ r.addAction("echo >> rc.d/rc")
+ r.addAction("sed -i '/# chkconfig:/s/ 10/ 06/g' rc.d/init.d/network")
+ r.addAction("sed -i '/# chkconfig:/s/ 25/ 11/g' rc.d/init.d/netfs")
+
+ # Make 5 the default runlevel
+ r.Replace('id:3:initdefault:','id:5:initdefault:','inittab')
+
+ if not Use.pie:
+ r.Replace('-fPIE', '', 'src/Makefile')
+
+ # LVM fails to load if you call --mknodes with a readonly / filesystem
+ r.Replace('--mknodes ', '', 'rc.d/rc.sysinit')
+ r.Make()
+ r.MakeInstall('SUPERUSER=$(id -un) SUPERGROUP=$(id -gn)'
+ ' mandir=%(mandir)s', rootVar='ROOT')
+
+ if not Arch.s390:
+
r.Remove('%(sysconfdir)s/sysconfig/network-scripts/ifup-{ctc,escon,iucv}')
+ else:
+ r.Remove('%(sysconfdir)s/sysconfig/init.s390')
+ r.Remove('%(sysconfdir)s/rc.d/rc.sysinit.s390init')
+
+ # we use separate build trees rather than trying to unify them
+ r.Remove('%(essentialsbindir)s/mkkerneldoth')
+
+ r.Doc('sysconfig.txt', 'sysvinitfiles', 'ChangeLog',
+ 'static-routes-ipv6', 'ipv6-tunnel.howto', 'ipv6-6to4.howto',
+ 'changes.ipv6')
+ r.SetModes('%(sbindir)s/usernetctl', 04755)
+ r.SetModes('%(essentialsbindir)s/netreport', 02755)
+ r.SetModes('%(localstatedir)s/run/netreport', 0775)
+
+ if r.macros.initdir != r.macros.sysconfdir+'/init.d':
+ # Using something other than FHS standard, add compat symlinks
+ r.Symlink('%(initdir)s', '%(sysconfdir)s/init.d')
+ # "rcdir = initdir - /init.d"
+ rcdir='/'.join(r.macros.initdir.split('/')[:-1])
+ for level in range(7):
+ r.Symlink('%s/rc%d.d' %(rcdir, level),
+ '/%%(sysconfdir)s/rc%d.d' %level)
+ else:
+ # we'll use the FHS init directories, with symlinks for old stuff
+ for dir in ('rc?.d', 'init.d'):
+ # remove the FHS compatibility symlinks
+ r.Remove('%(sysconfdir)s/'+dir)
+ # move directories to their new position
+ r.Move('%(sysconfdir)s/rc.d/'+dir, '%(sysconfdir)s/')
+ # Now install compatibility symlinks going the other way
+ r.Symlink('%(sysconfdir)s/'+dir, '%(sysconfdir)s/rc.d/')
+ for file in ('rc', 'rc.local', 'rc.sysinit'):
+ r.Remove('%(sysconfdir)s/'+file)
+ r.Move('%(sysconfdir)s/rc.d/'+file, '%(sysconfdir)s/')
+ r.Symlink('%(sysconfdir)s/'+file, '%(sysconfdir)s/rc.d/'+file)
+ r.Run("sed -i 's,/etc/rc.d/rc.sysinit,%(sysconfdir)s/rc.sysinit,g'"
+ " %(destdir)s/%(sysconfdir)s/inittab")
+
+ r.SetModes('%(localstatedir)s/{log/wtmp,run/utmp}', 0644)
+ r.Ownership('root', 'utmp', '%(localstatedir)s/log/wtmp',
+ '%(localstatedir)s/run/utmp')
+
+ # oddly enough, it's the initscripts package itself that has violations
+ # of its own "must use chkconfig" policy!
+
r.RemoveNonPackageFiles(exceptions='%(sysconfdir)s.*/rc[0-6].d/[KS].*$')
+
+ # Tag most init scripts in case the initscript tag desc. is
+ # not installed, but exclude some special scripts
+ r.TagSpec('initscript', '%(initdir)s/')
+ r.TagSpec('initscript', exceptions='%(initdir)s/killall')
+ r.TagSpec('initscript', exceptions='%(initdir)s/halt')
+ r.TagSpec('initscript', exceptions='%(initdir)s/single')
+ r.TagSpec('initscript', exceptions='%(initdir)s/functions')
+ r.RequireChkconfig(exceptions='%(initdir)s/killall')
+ r.RequireChkconfig(exceptions='%(initdir)s/halt')
+ r.RequireChkconfig(exceptions='%(initdir)s/single')
+ r.RequireChkconfig(exceptions='%(initdir)s/functions')
+
+ # add runtime requirements
+ # sysvinit:runtime for pidof
+ r.Requires('sysvinit:runtime', '%(initdir)s/functions')
+ # coreutils:runtime for rm, cp, etc
+ r.Requires('coreutils:runtime', '%(initdir)s/functions')
+ # filesystem:runtime required for directories like
+ # /var/lock/subsys
+ r.Requires('filesystem:runtime', '%(initdir)s/functions')
+ # default inittab requires mingetty
+ r.Requires('mingetty:runtime', '%(sysconfdir)s/inittab')
+ # inittab calls shutdown from sysvinit (and is also not
+ # very useful without an init(8))
+ r.Requires('sysvinit:runtime', '%(sysconfdir)s/inittab')
+ # /etc/init.d/functions calls /sbin/runuser
+ r.Requires('%(essentialsbindir)s/runuser', '%(initdir)s/functions')
initscripts-7.53-generic.patch: new
--- initscripts-7.53/rc.d/rc.sysinit.orig 2004-07-13 15:50:40.000000000
-0400
+++ initscripts-7.53/rc.d/rc.sysinit 2004-07-13 15:57:28.000000000 -0400
@@ -76,21 +76,10 @@
# Print a text banner.
echo -en $"\t\tWelcome to "
-if LC_ALL=C fgrep -q "Red Hat" /etc/redhat-release ; then
- [ "$BOOTUP" = "color" ] && echo -en "\\033[0;31m"
- echo -en "Red Hat"
+if [ -r /etc/distro-release ]; then
+ [ "$BOOTUP" = "color" ] && echo -en "\\033[0;34m"
+ echo `sed "s/ release.*//g" /etc/distro-release`
[ "$BOOTUP" = "color" ] && echo -en "\\033[0;39m"
- PRODUCT=`sed "s/Red Hat \(.*\) release.*/\1/" /etc/redhat-release`
- echo " $PRODUCT"
-elif LC_ALL=C fgrep -q "Fedora" /etc/redhat-release ; then
- [ "$BOOTUP" = "color" ] && echo -en "\\033[0;31m"
- echo -en "Fedora"
- [ "$BOOTUP" = "color" ] && echo -en "\\033[0;39m"
- PRODUCT=`sed "s/Fedora \(.*\) release.*/\1/" /etc/redhat-release`
- echo " $PRODUCT"
-else
- PRODUCT=`sed "s/ release.*//g" /etc/redhat-release`
- echo "$PRODUCT"
fi
if [ "$PROMPT" != "no" ]; then
echo -en $"\t\tPress 'I' to enter interactive startup."
initscripts-pidof.patch: new
diff -ruN initscripts-8.11.1/rc.d/init.d/functions
initscripts-8.11.1.new/rc.d/init.d/functions
--- initscripts-8.11.1/rc.d/init.d/functions 2005-04-29 11:51:48.000000000
-0400
+++ initscripts-8.11.1.new/rc.d/init.d/functions 2005-07-12
11:05:10.000000000 -0400
@@ -183,8 +183,8 @@
done
fi
if [ -z "$pid" ]; then
- pid=`pidof -c -o $$ -o $PPID -o %PPID -x $1 || \
- pidof -c -o $$ -o $PPID -o %PPID -x $base`
+ pid=`pidof -o $$ -o $PPID -o %PPID -x $1 || \
+ pidof -o $$ -o $PPID -o %PPID -x $base`
fi
# Kill it.
@@ -272,8 +272,8 @@
return 0
fi
fi
- pidof -c -o $$ -o $PPID -o %PPID -x $1 || \
- pidof -c -o $$ -o $PPID -o %PPID -x $base
+ pidof -o $$ -o $PPID -o %PPID -x $1 || \
+ pidof -o $$ -o $PPID -o %PPID -x $base
}
status() {
initscripts-8.12.tar.bz2: new
udev.patch: new
diff -ur initscripts-7.53.orig/rc.d/rc.sysinit initscripts-7.53/rc.d/rc.sysinit
--- initscripts-7.53.orig/rc.d/rc.sysinit 2004-05-07 00:26:43.000000000
-0400
+++ initscripts-7.53/rc.d/rc.sysinit 2005-03-18 11:07:23.048335696 -0500
@@ -13,6 +13,9 @@
# If we're using devfs, start devfsd now - we need the old device names
[ -e /dev/.devfsd -a -x /sbin/devfsd ] && /sbin/devfsd /dev
+# If we're using udev, start udev now
+[ -e /dev/.udev.tdb ] && /sbin/udevstart </dev/null >/dev/null 2>&1
+
HOSTNAME=`/bin/hostname`
HOSTTYPE=`uname -m`
unamer=`uname -r`
fastboot.patch: new
diff -ruN initscripts-8.11.1/inittab initscripts-8.11.1.new/inittab
--- initscripts-8.11.1/inittab 2005-04-15 13:44:24.000000000 -0400
+++ initscripts-8.11.1.new/inittab 2005-07-11 17:14:52.000000000 -0400
@@ -25,7 +25,7 @@
l2:2:wait:/etc/rc.d/rc 2
l3:3:wait:/etc/rc.d/rc 3
l4:4:wait:/etc/rc.d/rc 4
-l5:5:wait:/etc/rc.d/rc 5
+l5:5:once:/etc/rc.d/rc 5
l6:6:wait:/etc/rc.d/rc 6
# Trap CTRL-ALT-DELETE
@@ -42,7 +42,7 @@
# Run gettys in standard runlevels
-1:2345:respawn:/sbin/mingetty tty1
+1:234:respawn:/sbin/mingetty tty1
2:2345:respawn:/sbin/mingetty tty2
3:2345:respawn:/sbin/mingetty tty3
4:2345:respawn:/sbin/mingetty tty4
diff -ruN initscripts-8.11.1/prefdm initscripts-8.11.1.new/prefdm
--- initscripts-8.11.1/prefdm 2005-04-15 13:48:44.000000000 -0400
+++ initscripts-8.11.1.new/prefdm 2005-07-11 17:17:10.000000000 -0400
@@ -37,6 +37,11 @@
pidof xdm >/dev/null 2>&1 && exit 0
fi
+while ! [ -f /var/lock/subsys/prefdm ] ; do
+ # some locales want 0,25 instead
+ LANG=C sleep 0.25
+done
+
if [ -n "$preferred" ]; then
$preferred "$@" >/dev/null 2>&1
if [ $? -ne 127 ]; then
initscripts-s390.patch: new
--- initscripts-6.40/rc.d/init.d/halt.s390init Wed Sep 5 05:18:34 2001
+++ initscripts-6.40/rc.d/init.d/halt Fri Sep 14 17:36:28 2001
@@ -115,7 +115,6 @@
;;
esac
-runcmd $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
# Turn off swap, then unmount file systems.
SWAPS=`awk '! /^Filename/ { print $1 }' /proc/swaps`
--- initscripts-6.40/rc.d/rc.sysinit.s390init Sun Sep 9 09:00:54 2001
+++ initscripts-6.40/rc.d/rc.sysinit Fri Sep 14 17:39:17 2001
@@ -105,9 +105,8 @@
;;
esac
-/sbin/hwclock $CLOCKFLAGS
-
-action $"Setting clock $CLOCKDEF: `date`" date
+# System date on S390 is always set correctly
+action $"System date: `date` " date
if [ "$CONSOLETYPE" = "vt" ]; then
# Load keymap
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
