I have made the following changes intended for : CE:Adaptation:N950-N9 / bme-rm-680-bin
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7363 Thank You, Pekka Lundstrom [This message was auto-generated] --- Request # 7363: Messages from BOSS: State: review at 2012-11-12T09:14:13 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:plundstr:branches:CE:Adaptation:N950-N9 / bme-rm-680-bin -> CE:Adaptation:N950-N9 / bme-rm-680-bin changes files: -------------- --- bme-rm-680-bin.changes +++ bme-rm-680-bin.changes @@ -0,0 +1,4 @@ +* Mon Nov 12 2012 Pekka Lundstrom <[email protected]> - 0.9.95 +- Eliminated need for bme-rm-680-bin.sh startup script + Fixes NEMO#572 : bme should be started after dsme without using waitfordsme + old: ---- bme-rm-680-bin.sh spec files: ----------- --- bme-rm-680-bin.spec +++ bme-rm-680-bin.spec @@ -1,13 +1,15 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: bme-rm-680-bin + # >> macros %define debug_package %{nil} %define binary_release 4.1 # << macros -Name: bme-rm-680-bin Summary: Battery Management Entity Version: 0.9.95 Release: 0 @@ -17,7 +19,6 @@ Source0: %{name}-%{version}-%{binary_release}-armv7hl.tar.bz2 Source1: license.txt Source2: %{name}.service -Source3: %{name}.sh Source100: bme-rm-680-bin.yaml Requires: systemd Requires(preun): systemd @@ -26,12 +27,10 @@ Provides: bme-rx-71 Provides: bme - %description Controls battery charging, monitors battery state and provides battery information. - %package -n bme-libs-rm-680-bin Summary: Shared library for communication with Battery Management Entity Group: System/Libraries @@ -58,6 +57,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -75,12 +75,13 @@ install -D -m 644 %{SOURCE2} %{buildroot}/lib/systemd/system/%{name}.service install -d $RPM_BUILD_ROOT/lib/systemd/system/multi-user.target.wants/ ln -s ../%{name}.service $RPM_BUILD_ROOT/lib/systemd/system/multi-user.target.wants/%{name}.service -install -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/usr/sbin/%{name}.sh # << install post %preun +if [ "$1" -eq 0 ]; then systemctl stop %{name}.service +fi %post systemctl daemon-reload @@ -89,8 +90,6 @@ %postun systemctl daemon-reload - - %post -n bme-libs-rm-680-bin -p /sbin/ldconfig %postun -n bme-libs-rm-680-bin -p /sbin/ldconfig @@ -101,7 +100,6 @@ %doc license.txt /lib/systemd/system/%{name}.service /lib/systemd/system/multi-user.target.wants/%{name}.service -%attr(755,root,root) /usr/sbin/%{name}.sh %attr(755,root,root) %{_bindir}/bmedatalogger %attr(755,root,root) %{_bindir}/bmestat %attr(755,root,root) %{_sbindir}/bme_RX-71 @@ -114,7 +112,6 @@ %{_libdir}/hwi/hw/rx71.so # << files - %files -n bme-libs-rm-680-bin %defattr(-,root,root,-) # >> files bme-libs-rm-680-bin @@ -122,4 +119,3 @@ %{_libdir}/libbmeipc.so.* %{_libdir}/libbmeutil.so.* # << files bme-libs-rm-680-bin - other changes: -------------- ++++++ bme-rm-680-bin.service --- bme-rm-680-bin.service +++ bme-rm-680-bin.service @@ -1,11 +1,10 @@ [Unit] -Description=BME RM-680 +Description=BME for N9/N950 +Requires=dsme.service +After=dsme.service [Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/sbin/bme-rm-680-bin.sh start -ExecStop=/usr/sbin/bme-rm-680-bin.sh stop +ExecStart=/usr/sbin/bme_RX-71 -l syslog -v 5 -c /usr/lib/hwi/hw/rx71.so [Install] WantedBy=multi-user.target ++++++ bme-rm-680-bin.yaml --- bme-rm-680-bin.yaml +++ bme-rm-680-bin.yaml @@ -8,7 +8,6 @@ - "%{name}-%{version}-%{binary_release}-armv7hl.tar.bz2" - "license.txt" - "%{name}.service" - - "%{name}.sh" Description: | Controls battery charging, monitors battery state and provides battery information. ++++++ deleted files: --- bme-rm-680-bin.sh
