[arch-commits] Commit in systemd/repos (14 files)

Jan Steffens heftig at archlinux.org
Sun Mar 11 11:14:06 EDT 2012


    Date: Sunday, March 11, 2012 @ 11:14:05
  Author: heftig
Revision: 153036

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  systemd/repos/extra-i686/PKGBUILD
    (from rev 153035, systemd/trunk/PKGBUILD)
  systemd/repos/extra-i686/cpp-compat.patch
    (from rev 153035, systemd/trunk/cpp-compat.patch)
  systemd/repos/extra-i686/os-release
    (from rev 153035, systemd/trunk/os-release)
  systemd/repos/extra-i686/systemd.install
    (from rev 153035, systemd/trunk/systemd.install)
  systemd/repos/extra-x86_64/PKGBUILD
    (from rev 153035, systemd/trunk/PKGBUILD)
  systemd/repos/extra-x86_64/cpp-compat.patch
    (from rev 153035, systemd/trunk/cpp-compat.patch)
  systemd/repos/extra-x86_64/os-release
    (from rev 153035, systemd/trunk/os-release)
  systemd/repos/extra-x86_64/systemd.install
    (from rev 153035, systemd/trunk/systemd.install)
Deleted:
  systemd/repos/extra-i686/PKGBUILD
  systemd/repos/extra-i686/os-release
  systemd/repos/extra-i686/systemd.install
  systemd/repos/extra-x86_64/PKGBUILD
  systemd/repos/extra-x86_64/os-release
  systemd/repos/extra-x86_64/systemd.install

-------------------------------+
 extra-i686/PKGBUILD           |  208 ++++++++++++++++++++--------------------
 extra-i686/cpp-compat.patch   |   19 +++
 extra-i686/os-release         |   10 -
 extra-i686/systemd.install    |  106 ++++++++++----------
 extra-x86_64/PKGBUILD         |  208 ++++++++++++++++++++--------------------
 extra-x86_64/cpp-compat.patch |   19 +++
 extra-x86_64/os-release       |   10 -
 extra-x86_64/systemd.install  |  106 ++++++++++----------
 8 files changed, 366 insertions(+), 320 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-03-11 15:08:52 UTC (rev 153035)
