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

Dave Reisner dreisner at archlinux.org
Fri Sep 21 23:47:31 UTC 2012


    Date: Friday, September 21, 2012 @ 19:47:31
  Author: dreisner
Revision: 166914

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

Added:
  systemd/repos/testing-i686/
  systemd/repos/testing-i686/0001-Reinstate-TIMEOUT-handling.patch
    (from rev 166913, systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch)
  systemd/repos/testing-i686/0001-journal-bring-mmap-cache-prototype-in-sync.patch
    (from rev 166913, systemd/trunk/0001-journal-bring-mmap-cache-prototype-in-sync.patch)
  systemd/repos/testing-i686/PKGBUILD
    (from rev 166913, systemd/trunk/PKGBUILD)
  systemd/repos/testing-i686/initcpio-hook-udev
    (from rev 166913, systemd/trunk/initcpio-hook-udev)
  systemd/repos/testing-i686/initcpio-install-timestamp
    (from rev 166913, systemd/trunk/initcpio-install-timestamp)
  systemd/repos/testing-i686/initcpio-install-udev
    (from rev 166913, systemd/trunk/initcpio-install-udev)
  systemd/repos/testing-i686/systemd.install
    (from rev 166913, systemd/trunk/systemd.install)
  systemd/repos/testing-i686/use-split-usr-path.patch
    (from rev 166913, systemd/trunk/use-split-usr-path.patch)
  systemd/repos/testing-x86_64/
  systemd/repos/testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch
    (from rev 166913, systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch)
  systemd/repos/testing-x86_64/0001-journal-bring-mmap-cache-prototype-in-sync.patch
    (from rev 166913, systemd/trunk/0001-journal-bring-mmap-cache-prototype-in-sync.patch)
  systemd/repos/testing-x86_64/PKGBUILD
    (from rev 166913, systemd/trunk/PKGBUILD)
  systemd/repos/testing-x86_64/initcpio-hook-udev
    (from rev 166913, systemd/trunk/initcpio-hook-udev)
  systemd/repos/testing-x86_64/initcpio-install-timestamp
    (from rev 166913, systemd/trunk/initcpio-install-timestamp)
  systemd/repos/testing-x86_64/initcpio-install-udev
    (from rev 166913, systemd/trunk/initcpio-install-udev)
  systemd/repos/testing-x86_64/systemd.install
    (from rev 166913, systemd/trunk/systemd.install)
  systemd/repos/testing-x86_64/use-split-usr-path.patch
    (from rev 166913, systemd/trunk/use-split-usr-path.patch)

----------------------------------------------------------------------+
 testing-i686/0001-Reinstate-TIMEOUT-handling.patch                   |  124 +++++++
 testing-i686/0001-journal-bring-mmap-cache-prototype-in-sync.patch   |   24 +
 testing-i686/PKGBUILD                                                |  158 ++++++++++
 testing-i686/initcpio-hook-udev                                      |   20 +
 testing-i686/initcpio-install-timestamp                              |   14 
 testing-i686/initcpio-install-udev                                   |   28 +
 testing-i686/systemd.install                                         |   29 +
 testing-i686/use-split-usr-path.patch                                |   14 
 testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch                 |  124 +++++++
 testing-x86_64/0001-journal-bring-mmap-cache-prototype-in-sync.patch |   24 +
 testing-x86_64/PKGBUILD                                              |  158 ++++++++++
 testing-x86_64/initcpio-hook-udev                                    |   20 +
 testing-x86_64/initcpio-install-timestamp                            |   14 
 testing-x86_64/initcpio-install-udev                                 |   28 +
 testing-x86_64/systemd.install                                       |   29 +
 testing-x86_64/use-split-usr-path.patch                              |   14 
 16 files changed, 822 insertions(+)

