Merge branch 'master' of https://github.com/pisilinux/main

hardware/virtualization/docker/actions.py

@@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 shelltools.export("AUTO_GOPATH", "1")
-shelltools.export("DOCKER_GITCOMMIT", "0d03096") 
+shelltools.export("DOCKER_GITCOMMIT", "d12ea79")
 shelltools.export("GOPATH", "%s" % get.workDIR())
 
 shelltools.export("CGO_CFLAGS", "-I/usr/include")
@@ -24,10 +24,10 @@ def build():
     shelltools.system("./hack/make.sh dynbinary")
 
 def install():
-    pisitools.dobin("bundles/1.8.0/dynbinary/docker")
-    pisitools.dobin("bundles/1.8.0/dynbinary/docker-1.8.0")
-    pisitools.doexe("bundles/1.8.0/dynbinary/dockerinit", "/usr/lib/docker")
-    pisitools.doexe("bundles/1.8.0/dynbinary/dockerinit-1.8.0", "/usr/lib/docker")
+    pisitools.dobin("bundles/1.8.1/dynbinary/docker")
+    pisitools.dobin("bundles/1.8.1/dynbinary/docker-1.8.1")
+    pisitools.doexe("bundles/1.8.1/dynbinary/dockerinit", "/usr/lib/docker")
+    pisitools.doexe("bundles/1.8.1/dynbinary/dockerinit-1.8.1", "/usr/lib/docker")
 
     # insert udev rules
     pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules")

hardware/virtualization/docker/comar/service.py

@@ -17,14 +17,13 @@ def start():
     
     startService(command="/usr/bin/docker",
                 args="daemon %s" % (config.get("DOCKER_OPTS", "")),
-                chuid="root:docker",
-                pidfile="/var/run/docker.pid",
+                pidfile=pidfile,
                 donotify=True)
 
 @synchronized
 def stop():
     stopService(command="/usr/bin/docker",
-                pidfile="/var/run/docker.pid",
+                pidfile=pidfile,
                 donotify=True)
 
 def status():

hardware/virtualization/docker/pspec.xml

@@ -13,7 +13,7 @@
         <Summary>Pack, ship and run any application as a lightweight container</Summary>
         <Description>An open platform for distributed applications for developers and sysadmins</Description>
         <!--fix sha1sum-->
-        <Archive sha1sum="670f6ef2b8d03c11985fadfde09e1cfbe17fa8ec" type="targz">https://github.com/docker/docker/archive/v1.8.0.tar.gz</Archive>
+        <Archive sha1sum="5f18bfae488279afc02b05df73231f8974c3b00e" type="targz">https://github.com/docker/docker/archive/v1.8.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>git</Dependency>
             <Dependency>golang</Dependency>
@@ -54,6 +54,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2015-09-06</Date>
+            <Version>1.8.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2015-08-12</Date>
             <Version>1.8.0</Version>

kernel/tools/perf/pspec.xml

@@ -37,7 +37,7 @@
         </BuildDependencies>
 	<Patches>
             <!-- Linux patches -->
-            <Patch level="1" compressionType="xz">patches/linux/patch-4.1.5.xz</Patch>
+            <Patch level="1" compressionType="xz">patches/linux/patch-4.1.6.xz</Patch>
         </Patches>
     </Source>
 
@@ -68,6 +68,13 @@
         </Files>
     </Package>
     <History>
+        <Update release="53">
+            <Date>2015-09-06</Date>
+            <Version>4.1.6</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="52">
             <Date>2015-08-13</Date>
             <Version>4.1.5</Version>

pisi-index.xml.sha1sum

@@ -1 +1 @@
-4b0dadea048c57cc02d6f15e478cb0b452f91dbb
+8d1c615f954ce96d2724eab1a3c139daa6a99c4b

pisi-index.xml.xz.sha1sum

@@ -1 +1 @@
-5e2e1a37aa16d0ef02c5e8118ac9053c9063df96
+031dfcbe8315fff87bdabac55c6e23d79e5bfdb7

util/admin/cgmanager/comar/service.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from comar.service import *
+
+serviceType = "local"
+serviceDesc = _({"en": "Cgroup Management Daemon",
+                 "tr": "Cgroup Yönetim Servisi"})
+
+serviceDefault="on"
+
+CGMANAGER_PIDFILE = "/run/cgmanager.pid"
+CGPROXY_PIDFILE = "/run/cgproxy.pid"
+
+@synchronized
+def start():
+    startService(command="/usr/bin/cgmanager",
+                args="--daemon --mount=subsystems",
+                donotify=True)
+    
+    
+    startService(command="/usr/bin/cgproxy",
+                args="--daemon",
+                donotify=True)
+
+@synchronized
+def stop():
+    stopService(pidfile=CGPROXY_PIDFILE, donotify=True)
+    stopService(pidfile=CGMANAGER_PIDFILE, donotify=True)
+
+def status():
+    result = isServiceRunning(CGMANAGER_PIDFILE) and isServiceRunning(CGPROXY_PIDFILE)
+    return result

util/admin/cgmanager/pspec.xml

@@ -16,6 +16,7 @@
         <BuildDependencies>
             <Dependency>libnih-devel</Dependency>
             <Dependency>pam-devel</Dependency>
+            <Dependency>help2man</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -33,6 +34,9 @@
             <Path fileType="data">/usr/share/cgmanager</Path>
             <Path fileType="library">/usr/lib/libcgmanager*</Path>
         </Files>
+        <Provides>
+            <COMAR script="service.py">System.Service</COMAR>
+        </Provides>
     </Package>
     <Package>
         <Name>cgmanager-devel</Name>