diff options
Diffstat (limited to 'staging/systemd')
| -rw-r--r-- | staging/systemd/0001-Reinstate-TIMEOUT-handling.patch | 124 | ||||
| -rw-r--r-- | staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch | 30 | ||||
| -rw-r--r-- | staging/systemd/PKGBUILD | 151 | ||||
| -rw-r--r-- | staging/systemd/initcpio-hook-udev | 20 | ||||
| -rw-r--r-- | staging/systemd/initcpio-install-timestamp | 14 | ||||
| -rw-r--r-- | staging/systemd/initcpio-install-udev | 28 | ||||
| -rw-r--r-- | staging/systemd/systemd.install | 29 | ||||
| -rw-r--r-- | staging/systemd/use-split-usr-path.patch | 14 |
8 files changed, 0 insertions, 410 deletions
diff --git a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch b/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch deleted file mode 100644 index 766dcb87f..000000000 --- a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@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 - diff --git a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch deleted file mode 100644 index 9be6ef28f..000000000 --- a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Thu, 27 Sep 2012 20:48:13 -0400 -Subject: [PATCH] tmpfiles: restore previous behavior for F/f - -d4e9eb91ea changed the behavior for the F and f actions, wrongly sending -them to glob_item(). Restore the old behavior and shortcut straight to -write_one_file(). ---- - src/tmpfiles/tmpfiles.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index f10f908..bf900fa 100644 ---- a/src/tmpfiles/tmpfiles.c -+++ b/src/tmpfiles/tmpfiles.c -@@ -673,6 +673,10 @@ static int create_item(Item *i) { - - case CREATE_FILE: - case TRUNCATE_FILE: -+ r = write_one_file(i, i->path); -+ if (r < 0) -+ return r; -+ break; - case WRITE_FILE: - r = glob_item(i, write_one_file); - if (r < 0) --- -1.7.12.1 - diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD deleted file mode 100644 index 18c285073..000000000 --- a/staging/systemd/PKGBUILD +++ /dev/null @@ -1,151 +0,0 @@ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: Tom Gundersen <teg@jklm.no> - -pkgbase=systemd -pkgname=('systemd' 'systemd-sysvcompat') -pkgver=194 -pkgrel=2 -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' 'python' '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' - 'use-split-usr-path.patch') -md5sums=('0ebb73aea444693b9b86f7a76f5df23c' - 'e99e9189aa2f6084ac28b8ddf605aeb8' - 'fb37e34ea006c79be1c54cbb0f803414' - 'df69615503ad293c9ddf9d8b7755282d' - '5543be25f205f853a21fa5ee68e03f0d' - '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" - - ./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 -} - -check() { - make -C "$pkgname-$pkgver" check -} - -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@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') - depends=('sysvinit-tools') - - 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 diff --git a/staging/systemd/initcpio-hook-udev b/staging/systemd/initcpio-hook-udev deleted file mode 100644 index 75da7e4a8..000000000 --- a/staging/systemd/initcpio-hook-udev +++ /dev/null @@ -1,20 +0,0 @@ -#!/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: diff --git a/staging/systemd/initcpio-install-timestamp b/staging/systemd/initcpio-install-timestamp deleted file mode 100644 index 259cc705b..000000000 --- a/staging/systemd/initcpio-install-timestamp +++ /dev/null @@ -1,14 +0,0 @@ -#!/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: diff --git a/staging/systemd/initcpio-install-udev b/staging/systemd/initcpio-install-udev deleted file mode 100644 index 15124b8f7..000000000 --- a/staging/systemd/initcpio-install-udev +++ /dev/null @@ -1,28 +0,0 @@ -#!/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 64-btrfs.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: diff --git a/staging/systemd/systemd.install b/staging/systemd/systemd.install deleted file mode 100644 index 784926e17..000000000 --- a/staging/systemd/systemd.install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -sd_booted() { - [ -e sys/fs/cgroup/systemd ] -} - -post_install() { - # enable getty@tty1 by default, but don't track the file - systemctl enable getty@.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@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@.service || true - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/systemd/use-split-usr-path.patch b/staging/systemd/use-split-usr-path.patch deleted file mode 100644 index 2fd32998d..000000000 --- a/staging/systemd/use-split-usr-path.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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) { |