Copied: systemd/repos/testing-i686/0001-Reinstate-TIMEOUT-handling.patch (from rev 166913, systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch)
===================================================================
--- testing-i686/0001-Reinstate-TIMEOUT-handling.patch	                        (rev 0)
+++ testing-i686/0001-Reinstate-TIMEOUT-handling.patch	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,124 @@
+From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Fri, 25 May 2012 19:43:24 -0400
+Subject: [PATCH] Reinstate TIMEOUT= handling
+
+This is mostly to deal with ipw2?00 drivers which have yet to be fixed
+in the kernel.
+---
+ src/libudev/libudev-device.c  |   19 +++++++++++++++++++
+ src/libudev/libudev-private.h |    1 +
+ src/udev/udevd.c              |   13 ++++++++++---
+ 3 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
+index a8277d1..5966189 100644
+--- a/src/libudev/libudev-device.c
++++ b/src/libudev/libudev-device.c
+@@ -68,6 +68,7 @@ struct udev_device {
+         struct udev_list tags_list;
+         unsigned long long int seqnum;
+         unsigned long long int usec_initialized;
++        int timeout;
+         int devlink_priority;
+         int refcount;
+         dev_t devnum;
+@@ -89,6 +90,21 @@ struct udev_device {
+         bool db_persist;
+ };
+ 
++int udev_device_get_timeout(struct udev_device *udev_device)
++{
++        return udev_device->timeout;
++}
++
++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
++{
++        char num[32];
++
++        udev_device->timeout = timeout;
++        snprintf(num, sizeof(num), "%u", timeout);
++        udev_device_add_property(udev_device, "TIMEOUT", num);
++        return 0;
++}
++
+ /**
+  * udev_device_get_seqnum:
+  * @udev_device: udev device
+@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
+ 
+                 util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
+                 udev_device_set_syspath(udev_device, path);
++        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
++                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
+         } else if (startswith(property, "SUBSYSTEM=")) {
+                 udev_device_set_subsystem(udev_device, &property[10]);
+         } else if (startswith(property, "DEVTYPE=")) {
+@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
+         udev_list_init(udev, &udev_device->sysattr_value_list, true);
+         udev_list_init(udev, &udev_device->sysattr_list, false);
+         udev_list_init(udev, &udev_device->tags_list, true);
++        udev_device->timeout = -1;
+         udev_device->watch_handle = -1;
+         /* copy global properties */
+         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
+diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
+index 4eb4a59..99aefeb 100644
+--- a/src/libudev/libudev-private.h
++++ b/src/libudev/libudev-private.h
+@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
+ void udev_device_set_is_initialized(struct udev_device *udev_device);
+ int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
+ void udev_device_cleanup_tags_list(struct udev_device *udev_device);
++int udev_device_get_timeout(struct udev_device *udev_device);
+ unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
+ void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
+ int udev_device_get_devlink_priority(struct udev_device *udev_device);
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 0d85960..cd24462 100644
+--- a/src/udev/udevd.c
++++ b/src/udev/udevd.c
+@@ -384,7 +384,7 @@ out:
+         }
+ }
+ 
+-static void event_run(struct event *event)
++static void event_run(struct event *event, bool force)
+ {
+         struct udev_list_node *loop;
+ 
+@@ -410,7 +410,7 @@ static void event_run(struct event *event)
+                 return;
+         }
+ 
+-        if (children >= children_max) {
++        if (!force && children >= children_max) {
+                 if (children_max > 1)
+                         log_debug("maximum number (%i) of children reached\n", children);
+                 return;
+@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
+ 
+         event->state = EVENT_QUEUED;
+         udev_list_node_append(&event->node, &event_list);
++
++        /* run all events with a timeout set immediately */
++        if (udev_device_get_timeout(dev) > 0) {
++                event_run(event, true);
++                return 0;
++        }
++
+         return 0;
+ }
+ 
+@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
+                 if (is_devpath_busy(event))
+                         continue;
+ 
+-                event_run(event);
++                event_run(event, false);
+         }
+ }
+ 
+-- 
+1.7.10.2
+

