[meego-commits] 24018: Changes to Trunk:non-oss:Testing/wl1251-cal-bin

[Marko Saukko]

Hi,
I have made the following changes to wl1251-cal-bin in project Trunk:non-oss:Testing. Please review and accept ASAP.

Thank You,
Marko Saukko

[This message was auto-generated]

---

Request #24018:

  submit:   devel:devices:n900/wl1251-cal-bin(r3) -> Trunk:non-oss:Testing/wl1251-cal-bin


Message:
    * Tue Sep 20 2011 Jouni Peltonen <jouni.peltonen at cybercom.com> - 0.18
- Udev rule replaced with wl1251-cal.service file. BMC#23125 (forwarded request 24014 from jouni.peltonen)

State:   new          2011-09-20T00:54:49 marko.saukko
Comment: None



changes files:
--------------
--- wl1251-cal-bin.changes
+++ wl1251-cal-bin.changes
@@ -0,0 +1,3 @@
+* Tue Sep 20 2011 Jouni Peltonen <jouni.peltonen at cybercom.com> - 0.18
+- Udev rule replaced with wl1251-cal.service file. BMC#23125
+

new:
----
  wl1251-cal.service

spec files:
-----------
--- wl1251-cal-bin.spec
+++ wl1251-cal-bin.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22git
+# Generated by: spectacle version 0.22
 # 
 # >> macros
 %define debug_package %{nil}
@@ -15,6 +15,7 @@
 ExclusiveArch:  %arm
 Source0:    %{name}-%{version}-%{_target_cpu}.tar.bz2
 Source1:    license.txt
+Source2:    wl1251-cal.service
 Source100:  wl1251-cal-bin.yaml
 
 
@@ -47,7 +48,10 @@
 # >> install post
 install -d $RPM_BUILD_ROOT
 cp -ax ./usr $RPM_BUILD_ROOT
-cp -ax ./etc $RPM_BUILD_ROOT
+mkdir -p %{buildroot}/%{_lib}/systemd/system/basic.target.wants
+install -D -m 0644 %SOURCE2 ${RPM_BUILD_ROOT}/%{_lib}/systemd/system/  
+mkdir -p %{buildroot}/%{_lib}/systemd/system/basic.target.wants/  
+ln -s ../wl1251-cal.service %{buildroot}/%{_lib}/systemd/system/basic.target.wants/wl1251-cal.service
 # << install post
 
 
@@ -59,7 +63,8 @@
 %defattr(-,root,root,-)
 # >> files
 %{_bindir}/*
-%config %{_sysconfdir}/udev/rules.d/wl1251-cal.rules
+/%{_lib}/systemd/system/wl1251-cal.service 
+/%{_lib}/systemd/system/basic.target.wants/wl1251-cal.service
 %doc license.txt
 # << files
 

other changes:
--------------

++++++ wl1251-cal-bin.yaml
--- wl1251-cal-bin.yaml
+++ wl1251-cal-bin.yaml
@@ -7,6 +7,7 @@
 Sources:
     - "%{name}-%{version}-%{_target_cpu}.tar.bz2"
     - "license.txt"
+    - "wl1251-cal.service"
 Description: This application reads the stored calibration data and pushes it to wl1251.
 ExclusiveArch: "%arm"
 

++++++ wl1251-cal.service (new)
--- wl1251-cal.service
+++ wl1251-cal.service
+[Unit]
+Description=wl1251-cal service to set wlan0 MAC address
+DefaultDependencies=no
+After=dbus.service
+Before=connman.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/wl1251-cal
+
+[Install]
+WantedBy=basic.target
+