[arch-commits] Commit in systemd/trunk (4 files)
Tom Gundersen
tomegun at archlinux.org
Wed Nov 21 02:10:58 UTC 2012
Date: Tuesday, November 20, 2012 @ 21:10:57
Author: tomegun
Revision: 171675
prepare for 196
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/systemd.install
systemd/trunk/use-split-usr-path.patch
Deleted:
systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch
---------------------------------------+
0001-Reinstate-TIMEOUT-handling.patch | 124 --------------------------------
PKGBUILD | 20 +----
systemd.install | 7 +
use-split-usr-path.patch | 2
4 files changed, 13 insertions(+), 140 deletions(-)
Deleted: 0001-Reinstate-TIMEOUT-handling.patch
===================================================================
--- 0001-Reinstate-TIMEOUT-handling.patch 2012-11-21 02:05:29 UTC (rev 171674)
+++ 0001-Reinstate-TIMEOUT-handling.patch 2012-11-21 02:10:57 UTC (rev 171675)
@@ -1,124 +0,0 @@
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-11-21 02:05:29 UTC (rev 171674)
+++ PKGBUILD 2012-11-21 02:10:57 UTC (rev 171675)
@@ -3,8 +3,8 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=195
-pkgrel=2
+pkgver=196
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,21 +16,16 @@
'initcpio-hook-udev'
'initcpio-install-udev'
'initcpio-install-timestamp'
- '0001-Reinstate-TIMEOUT-handling.patch'
'use-split-usr-path.patch')
-md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680'
+md5sums=('05ebd7f108e420e2b4e4810ea4b3c810'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d'
- '5543be25f205f853a21fa5ee68e03f0d'
- 'fd5b5f04ab0a847373d357555129d4c0')
+ '76bf83fe34c5b40533abc5dc940576a6')
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"
@@ -42,9 +37,7 @@
--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
+ --with-distro=arch
make
}
@@ -126,9 +119,6 @@
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/
Modified: systemd.install
===================================================================
--- systemd.install 2012-11-21 02:05:29 UTC (rev 171674)
+++ systemd.install 2012-11-21 02:10:57 UTC (rev 171675)
@@ -7,6 +7,8 @@
post_common() {
systemd-machine-id-setup
+ udevadm hwdb --update
+
setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt
if sd_booted; then
@@ -40,6 +42,11 @@
printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n'
fi
+ if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then
+ printf '==> The legacy configuration options are no longer supported in rc.conf,\n'
+ printf ' convert your rc.conf to the new configuration formats.\n'
+ fi
+
# logind's protocol changed. kindly restart the daemon to avoid locking
# out further logins.
if [ "$(vercmp 195 "$2")" -eq 1 ]; then
Modified: use-split-usr-path.patch
===================================================================
--- use-split-usr-path.patch 2012-11-21 02:05:29 UTC (rev 171674)
+++ use-split-usr-path.patch 2012-11-21 02:10:57 UTC (rev 171675)
@@ -1,6 +1,6 @@
--- 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 @@
+@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) {
/* Set up PATH unless it is already set */
setenv("PATH",
More information about the arch-commits
mailing list