Copied: systemd/repos/testing-i686/0001-journal-bring-mmap-cache-prototype-in-sync.patch (from rev 166913, systemd/trunk/0001-journal-bring-mmap-cache-prototype-in-sync.patch)
===================================================================
--- testing-i686/0001-journal-bring-mmap-cache-prototype-in-sync.patch	                        (rev 0)
+++ testing-i686/0001-journal-bring-mmap-cache-prototype-in-sync.patch	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,24 @@
+From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Sat, 22 Sep 2012 00:16:13 +0200
+Subject: [PATCH] journal: bring mmap cache prototype in sync
+
+---
+ src/journal/mmap-cache.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
+index de34634..0c42fb8 100644
+--- a/src/journal/mmap-cache.h
++++ b/src/journal/mmap-cache.h
+@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
+ MMapCache* mmap_cache_ref(MMapCache *m);
+ MMapCache* mmap_cache_unref(MMapCache *m);
+ 
+-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
++int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
+ void mmap_cache_close_fd(MMapCache *m, int fd);
+ void mmap_cache_close_context(MMapCache *m, unsigned context);
+-- 
+1.7.12.1
+

Copied: systemd/repos/testing-i686/PKGBUILD (from rev 166913, systemd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,158 @@
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+
+pkgbase=systemd
+pkgname=('systemd' 'systemd-sysvcompat')
+pkgver=191
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2' 'LGPL2.1' 'MIT')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
+             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
+             'pam' 'quota-tools' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        'initcpio-hook-udev'
+        'initcpio-install-udev'
+        'initcpio-install-timestamp'
+        '0001-Reinstate-TIMEOUT-handling.patch'
+        '0001-journal-bring-mmap-cache-prototype-in-sync.patch'
+        'use-split-usr-path.patch')
+md5sums=('a5e4bfaf900a9e2480827feaf58556cb'
+         'e99e9189aa2f6084ac28b8ddf605aeb8'
+         '59e91c4d7a69b7bf12c86a9982e37ced'
+         'df69615503ad293c9ddf9d8b7755282d'
+         '5543be25f205f853a21fa5ee68e03f0d'
+         'ab42d779d640c6f986f48d326b7f0555'
+         'fd5b5f04ab0a847373d357555129d4c0')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # still waiting on ipw2x00, et al to get fixed...
+  patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
+
+  # hang onto this until we do the /{,s}bin merge
+  patch -Np1 <"$srcdir/use-split-usr-path.patch"
+
+  # i686 build fail
+  # upstream commit: e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb
+  patch -Np1 <"$srcdir/0001-journal-bring-mmap-cache-prototype-in-sync.patch"
+
+  ./configure \
+      --libexecdir=/usr/lib \
+      --localstatedir=/var \
+      --sysconfdir=/etc \
+      --enable-introspection \
+      --enable-gtk-doc \
+      --disable-audit \
+      --disable-ima \
+      --with-distro=arch \
+      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
+      --with-pci-ids-path=/usr/share/hwdata/pci.ids
+
+  make
+}
+
+package_systemd() {
+  pkgdesc="system and service manager"
+  depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
+           'pam' 'util-linux' 'xz')
+  provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
+  replaces=('libsystemd' 'systemd-tools' 'udev')
+  conflicts=('libsystemd' 'systemd-tools' 'udev')
+  optdepends=('initscripts: legacy support for /etc/rc.conf'
+              'python2-cairo: systemd-analyze'
+              'python2-dbus: systemd-analyze'
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries'
+              'cryptsetup: required for encrypted block devices'
+              'quota-tools: kernel-level quota management')
+  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/logind.conf
+          etc/systemd/journald.conf
+          etc/udev/udev.conf)
+  install="systemd.install"
+
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  install -dm755 "$pkgdir/bin"
+  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
+
+  # move bash-completion and symlink for loginctl
+  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
+    "$pkgdir/usr/share/bash-completion/completions/systemctl"
+  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
+  rm -rf "$pkgdir/etc/bash_completion.d"
+
+  # don't write units to /etc by default -- we'll enable this on post_install
+  # as a sane default
+  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty at tty1.service"
+  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
+
+  # get rid of RPM macros
+  rm -r "$pkgdir/etc/rpm"
+
+  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
+  # https://pokersource.info/show_bug.cgi?id=50989
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+  # the path to udevadm is hardcoded in some places
+  install -d "$pkgdir/sbin"
+  ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
+
+  # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
+  ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
+
+  # add back tmpfiles.d/legacy.conf
+  install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+
+  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
+          s#GROUP="tape"#GROUP="storage"#g;
+          s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
+
+  # add mkinitcpio hooks
+  install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
+  install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
+  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
+
+  # XXX: kill off coredump rule until the journal can recover coredumps
+  rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
+
+  ### split out manpages for sysvcompat
+  rm -rf "$srcdir/_sysvcompat"
+  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
+  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+     "$srcdir"/_sysvcompat/usr/share/man/man8
+}
+
+package_systemd-sysvcompat() {
+  pkgdesc="sysvinit compat for systemd"
+  conflicts=('sysvinit' 'initscripts')
+  depends=('sysvinit-tools')
+
+  # the initscripts conflict here isn't actually needed, but in order to make
+  # this package remove both sysvinit and initscripts, the initscripts conflict
+  # is needed. There's no case in which you would ever want initscripts installed
+  # without sysvinit, and vice versa, as in both cases, they are unusable.
+
+  mv "$srcdir/_sysvcompat"/* "$pkgdir"
+
+  install -dm755 "$pkgdir/sbin"
+  for tool in runlevel reboot shutdown poweroff halt telinit; do
+    ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
+  done
+
+  ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
+}
+
+# vim: ft=sh syn=sh et

Copied: systemd/repos/testing-i686/initcpio-hook-udev (from rev 166913, systemd/trunk/initcpio-hook-udev)
===================================================================
--- testing-i686/initcpio-hook-udev	                        (rev 0)
+++ testing-i686/initcpio-hook-udev	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,20 @@
+#!/usr/bin/ash
+
+run_earlyhook() {
+    udevd --daemon --resolve-names=never
+    udevd_running=1
+}
+
+run_hook() {
+    msg ":: Triggering uevents..."
+    udevadm trigger --action=add --type=subsystems
+    udevadm trigger --action=add --type=devices
+    udevadm settle
+}
+
+run_cleanuphook() {
+    udevadm control --exit
+    udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-i686/initcpio-install-timestamp (from rev 166913, systemd/trunk/initcpio-install-timestamp)
===================================================================
--- testing-i686/initcpio-install-timestamp	                        (rev 0)
+++ testing-i686/initcpio-install-timestamp	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+build() {
+    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
+}
+
+help() {
+    cat <<HELPEOF
+Provides support for RD_TIMESTAMP in early userspace, which can be read by a
+program such as systemd-analyze to determine boot time.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-i686/initcpio-install-udev (from rev 166913, systemd/trunk/initcpio-install-udev)
===================================================================
--- testing-i686/initcpio-install-udev	                        (rev 0)
+++ testing-i686/initcpio-install-udev	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+build() {
+    local rules tool
+
+    add_file "/etc/udev/udev.conf"
+    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
+    add_binary /usr/bin/udevadm
+
+    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
+        add_file "/usr/lib/udev/rules.d/$rules"
+    done
+    for tool in ata_id scsi_id; do
+        add_file "/usr/lib/udev/$tool"
+    done
+
+    add_runscript
+}
+
+help() {
+    cat <<HELPEOF
+This hook will use udev to create your root device node and detect the needed
+modules for your root device. It is also required for firmware loading in
+initramfs. It is recommended to use this hook.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-i686/systemd.install (from rev 166913, systemd/trunk/systemd.install)
===================================================================
--- testing-i686/systemd.install	                        (rev 0)
+++ testing-i686/systemd.install	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+sd_booted() {
+  [ -e sys/fs/cgroup/systemd ]
+}
+
+post_install() {
+  # enable getty at tty1 by default, but don't track the file
+  systemctl enable getty at .service
+
+  systemd-machine-id-setup
+
+  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
+  echo "   bootloader to replace sysvinit with systemd"
+}
+
+post_upgrade() {
+  systemd-machine-id-setup
+
+  # getty at tty1.service is no longer enabled by default, but we don't want to break
+  # existing setups.
+  if [ "$(vercmp 183 "$2")" -eq 1 ]; then
+    # systemctl seems to be whiny on sysvinit. this will succeed unless something
+    # horrific happens, so just mask the error.
+    systemctl -q enable getty at .service || true
+  fi
+}
+
+# vim:set ts=2 sw=2 et:

Copied: systemd/repos/testing-i686/use-split-usr-path.patch (from rev 166913, systemd/trunk/use-split-usr-path.patch)
===================================================================
--- testing-i686/use-split-usr-path.patch	                        (rev 0)
+++ testing-i686/use-split-usr-path.patch	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,14 @@
+--- a/src/core/main.c	2012-09-20 23:02:54.000000000 -0400
++++ b/src/core/main.c	2012-09-20 23:03:13.000000000 -0400
+@@ -1455,11 +1455,7 @@
+ 
+         /* Set up PATH unless it is already set */
+         setenv("PATH",
+-#ifdef HAVE_SPLIT_USR
+                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+-#else
+-               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
+-#endif
+                arg_running_as == SYSTEMD_SYSTEM);
+ 
+         if (arg_running_as == SYSTEMD_SYSTEM) {

Copied: systemd/repos/testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch (from rev 166913, systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch)
===================================================================
--- testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch	                        (rev 0)
+++ testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,124 @@
+From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Fri, 25 May 2012 19:43:24 -0400
+Subject: [PATCH] Reinstate TIMEOUT= handling
+
+This is mostly to deal with ipw2?00 drivers which have yet to be fixed
+in the kernel.
+---
+ src/libudev/libudev-device.c  |   19 +++++++++++++++++++
+ src/libudev/libudev-private.h |    1 +
+ src/udev/udevd.c              |   13 ++++++++++---
+ 3 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
+index a8277d1..5966189 100644
+--- a/src/libudev/libudev-device.c
++++ b/src/libudev/libudev-device.c
+@@ -68,6 +68,7 @@ struct udev_device {
+         struct udev_list tags_list;
+         unsigned long long int seqnum;
+         unsigned long long int usec_initialized;
++        int timeout;
+         int devlink_priority;
+         int refcount;
+         dev_t devnum;
+@@ -89,6 +90,21 @@ struct udev_device {
+         bool db_persist;
+ };
+ 
++int udev_device_get_timeout(struct udev_device *udev_device)
++{
++        return udev_device->timeout;
++}
++
++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
++{
++        char num[32];
++
++        udev_device->timeout = timeout;
++        snprintf(num, sizeof(num), "%u", timeout);
++        udev_device_add_property(udev_device, "TIMEOUT", num);
++        return 0;
++}
++
+ /**
+  * udev_device_get_seqnum:
+  * @udev_device: udev device
+@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
+ 
+                 util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
+                 udev_device_set_syspath(udev_device, path);
++        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
++                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
+         } else if (startswith(property, "SUBSYSTEM=")) {
+                 udev_device_set_subsystem(udev_device, &property[10]);
+         } else if (startswith(property, "DEVTYPE=")) {
+@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
+         udev_list_init(udev, &udev_device->sysattr_value_list, true);
+         udev_list_init(udev, &udev_device->sysattr_list, false);
+         udev_list_init(udev, &udev_device->tags_list, true);
++        udev_device->timeout = -1;
+         udev_device->watch_handle = -1;
+         /* copy global properties */
+         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
+diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
+index 4eb4a59..99aefeb 100644
+--- a/src/libudev/libudev-private.h
++++ b/src/libudev/libudev-private.h
+@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
+ void udev_device_set_is_initialized(struct udev_device *udev_device);
+ int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
+ void udev_device_cleanup_tags_list(struct udev_device *udev_device);
++int udev_device_get_timeout(struct udev_device *udev_device);
+ unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
+ void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
+ int udev_device_get_devlink_priority(struct udev_device *udev_device);
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 0d85960..cd24462 100644
+--- a/src/udev/udevd.c
++++ b/src/udev/udevd.c
+@@ -384,7 +384,7 @@ out:
+         }
+ }
+ 
+-static void event_run(struct event *event)
++static void event_run(struct event *event, bool force)
+ {
+         struct udev_list_node *loop;
+ 
+@@ -410,7 +410,7 @@ static void event_run(struct event *event)
+                 return;
+         }
+ 
+-        if (children >= children_max) {
++        if (!force && children >= children_max) {
+                 if (children_max > 1)
+                         log_debug("maximum number (%i) of children reached\n", children);
+                 return;
+@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
+ 
+         event->state = EVENT_QUEUED;
+         udev_list_node_append(&event->node, &event_list);
++
++        /* run all events with a timeout set immediately */
++        if (udev_device_get_timeout(dev) > 0) {
++                event_run(event, true);
++                return 0;
++        }
++
+         return 0;
+ }
+ 
+@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
+                 if (is_devpath_busy(event))
+                         continue;
+ 
+-                event_run(event);
++                event_run(event, false);
+         }
+ }
+ 
+-- 
+1.7.10.2
+

