Ok, I found the trick. It's in fastinit # + sensordconfig="" # + # Determine the correct "primary" config file: the first conf file # + # whose basename is a substring of boardname, if any (i.e. 'foo.conf' # + # matches all devices which have 'foo' in their /etc/boardname) # + if [ -f /etc/boardname ]; then # + for f in /etc/sensorfw/*conf; do # + fbase=`basename $f '.conf' | sed s/sensord-//` # + grep -q $fbase /etc/boardname # + if [ $? -eq 0 ]; then # + sensordconfig="-c=$f" # + break # + fi # + done # + fi # + /usr/sbin/sensord $sensordconfig -d --log-target=4 --log-file-path=/var/log/sensord.log # fi
Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Zhu, Peter J > Sent: Friday, March 04, 2011 2:54 PM > To: [email protected]; [email protected] > Subject: Re: [meego-packaging] [meego-commits] 14466: Changes to > Trunk:Testing/sensorfw > > Markus, > > We install new sensorfw and senforfw-configs, rotation doesn't work now. > > Does board auto-detection works in this update? I didn't find the logic here > or > do I miss something? > > > Peter > > > -----Original Message----- > > From: [email protected] > > [mailto:[email protected]] On Behalf Of Markus > Lehtonen > > Sent: Thursday, March 03, 2011 5:56 PM > > To: [email protected] > > Subject: [meego-commits] 14466: Changes to Trunk:Testing/sensorfw > > > > Hi, > > I have made the following changes to sensorfw in project Trunk:Testing. > Please > > review and accept ASAP. > > > > Thank You, > > Markus Lehtonen > > > > [This message was auto-generated] > > > > --- > > > > Request #14466: > > > > submit: devel:systemsw/sensorfw(r22) -> Trunk:Testing/sensorfw > > > > > > Message: > > * Thu Mar 03 2011 Markus Lehtonen <[email protected]> - > > 0.6.36 > > - Fix icdk ALS configuration (BMC#11699). Fix from Catalin Popescu > > <[email protected]> > > - Separate configuration packages removed. Automatic board detection > > removing > > the need for this (needed to fix BMC#11698, BMC#1169, as well). > > > > State: new 2011-03-02T20:53:41 mlehtonen > > Comment: None > > > > > > > > changes files: > > -------------- > > --- sensorfw.changes > > +++ sensorfw.changes > > @@ -0,0 +1,6 @@ > > +* Thu Mar 03 2011 Markus Lehtonen <[email protected]> - > 0.6.36 > > +- Fix icdk ALS configuration (BMC#11699). Fix from Catalin Popescu > > + <[email protected]> > > +- Separate configuration packages removed. Automatic board detection > > removing > > + the need for this (needed to fix BMC#11698, BMC#1169). > > + > > > > old: > > ---- > > sensord-n900.conf > > > > new: > > ---- > > sensord-rx_51.conf > > > > spec files: > > ----------- > > --- sensorfw.spec > > +++ sensorfw.spec > > @@ -13,7 +13,7 @@ > > License: LGPLv2+ > > URL: http://gitorious.org/sensorfw > > Source0: %{name}-%{version}.tar.gz > > -Source1: sensord-n900.conf > > +Source1: sensord-rx_51.conf > > Source2: sensord-aava.conf > > Source3: sensord-icdk.conf > > Source4: sensord-ncdk.conf > > @@ -88,81 +88,22 @@ > > Doxygen-generated API documentation for sensord. > > > > > > -%package config-n900 > > -Summary: Configuration for Nokia N900 > > +%package configs > > +Summary: Sensorfw configuration files > > Group: System/Libraries > > BuildArch: noarch > > Requires: %{name} = %{version}-%{release} > > Provides: sensord-config > > +Provides: config-n900 > > +Provides: config-aava > > +Provides: config-icdk > > +Provides: config-ncdk > > +Provides: config-pegatron > > +Provides: config-oemtablet > > +Provides: config-oaktrail > > > > -%description config-n900 > > -Sensorfw configuration file(s) for Nokia N900 > > - > > - > > -%package config-aava > > -Summary: Configuration for Aava > > -Group: System/Libraries > > -BuildArch: noarch > > -Requires: %{name} = %{version}-%{release} > > -Provides: sensord-config > > - > > -%description config-aava > > -Sensorfw configuration file(s) for Aava > > - > > - > > -%package config-icdk > > -Summary: Configuration for iCDK > > -Group: System/Libraries > > -BuildArch: noarch > > -Requires: %{name} = %{version}-%{release} > > -Provides: sensord-config > > - > > -%description config-icdk > > -Sensorfw configuration file(s) for iCDK > > - > > - > > -%package config-ncdk > > -Summary: Configuration for nCDK > > -Group: System/Libraries > > -BuildArch: noarch > > -Requires: %{name} = %{version}-%{release} > > -Provides: sensord-config > > - > > -%description config-ncdk > > -Sensorfw configuration file(s) for nCDK > > - > > - > > -%package config-pegatron > > -Summary: Configuration for PEGATRON > > -Group: System/Libraries > > -BuildArch: noarch > > -Requires: %{name} = %{version}-%{release} > > -Provides: sensord-config > > - > > -%description config-pegatron > > -Sensorfw configuration file(s) for PEGATRON > > - > > - > > -%package config-oemtablet > > -Summary: Configuration for OEM tablet > > -Group: System/Libraries > > -BuildArch: noarch > > -Requires: %{name} = %{version}-%{release} > > -Provides: sensord-config > > - > > -%description config-oemtablet > > -Sensorfw configuration file(s) for OEM tablet > > - > > - > > -%package config-oaktrail > > -Summary: Configuration for Oaktrail > > -Group: System/Libraries > > -BuildArch: noarch > > -Requires: %{name} = %{version}-%{release} > > -Provides: sensord-config > > - > > -%description config-oaktrail > > -Sensorfw configuration file(s) for Oaktrail > > +%description configs > > +Sensorfw configuration files. > > > > > > > > @@ -205,13 +146,13 @@ > > %qmake_install > > > > # >> install post > > -install -m644 %{SOURCE1} > > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sensord.conf.d/50-n900.conf > > -install -m644 %{SOURCE2} > > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sensord.conf.d/50-aava.conf > > -install -m644 %{SOURCE3} > > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sensord.conf.d/50-icdk.conf > > -install -m644 %{SOURCE4} > > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sensord.conf.d/50-ncdk.conf > > -install -m644 %{SOURCE5} > > > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sensord.conf.d/50-pegatron.conf > > -install -m644 %{SOURCE6} > > > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sensord.conf.d/50-oemtablet.con > > f > > -install -m644 %{SOURCE7} > > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/sensord.conf.d/50-oaktrail.conf > > +install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ > > +install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ > > +install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ > > +install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ > > +install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ > > +install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ > > +install -m644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ > > # << install post > > > > > > @@ -236,24 +177,6 @@ > > > > > > > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > - > > %files > > %defattr(-,root,root,-) > > # >> files > > @@ -262,7 +185,7 @@ > > %{_libdir}/*.so.* > > %config %{_sysconfdir}/dbus-1/system.d/sensorfw.conf > > %config %{_sysconfdir}/sensorfw/sensord.conf > > -%config %{_sysconfdir}/sensorfw/sensord.conf.d/90* > > +%dir %{_sysconfdir}/%{name}/sensord.conf.d/ > > %{_datadir}/contextkit/providers/com.nokia.SensorService.context > > %attr(0755,root,root) %{_initrddir}/sensord > > %doc debian/copyright debian/README COPYING > > @@ -302,45 +225,11 @@ > > %attr(644,root,root)%{_defaultdocdir}/sensord/html/* > > # << files doc > > > > -%files config-n900 > > -%defattr(-,root,root,-) > > -# >> files config-n900 > > -%config %{_sysconfdir}/%{name}/sensord.conf.d/50-n900.conf > > -# << files config-n900 > > - > > -%files config-aava > > -%defattr(-,root,root,-) > > -# >> files config-aava > > -%config %{_sysconfdir}/%{name}/sensord.conf.d/50-aava.conf > > -# << files config-aava > > - > > -%files config-icdk > > -%defattr(-,root,root,-) > > -# >> files config-icdk > > -%config %{_sysconfdir}/%{name}/sensord.conf.d/50-icdk.conf > > -# << files config-icdk > > - > > -%files config-ncdk > > -%defattr(-,root,root,-) > > -# >> files config-ncdk > > -%config %{_sysconfdir}/%{name}/sensord.conf.d/50-ncdk.conf > > -# << files config-ncdk > > - > > -%files config-pegatron > > -%defattr(-,root,root,-) > > -# >> files config-pegatron > > -%config %{_sysconfdir}/%{name}/sensord.conf.d/50-pegatron.conf > > -# << files config-pegatron > > - > > -%files config-oemtablet > > -%defattr(-,root,root,-) > > -# >> files config-oemtablet > > -%config %{_sysconfdir}/%{name}/sensord.conf.d/50-oemtablet.conf > > -# << files config-oemtablet > > - > > -%files config-oaktrail > > +%files configs > > %defattr(-,root,root,-) > > -# >> files config-oaktrail > > -%config %{_sysconfdir}/%{name}/sensord.conf.d/50-oaktrail.conf > > -# << files config-oaktrail > > +# >> files configs > > +%config %{_sysconfdir}/%{name}/sensord.conf.d/*conf > > +%config %{_sysconfdir}/%{name}/*conf > > +%exclude %{_sysconfdir}/sensorfw/sensord.conf > > +# << files configs > > > > > > other changes: > > -------------- > > > > ++++++ sensord-icdk.conf > > --- sensord-icdk.conf > > +++ sensord-icdk.conf > > @@ -6,6 +6,10 @@ > > # when it rotates into desired positions, no need to poll now. > > orientation_poll_interval = 0 > > > > +# sysfs interface for ALS > > +als-ascii_range_sysfs_path = > > /sys/bus/i2c/drivers/apds9802als/5-0029/apds9802als/sensing_range > > +als-ascii_sysfs_path = > > /sys/bus/i2c/drivers/apds9802als/5-0029/apds9802als/lux_output > > + > > [icdk] > > accelerometeradaptor = accelerometeradaptor > > alsadaptor = alsadaptor-ascii > > > > ++++++ sensord-rx_51.conf (new) > > --- sensord-rx_51.conf > > +++ sensord-rx_51.conf > > +deviceId = n900 > > + > > +# Accelerometer coordinate transformation matrix > > +# (values separated by commas, concatenate rows from top to bottom) > > +acc_trans_matrix = "0,-1,0,1,0,0,0,0,-1" > > + > > +# All other keys are already correctly set in default config file > > > > ++++++ sensorfw.yaml > > --- sensorfw.yaml > > +++ sensorfw.yaml > > @@ -9,7 +9,7 @@ > > Sensor Framework provides an interface to hardware sensor drivers > > through logical sensors. This package contains sensor framework daemon > and > > required libraries. > > Sources: > > - "%{name}-%{version}.tar.gz" > > - - "sensord-n900.conf" > > + - "sensord-rx_51.conf" > > - "sensord-aava.conf" > > - "sensord-icdk.conf" > > - "sensord-ncdk.conf" > > @@ -77,59 +77,18 @@ > > Summary: API documentation for libsensord > > Description: | > > Doxygen-generated API documentation for sensord. > > - - Name: config-n900 > > + - Name: configs > > Group: System/Libraries > > - Summary: Configuration for Nokia N900 > > + Summary: Sensorfw configuration files > > Description: | > > - Sensorfw configuration file(s) for Nokia N900 > > - BuildArch: noarch > > - Provides: > > - - sensord-config > > - - Name: config-aava > > - Group: System/Libraries > > - Summary: Configuration for Aava > > - Description: | > > - Sensorfw configuration file(s) for Aava > > - BuildArch: noarch > > - Provides: > > - - sensord-config > > - - Name: config-icdk > > - Group: System/Libraries > > - Summary: Configuration for iCDK > > - Description: | > > - Sensorfw configuration file(s) for iCDK > > - BuildArch: noarch > > - Provides: > > - - sensord-config > > - - Name: config-ncdk > > - Group: System/Libraries > > - Summary: Configuration for nCDK > > - Description: | > > - Sensorfw configuration file(s) for nCDK > > - BuildArch: noarch > > - Provides: > > - - sensord-config > > - - Name: config-pegatron > > - Group: System/Libraries > > - Summary: Configuration for PEGATRON > > - Description: | > > - Sensorfw configuration file(s) for PEGATRON > > - BuildArch: noarch > > - Provides: > > - - sensord-config > > - - Name: config-oemtablet > > - Group: System/Libraries > > - Summary: Configuration for OEM tablet > > - Description: | > > - Sensorfw configuration file(s) for OEM tablet > > - BuildArch: noarch > > - Provides: > > - - sensord-config > > - - Name: config-oaktrail > > - Group: System/Libraries > > - Summary: Configuration for Oaktrail > > - Description: | > > - Sensorfw configuration file(s) for Oaktrail > > + Sensorfw configuration files. > > BuildArch: noarch > > Provides: > > - sensord-config > > + - config-n900 > > + - config-aava > > + - config-icdk > > + - config-ncdk > > + - config-pegatron > > + - config-oemtablet > > + - config-oaktrail > > > > ++++++ deleted files: > > --- sensord-n900.conf > > > > _______________________________________________ > > MeeGo-commits mailing list > > [email protected] > > http://lists.meego.com/listinfo/meego-commits > _______________________________________________ > MeeGo-packaging mailing list > [email protected] > http://lists.meego.com/listinfo/meego-packaging _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
