diff options
| author | Arwed von Merkatz | 2009-10-12 18:35:09 +0200 |
|---|---|---|
| committer | Eric Sandall | 2009-10-12 11:54:20 -0700 |
| commit | 3e32de8cc9d800fefed552959aa69f280c59874e (patch) | |
| tree | 29570f6a79600d9b789023b27fce3a67f39db37e | |
| parent | 035cfc0335f41602d7d7818188d099150ae0c7ab (diff) | |
udev: fix EXTRAS sub_depends, bug 15464
(cherry-picked from b98ee5a)
| -rw-r--r-- | disk/udev/HISTORY | 5 | ||||
| -rwxr-xr-x | disk/udev/SUB_DEPENDS | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY index f95f22b6cc..2810f9fd58 100644 --- a/disk/udev/HISTORY +++ b/disk/udev/HISTORY @@ -1,3 +1,8 @@ +2009-10-12 Arwed v. Merkatz <v.merkatz@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@gmx.net> * DEPENDS: udev extras require usbutils diff --git a/disk/udev/SUB_DEPENDS b/disk/udev/SUB_DEPENDS index aabe06aed3..1dddd5697a 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 |