+++ extra-i686/PKGBUILD	2012-03-11 15:14:05 UTC (rev 153036)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=43
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
-             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release")
-md5sums=('446cc6db7625617af67e2d8e5f503a49'
-         '752636def0db3c03f121f8b4f44a63cd')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
-              --libdir=/usr/lib \
-              --with-pamlibdir=/lib/security \
-              --localstatedir=/var \
-              --with-rootprefix= \
-              --with-distro=arch
-
-  make
-}
-
-package_systemd() {
-  pkgdesc="systemd and service manager"
-  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
-  optdepends=('cryptsetup: required for encrypted block devices'
-              'dbus-python: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
-              'python2-cairo: systemd-analyze'
-              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.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-journald.conf)
-  install="$pkgname.install"
-
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-
-  printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf"
-  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # symlink to /bin/systemd for compat and sanity
-  ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # use python2 for systemd-analyze
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # didn't build this...
-  rm -f "man1/systemadm.1"
-
-  # 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
-  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-            man5/{hostname,{vconsole,locale}.conf}.5)
-  cd "$pkgdir/usr/share/man"
-  for manpage in "${manpages[@]}"; do
-    IFS='/' read section page <<< "$manpage"
-    mv "$manpage" "$section/systemd.$page"
-  done
-
-  ### split off libsystemd (libs, includes, pkgconfig, man3)
-  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig,share/man}
-
-  cd "$srcdir"/libsystemd
-  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
-  mv "$pkgdir/usr/include/systemd" usr/include
-  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
-  mv "$pkgdir/usr/share/man/man3" usr/share/man
-}
-
-package_libsystemd() {
-  pkgdesc="systemd client libraries"
-  depends=('libcap' 'xz')
-
-  mv "$srcdir/libsystemd"/* "$pkgdir"
-}
-
-# vim: ft=sh syn=sh et

Copied: systemd/repos/extra-i686/PKGBUILD (from rev 153035, systemd/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-03-11 15:14:05 UTC (rev 153036)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd')
+pkgver=43
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
+             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        "os-release" "cpp-compat.patch")
+md5sums=('446cc6db7625617af67e2d8e5f503a49'
+         '752636def0db3c03f121f8b4f44a63cd'
+         '414968aa314ced0b0ab4b2207e46aa69')
+
+build() {
+  cd "$pkgname-$pkgver"
+  
+  # Fix C++ compile error when including sd-login.h
+  # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514
+  patch -p1 -i ../cpp-compat.patch
+
+  ./configure --sysconfdir=/etc \
+              --libexecdir=/usr/lib \
+              --libdir=/usr/lib \
+              --with-pamlibdir=/lib/security \
+              --localstatedir=/var \
+              --with-rootprefix= \
+              --with-distro=arch
+
+  make
+}
+
+package_systemd() {
+  pkgdesc="systemd and service manager"
+  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
+  optdepends=('cryptsetup: required for encrypted block devices'
+              'dbus-python: systemd-analyze'
+              'initscripts: legacy support for hostname and vconsole setup'
+              'initscripts-systemd: native boot and initialization scripts'
+              'python2-cairo: systemd-analyze'
+              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+          etc/dbus-1/system.d/org.freedesktop.login1.conf
+          etc/dbus-1/system.d/org.freedesktop.locale1.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-journald.conf)
+  install="$pkgname.install"
+
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+
+  printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf"
+  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  # symlink to /bin/systemd for compat and sanity
+  ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd"
+
+  # use python2 for systemd-analyze
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+  # didn't build this...
+  rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
+
+  # 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
+  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+            man5/{hostname,{vconsole,locale}.conf}.5)
+  cd "$pkgdir/usr/share/man"
+  for manpage in "${manpages[@]}"; do
+    IFS='/' read section page <<< "$manpage"
+    mv "$manpage" "$section/systemd.$page"
+  done
+
+  ### split off libsystemd (libs, includes, pkgconfig, man3)
+  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
+
+  cd "$srcdir"/libsystemd
+  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
+  mv "$pkgdir/usr/include/systemd" usr/include
+  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+}
+
+package_libsystemd() {
+  pkgdesc="systemd client libraries"
+  depends=('libcap' 'xz')
+
+  mv "$srcdir/libsystemd"/* "$pkgdir"
+}
+
+# vim: ft=sh syn=sh et

Copied: systemd/repos/extra-i686/cpp-compat.patch (from rev 153035, systemd/trunk/cpp-compat.patch)
===================================================================
--- extra-i686/cpp-compat.patch	                        (rev 0)
+++ extra-i686/cpp-compat.patch	2012-03-11 15:14:05 UTC (rev 153036)
@@ -0,0 +1,19 @@
+commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
+Author: Lennart Poettering <lennart at poettering.net>
+Date:   2012-03-05 15:16:10 +0100
+
+    sd-login: c++ compatibility
+
+diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
+index 2f3c90c..6e99cfc 100644
+--- a/src/systemd/sd-login.h
++++ b/src/systemd/sd-login.h
+@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char **service);
+ int sd_session_get_type(const char *session, char **type);
+ 
+ /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
+-int sd_session_get_class(const char *session, char **class);
++int sd_session_get_class(const char *session, char **clazz);
+ 
+ /* Determine the X11 display of this session. */
+ int sd_session_get_display(const char *session, char **display);

Deleted: extra-i686/os-release
===================================================================
--- extra-i686/os-release	2012-03-11 15:08:52 UTC (rev 153035)
+++ extra-i686/os-release	2012-03-11 15:14:05 UTC (rev 153036)
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-

Copied: systemd/repos/extra-i686/os-release (from rev 153035, systemd/trunk/os-release)
===================================================================
--- extra-i686/os-release	                        (rev 0)
+++ extra-i686/os-release	2012-03-11 15:14:05 UTC (rev 153036)
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+

Deleted: extra-i686/systemd.install
===================================================================
--- extra-i686/systemd.install	2012-03-11 15:08:52 UTC (rev 153035)
+++ extra-i686/systemd.install	2012-03-11 15:14:05 UTC (rev 153036)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
-  if ! getent group lock >/dev/null; then
-    groupadd -g 54 lock
-  fi
-}
-
-sd_booted() {
-  [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  echo "systemd has been installed to /bin/systemd. Please ensure you append"
-  echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    systemctl daemon-reexec >/dev/null
-  fi
-
-  newpkgver=${1%-*}
-  oldpkgver=${2%-*}
-
-  # catch v31 need for restarting systemd-logind.service
-  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
-    # but only if systemd is running
-    if sd_booted; then
-      systemctl try-restart systemd-logind.service
-    fi
-  fi
-}
-
-post_remove() {
-  if getent group lock >/dev/null; then
-    groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et:

Copied: systemd/repos/extra-i686/systemd.install (from rev 153035, systemd/trunk/systemd.install)
===================================================================
--- extra-i686/systemd.install	                        (rev 0)
+++ extra-i686/systemd.install	2012-03-11 15:14:05 UTC (rev 153036)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+checkgroups() {
+  if ! getent group lock >/dev/null; then
+    groupadd -g 54 lock
+  fi
+}
+
+sd_booted() {
+  [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  echo "systemd has been installed to /bin/systemd. Please ensure you append"
+  echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  if sd_booted; then
+    systemctl daemon-reexec >/dev/null
+  fi
+
+  newpkgver=${1%-*}
+  oldpkgver=${2%-*}
+
+  # catch v31 need for restarting systemd-logind.service
+  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+    # but only if systemd is running
+    if sd_booted; then
+      systemctl try-restart systemd-logind.service
+    fi
+  fi
+}
+
+post_remove() {
+  if getent group lock >/dev/null; then
+    groupdel lock
+  fi
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-03-11 15:08:52 UTC (rev 153035)
+++ extra-x86_64/PKGBUILD	2012-03-11 15:14:05 UTC (rev 153036)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=43
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
-             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release")
-md5sums=('446cc6db7625617af67e2d8e5f503a49'
-         '752636def0db3c03f121f8b4f44a63cd')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
-              --libdir=/usr/lib \
-              --with-pamlibdir=/lib/security \
-              --localstatedir=/var \
-              --with-rootprefix= \
-              --with-distro=arch
-
-  make
-}
-
-package_systemd() {
-  pkgdesc="systemd and service manager"
-  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
-  optdepends=('cryptsetup: required for encrypted block devices'
-              'dbus-python: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
-              'python2-cairo: systemd-analyze'
-              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.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-journald.conf)
-  install="$pkgname.install"
-
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-
-  printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf"
-  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # symlink to /bin/systemd for compat and sanity
-  ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # use python2 for systemd-analyze
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # didn't build this...
-  rm -f "man1/systemadm.1"
-
-  # 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
-  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-            man5/{hostname,{vconsole,locale}.conf}.5)
-  cd "$pkgdir/usr/share/man"
-  for manpage in "${manpages[@]}"; do
-    IFS='/' read section page <<< "$manpage"
-    mv "$manpage" "$section/systemd.$page"
-  done
-
-  ### split off libsystemd (libs, includes, pkgconfig, man3)
-  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig,share/man}
-
-  cd "$srcdir"/libsystemd
-  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
-  mv "$pkgdir/usr/include/systemd" usr/include
-  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
-  mv "$pkgdir/usr/share/man/man3" usr/share/man
-}
-
-package_libsystemd() {
-  pkgdesc="systemd client libraries"
-  depends=('libcap' 'xz')
-
-  mv "$srcdir/libsystemd"/* "$pkgdir"
-}
-
-# vim: ft=sh syn=sh et

Copied: systemd/repos/extra-x86_64/PKGBUILD (from rev 153035, systemd/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-03-11 15:14:05 UTC (rev 153036)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd')
+pkgver=43
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
+             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        "os-release" "cpp-compat.patch")
+md5sums=('446cc6db7625617af67e2d8e5f503a49'
+         '752636def0db3c03f121f8b4f44a63cd'
+         '414968aa314ced0b0ab4b2207e46aa69')
+
+build() {
+  cd "$pkgname-$pkgver"
+  
+  # Fix C++ compile error when including sd-login.h
+  # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514
+  patch -p1 -i ../cpp-compat.patch
+
+  ./configure --sysconfdir=/etc \
+              --libexecdir=/usr/lib \
+              --libdir=/usr/lib \
+              --with-pamlibdir=/lib/security \
+              --localstatedir=/var \
+              --with-rootprefix= \
+              --with-distro=arch
+
+  make
+}
+
+package_systemd() {
+  pkgdesc="systemd and service manager"
+  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
+  optdepends=('cryptsetup: required for encrypted block devices'
+              'dbus-python: systemd-analyze'
+              'initscripts: legacy support for hostname and vconsole setup'
+              'initscripts-systemd: native boot and initialization scripts'
+              'python2-cairo: systemd-analyze'
+              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+          etc/dbus-1/system.d/org.freedesktop.login1.conf
+          etc/dbus-1/system.d/org.freedesktop.locale1.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-journald.conf)
+  install="$pkgname.install"
+
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+
+  printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf"
+  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  # symlink to /bin/systemd for compat and sanity
+  ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd"
+
+  # use python2 for systemd-analyze
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+  # didn't build this...
+  rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
+
+  # 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
+  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+            man5/{hostname,{vconsole,locale}.conf}.5)
+  cd "$pkgdir/usr/share/man"
+  for manpage in "${manpages[@]}"; do
+    IFS='/' read section page <<< "$manpage"
+    mv "$manpage" "$section/systemd.$page"
+  done
+
+  ### split off libsystemd (libs, includes, pkgconfig, man3)
+  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
+
+  cd "$srcdir"/libsystemd
+  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
+  mv "$pkgdir/usr/include/systemd" usr/include
+  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+}
+
+package_libsystemd() {
+  pkgdesc="systemd client libraries"
+  depends=('libcap' 'xz')
+
+  mv "$srcdir/libsystemd"/* "$pkgdir"
+}
+
+# vim: ft=sh syn=sh et

Copied: systemd/repos/extra-x86_64/cpp-compat.patch (from rev 153035, systemd/trunk/cpp-compat.patch)
===================================================================
--- extra-x86_64/cpp-compat.patch	                        (rev 0)
+++ extra-x86_64/cpp-compat.patch	2012-03-11 15:14:05 UTC (rev 153036)
@@ -0,0 +1,19 @@
+commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
+Author: Lennart Poettering <lennart at poettering.net>
+Date:   2012-03-05 15:16:10 +0100
+
+    sd-login: c++ compatibility
+
+diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
+index 2f3c90c..6e99cfc 100644
+--- a/src/systemd/sd-login.h
++++ b/src/systemd/sd-login.h
+@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char **service);
+ int sd_session_get_type(const char *session, char **type);
+ 
+ /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
+-int sd_session_get_class(const char *session, char **class);
++int sd_session_get_class(const char *session, char **clazz);
+ 
+ /* Determine the X11 display of this session. */
+ int sd_session_get_display(const char *session, char **display);

Deleted: extra-x86_64/os-release
===================================================================
--- extra-x86_64/os-release	2012-03-11 15:08:52 UTC (rev 153035)
+++ extra-x86_64/os-release	2012-03-11 15:14:05 UTC (rev 153036)
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-

Copied: systemd/repos/extra-x86_64/os-release (from rev 153035, systemd/trunk/os-release)
===================================================================
--- extra-x86_64/os-release	                        (rev 0)
+++ extra-x86_64/os-release	2012-03-11 15:14:05 UTC (rev 153036)
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+

Deleted: extra-x86_64/systemd.install
===================================================================
--- extra-x86_64/systemd.install	2012-03-11 15:08:52 UTC (rev 153035)
+++ extra-x86_64/systemd.install	2012-03-11 15:14:05 UTC (rev 153036)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
-  if ! getent group lock >/dev/null; then
-    groupadd -g 54 lock
-  fi
-}
-
-sd_booted() {
-  [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  echo "systemd has been installed to /bin/systemd. Please ensure you append"
-  echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    systemctl daemon-reexec >/dev/null
-  fi
-
-  newpkgver=${1%-*}
-  oldpkgver=${2%-*}
-
-  # catch v31 need for restarting systemd-logind.service
-  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
-    # but only if systemd is running
-    if sd_booted; then
-      systemctl try-restart systemd-logind.service
-    fi
-  fi
-}
-
-post_remove() {
-  if getent group lock >/dev/null; then
-    groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et:

Copied: systemd/repos/extra-x86_64/systemd.install (from rev 153035, systemd/trunk/systemd.install)
===================================================================
--- extra-x86_64/systemd.install	                        (rev 0)
+++ extra-x86_64/systemd.install	2012-03-11 15:14:05 UTC (rev 153036)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+checkgroups() {
+  if ! getent group lock >/dev/null; then
+    groupadd -g 54 lock
+  fi
+}
+
+sd_booted() {
+  [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  echo "systemd has been installed to /bin/systemd. Please ensure you append"
+  echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  if sd_booted; then
+    systemctl daemon-reexec >/dev/null
+  fi
+
+  newpkgver=${1%-*}
+  oldpkgver=${2%-*}
+
+  # catch v31 need for restarting systemd-logind.service
+  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+    # but only if systemd is running
+    if sd_booted; then
+      systemctl try-restart systemd-logind.service
+    fi
+  fi
+}
+
+post_remove() {
+  if getent group lock >/dev/null; then
+    groupdel lock
+  fi
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list