Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting9.git;a=commitdiff;h=eb28af8830a57886b0166bff337d9110181656a7

commit eb28af8830a57886b0166bff337d9110181656a7
Author: Michel Hermier <[email protected]>
Date:   Tue Dec 11 22:22:44 2012 +0100

systemd-196-1-i686

* Bump version.

diff --git a/source/base/systemd/0001-Reinstate-TIMEOUT-handling.patch 
b/source/base/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 2092fef..0000000
--- a/source/base/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <[email protected]>
-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/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index ade5291..eb2427e 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -5,8 +5,8 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"}
USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"}

pkgname=systemd
-pkgver=189
-pkgrel=4
+pkgver=196
+pkgrel=1
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd";
depends=('dbus' 'kmod>=7' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 
'sysvinit-tools' 'xfsprogs-acl' 'pciutils' 'usbutils' 'shadow' 'libgcrypt')
@@ -15,22 +15,20 @@ options=('scriptlet' 'force')
up2date="Flasttar http://www.freedesktop.org/software/$pkgname";
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz \
console.conf 65-permissions.rules blacklist media.mount var-lock.mount 
var-run.mount \
-       vconsole.conf \
-       0001-Reinstate-TIMEOUT-handling.patch)
-sha1sums=('3e7ea7d1a9e7fcc9b3ec0e190d61ef1a7e17eaef' \
+       vconsole.conf)
+sha1sums=('65f6844c2d2a5e6b7ed1f77bb9f457b04774c74f' \
'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \
'439e2be7278ecedb4a4f090241bb484a7a25a9c3' \
'4657cbad76a3d5c8aade4dba166b3f8704c7b07f' \
'f896279eca1bcd02db36b215470593734fd894ee' \
'b784cca7ac15405edc2e5c4c1851d712bb6bcc38' \
'31b8d2530e0c8a70358ad5a6c7d8a0fbf43d1bca' \
-          '66c90190613ef915e5b2b1da37abd19791f7b16d' \
-          'a6539821cc493ce282013d79de8b5db3ec1003ac')
+         '66c90190613ef915e5b2b1da37abd19791f7b16d')

if Fuse $USE_CRYPTSETUP; then
depends=("${depends[@]}"  'cryptsetup-luks')
fi
-rodepends=("${depends[@]}" 'systemd-sysvinit')
+rodepends=('hwdata' 'systemd-sysvinit')

groups=('base' 'core')
archs=('i686' 'x86_64' 'arm')
@@ -51,9 +49,7 @@ suboptions=('force')
Fconfopts+=" --disable-selinux --with-distro=frugalware 
--with-pamlibdir=/lib/security \
--with-rootprefix= 
--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
--with-dbusinterfacedir=/usr/share/dbus-1/interfaces --enable-gtk-doc 
--enable-introspection \
-       --disable-audit --disable-ima 
--with-usb-ids-path=/usr/share/hwdata/usb.ids \
-       --with-pci-ids-path=/usr/share/hwdata/pci.ids \
-       --with-firmware-path=/lib/firmware"
+       --disable-audit --disable-ima --with-firmware-path=/lib/firmware"
if ! Fuse $USE_SYSV_COMPAT; then
Fconfopts+=" --with-sysvinit-path= --with-sysvrcd-path="
fi
@@ -124,6 +120,7 @@ build()
Fln ../var-lock.mount /lib/systemd/system/local-fs.target.wants/var-lock.mount

Frm /etc/bash_completion.d
+       Frm /lib/udev/hwdb.d # Use the one from hwdata
}

# optimization OK
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to