I have made the following changes intended for : CE:Adaptation:N950-N9 / nokia-n950-configs
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/7497 Thank You, Pekka Lundstrom [This message was auto-generated] --- Request # 7497: Messages from BOSS: State: review at 2012-12-04T08:11:43 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 / nokia-n950-configs -> CE:Adaptation:N950-N9 / nokia-n950-configs changes files: -------------- --- nokia-n950-configs.changes +++ nokia-n950-configs.changes @@ -0,0 +1,8 @@ +* Mon Dec 03 2012 Pekka Lundstrom <[email protected]> - 0.3.5 +- Let systemd take care of module loading + added /usr/lib/modules-load.d/nokia-n950-modules.conf + removed nokia-n950-configs.service, nokia-n950-configs.sh +- Old stuff cleanup + removed n950-qt-mtf-config.sh, boss.conf + added nemo-mobile-hw + old: ---- boss.conf n950-qt-mtf-config.sh nokia-n950-configs.service nokia-n950-configs.sh new: ---- nemo-mobile-hw nokia-n950-modules.conf spec files: ----------- --- nokia-n950-configs.spec +++ nokia-n950-configs.spec @@ -1,6 +1,6 @@ Name: nokia-n950-configs Summary: Nokia N950-specific configuration files -Version: 0.3.4 +Version: 0.3.5 Release: 0 Group: System/Startup Services License: GPLv2 @@ -11,12 +11,9 @@ Source4: camera-pipelines.conf Source5: enable_gprs.desktop Source6: enable_gprs.sh -Source7: n950-qt-mtf-config.sh -Source8: %{name}.sh -Source9: %{name}.service +Source7: nemo-mobile-hw Source10: n950-plymouth-start-update.service -Source11: boss.conf -Requires: alsa-utils +Source11: nokia-n950-modules.conf Requires: xorg-x11-xkb-utils Requires: systemd Requires(preun): systemd @@ -38,13 +35,9 @@ install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/meegotouch/targets/N950.conf install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/camera/pipelines.conf install -D -m 755 %{SOURCE6} $RPM_BUILD_ROOT/%{_bindir}/enable_gprs.sh -install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT/etc/profile.d/n950-qt-mtf-config.sh -install -D -m 755 %{SOURCE8} $RPM_BUILD_ROOT/%{_sbindir}/%{name}.sh +install -D -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nemo-mobile-hw # systemd -install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT/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 644 %{SOURCE11} $RPM_BUILD_ROOT/usr/lib/modules-load.d/nokia-n950-modules.conf install -d $RPM_BUILD_ROOT/lib/systemd/system/sysinit.target.wants/ install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT/lib/systemd/system/n950-plymouth-start-update.service ln -s ../n950-plymouth-start-update.service $RPM_BUILD_ROOT/lib/systemd/system/sysinit.target.wants/n950-plymouth-start-update.service @@ -52,13 +45,11 @@ %preun if [ "$1" -eq 0 ]; then -systemctl stop %{name}.service systemctl stop n950-plymouth-start-update.service fi %post systemctl daemon-reload -systemctl reload-or-try-restart %{name}.service systemctl reload-or-try-restart n950-plymouth-start-update.service %postun @@ -68,12 +59,10 @@ %defattr(-,root,root,-) %config %{_sysconfdir}/X11/xorg.conf.d/90-input-n950.conf %config %{_sysconfdir}/xdg/autostart/n950-xkb-hack.desktop -%attr(755,root,root) %{_sbindir}/%{name}.sh %{_datadir}/meegotouch/targets/* %config %{_sysconfdir}/camera/pipelines.conf %{_bindir}/* -%{_sysconfdir}/profile.d/n950-qt-mtf-config.sh -/lib/systemd/system/%{name}.service -/lib/systemd/system/multi-user.target.wants/%{name}.service +%{_sysconfdir}/sysconfig/nemo-mobile-hw /lib/systemd/system/n950-plymouth-start-update.service /lib/systemd/system/sysinit.target.wants/n950-plymouth-start-update.service +/usr/lib/modules-load.d/nokia-n950-modules.conf other changes: -------------- ++++++ nemo-mobile-hw (new) --- nemo-mobile-hw +++ nemo-mobile-hw @@ -0,0 +1,4 @@ +# Set QT_USE_DRAG_DISTANCE environment variable +# The variable defines default value for QApplication's +# startDragDistance property +export QT_USE_DRAG_DISTANCE=16 ++++++ nokia-n950-modules.conf (new) --- nokia-n950-modules.conf +++ nokia-n950-modules.conf @@ -0,0 +1,6 @@ +# Camera modules +omap3-isp +smiapp +# DSP bridge +bridgedriver + ++++++ deleted files: --- boss.conf --- n950-qt-mtf-config.sh --- nokia-n950-configs.service --- nokia-n950-configs.sh
