sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-rc-0.37 grimoire by Eric Sandall (3e32de8cc9d800fefed552959aa69f280c59874e)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-rc-0.37 grimoire by Eric Sandall (3e32de8cc9d800fefed552959aa69f280c59874e)
- Date: Mon, 12 Oct 2009 13:54:43 -0500
GIT changes to stable-rc-0.37 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
disk/udev/HISTORY | 5 +++++
disk/udev/SUB_DEPENDS | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 3e32de8cc9d800fefed552959aa69f280c59874e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>
udev: fix EXTRAS sub_depends, bug 15464
(cherry-picked from b98ee5a)
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index f95f22b..2810f9f 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,8 @@
+2009-10-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * SUB_DEPENDS: remove --disable-extras from UDEV_OPTS if
+ EXTRAS sub_depends is requested, otherwise fails to actually build
+ the extras, bug #15464
+
2009-09-29 Finn Haedicke <finn_haedicke AT gmx.net>
* DEPENDS: udev extras require usbutils
diff --git a/disk/udev/SUB_DEPENDS b/disk/udev/SUB_DEPENDS
index aabe06a..1dddd56 100755
--- a/disk/udev/SUB_DEPENDS
+++ b/disk/udev/SUB_DEPENDS
@@ -1,6 +1,7 @@
case "$THIS_SUB_DEPENDS" in
VOLUME_ID) true;;
- EXTRAS) list_add UDEV_OPTS --enable-extras ;;
+ EXTRAS) list_add UDEV_OPTS --enable-extras
+ list_remove UDEV_OPTS --disable-extras ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
return 1;;
esac
- [SM-Commit] GIT changes to stable-rc-0.37 grimoire by Eric Sandall (3e32de8cc9d800fefed552959aa69f280c59874e), Eric Sandall, 10/12/2009
Archive powered by MHonArc 2.6.24.