Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker verbump, tier3 kbookmarks fix build

Browse Source
This commit is contained in:
Ertuğrul Erata
2015-07-25 12:23:30 +03:00
parent a5bc7275a9
commit 31da617443
4 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/framework/kbookmarks/pspec.xml
+26 -17
View File
@@ -15,9 +15,18 @@
<Archive sha1sum="ba2bb31eeb5593f627b2f8d334f31b3d8793990d" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kbookmarks-5.11.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>python3</Dependency>
<Dependency>qt5-tools-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>python3</Dependency>
<Dependency>qt5-tools-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>kauth-devel</Dependency>
<Dependency>kcodecs-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kconfigwidgets-devel</Dependency>
<Dependency>kiconthemes-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>kxmlgui-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies>
</Source>
@@ -25,35 +34,35 @@
<Name>kbookmarks</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kcodecs</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kiconthemes</Dependency>
<Dependency>kwidgetsaddons</Dependency>
<Dependency>kxmlgui</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kcodecs</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kiconthemes</Dependency>
<Dependency>kwidgetsaddons</Dependency>
<Dependency>kxmlgui</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="config">/etc</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="localesdata">/usr/share/locale</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="localesdata">/usr/share/locale</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>kbookmarks-devel</Name>
<Summary>Development files for kbookmarks</Summary>
<Summary>Development files for kbookmarks</Summary>
<RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency release="current">kbookmarks</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="config">/usr/lib/pkgconfig</Path>
<Path fileType="config">/usr/lib/pkgconfig</Path>
</Files>
</Package>
hardware/virtualization/docker/actions.py
+7 -7
View File
@@ -10,13 +10,13 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
shelltools.export("AUTO_GOPATH", "1")
shelltools.export("DOCKER_GITCOMMIT", "0baf609") #DOCKER_GITCOMMIT="0baf609"
shelltools.export("DOCKER_GITCOMMIT", "786b29d")
shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.export("CGO_CFLAGS", "-I/usr/include")
shelltools.export("CGO_LDFLAGS", "-L/usr/lib")
shelltools.export("DOCKER_BUILDTAGS","exclude_graphdriver_aufs")
shelltools.export("DOCKER_INITPATH", "/usr/libexec/docker/dockerinit")
shelltools.export("DOCKER_INITPATH", "/usr/lib/docker/dockerinit")
NoStrip=["/"]
@@ -24,14 +24,14 @@ def build():
shelltools.system("./hack/make.sh dynbinary")
def install():
pisitools.dobin("bundles/1.7.0/dynbinary/docker")
pisitools.dobin("bundles/1.7.0/dynbinary/docker-1.7.0")
pisitools.doexe("bundles/1.7.0/dynbinary/dockerinit", "/usr/libexec/docker")
pisitools.doexe("bundles/1.7.0/dynbinary/dockerinit-1.7.0", "/usr/libexec/docker")
pisitools.dobin("bundles/1.7.1/dynbinary/docker")
pisitools.dobin("bundles/1.7.1/dynbinary/docker-1.7.1")
pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit", "/usr/lib/docker")
pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit-1.7.1", "/usr/lib/docker")
# insert udev rules
pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules")
#insert contrib in docs
pisitools.insinto("/usr/share/doc/docker", "contrib")
hardware/virtualization/docker/comar/package.py
+1
View File
@@ -11,6 +11,7 @@ logfile = "/var/log/docker.log"
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
try:
os.system ("usr/sbin/groupadd -g %d %s" % (OUR_ID, OUR_NAME))
os.system ("usr/sbin/usermod -aG %d %s" % (OUR_ID, OUR_NAME))
os.system("/bin/touch %s" % logfile)
os.system("/bin/chown root:docker %s" % logfile)
os.system("chmod 0644 %s" % logfile)
hardware/virtualization/docker/pspec.xml
+9 -2
View File
@@ -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="e638f39c6081de7b0903ed09096300bdbb1d5aa0" type="targz">https://github.com/docker/docker/archive/v1.7.0.tar.gz</Archive>
<Archive sha1sum="93a7dffdc434af3ba38104a1d3ae445212ae8c0d" type="targz">https://github.com/docker/docker/archive/v1.7.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>git</Dependency>
<Dependency>golang</Dependency>
@@ -39,7 +39,7 @@
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin/</Path>
<Path fileType="library">/usr/libexec/docker</Path>
<Path fileType="library">/usr/lib/docker</Path>
<Path fileType="data">/usr/share/</Path>
</Files>
<AdditionalFiles>
@@ -54,6 +54,13 @@
</Package>
<History>
<Update release="5">
<Date>2015-07-24</Date>
<Version>1.7.1</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2015-06-24</Date>
<Version>1.7.0</Version>