sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (802f34cbffee44933e5c75d6298bc4834bed8b4d)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (802f34cbffee44933e5c75d6298bc4834bed8b4d)
- Date: Thu, 9 Jun 2011 12:02:16 -0500
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
disk/udev/CONFIGURE | 21 ++++++++++++++++++---
disk/udev/DEPENDS | 8 ++++++--
disk/udev/HISTORY | 8 ++++++++
3 files changed, 32 insertions(+), 5 deletions(-)
New commits:
commit 802f34cbffee44933e5c75d6298bc4834bed8b4d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
udev: Fix Bug #15994
extras split to glib2 (gudev) and --enable-udev_acl
Remove old '--enable-extras' and switch to '--enable-udev_acl'
Remove old '--disable-extras' and switch to '--disable-udev_acl'
Move depends glib2 to optional_depends for hash function
Change ACL check to '--enable-udev_acl'
diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index 13df888..84f4673 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -3,10 +3,25 @@ config_query_option UDEV_OPTS \
"--enable-debug" \
"--disable-debug" &&
+#
+# Remove this after stable-0.58 is released.
+# Bug #15994
+#
+if list_find "$UDEV_OPTS" '--enable-extras'; then
+ list_remove UDEV_OPTS '--enable-extras' &&
+ list_add UDEV_OPTS '--enable-udev_acl'
+elif list_find "$UDEV_OPTS" '--disable-extras'; then
+ list_remove UDEV_OPTS '--disable-extras' &&
+ list_add UDEV_OPTS '--disable-udev_acl'
+fi &&
+#
+# End Bug #15994
+#
+
config_query_option UDEV_OPTS \
- "Compile hash function generator and access control
lists" n \
- "--enable-extras" \
- "--disable-extras" &&
+ "Compile access control lists" n \
+ "--enable-udev_acl" \
+ "--disable-udev_acl" &&
if spell_ok hotplug; then
message "You seem to have hotplug installed. Hotplug has been" \
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index db1372e..3ebeebe 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -4,9 +4,8 @@ depends gperf &&
depends usbutils &&
depends PCIIDS &&
-if list_find "$UDEV_OPTS" "--enable-extras"; then
+if list_find "$UDEV_OPTS" "--enable-udev_acl"; then
depends pkgconfig &&
- depends glib2 &&
depends libusb &&
optional_depends consolekit '' '' 'seesion/seat support'
fi &&
@@ -20,6 +19,11 @@ optional_depends acl \
"--disable-udev_acl" \
"for local user acl permissions support" &&
+optional_depends glib2 \
+ '--enable-gudev' \
+ '--disable-gudev' \
+ 'for GObject libudev (has function generator) support' &&
+
optional_depends gobject-introspection \
"--enable-introspection" \
"--disable-introspection" \
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index fa93ca9..f0f7cff 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,11 @@
+2011-06-08 Eric Sandall <sandalle AT sourcemage.org>
+ * Fix Bug #15994
+ * CONFIGURE: extras split to glib2 (gudev) and --enable-udev_acl
+ Remove old '--enable-extras' and switch to '--enable-udev_acl'
+ Remove old '--disable-extras' and switch to '--disable-udev_acl'
+ * DEPENDS: Move depends glib2 to optional_depends for hash function
+ Change ACL check to '--enable-udev_acl'
+
2011-06-01 David C. Haley <khoralin AT gmail.com>
* DEPENDS: gperf, usbutils, PCIIDS required dependencies
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (802f34cbffee44933e5c75d6298bc4834bed8b4d), Eric Sandall, 06/09/2011
Archive powered by MHonArc 2.6.24.