I have made the following changes intended for : CE:Adaptation:N900 / bme-rx-51-bin
Please review and accept ASAP - BOSS has already processed this request and suggests ??? See the "Messages from BOSS" section below https://build.pub.meego.com/request/show/2604 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 2604: Messages from BOSS: None State: new 2011-10-24T11:56:48 bossbot Reviews: from bossbot :BOSS suggests accepting this review. See email for more details. BOSS accepted this review because: Target repo CE_Mer_Core_armv7hl found. accepted on No date Changes: submit: home:stskeeps:mer:hw:n900 / bme-rx-51-bin -> CE:Adaptation:N900 / bme-rx-51-bin Index: bme-rx-51-bin.service =================================================================== --- bme-rx-51-bin.service (revision 0) +++ bme-rx-51-bin.service (revision 3) @@ -0,0 +1,15 @@ +[Unit] +Description=BME RX-51 +Requires=dsme.service +After=dsme.service + +[Service] +Environment=DSME_SOCKFILE=/run/dsme.socket +#ExecStartPre=-/sbin/rmmod bq27x00_battery +ExecStart=/usr/sbin/bme_RX-51_start.sh +#ExecStartPost=/bin/sleep 5 +#ExecStartPost=-/sbin/modprobe bq27x00_battery +Restart=always + +[Install] +WantedBy=default.target Index: bme-rx-51-bin.yaml =================================================================== --- bme-rx-51-bin.yaml (revision 0) +++ bme-rx-51-bin.yaml (revision 3) @@ -0,0 +1,47 @@ +Name: bme-rx-51-bin +Summary: BME binary +Version: 0.8.55 +Release: 0 +Group: System/Daemons +License: Nokia Proprietary +Description: | + BME (Battery Management Entity) binary for Nokia N900 +ExclusiveArch: "%arm" + +Provides: + - bme + - bme-rx-51 +Sources: + - "%{name}-%{version}-%{_target_cpu}.tar.bz2" + - "libbmeipc-bin-%{version}-%{_target_cpu}.tar.bz2" + - "license.txt" + - "%{name}.service" + - "bme_RX-51_start.sh" + +Requires: + # DSME is required in .service file as well as in the startup script + # pre charging part. + - dsme + +SetupOptions: "-q -a 1 -n %{name}-%{version}-%{_target_cpu}" +Configure: none +Builder: none + +Files: + - "%{_sbindir}/bme_RX-51" + - "%{_sbindir}/bme_RX-51_start.sh" + - "%doc license.txt" + - "/lib/systemd/system/%{name}.service" + - "/lib/systemd/system/sysinit.target.wants/%{name}.service" + +SubPackages: + - Name: libbmeipc-bin + AsWholeName: yes + Summary: Shared library for communication with Battery Management Entity + Group: System/Libraries + Provides: + - libbmeipc + Description: shared library for communication with Battery Management Entity + Files: + - "%{_libdir}/libbmeipc.so.0" + - "%doc license.txt" Index: bme-rx-51-bin-0.8.55-armv7l.tar.bz2 =================================================================== Binary file bme-rx-51-bin-0.8.55-armv7l.tar.bz2 added Index: bme_RX-51_start.sh =================================================================== --- bme_RX-51_start.sh (revision 0) +++ bme_RX-51_start.sh (revision 3) @@ -0,0 +1,102 @@ +#!/bin/sh +service=bme +proc=bme_RX-51 + +SYSFS_BACKLIGHT_BRIGHTNESS="/sys/class/backlight/acx565akm/brightness" +SYSFS_VBUS="/sys/class/i2c-adapter/i2c-1/1-0048/twl4030_usb/vbus" + +SYSFS_LED_ENGINE_BASE="/sys/class/i2c-adapter/i2c-2/2-0032" +SYSFS_LED_BASE="/sys/class/leds/lp5523:channel" + +ledpattern_off() +{ + echo "disabled" > "$SYSFS_LED_ENGINE_BASE/engine1_mode" + echo "disabled" > "$SYSFS_LED_ENGINE_BASE/engine2_mode" + echo 0 > ""$SYSFS_LED_BASE"6/brightness" + echo 0 > ""$SYSFS_LED_BASE"5/brightness" + echo 0 > ""$SYSFS_LED_BASE"4/brightness" +} + +ledpattern_on() +{ + # Clear LED states + ledpattern_off + + # Set yellow light pattern + echo "load" > "$SYSFS_LED_ENGINE_BASE/engine1_mode" + echo "000001100" > "$SYSFS_LED_ENGINE_BASE/engine1_leds" + echo "9d804000427f0d7f7f007f0042000000" > "$SYSFS_LED_ENGINE_BASE/engine1_load" + + echo "load" > "$SYSFS_LED_ENGINE_BASE/engine2_mode" + echo "000000000" > "$SYSFS_LED_ENGINE_BASE/engine2_leds" + echo "9d800000" > "$SYSFS_LED_ENGINE_BASE/engine2_load" + + # Run the pattern + echo "run" > "$SYSFS_LED_ENGINE_BASE/engine2_mode" + echo "run" > "$SYSFS_LED_ENGINE_BASE/engine1_mode" + + echo 50 > ""$SYSFS_LED_BASE"6/brightness" + echo 50 > ""$SYSFS_LED_BASE"5/brightness" + echo 0 > ""$SYSFS_LED_BASE"4/brightness" +} + +# Handles case of empty battery +precharge() +{ + RETV=0 + modprobe isp1704_charger + modprobe g_nokia + + if [ $(cat $SYSFS_VBUS) = "on" ]; then + #echo "BME pre-charge: " + + # Set backlight brightness to minimum to minimize current drain + ORIG_BRIGHTNESS=`cat $SYSFS_BACKLIGHT_BRIGHTNESS` + echo 0 > $SYSFS_BACKLIGHT_BRIGHTNESS + + /usr/sbin/waitfordsme &> /dev/null + if [ $? -ne 0 ]; then + echo "BME pre-charge: waitfordsme failed!" + killall -q dsme + return 1 + fi + + # Start yellow blinking led to notify user about charging + ledpattern_on + + # Start BME in pre-charge mode + /usr/sbin/bme_RX-51 -b + case $? in + 0) + echo $ORIG_BRIGHTNESS > $SYSFS_BACKLIGHT_BRIGHTNESS + RETV=0 + ;; + 2) + # BME decided that poweroff is wiser + echo "BME pre-charge -> power off!" + RETV=1 + ;; + *) + # Shouldn't happen + echo "BME pre-charge: some error, go on nevertheless..." + echo $ORIG_BRIGHTNESS > $SYSFS_BACKLIGHT_BRIGHTNESS + RETV=0 + ;; + esac + + # Turn off blinking led + ledpattern_off + fi + + return $RETV +} + +start() { + exec /usr/sbin/bme_RX-51 + return $? +} + +precharge +[ $? -eq 0 ] && start + +exit $? Index: libbmeipc-bin-0.8.55-armv7l.tar.bz2 =================================================================== Binary file libbmeipc-bin-0.8.55-armv7l.tar.bz2 added Index: bme-rx-51-bin.spec =================================================================== --- bme-rx-51-bin.spec (revision 0) +++ bme-rx-51-bin.spec (revision 3) @@ -0,0 +1,113 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.23 +# +# >> macros +%define debug_package %{nil} +# << macros + +Name: bme-rx-51-bin +Summary: BME binary +Version: 0.8.55 +Release: 0 +Group: System/Daemons +License: Nokia Proprietary +ExclusiveArch: %arm +Source0: %{name}-%{version}-%{_target_cpu}.tar.bz2 +Source1: libbmeipc-bin-%{version}-%{_target_cpu}.tar.bz2 +Source2: license.txt +Source3: %{name}.service +Source4: bme_RX-51_start.sh +Source100: bme-rx-51-bin.yaml +Requires: dsme +Requires: systemd +Requires(preun): systemd +Requires(post): systemd +Requires(postun): systemd +Provides: bme +Provides: bme-rx-51 + + +%description +BME (Battery Management Entity) binary for Nokia N900 + + + +%package -n libbmeipc-bin +Summary: Shared library for communication with Battery Management Entity +Group: System/Libraries +Requires: %{name} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Provides: libbmeipc + +%description -n libbmeipc-bin +shared library for communication with Battery Management Entity + + +%prep +%setup -q -a 1 -n %{name}-%{version}-%{_target_cpu} + +# >> setup +# Copy license to build dir +cp %{SOURCE2} . +# << setup + +%build +# >> build pre +# << build pre + + + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +install -d %{buildroot}%{_libdir} +install -D -m 0755 ./%{_sbindir}/bme_RX-51 %{buildroot}%{_sbindir}/bme_RX-51 +install -m 0755 libbmeipc-bin-%{version}-%{_target_cpu}/%{_libdir}/libbmeipc.so.0 %{buildroot}%{_libdir} +install -D -m 644 %{SOURCE3} %{buildroot}/lib/systemd/system/%{name}.service +install -d %{buildroot}/lib/systemd/system/sysinit.target.wants/ +ln -s ../%{name}.service %{buildroot}/lib/systemd/system/sysinit.target.wants/%{name}.service +install -D -m 0755 %{SOURCE4} %{buildroot}/usr/sbin/bme_RX-51_start.sh +# << install pre + +# >> install post +# << install post + + +%preun +systemctl stop %{name}.service + +%post +systemctl daemon-reload +systemctl reload-or-try-restart %{name}.service + +%postun +systemctl daemon-reload + + + +%post -n libbmeipc-bin -p /sbin/ldconfig + +%postun -n libbmeipc-bin -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_sbindir}/bme_RX-51 +%{_sbindir}/bme_RX-51_start.sh +%doc license.txt +/lib/systemd/system/%{name}.service +/lib/systemd/system/sysinit.target.wants/%{name}.service +# >> files +# << files + + +%files -n libbmeipc-bin +%defattr(-,root,root,-) +%{_libdir}/libbmeipc.so.0 +%doc license.txt +# >> files libbmeipc-bin +# << files libbmeipc-bin + Index: libbmeipc-bin-0.8.55-armv7hl.tar.bz2 =================================================================== Binary file libbmeipc-bin-0.8.55-armv7hl.tar.bz2 added Index: license.txt =================================================================== --- license.txt (revision 0) +++ license.txt (revision 3) @@ -0,0 +1,9 @@ +Copyright (c) Nokia Corporation 2010 +All Rights Reserved. + +This material, including documentation and any related computer programs, is +protected by copyright controlled by Nokia Corporation. All rights are +reserved. Modifying, adapting and/or translating, any or all of this material +requires the prior written consent of Nokia. Distribution for commercial +purposes not allowed without prior written approval from Nokia. + Index: bme-rx-51-bin-0.8.55-armv7hl.tar.bz2 =================================================================== Binary file bme-rx-51-bin-0.8.55-armv7hl.tar.bz2 added Index: Makefile =================================================================== --- Makefile (revision 0) +++ Makefile (revision 3) @@ -0,0 +1,6 @@ +PKG_NAME := bme-rx-51-bin +SPECFILE = $(addsuffix .spec, $(PKG_NAME)) +YAMLFILE = $(addsuffix .yaml, $(PKG_NAME)) + + +include /usr/share/packaging-tools/Makefile.common Index: bme-rx-51-bin.changes =================================================================== --- bme-rx-51-bin.changes (revision 0) +++ bme-rx-51-bin.changes (revision 3) @@ -0,0 +1,60 @@ +* Fri Sep 23 2011 Marko Saukko <[email protected]> - 0.8.55 +- Disabled bq27x00_battery hacks for now. + +* Tue Sep 20 2011 Marko Saukko <[email protected]> - 0.8.55 +- Move bq27x00_battery rmmod/modprobe to systemd service file. + +* Thu Sep 15 2011 Marko Saukko <[email protected]> - 0.8.55 +- Moved dsme socket location, because tmp is cleaned up at times. + +* Wed Sep 14 2011 Marko Saukko <[email protected]> - 0.8.55 +- Added Requires: dsme to bme rpm. + +* Mon Sep 12 2011 Carsten Munk <[email protected]> - 0.8.55 +- rmmod bq24x00_charger, it breaks BME if loaded first + +* Tue Sep 06 2011 Kalle Lampila <[email protected]> - 0.8.55 +- systemd support +- dsme requirement support + +* Fri Jun 03 2011 Marko Saukko <[email protected]> - 0.8.55 +- Initial changes from sysvinit to systemd (FEA#16109). + +* Fri Jan 21 2011 Markus Lehtonen <[email protected]> - 0.8.55 +- Added support for ARMv7 hardfp (armv7hl), BMC#11429 + +* Mon Jan 17 2011 Markus Lehtonen <[email protected]> - 0.8.55 +- More bugfixes/robustness to wallcharger detection (BMC#9800) +- Init script updated (now modprobes also isp1704 driver) (BMC#9800) + +* Wed Dec 22 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- Works with new kernel that supports /sys/class/power interfaces +- Adds wall charger support for MeeGo 1.2 (BMC#9800) +- Minor cleanup in the %setup and %install sections in .spec/.yaml + +* Fri Oct 22 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- Updated to more recent binaries + +* Thu Oct 07 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- Add libbmeipc +- Drop armv5 versions of the binaries + +* Mon Sep 27 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- fix broken packaging: added Post and PreUn requires to .spec + +* Fri Sep 24 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- Spec change: now provides bme-rx-51 + +* Tue Sep 14 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- Update to latest fixes. Biggest change is the major revamp of the init + script. + +* Tue Aug 17 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- packaging changed to use spectacle +- group changed to System/Daemons + +* Mon Aug 16 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- preun script in .spec file fixed + +* Thu Aug 13 2010 Markus Lehtonen <[email protected]> - 0.8.55 +- initial packaging of bme binary
