Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (2fef37cc35fd8a2d15b80037cc9ddd303c5f102d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (2fef37cc35fd8a2d15b80037cc9ddd303c5f102d)
  • Date: Wed, 14 Nov 2007 05:27:05 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

utils/hal-info/CONFIGURE | 3 ---
utils/hal-info/DEPENDS | 12 ++++++++++++
utils/hal-info/HISTORY | 5 ++---
3 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 2fef37cc35fd8a2d15b80037cc9ddd303c5f102d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hal-info: force_depends on older hal versions, needs 0.5.10+ #14079
other part of the bug

commit 49b18996c7d413013bf6a328b07def5a9198444e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "hal-info: correction for enable/disable WLAN killswitch support :
removed DEPENDS to avoid a circular dependency, added a config_query_option
in CONFIGURE instead"

This reverts commit 76222f7353a77cefa5c524948310a028c4431efb.

diff --git a/utils/hal-info/CONFIGURE b/utils/hal-info/CONFIGURE
index ea8647d..f961414 100755
--- a/utils/hal-info/CONFIGURE
+++ b/utils/hal-info/CONFIGURE
@@ -1,5 +1,2 @@
config_query_option HALINFO "include recall data?" n "--enable-recall" ""
config_query_option HALINFO "include video suspend data?" n "--enable-video"
""
-config_query_option HALINFO "enable WLAN killswitch support?" y \
- "--enable-killswitch-ipw-wlan" \
- "--disable-killswitch-ipw-wlan"
diff --git a/utils/hal-info/DEPENDS b/utils/hal-info/DEPENDS
new file mode 100755
index 0000000..f374ba5
--- /dev/null
+++ b/utils/hal-info/DEPENDS
@@ -0,0 +1,12 @@
+optional_depends hal \
+ "--enable-killswitch-ipw-wlan" \
+ "--disable-killswitch-ipw-wlan" \
+ "for WLAN killswitch support" &&
+
+if is_depends_enabled $SPELL hal; then
+ local hal_ver=$(installed_version hal) &&
+ case $hal_ver in
+ 0.5.[02-9]|0.5.[0-9].*|0.[24]*) force_depends hal ;;
+ *) true ;;
+ esac
+fi
diff --git a/utils/hal-info/HISTORY b/utils/hal-info/HISTORY
index c63b486..859c95c 100644
--- a/utils/hal-info/HISTORY
+++ b/utils/hal-info/HISTORY
@@ -1,6 +1,5 @@
-2007-10-31 Julien "_kaze_" ROZO <julien AT rozo.org>
- * DEPENDS: removed, to avoid a circular dependency
- * CONFIGURE: instead of DEPENDS, added an option to enable WLAN
killswitch support
+2007-11-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: force_depends on older hal versions, needs 0.5.10+ #14079

2007-10-30 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: added, optionally depends on hal for WLAN killswitch
support



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (2fef37cc35fd8a2d15b80037cc9ddd303c5f102d), Jaka Kranjc, 11/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page