Changes - SailfishOS Open Build Service

Changes of Revision 2

[-] [+]	Changed	nokia-n900-configs.changes
@@ -1,3 +1,6 @@ +* Wed Mar 13 2013 Marko Saukko <marko.saukko@jollamobile.com> - 0.7.6 +- Add 10-n900-swap to fix the swap issue. + * Mon Feb 18 2013 Pekka Lundstrom <pekka.lundstrom@jollamobile.com> - 0.7.5 - File /etc/sysconfig/nemo-mobile-hw moved to /var/lib/environment/nemo/60-nemo-mobile-hw.conf
[-] [+]	Changed	nokia-n900-configs.spec ^
@@ -9,7 +9,7 @@ # << macros Summary: Provides configs for Nokia N900 -Version: 0.7.5 +Version: 0.7.6 Release: 1 Group: System/Device Mode Adaptation License: GPLv2 @@ -20,17 +20,24 @@ Source3: pipelines.conf Source4: %{name}.service Source5: 60-nemo-mobile-hw.conf +Source6: 10-n900-swap Source100: nokia-n900-configs.yaml Requires: kbd +Requires: oneshot Requires: systemd Requires(preun): systemd Requires(post): systemd Requires(postun): systemd +BuildRequires: oneshot %description Provides configs for Nokia N900 device. +# >> macros2 +%{_oneshot_requires_post} +# << macros2 + %prep # No setup @@ -60,6 +67,7 @@ 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 %{SOURCE5} $RPM_BUILD_ROOT/var/lib/environment/nemo/60-nemo-mobile-hw.conf +install -D -m 755 %{SOURCE6} $RPM_BUILD_ROOT/%{_oneshotdir}/10-n900-swap # << install post @@ -71,6 +79,11 @@ %post systemctl daemon-reload systemctl reload-or-try-restart %{name}.service +# >> post +if [ "$1" -eq 1 ]; then +%{_bindir}/add-oneshot 10-n900-swap +fi +# << post %postun systemctl daemon-reload @@ -78,7 +91,7 @@ %files %defattr(-,root,root,-) # >> files -%defattr(644,root,root,-) +%{_oneshotdir}/* # Input %config %{_sysconfdir}/X11/xorg.conf.d/90-input-n900.conf /lib/kbd/keymaps/arm/qwerty/nokia-n900.map
[-] [+]	Added	10-n900-swap ^
@@ -0,0 +1,13 @@ +#!/bin/sh + +grep mmcblk1p3 /etc/fstab > /dev/null +RETVAL=`echo $?` + +if [ "0" -eq "$RETVAL" ]; then + exit 0 +fi + +echo "/dev/mmcblk1p3 swap swap defaults,noatime 0 0" >> /etc/fstab + +swapon -a +
[-] [+]	Changed	nokia-n900-configs.yaml ^
@@ -1,6 +1,6 @@ Name: nokia-n900-configs Summary: Provides configs for Nokia N900 -Version: 0.7.5 +Version: 0.7.6 Release: 1 Group: System/Device Mode Adaptation License: GPLv2 @@ -11,12 +11,17 @@ - pipelines.conf - "%{name}.service" - 60-nemo-mobile-hw.conf + - 10-n900-swap Description: Provides configs for Nokia N900 device. Requires: # Required by nokia-n900-setup.init - kbd + - oneshot + +PkgBR: + - oneshot Configure: none Builder: none