summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2011-04-03 12:17:00 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2011-04-03 12:17:00 +0000
commitc0813221e43ae6357e73a07cfb4454ad2ce514f2 (patch)
tree70731009a28b7c3472b44254b0c1a837a72a1f23 /sys-fs/udev/files
parentVersion bump. (diff)
downloadhistorical-c0813221e43ae6357e73a07cfb4454ad2ce514f2.tar.gz
historical-c0813221e43ae6357e73a07cfb4454ad2ce514f2.tar.bz2
historical-c0813221e43ae6357e73a07cfb4454ad2ce514f2.zip
Let USE=-extras still build important utils like ata_id and usb_id. Backported from udev-168.
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/udev/files')
-rw-r--r--sys-fs/udev/files/udev-167-revert-disable-all-extras.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/sys-fs/udev/files/udev-167-revert-disable-all-extras.patch b/sys-fs/udev/files/udev-167-revert-disable-all-extras.patch
new file mode 100644
index 000000000000..dff195aa758d
--- /dev/null
+++ b/sys-fs/udev/files/udev-167-revert-disable-all-extras.patch
@@ -0,0 +1,32 @@
+commit 9bb54267a1483e8f3b2de352c7be433f625e5606
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Thu Mar 31 19:23:19 2011 +0200
+
+ Revert "Do not build extras with --disable-extras"
+
+ This reverts commit 905818f5961446ac32d1b2d165185fffddc4915a.
+
+ We do want to build some extras, just not the ones with extra dependencies.
+ Thanks to Juergen Daubert for pointing this out.
+
+diff --git a/Makefile.am b/Makefile.am
+index df70bf7..2c20f46 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -225,7 +225,6 @@ dist_udevrules_DATA += \
+ extras/rule_generator/75-cd-aliases-generator.rules \
+ extras/rule_generator/75-persistent-net-generator.rules
+
+-if ENABLE_EXTRAS
+ # ------------------------------------------------------------------------------
+ # firmware - firmware loading
+ # ------------------------------------------------------------------------------
+@@ -314,8 +313,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
+ libexec_PROGRAMS += extras/v4l_id/v4l_id
+ dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
+
+-endif # ENABLE_EXTRAS
+-
+ # ------------------------------------------------------------------------------
+ # qemu -- qemu/kvm guest tweaks
+ # ------------------------------------------------------------------------------