Permalink
Browse files

systemd-git: assorted updates

  • Loading branch information...
falconindy committed Feb 21, 2012
1 parent 5aa9630 commit 394ed72e811f79681d30594ed43205e9f74a5834
Showing with 16 additions and 10 deletions.
  1. +16 −10 systemd-git/PKGBUILD
View
@@ -1,13 +1,13 @@
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=systemd-git
-pkgver=20120123
+pkgver=20120221
pkgrel=1
pkgdesc="Session and Startup manager"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'libcap' 'udev>=172' 'util-linux>=2.19')
+depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'udev' 'util-linux')
makedepends=('cryptsetup' 'docbook-xsl' 'git' 'gperf' 'intltool' 'libxslt'
'linux-api-headers' 'xz')
optdepends=('cryptsetup: required for encrypted block devices'
@@ -27,7 +27,8 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
etc/dbus-1/system.d/org.freedesktop.timedate1.conf
etc/systemd/system.conf
etc/systemd/user.conf
- etc/systemd/systemd-logind.conf)
+ etc/systemd/systemd-logind.conf
+ etc/systemd/systemd-journald.conf)
install=systemd.install
source=('os-release')
md5sums=('752636def0db3c03f121f8b4f44a63cd')
@@ -57,22 +58,18 @@ build() {
sed -i -e '/^Environ.*LANG/s/^/#/' \
-e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
- # don't trigger ./configure automatically
- ./autogen.sh ac
+ ./autogen.sh
./configure --with-rootprefix= \
--with-pamlibdir=/lib/security \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
--disable-audit \
- --disable-gtk
+ --disable-gtk \
+ --with-distro=arch
make
-
- # fix .so links in manpages
- sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,reboot,poweroff}.8
- sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
}
package() {
@@ -88,12 +85,21 @@ package() {
src/sd-daemon.[ch] \
src/readahead/sd-readahead.[ch]
+ ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd"
+
# fix systemd-analyze for python2
sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+ # fix .so links in manpage stubs
+ find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+ -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
+
# rename man pages to avoid conflicts with sysvinit and initscripts
cd "$pkgdir/usr/share/man"
+ # not building this with systemd
+ rm -f "man1/systemadm.1"
+
manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
man5/{hostname,{vconsole,locale}.conf}.5)

0 comments on commit 394ed72

Please sign in to comment.