Copied: systemd/repos/testing-x86_64/0001-journal-bring-mmap-cache-prototype-in-sync.patch (from rev 166913, systemd/trunk/0001-journal-bring-mmap-cache-prototype-in-sync.patch)
===================================================================
--- testing-x86_64/0001-journal-bring-mmap-cache-prototype-in-sync.patch	                        (rev 0)
+++ testing-x86_64/0001-journal-bring-mmap-cache-prototype-in-sync.patch	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,24 @@
+From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Sat, 22 Sep 2012 00:16:13 +0200
+Subject: [PATCH] journal: bring mmap cache prototype in sync
+
+---
+ src/journal/mmap-cache.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
+index de34634..0c42fb8 100644
+--- a/src/journal/mmap-cache.h
++++ b/src/journal/mmap-cache.h
+@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
+ MMapCache* mmap_cache_ref(MMapCache *m);
+ MMapCache* mmap_cache_unref(MMapCache *m);
+ 
+-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
++int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
+ void mmap_cache_close_fd(MMapCache *m, int fd);
+ void mmap_cache_close_context(MMapCache *m, unsigned context);
+-- 
+1.7.12.1
+

Copied: systemd/repos/testing-x86_64/PKGBUILD (from rev 166913, systemd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,158 @@
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+
+pkgbase=systemd
+pkgname=('systemd' 'systemd-sysvcompat')
+pkgver=191
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2' 'LGPL2.1' 'MIT')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
+             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
+             'pam' 'quota-tools' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        'initcpio-hook-udev'
+        'initcpio-install-udev'
+        'initcpio-install-timestamp'
+        '0001-Reinstate-TIMEOUT-handling.patch'
+        '0001-journal-bring-mmap-cache-prototype-in-sync.patch'
+        'use-split-usr-path.patch')
+md5sums=('a5e4bfaf900a9e2480827feaf58556cb'
+         'e99e9189aa2f6084ac28b8ddf605aeb8'
+         '59e91c4d7a69b7bf12c86a9982e37ced'
+         'df69615503ad293c9ddf9d8b7755282d'
+         '5543be25f205f853a21fa5ee68e03f0d'
+         'ab42d779d640c6f986f48d326b7f0555'
+         'fd5b5f04ab0a847373d357555129d4c0')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # still waiting on ipw2x00, et al to get fixed...
+  patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
+
+  # hang onto this until we do the /{,s}bin merge
+  patch -Np1 <"$srcdir/use-split-usr-path.patch"
+
+  # i686 build fail
+  # upstream commit: e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb
+  patch -Np1 <"$srcdir/0001-journal-bring-mmap-cache-prototype-in-sync.patch"
+
+  ./configure \
+      --libexecdir=/usr/lib \
+      --localstatedir=/var \
+      --sysconfdir=/etc \
+      --enable-introspection \
+      --enable-gtk-doc \
+      --disable-audit \
+      --disable-ima \
+      --with-distro=arch \
+      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
+      --with-pci-ids-path=/usr/share/hwdata/pci.ids
+
+  make
+}
+
+package_systemd() {
+  pkgdesc="system and service manager"
+  depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
+           'pam' 'util-linux' 'xz')
+  provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
+  replaces=('libsystemd' 'systemd-tools' 'udev')
+  conflicts=('libsystemd' 'systemd-tools' 'udev')
+  optdepends=('initscripts: legacy support for /etc/rc.conf'
+              'python2-cairo: systemd-analyze'
+              'python2-dbus: systemd-analyze'
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries'
+              'cryptsetup: required for encrypted block devices'
+              'quota-tools: kernel-level quota management')
+  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/logind.conf
+          etc/systemd/journald.conf
+          etc/udev/udev.conf)
+  install="systemd.install"
+
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  install -dm755 "$pkgdir/bin"
+  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
+
+  # move bash-completion and symlink for loginctl
+  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
+    "$pkgdir/usr/share/bash-completion/completions/systemctl"
+  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
+  rm -rf "$pkgdir/etc/bash_completion.d"
+
+  # don't write units to /etc by default -- we'll enable this on post_install
+  # as a sane default
+  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty at tty1.service"
+  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
+
+  # get rid of RPM macros
+  rm -r "$pkgdir/etc/rpm"
+
+  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
+  # https://pokersource.info/show_bug.cgi?id=50989
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+  # the path to udevadm is hardcoded in some places
+  install -d "$pkgdir/sbin"
+  ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
+
+  # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
+  ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
+
+  # add back tmpfiles.d/legacy.conf
+  install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+
+  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
+          s#GROUP="tape"#GROUP="storage"#g;
+          s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
+
+  # add mkinitcpio hooks
+  install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
+  install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
+  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
+
+  # XXX: kill off coredump rule until the journal can recover coredumps
+  rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
+
+  ### split out manpages for sysvcompat
+  rm -rf "$srcdir/_sysvcompat"
+  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
+  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+     "$srcdir"/_sysvcompat/usr/share/man/man8
+}
+
+package_systemd-sysvcompat() {
+  pkgdesc="sysvinit compat for systemd"
+  conflicts=('sysvinit' 'initscripts')
+  depends=('sysvinit-tools')
+
+  # the initscripts conflict here isn't actually needed, but in order to make
+  # this package remove both sysvinit and initscripts, the initscripts conflict
+  # is needed. There's no case in which you would ever want initscripts installed
+  # without sysvinit, and vice versa, as in both cases, they are unusable.
+
+  mv "$srcdir/_sysvcompat"/* "$pkgdir"
+
+  install -dm755 "$pkgdir/sbin"
+  for tool in runlevel reboot shutdown poweroff halt telinit; do
+    ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
+  done
+
+  ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
+}
+
+# vim: ft=sh syn=sh et

Copied: systemd/repos/testing-x86_64/initcpio-hook-udev (from rev 166913, systemd/trunk/initcpio-hook-udev)
===================================================================
--- testing-x86_64/initcpio-hook-udev	                        (rev 0)
+++ testing-x86_64/initcpio-hook-udev	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,20 @@
+#!/usr/bin/ash
+
+run_earlyhook() {
+    udevd --daemon --resolve-names=never
+    udevd_running=1
+}
+
+run_hook() {
+    msg ":: Triggering uevents..."
+    udevadm trigger --action=add --type=subsystems
+    udevadm trigger --action=add --type=devices
+    udevadm settle
+}
+
+run_cleanuphook() {
+    udevadm control --exit
+    udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-x86_64/initcpio-install-timestamp (from rev 166913, systemd/trunk/initcpio-install-timestamp)
===================================================================
--- testing-x86_64/initcpio-install-timestamp	                        (rev 0)
+++ testing-x86_64/initcpio-install-timestamp	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+build() {
+    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
+}
+
+help() {
+    cat <<HELPEOF
+Provides support for RD_TIMESTAMP in early userspace, which can be read by a
+program such as systemd-analyze to determine boot time.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-x86_64/initcpio-install-udev (from rev 166913, systemd/trunk/initcpio-install-udev)
===================================================================
--- testing-x86_64/initcpio-install-udev	                        (rev 0)
+++ testing-x86_64/initcpio-install-udev	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+build() {
+    local rules tool
+
+    add_file "/etc/udev/udev.conf"
+    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
+    add_binary /usr/bin/udevadm
+
+    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
+        add_file "/usr/lib/udev/rules.d/$rules"
+    done
+    for tool in ata_id scsi_id; do
+        add_file "/usr/lib/udev/$tool"
+    done
+
+    add_runscript
+}
+
+help() {
+    cat <<HELPEOF
+This hook will use udev to create your root device node and detect the needed
+modules for your root device. It is also required for firmware loading in
+initramfs. It is recommended to use this hook.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-x86_64/systemd.install (from rev 166913, systemd/trunk/systemd.install)
===================================================================
--- testing-x86_64/systemd.install	                        (rev 0)
+++ testing-x86_64/systemd.install	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+sd_booted() {
+  [ -e sys/fs/cgroup/systemd ]
+}
+
+post_install() {
+  # enable getty at tty1 by default, but don't track the file
+  systemctl enable getty at .service
+
+  systemd-machine-id-setup
+
+  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
+  echo "   bootloader to replace sysvinit with systemd"
+}
+
+post_upgrade() {
+  systemd-machine-id-setup
+
+  # getty at tty1.service is no longer enabled by default, but we don't want to break
+  # existing setups.
+  if [ "$(vercmp 183 "$2")" -eq 1 ]; then
+    # systemctl seems to be whiny on sysvinit. this will succeed unless something
+    # horrific happens, so just mask the error.
+    systemctl -q enable getty at .service || true
+  fi
+}
+
+# vim:set ts=2 sw=2 et:

Copied: systemd/repos/testing-x86_64/use-split-usr-path.patch (from rev 166913, systemd/trunk/use-split-usr-path.patch)
===================================================================
--- testing-x86_64/use-split-usr-path.patch	                        (rev 0)
+++ testing-x86_64/use-split-usr-path.patch	2012-09-21 23:47:31 UTC (rev 166914)
@@ -0,0 +1,14 @@
+--- a/src/core/main.c	2012-09-20 23:02:54.000000000 -0400
++++ b/src/core/main.c	2012-09-20 23:03:13.000000000 -0400
+@@ -1455,11 +1455,7 @@
+ 
+         /* Set up PATH unless it is already set */
+         setenv("PATH",
+-#ifdef HAVE_SPLIT_USR
+                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+-#else
+-               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
+-#endif
+                arg_running_as == SYSTEMD_SYSTEM);
+ 
+         if (arg_running_as == SYSTEMD_SYSTEM) {




More information about the arch-commits mailing list