Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=078b11fdb8ed53e364173a494441b56fbe7a9d9a

commit 078b11fdb8ed53e364173a494441b56fbe7a9d9a
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Tue Apr 5 23:58:10 2011 +0200

systemd-23-1-i686

- version bump
- prefdm.service is now in upstream
- introducing the /run tmpfs as a replacement for /var/run (which can be
now mounted before /var is ready)

diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index d38324e..45433a8 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -7,8 +7,8 @@ USE_TCP=${USE_TCP:-"n"}
USE_GUI=${USE_GUI:-"y"}

pkgname=systemd
-pkgver=20
-pkgrel=2
+pkgver=23
+pkgrel=1
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd";
depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 
'sysvinit-tools')
@@ -16,10 +16,9 @@ makedepends=('vala' 'docbook-xsl>=1.73.0-2' 'docbook-xml')
options=('scriptlet')
up2date="Flasttar http://www.freedesktop.org/software/$pkgname";
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \
-       console.conf prefdm.service)
-sha1sums=('89ebb9c96e8451b0e52ec0d20291aefd51d85f6f' \
-          'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \
-          'fdb7dc79f5a0d120e722c152f956a841667fe011')
+       console.conf)
+sha1sums=('43942b27c26ae1f4424f6645de9f49d936488438' \
+          'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505')

if Fuse $USE_CRYPTSETUP; then
depends=("${depends[@]}"  'cryptsetup-luks')
@@ -79,9 +78,6 @@ build()
Fsed '"quiet"' '"nosystemd"' src/main.c
# we don't have auditd
Fsed 'auditd.service ' '' 
units/systemd-update-utmp-{runlevel,shutdown}.service.in
-       # our syslog implementations provide an lsb header, so this is
-       # not needed
-       Fsed '\(After=@SPECIAL_SYSLOG_SERVICE@\)' '#\1' units/syslog.target.in
Fpatchall
Fautoreconf
# force rebuild of vala files with our libnotify
@@ -111,11 +107,6 @@ build()

Frm etc/systemd/system/*.target.wants

-       #don't have tmpfs on /var/run, /var/lock and /media
-       Frm lib/systemd/system/local-fs.target.wants/var-run.mount
-       Frm lib/systemd/system/local-fs.target.wants/var-lock.mount
-       Frm lib/systemd/system/local-fs.target.wants/media.mount
-
# support for this is disabled in the kernel
Frm /lib/systemd/system/dev-hugepages.automount
Frm /lib/systemd/system/dev-hugepages.mount
@@ -130,9 +121,7 @@ build()
Fsed " getty.target.wants/getty@tty6.service" "$s" 
$Fdestdir/lib/systemd/system/getty@.service

# /etc/sysconfig/desktop compatibility
-       Ffile /lib/systemd/system/prefdm.service
-       Fln prefdm.service /lib/systemd/system/display-manager.service
-       Fln ../prefdm.service 
/lib/systemd/system/graphical.target.wants/prefdm.service
+       Fln ../display-manager.service 
/lib/systemd/system/graphical.target.wants/display-manager.service

# we have runlevel 4 as the x11 target, not 5
Fln multi-user.target /lib/systemd/system/runlevel5.target
diff --git a/source/base/systemd/prefdm.service 
b/source/base/systemd/prefdm.service
deleted file mode 100644
index 849506c..0000000
--- a/source/base/systemd/prefdm.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Display Manager
-After=syslog.target local.service systemd-user-sessions.service
-
-Conflicts=splashy-quit.service
-After=splashy-quit.service
-
-[Service]
-ExecStart=/etc/rc.d/rc.4
-Restart=always
-RestartSec=0
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to