Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

systemd-git: update for more churn

  • Loading branch information...
commit 5fe06ca26d422eeb67cb9806060d05c6986427c1 1 parent 950aaa2
@falconindy authored
View
24 systemd-git/0001-udev-read-from-lib-udev-rules.d-for-compat.patch
@@ -0,0 +1,24 @@
+From 272798d713502c95f7cb0aed4b700065f10bdc0c Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 16 Apr 2012 20:00:34 -0400
+Subject: [PATCH] udev: read from /lib/udev/rules.d for compat
+
+---
+ src/udev/udev-rules.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
+index a800ccd..b3fc5e5 100644
+--- a/src/udev/udev-rules.c
++++ b/src/udev/udev-rules.c
+@@ -39,6 +39,7 @@
+ /* configuration directories with last modification timestamp */
+ static const char *rules_dirs[] = {
+ TEST_PREFIX UDEVLIBEXECDIR "/rules.d",
++ TEST_PREFIX "/lib/udev/rules.d",
+ TEST_PREFIX "/run/udev/rules.d",
+ TEST_PREFIX SYSCONFDIR "/udev/rules.d",
+ };
+--
+1.7.10
+
View
79 systemd-git/0001-udev-support-reading-from-split-usr-setup.patch
@@ -1,79 +0,0 @@
-From c1d144df648e469f703eda4da911e19ec54d6211 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Wed, 4 Apr 2012 01:15:33 -0400
-Subject: [PATCH] udev: support reading from split usr setup
-
----
- src/udev/libudev.c | 27 +++++++++++++++++----------
- 1 file changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/src/udev/libudev.c b/src/udev/libudev.c
-index dcba15d..5c3c375 100644
---- a/src/udev/libudev.c
-+++ b/src/udev/libudev.c
-@@ -43,8 +43,8 @@ struct udev {
- void *userdata;
- char *sys_path;
- char *dev_path;
-- char *rules_path[4];
-- unsigned long long rules_path_ts[4];
-+ char *rules_path[5];
-+ unsigned long long rules_path_ts[5];
- int rules_path_count;
- char *run_path;
- struct udev_list properties_list;
-@@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void)
- goto err;
-
- if (udev->rules_path[0] == NULL) {
-- /* /usr/lib/udev -- system rules */
-- udev->rules_path[0] = strdup(UDEVLIBEXECDIR "/rules.d");
-+ /* /lib/udev -- compat for system rules */
-+ udev->rules_path[0] = strdup("/lib/udev/rules.d");
- if (!udev->rules_path[0])
- goto err;
-
-- /* /run/udev -- runtime rules */
-- if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0)
-+ /* /usr/lib/udev -- system rules */
-+ udev->rules_path[1] = strdup(UDEVLIBEXECDIR "/rules.d");
-+ if (!udev->rules_path[1])
- goto err;
-
- /* /etc/udev -- local administration rules */
-- udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d");
-- if (!udev->rules_path[1])
-+ udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d");
-+ if (!udev->rules_path[2])
-+ goto err;
-+
-+ /* /run/udev -- runtime rules */
-+ if (asprintf(&udev->rules_path[4], "%s/rules.d", udev->run_path) < 0)
- goto err;
-
-- udev->rules_path_count = 3;
-+ udev->rules_path_count = 4;
- }
-
- dbg(udev, "context %p created\n", udev);
-@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void)
- dbg(udev, "dev_path='%s'\n", udev->dev_path);
- dbg(udev, "sys_path='%s'\n", udev->sys_path);
- dbg(udev, "run_path='%s'\n", udev->run_path);
-- dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]);
-+ dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1],
-+ udev->rules_path[2], udev->rules_path[3]);
- free(config_file);
- return udev;
- err:
-@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev)
- free(udev->rules_path[0]);
- free(udev->rules_path[1]);
- free(udev->rules_path[2]);
-+ free(udev->rules_path[3]);
- free(udev->run_path);
- dbg(udev, "context %p released\n", udev);
- free(udev);
---
-1.7.9.6
-
View
132 systemd-git/0002-reinstate-TIMEOUT-handling.patch
@@ -1,132 +0,0 @@
-From 0a581062ee3e31e0c2aedc5eb64c60f52868b17f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Thu, 15 Mar 2012 02:12:43 +0100
-Subject: [PATCH 2/2] reinstate TIMEOUT= handling
-
-Without treating events with timeouts specially some drivers would cause a
-30 seconds stall on boot: .
-
-I also received reports of some drivers not working at all, even after the
-timeout.
-
-We will remove this patch when more drivers have been fixed in the kernel (3.4?).
-
-This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and
-57c6f8ae5f52a6e8ffc66a54966346f733dded39.
----
- src/libudev-device.c | 19 +++++++++++++++++++
- src/libudev-private.h | 1 +
- src/udevd.c | 13 ++++++++++---
- 4 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev-device.c b/src/libudev-device.c
-index 10f28b8..639c367 100644
---- a/src/udev/libudev-device.c
-+++ b/src/udev/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;
-@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
- return 0;
- }
-
-+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;
-+}
-+
- const char *udev_device_get_devpath_old(struct udev_device *udev_device)
- {
- return udev_device->devpath_old;
-@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
- udev_device_set_devpath_old(udev_device, &property[12]);
- } else if (strncmp(property, "SEQNUM=", 7) == 0) {
- udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10));
-+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
- } else if (strncmp(property, "IFINDEX=", 8) == 0) {
- udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10));
- } else if (strncmp(property, "DEVMODE=", 8) == 0) {
-@@ -599,6 +617,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-private.h b/src/libudev-private.h
-index 5f5c64a..ec63b67 100644
---- a/src/udev/libudev-private.h
-+++ b/src/udev/libudev-private.h
-@@ -87,6 +87,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/udevd.c b/src/udevd.c
-index 1702217..88e9272 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -401,7 +401,7 @@ out:
- }
- }
-
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
- struct udev_list_node *loop;
-
-@@ -427,7 +427,7 @@ static void event_run(struct event *event)
- return;
- }
-
-- if (children >= children_max) {
-+ if (!force && children >= children_max) {
- if (children_max > 1)
- info(event->udev, "maximum number (%i) of children reached\n", children);
- return;
-@@ -461,6 +461,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;
- }
-
-@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev)
- continue;
- }
-
-- event_run(event);
-+ event_run(event, false);
- }
- }
-
---
-1.7.9.5
-
View
26 systemd-git/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=systemd-git
-pkgver=20120404
-pkgrel=2
+pkgver=20120416
+pkgrel=1
pkgdesc="system and service manager"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('acl' 'dbus' 'dbus-core' 'kbd' 'kmod' 'libcap' 'pam' 'udev' 'util-linux' 'xz')
+license=('GPL2' 'LGPL2.1' 'MIT')
+depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'xz')
makedepends=('cryptsetup' 'docbook-xsl' 'git' 'gobject-introspection' 'gperf'
'gtk-doc' 'intltool' 'libxslt')
optdepends=('cryptsetup: required for encrypted block devices'
@@ -34,13 +34,11 @@ install='systemd.install'
source=('os-release'
'initcpio-hooks-udev'
'initcpio-install-udev'
- 0001-udev-support-reading-from-split-usr-setup.patch
- 0002-reinstate-TIMEOUT-handling.patch)
+ 0001-udev-read-from-lib-udev-rules.d-for-compat.patch)
md5sums=('752636def0db3c03f121f8b4f44a63cd'
'a4dd853050bf2e0ae6b2e3d2c75499c2'
'd2b16edc6d806b5dafdbbad43ae5a3de'
- 'b2f1827cfe9035df20b2a05550f35188'
- 'f6f942e0241b848763cad7bfd00f6757')
+ '5a743ccd6409581d8899a55ff40fd75d')
_gitroot="git://anongit.freedesktop.org/systemd/systemd.git"
_gitname="systemd"
@@ -62,17 +60,20 @@ build() {
git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
cd "$srcdir/$_gitname-build"
- patch -Np1 <"$srcdir/0001-udev-support-reading-from-split-usr-setup.patch"
- patch -Np1 <"$srcdir/0002-reinstate-TIMEOUT-handling.patch"
+ # allow udev to read from /lib and /usr/lib
+ patch -Np1 <"$srcdir/0001-udev-read-from-lib-udev-rules.d-for-compat.patch"
./autogen.sh
./configure --libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
--enable-split-usr \
+ --enable-introspection \
+ --enable-gtk-doc \
--disable-audit \
--with-pamlibdir=/lib/security \
--with-distro=arch \
+ --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
--with-sysvinit-path= \
--with-sysvrcd-path=
@@ -89,7 +90,7 @@ package() {
# install external sd-{daemon,readahead} libraries
install -m644 -t "$pkgdir/usr/share/doc/systemd" \
- src/sd-daemon.[ch] \
+ src/systemd/sd-daemon.[ch] \
src/readahead/sd-readahead.[ch]
install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd"
@@ -124,6 +125,9 @@ package() {
install -d "$pkgdir/sbin"
ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
+ # udevd is no longer udevd because systemd.
+ ln -s ../systemd/systemd-udevd "$pkgdir/usr/lib/udev/udevd"
+
# Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
s#GROUP="tape"#GROUP="storage"#g;
Please sign in to comment.
Something went wrong with that request. Please try again.