Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit acpid
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 09 Aug 2007 17:37:19 +0200
  • Message-id: <20070809153719.E12B7678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package acpid
checked in at Thu Aug 9 17:37:19 CEST 2007.

--------
--- acpid/acpid.changes 2007-07-30 19:06:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/acpid/acpid.changes    2007-08-08 15:30:33.917032000 +0200
@@ -1,0 +2,8 @@
+Wed Aug  8 11:04:56 CEST 2007 - thoenig@xxxxxxx
+
+- remove loading of ACPI modules, they are now being loaded
+  automatically (#216564)
+- rename ibm_acpi.modprobe to thinkpad_acpi.modprobe as the kernel
+  module was renamed (#297812)
+
+-------------------------------------------------------------------

Old:
----
  ibm_acpi.modprobe

New:
----
  thinkpad_acpi.modprobe

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ acpid.spec ++++++
--- /var/tmp/diff_new_pack.h16603/_old  2007-08-09 17:36:35.000000000 +0200
+++ /var/tmp/diff_new_pack.h16603/_new  2007-08-09 17:36:35.000000000 +0200
@@ -13,7 +13,7 @@
 Name:           acpid
 URL:            http://acpid.sourceforge.net/
 Version:        1.0.6
-Release:        9
+Release:        12
 %define       acpi_version 0.09
 License:        GPL v2 or later
 Group:          System/Daemons
@@ -25,7 +25,7 @@
 Source1:        acpi-%{acpi_version}.tar.bz2
 Source2:        rcacpid
 Source3:        README.SuSE
-Source4:        ibm_acpi.modprobe
+Source4:        thinkpad_acpi.modprobe
 Source5:        events.default
 Patch1:         acpi_%{acpi_version}.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -66,7 +66,7 @@
 %install
 make install INSTPREFIX=%{buildroot} SBINDIR=%{buildroot}/sbin
 install -Dm 744 rcacpid %{buildroot}/etc/init.d/acpid
-install -Dm 644 ibm_acpi.modprobe %{buildroot}/etc/modprobe.d/ibm_acpi
+install -Dm 644 thinkpad_acpi.modprobe %{buildroot}/etc/modprobe.d/thinkpad_acpi
 mkdir -p %{buildroot}/usr/sbin
 ln -sf ../../etc/init.d/acpid %{buildroot}/usr/sbin/rcacpid
 install -Dm 644 events.default %{buildroot}/etc/acpi/events/default
@@ -77,7 +77,6 @@
 popd
 # for the rpmlint fascists
 mv samples examples 
-mkdir -p %{buildroot}/var/lib/acpi
 # keep the logfile
 install -dm 755 %buildroot%_var/log
 touch %buildroot%_var/log/acpid
@@ -87,7 +86,6 @@
 
 %post
 %{fillup_and_insserv -Y -f acpid}
-rm -f -- var/lib/acpi/*
 
 %postun
 %restart_on_update acpid
@@ -103,7 +101,7 @@
 %dir /etc/acpi/events
 /etc/acpi/events/default
 /etc/init.d/acpid
-/etc/modprobe.d/ibm_acpi
+/etc/modprobe.d/thinkpad_acpi
 /usr/sbin/rcacpid
 /sbin/acpid
 /usr/bin/acpi_listen
@@ -113,9 +111,13 @@
 /usr/bin/acpi
 /usr/share/man/man1/acpi.1.gz
 %ghost %config(noreplace,missingok) %_var/log/acpid
-%dir %attr(0750, root, root) /var/lib/acpi
 
 %changelog
+* Wed Aug 08 2007 - thoenig@xxxxxxx
+- remove loading of ACPI modules, they are now being loaded
+  automatically (#216564)
+- rename ibm_acpi.modprobe to thinkpad_acpi.modprobe as the kernel
+  module was renamed (#297812)
 * Mon Jul 30 2007 - seife@xxxxxxx
 - fix "--skip-unsupported" warnings on module load (b.n.c #293758)
 * Tue Jul 03 2007 - seife@xxxxxxx


++++++ rcacpid ++++++
--- acpid/rcacpid       2007-07-30 16:12:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/acpid/rcacpid  2007-08-08 12:02:44.221974000 +0200
@@ -64,20 +64,6 @@
 # with force-reload (in case signaling is not supported) are
 # considered a success.
 
-ACPI_MODULES=""
-DEFAULT_ACPI_MODULES="ac battery button fan processor thermal"
-ACPI_LAPTOP_MODULES_PROBE="asus_acpi ibm_acpi toshiba_acpi sony_acpi pcc_acpi dock bay"
-ACPI_LAPTOP_MODULES_FILE="/var/lib/acpi/laptop_modules"
-
-ARCH=`uname -i`
-case $ARCH in
-       ia64)   DEFAULT_ACPI_MODULES="button fan processor thermal"
-               ACPI_LAPTOP_MODULES_PROBE=""
-               # avoid even occassional probing of laptop modules!
-               ACPI_LAPTOP_MODULES_USER="NONE"
-               ;;
-esac
-
 [ -f /etc/sysconfig/powersave/common ] && . /etc/sysconfig/powersave/common
 [ -f /etc/sysconfig/acpi ] && . /etc/sysconfig/acpi 
 [ -f /etc/sysconfig/powersave/cpufreq ] && . /etc/sysconfig/powersave/cpufreq
@@ -90,76 +76,6 @@
                        rc_exit
                fi
 
-               echo -n "acpid: loading ACPI modules ( "
-               if [ "$ACPI_MODULES" != "NONE" ]; then
-                   # load ACPI modules
-                   for m in ${ACPI_MODULES:-$DEFAULT_ACPI_MODULES}; do
-                       grep -wq $m /proc/modules || { modprobe -s $m && echo -n "$m " || rc_status; }
-                   done
-               fi
-               echo -n ") "
-               rc_status -v
-
-               if [ -n "$ACPI_LAPTOP_MODULES_USER" ]; then
-                   if [ "$ACPI_LAPTOP_MODULES_USER" != "NONE" ]; then
-                       echo -n "acpid: loading ACPI laptop modules ( "
-                       # Load modules defined by user
-                       for m in ${ACPI_LAPTOP_MODULES_USER}; do
-                           grep -wq $m /proc/modules || { modprobe -s $m && echo -n "$m " || rc_status; }
-                       done
-                       echo -n ") "
-                       rc_status -v
-                   fi
-               else
-                   if [ /boot/vmlinuz -ot "$ACPI_LAPTOP_MODULES_FILE" ]; then
-                       echo -n "acpid: loading ACPI laptop modules ( "
-                       # Load modules defined by system probe
-                       while read m; do
-                           grep -wq $m /proc/modules || { modprobe -s $m && echo -n "$m " || rc_status; }
-                       done < $ACPI_LAPTOP_MODULES_FILE
-                       echo -n ") "
-                       rc_status -v
-                   else
-                       # First run, or kernel has been updated. We have to probe which
-                       # modules load successfully.  For this, we do respect
-                       # LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.
-
-                       echo "acpid: probing laptop ACPI modules "
-                       touch "$ACPI_LAPTOP_MODULES_FILE"
-                       for m in $ACPI_LAPTOP_MODULES_PROBE; do
-                           if modprobe $MODPROBE_OPTS -s $m; then
-                               # pcc_acpi and sony_acpi can always be loaded. 
-                               # remove them if the system does not support them.
-                               case $m in
-                                   sony_acpi)
-                                       if [ ! -r /proc/acpi/sony/brightness ] ; then
-                                           grep -wq $m /proc/modules && rmmod sony_acpi;
-                                           continue
-                                       fi ;;
-                                   pcc_acpi)
-                                       if [ ! -r /proc/acpi/panasonic -a ! -r /proc/acpi/pcc ] ; then
-                                           grep -wq $m /proc/modules && rmmod pcc_acpi;
-                                           continue
-                                       fi ;;
-                                   asus_acpi)
-                                       if [ ! -r /proc/acpi/asus ] ; then
-                                           grep -wq $m /proc/modules && rmmod asus_acpi;
-                                           continue
-                                       fi ;;
-                               esac
-                               echo $m >> $ACPI_LAPTOP_MODULES_FILE
-                           fi
-                       done 
-                       echo -n "acpid: added " 
-                       while read m; do
-                               echo  -n "$m "
-                       done < $ACPI_LAPTOP_MODULES_FILE
-               
-                       echo -n "to $ACPI_LAPTOP_MODULES_FILE"
-                       rc_status -v;
-                   fi
-               fi
-               
                echo -n "Starting acpid "
                startproc $ACPID_BIN
                rc_status -v



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages