Rdeleting this package from Trunk:Testing.
Ulf
On 09/08/2011 02:05 AM, Kok, Auke-jan H wrote:
this should be rejected. you should never let a system daemon run with
environment files from /home/user.... let alone that it's entirely
possible that user "meego" does not exist, etc...
this change is rather crude as well, you change stuff cosmetically,
cut out dependencies that should be there, etc etc
Auke
On Thu, Sep 8, 2011 at 6:02 PM, Kalle Lampila<[email protected]> wrote:
Hi,
I have made the following changes to ohm in project devel:resourcepolicy.
Please review and accept ASAP.
Thank You,
Kalle Lampila
[This message was auto-generated]
---
Request #23824:
submit: home:kalle.lampila:branches:devel:resourcepolicy/ohm(cleanup) ->
devel:resourcepolicy/ohm
Message:
Added Xauthority environment (BMC#22887)
State: new 2011-09-08T01:53:45 kalle.lampila
Comment: None
changes files:
--------------
--- ohm.changes
+++ ohm.changes
@@ -0,0 +1,3 @@
+* Thu Sep 08 2011 Kalle Lampila<[email protected]> - 1.1.14
+- Added Xauthority environment (BMC#22887)
+
spec files:
-----------
--- ohm.spec
+++ ohm.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
#<< macros
@@ -19,7 +19,7 @@
Patch1: meego-distro.patch
Patch2: compiler-warn-fix.patch
Requires: ohm-config
-Requires: boardname>= 0.4-1
+Requires: boardname>= 0.4.1
Requires: systemd
Requires(preun): systemd
Requires(post): systemd
@@ -31,6 +31,7 @@
BuildRequires: pkgconfig(libsimple-trace)
BuildRequires: pkgconfig(boardname)
+
%description
Open Hardware Manager.
@@ -74,7 +75,6 @@
%patch1 -p1
# compiler-warn-fix.patch
%patch2 -p1
-
#>> setup
#<< setup
@@ -105,7 +105,7 @@
# enable ohmd in the basic systemd target
install -d $RPM_BUILD_ROOT/%{_lib}/systemd/system/basic.target.wants
ln -s /%{_lib}/systemd/system/ohmd.service \
- $RPM_BUILD_ROOT/%{_lib}/systemd/system/basic.target.wants/ohmd.service
+$RPM_BUILD_ROOT/%{_lib}/systemd/system/basic.target.wants/ohmd.service
#<< install post
@@ -116,10 +116,14 @@
systemctl daemon-reload
systemctl reload-or-try-restart ohmd.service
-
%postun
systemctl daemon-reload
+
+
+
+
+
%post plugin-core -p /sbin/ldconfig
%postun plugin-core -p /sbin/ldconfig
other changes:
--------------
++++++ meego-distro.patch
--- meego-distro.patch
+++ meego-distro.patch
@@ -1,4 +1,9 @@
From: Kalle.lampila<[email protected]>
+Date: Thu Sep 08 2011
+
+Added Xauthority setting (BMC#22887)
+
+From: Kalle.lampila<[email protected]>
Modify to use dbus type service instead of forking.
@@ -71,7 +76,7 @@
index 0000000..1de01f2
--- /dev/null
+++ b/initscript/MeeGo/ohmd.service
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,15 @@
+[Unit]
+Description=ohm daemon for resource policy management
+After=boardname.service
@@ -80,6 +85,7 @@
+[Service]
+Type=dbus
+BusName=org.freedesktop.ohm
++Environment=XAUTHORITY=/home/meego/.Xauthority
+ExecStart=/usr/sbin/ohmd --no-daemon
+ExecReload=/bin/kill -HUP $MAINPID
+
++++++ ohm.yaml
--- ohm.yaml
+++ ohm.yaml
@@ -19,7 +19,6 @@
Requires:
- ohm-config
- boardname>= 0.4.1
- - systemd
PkgConfigBR:
- glib-2.0
_______________________________________________
MeeGo-commits mailing list
[email protected]
http://lists.meego.com/listinfo/meego-commits
_______________________________________________
MeeGo-packaging mailing list
[email protected]
http://lists.meego.com/listinfo/meego-packaging
_______________________________________________
MeeGo-packaging mailing list
[email protected]
http://lists.meego.com/listinfo/meego-packaging
