15 files changed, 0 insertions, 768 deletions
diff --git a/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch b/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 766dcb87f..000000000
--- a/testing/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/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch b/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch
deleted file mode 100644
index c92cf5d11..000000000
--- a/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@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
-
diff --git a/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch b/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
deleted file mode 100644
index 5c6085c95..000000000
--- a/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 10 Aug 2012 11:02:03 -0400
-Subject: [PATCH] shutdown: recursively mark root as private before pivot
-
-Because root is now recursively marked as shared on bootup, we need to
-recursively mark root as private. This prevents a pivot_root failure on
-shutdown:
-
-  Cannot finalize remaining file systems and devices, giving up.
-  pivot failed: Invalid argument
----
- src/core/shutdown.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index 105a604..0b7cbd8 100644
---- a/src/core/shutdown.c
-+++ b/src/core/shutdown.c
-@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) {
-           It works for pivot_root, but the ref count for the root device
-           is not decreasing :-/
-         */
--        if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) {
-+        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) {
-                 log_error("Failed to make \"/\" private mount %m");
-                 return -errno;
-         }
--- 
-1.7.11.4
-
diff --git a/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch b/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
deleted file mode 100644
index 3aec94edc..000000000
--- a/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c516c8d17f77a1c761447f4c40c8dfffeda2e06d Mon Sep 17 00:00:00 2001
-From: Simon Peeters <peeters.simon@gmail.com>
-Date: Fri, 10 Aug 2012 17:32:19 +0200
-Subject: [PATCH] systemctl: fix issue with systemctl daemon-reexec
-
----
- src/shared/dbus-common.c  |  3 ++-
- src/systemctl/systemctl.c | 11 ++++++++---
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
-index 7f0dce5..da2dc2e 100644
---- a/src/shared/dbus-common.c
-+++ b/src/shared/dbus-common.c
-@@ -1287,7 +1287,8 @@ int bus_method_call_with_reply(DBusConnection *bus,
-         reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
-         dbus_message_unref(m);
-         if (!reply) {
--                log_error("Failed to issue method call: %s", bus_error_message(&error));
-+                if (!return_error)
-+                        log_error("Failed to issue method call: %s", bus_error_message(&error));
-                 if (bus_error_is_no_service(&error))
-                         r = -ENOENT;
-                 else if (dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED))
-diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 2e0aaaa..13e0f91 100644
---- a/src/systemctl/systemctl.c
-+++ b/src/systemctl/systemctl.c
-@@ -1537,11 +1537,12 @@ static int start_unit_one(
-                         DBUS_TYPE_INVALID);
-         free(n);
-         if (r) {
--                if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) {
-+                if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL )
-                         /* There's always a fallback possible for
-                          * legacy actions. */
-                         r = -EADDRNOTAVAIL;
--                }
-+                else
-+                        log_error("Failed to issue method call: %s", bus_error_message(error));
-                 goto finish;
-         }
- 
-@@ -3143,6 +3144,7 @@ finish:
- static int daemon_reload(DBusConnection *bus, char **args) {
-         int r;
-         const char *method;
-+        DBusError error;
- 
-         if (arg_action == ACTION_RELOAD)
-                 method = "Reload";
-@@ -3171,7 +3173,7 @@ static int daemon_reload(DBusConnection *bus, char **args) {
-                         "org.freedesktop.systemd1.Manager",
-                         method,
-                         NULL,
--                        NULL,
-+                        &error,
-                         DBUS_TYPE_INVALID);
- 
-         if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL)
-@@ -3182,6 +3184,9 @@ static int daemon_reload(DBusConnection *bus, char **args) {
-                 /* On reexecution, we expect a disconnect, not
-                  * a reply */
-                 r = 0;
-+        else if (r)
-+                log_error("Failed to issue method call: %s", bus_error_message(&error));
-+        dbus_error_free(&error);
- 
-         return r;
- }
--- 
-1.7.11.4
-
diff --git a/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
deleted file mode 100644
index 9be6ef28f..000000000
--- a/testing/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/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch b/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch
deleted file mode 100644
index 117b0df57..000000000
--- a/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Wed, 6 Jun 2012 14:30:16 +0200
-Subject: [PATCH] udev: systemd-udev-settle.service fix After=
-
-https://bugs.freedesktop.org/show_bug.cgi?id=50779
----
- units/systemd-udev-settle.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
-index d637700..2c4c129 100644
---- a/units/systemd-udev-settle.service.in
-+++ b/units/systemd-udev-settle.service.in
-@@ -21,7 +21,7 @@ Documentation=man:udev(7)
- Documentation=man:systemd-udevd(8)
- DefaultDependencies=no
- Wants=systemd-udev.service
--After=udev-trigger.service
-+After=systemd-udev-trigger.service
- Before=basic.target
- ConditionCapability=CAP_MKNOD
- 
--- 
-1.7.11
-
diff --git a/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch b/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
deleted file mode 100644
index a2cdf64a7..000000000
--- a/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From d305a67b46644d6360ef557109384c831ee8e018 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sun, 10 Jun 2012 20:37:14 +0200
-Subject: [PATCH] vconsole-setup: enable utf-8 mode explicitly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Rather than assuming the console is in utf-8 mode if nothing else is
-specified, be a bit more robust and enable it explicitly.
-
-This fixes a regression compared with Arch's initscripts when not
-using a framebuffer as the old VGA console would not be in utf-8
-mode by default.
-
-Furthermore, this would allow vconsole-setup to be used after boot
-to change the vconsole into utf-8 mode in case it has been set to
-non-utf-8 mode for whatever reason. I.e, the following would leave
-the console in utf-8 mode as expected:
-
- # export LANG=en_US.ISO-8859-1
- # /usr/lib/systemd/systemd-vconsole-setup
- # export LANG=en_US.UTF-8
- # /usr/lib/systemd/systemd-vconsole-setup
-
-Reported-by: Xyne <xyne@archlinx.ca>
-Reported-by: Thomas Bächler <thomas@archlinux.org>
-Cc: Dave Reisner <dreisner@archlinux.org>
----
- src/vconsole/vconsole-setup.c | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index d04fab4..aa5fa18 100644
---- a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
-@@ -80,6 +80,25 @@ static int disable_utf8(int fd) {
-         return r;
- }
- 
-+static int enable_utf8(int fd) {
-+        int r = 0, k;
-+
-+        if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0)
-+                r = -errno;
-+
-+        if (loop_write(fd, "\033%G", 3, false) < 0)
-+                r = -errno;
-+
-+        k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1");
-+        if (k < 0)
-+                r = k;
-+
-+        if (r < 0)
-+                log_warning("Failed to enable UTF-8: %s", strerror(-r));
-+
-+        return r;
-+}
-+
- static int load_keymap(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) {
-         const char *args[8];
-         int i = 0;
-@@ -418,9 +437,12 @@ int main(int argc, char **argv) {
- 
-         r = EXIT_FAILURE;
- 
--        if (!utf8)
-+        if (utf8)
-+                enable_utf8(fd);
-+        else
-                 disable_utf8(fd);
- 
-+
-         if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
-             load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
-                 r = EXIT_SUCCESS;
--- 
-1.7.11
-
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
deleted file mode 100644
index cce4b8e44..000000000
--- a/testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=195
-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=('38e8c8144e7e6e5bc3ce32eb4260e680'
-         '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'
-              'python: systemd library bindings'
-              '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 *ctl's
-  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
-    "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  for ctl in {login,journal,timedate,locale,hostname}ctl; do
-    ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl"
-  done
-  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
-
-  # create /var/log/journal. users can control the actual log destination via journald.conf
-  install -dm755 "$pkgdir/var/log/journal"
-}
-
-package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
-  groups=('base')
-  conflicts=('sysvinit')
-  depends=('sysvinit-tools' 'systemd')
-
-  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/testing/systemd/initcpio-hook-udev b/testing/systemd/initcpio-hook-udev
deleted file mode 100644
index 75da7e4a8..000000000
--- a/testing/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/testing/systemd/initcpio-install-timestamp b/testing/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/testing/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/testing/systemd/initcpio-install-udev b/testing/systemd/initcpio-install-udev
deleted file mode 100644
index 15124b8f7..000000000
--- a/testing/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/testing/systemd/locale.sh b/testing/systemd/locale.sh
deleted file mode 100644
index a4c413eed..000000000
--- a/testing/systemd/locale.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-if [ ! -r /etc/locale.conf ]; then
-  return
-fi
-
-. /etc/locale.conf
-
-if [ "${LANG+x}" = 'x' ]; then
-  export LANG
-fi
-
-if [ "${LC_CTYPE+x}" = 'x' ]; then
-  export LC_CTYPE
-fi
-
-if [ "${LC_NUMERIC+x}" = 'x' ]; then
-  export LC_NUMERIC
-fi
-
-if [ "${LC_TIME+x}" = 'x' ]; then
-  export LC_TIME
-fi
-
-if [ "${LC_COLLATE+x}" = 'x' ]; then
-  export LC_COLLATE
-fi
-
-if [ "${LC_MONETARY+x}" = 'x' ]; then
-  export LC_MONETARY
-fi
-
-if [ "${LC_MESSAGES+x}" = 'x' ]; then
-  export LC_MESSAGES
-fi
-
-if [ "${LC_PAPER+x}" = 'x' ]; then
-  export LC_PAPER
-fi
-
-if [ "${LC_NAME+x}" = 'x' ]; then
-  export LC_NAME
-fi
-
-if [ "${LC_ADDRESS+x}" = 'x' ]; then
-  export LC_ADDRESS
-fi
-
-if [ "${LC_TELEPHONE+x}" = 'x' ]; then
-  export LC_TELEPHONE
-fi
-
-if [ "${LC_MEASUREMENT+x}" = 'x' ]; then
-  export LC_MEASUREMENT
-fi
-
-if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then
-  export LC_IDENTIFICATION
-fi
-
diff --git a/testing/systemd/systemd-tools.install b/testing/systemd/systemd-tools.install
deleted file mode 100644
index 7d0bd8790..000000000
--- a/testing/systemd/systemd-tools.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_install() {
-  systemd-machine-id-setup
-}
-
-post_upgrade() {
-  systemd-machine-id-setup
-
-  if [ "$(vercmp $2 174)" -lt 0 ]; then
-    echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
-    echo "   'scanner' and 'video' groups. Beware of any changes."
-    echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-    echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
-    echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-    echo "   this functionality back."
-    echo " * We no longer create the static nodes on install needed for an initrd-less"
-    echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
-    echo "   installs."
-  fi
-  if [ "$(vercmp $2 175)" -lt 0 ]; then
-    echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
-    echo "   kernels have this enabled."
-  fi
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo " * udev-compat has been removed, and should be uninstalled."
-    echo " * Framebuffers are no longer blacklisted by default."
-    echo " * binaries moved from /sbin to /usr/bin"
-  fi
-  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
-    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
-    echo "   load the 'loop' module before using losetup"
-  fi
-}
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
deleted file mode 100644
index aad9691b0..000000000
--- a/testing/systemd/systemd.install
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
-}
-
-post_common() {
-  systemd-machine-id-setup
-
-  setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt
-
-  if sd_booted; then
-    systemctl --system daemon-reexec
-  fi
-}
-
-post_install() {
-  post_common
-
-  # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@.service
-
-  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
-  echo "   bootloader to replace sysvinit with systemd"
-}
-
-post_upgrade() {
-  post_common
-
-  # 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
-
-  if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then
-    printf '==> journald now writes to /var/log/journal by default. This can be\n'
-    printf '    controlled with the Storage setting in /etc/systemd/journald.conf\n'
-  fi
-
-  # logind's protocol changed. kindly restart the daemon to avoid locking
-  # out further logins.
-  if [ "$(vercmp 195 "$2")" -eq 1 ]; then
-    if sd_booted; then
-      systemctl restart systemd-logind.service
-    fi
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/systemd/use-split-usr-path.patch b/testing/systemd/use-split-usr-path.patch
deleted file mode 100644
index 2fd32998d..000000000
--- a/testing/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) {