...
This commit is contained in:
Ertuğrul Erata
@@ -15,7 +15,7 @@ def start():
|
||||
os.system("/sbin/modprobe -va bridge nf_nat br_netfilter")
|
||||
|
||||
startService(command="/usr/bin/dockerd",
|
||||
args="daemon -p %s %s" % (pidfile, config.get("DOCKER_OPTS")),
|
||||
args="%s %s" % (pidfile, config.get("DOCKER_OPTS")),
|
||||
detach=True,
|
||||
pidfile=pidfile,
|
||||
donotify=True)
|
||||
|
||||
@@ -41,8 +41,9 @@
|
||||
<Dependency>iptables</Dependency>
|
||||
<Dependency>libseccomp</Dependency>
|
||||
<Dependency>libtool-ltdl</Dependency>
|
||||
<Dependency>runc</Dependency>
|
||||
<Dependency>containerd</Dependency>
|
||||
<Dependency versionFrom="1.0.0_rc5">runc</Dependency>
|
||||
<Dependency versionFrom="1.1.0">containerd</Dependency>
|
||||
<Dependency versionFrom="0.18.0">tini</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="config">/etc</Path>
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright 2018 TUBITAK/UEKAE
|
||||
# Licensed under the GNU General Public License, version 2.
|
||||
# See the file http://www.gnu.org/copyleft/gpl.txt.
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import cmaketools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
# WorkDir = ""
|
||||
# NoStrip = "/"
|
||||
|
||||
def setup():
|
||||
cmaketools.configure()
|
||||
|
||||
def build():
|
||||
cmaketools.make()
|
||||
|
||||
def install():
|
||||
pisitools.dobin("tini")
|
||||
pisitools.dobin("tini-static")
|
||||
|
||||
# symlink docker-init (nice integration with docker)
|
||||
pisitools.dosym("/usr/bin/tini-static", "/usr/bin/docker-init")
|
||||
|
||||
pisitools.dodoc("LICENSE", "README*", "VERSION")
|
||||
@@ -0,0 +1,78 @@
|
||||
From a8f82ea60cde15cbbd0ebcf729062de6bad9859c Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Orozco <thomas@orozco.fr>
|
||||
Date: Tue, 28 Mar 2017 21:59:07 +0200
|
||||
Subject: [PATCH] Allow setting VERSION_GIT
|
||||
|
||||
Fixes: #79
|
||||
---
|
||||
CMakeLists.txt | 48 +++++++++++++++++++++++++++++-------------------
|
||||
1 file changed, 29 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8936f18..06c180c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -6,34 +6,44 @@ set (tini_VERSION_MAJOR 0)
|
||||
set (tini_VERSION_MINOR 14)
|
||||
set (tini_VERSION_PATCH 0)
|
||||
|
||||
+set (GIT_PREFIX " - git.")
|
||||
+
|
||||
# Build options
|
||||
option(MINIMAL "Disable argument parsing and verbose output" OFF)
|
||||
|
||||
+# Set VERSION_GIT to INTERNAL so it does not persist across runs of CMake, just
|
||||
+# like the auto-discovery would.
|
||||
+set(VERSION_GIT "" CACHE INTERNAL "Override the git revision")
|
||||
+
|
||||
if(MINIMAL)
|
||||
add_definitions(-DTINI_MINIMAL=1)
|
||||
endif()
|
||||
|
||||
# Extract git version and dirty-ness
|
||||
-execute_process (
|
||||
- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h
|
||||
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
|
||||
- RESULT_VARIABLE git_version_check_ret
|
||||
- OUTPUT_VARIABLE tini_VERSION_GIT
|
||||
-)
|
||||
-
|
||||
-execute_process(
|
||||
- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no
|
||||
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
|
||||
- OUTPUT_VARIABLE git_dirty_check_out
|
||||
-)
|
||||
-
|
||||
-if("${git_version_check_ret}" EQUAL 0)
|
||||
- set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}")
|
||||
- if(NOT "${git_dirty_check_out}" STREQUAL "")
|
||||
- set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty")
|
||||
- endif()
|
||||
+if(VERSION_GIT)
|
||||
+ set(tini_VERSION_GIT "${GIT_PREFIX}${VERSION_GIT}")
|
||||
else()
|
||||
- set(tini_VERSION_GIT "")
|
||||
+ execute_process (
|
||||
+ COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h
|
||||
+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
|
||||
+ RESULT_VARIABLE git_version_check_ret
|
||||
+ OUTPUT_VARIABLE tini_VERSION_GIT
|
||||
+ )
|
||||
+
|
||||
+ execute_process(
|
||||
+ COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no
|
||||
+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
|
||||
+ OUTPUT_VARIABLE git_dirty_check_out
|
||||
+ )
|
||||
+
|
||||
+ if("${git_version_check_ret}" EQUAL 0)
|
||||
+ set(tini_VERSION_GIT "${GIT_PREFIX}${tini_VERSION_GIT}")
|
||||
+ if(NOT "${git_dirty_check_out}" STREQUAL "")
|
||||
+ set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty")
|
||||
+ endif()
|
||||
+ else()
|
||||
+ set(tini_VERSION_GIT "")
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
# Flags
|
||||
@@ -0,0 +1,42 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>tini</Name>
|
||||
<Homepage>https://github.com/krallin/tini</Homepage>
|
||||
<Packager>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>A tiny but valid `init` for containers </Summary>
|
||||
<Description>A tiny but valid `init` for containers </Description>
|
||||
<Archive sha1sum="27b7529ae87ea688e21d0a061b6d9299ff9362f6" type="targz">https://github.com/krallin/tini/archive/v0.18.0.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<!--Dependency versionFrom="1.10.3">golang</Dependency-->
|
||||
<Dependency>cmake</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">tini-cmake-fixes.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>tini</Name>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2018-06-17</Date>
|
||||
<Version>0.18.0</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user