[SM-Commit] GIT changes to master grimoire by Arjan Bouter (f11cfd811c570eddc43eadf57b34f55dcb712e94)

Arjan Bouter scm at sourcemage.org
Mon Sep 15 08:12:00 EDT 2008


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 utils/hal/DEPENDS |   30 +++++++++++++++++++++++-------
 utils/hal/HISTORY |    5 +++++
 2 files changed, 28 insertions(+), 7 deletions(-)

New commits:
commit f11cfd811c570eddc43eadf57b34f55dcb712e94
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    hal: removed dependency on python, added optional dependencies on cryptsetup-luks, acpid and
    libsmbios. Completed some other optional_depends.
    
    NOTE: the dependency on dbus_python is commented out, this needs to be
    checked.

diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index ad31911..133f5d3 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -4,11 +4,12 @@ depends  glib2              &&
 depends  intltool           &&
 depends  libcap             &&
 depends  libtool            &&
-depends  python             &&
 depends  udev               &&
 depends  xml-parser-expat   &&
 depends  pkgconfig          &&
-depends  dbus-python        &&
+
+# needs checking, maybe optional_depends, but definately not depends
+# depends  dbus-python  &&
 
 # bug #13500
 sub_depends  udev  VOLUME_ID  &&
@@ -43,10 +44,10 @@ optional_depends  docbook-utils             \
                   "--disable-docbook-docs"  \
                   "Build Docbook Docs"      &&
 
-optional_depends  libusb         \
-                  ""             \
-                  ""             \
-                  "usb support"  &&
+optional_depends  libusb                    \
+                  "--enable-usb"            \
+                  "--disable-usb"           \
+                  "for libusb support"      &&
 
 optional_depends  hwdata                             \
                   "--with-hwdata=/usr/share/hwdata"  \
@@ -61,5 +62,20 @@ optional_depends  pciutils                           \
 optional_depends  dmidecode                          \
                   ""                                 \
                   ""                                 \
-                  "for dmidecode support"
+                  "for dmidecode support"           &&
+
+optional_depends  acpid                              \
+                  "--enable-acpi-acpid"              \
+                  "--disable-acpi-acpid"             \
+                  "for an acpid event source"       &&
+
+optional_depends  cryptsetup-luks                    \
+                  ""                                 \
+                  ""                                 \
+                  "for cryptsetup-luks support"     &&
+
+optional_depends  libsmbios                          \
+                  "--enable-smbios"                  \
+                  "--disable-smbios"                 \
+                  "for smbios support"
 
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index d6a2608..9b83834 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,8 @@
+2008-09-15 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: doesn't depend on python anymore, added deps on
+	  cryptsetup-luks, acpid and libsmbios. completed some optional deps
+	  dbus_python needs checking.
+
 2008-08-30 Vlad Glagolev <stealth at sourcemage.org>
 	* TRIGGERS: added, recast on updating udev: libvolume_id.so
 



More information about the SM-Commit mailing list