From 0b9959aa230b31cf0d54e99074438cd7f8a0b485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Sun, 17 Jun 2018 19:36:25 +0300 Subject: [PATCH] ... --- .../virtualization/docker/comar/service.py | 2 +- hardware/virtualization/docker/pspec.xml | 5 +- hardware/virtualization/tini/actions.py | 30 +++++++ .../tini/files/tini-cmake-fixes.patch | 78 +++++++++++++++++++ hardware/virtualization/tini/pspec.xml | 42 ++++++++++ 5 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 hardware/virtualization/tini/actions.py create mode 100644 hardware/virtualization/tini/files/tini-cmake-fixes.patch create mode 100644 hardware/virtualization/tini/pspec.xml diff --git a/hardware/virtualization/docker/comar/service.py b/hardware/virtualization/docker/comar/service.py index af598f0d0d..e2637048b9 100644 --- a/hardware/virtualization/docker/comar/service.py +++ b/hardware/virtualization/docker/comar/service.py @@ -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) diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml index b70767de2a..7519db58d0 100644 --- a/hardware/virtualization/docker/pspec.xml +++ b/hardware/virtualization/docker/pspec.xml @@ -41,8 +41,9 @@ iptables libseccomp libtool-ltdl - runc - containerd + runc + containerd + tini /etc diff --git a/hardware/virtualization/tini/actions.py b/hardware/virtualization/tini/actions.py new file mode 100644 index 0000000000..82a0bba0d8 --- /dev/null +++ b/hardware/virtualization/tini/actions.py @@ -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") diff --git a/hardware/virtualization/tini/files/tini-cmake-fixes.patch b/hardware/virtualization/tini/files/tini-cmake-fixes.patch new file mode 100644 index 0000000000..dfd2a749bd --- /dev/null +++ b/hardware/virtualization/tini/files/tini-cmake-fixes.patch @@ -0,0 +1,78 @@ +From a8f82ea60cde15cbbd0ebcf729062de6bad9859c Mon Sep 17 00:00:00 2001 +From: Thomas Orozco +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 diff --git a/hardware/virtualization/tini/pspec.xml b/hardware/virtualization/tini/pspec.xml new file mode 100644 index 0000000000..3c77b36f51 --- /dev/null +++ b/hardware/virtualization/tini/pspec.xml @@ -0,0 +1,42 @@ + + + + + tini + https://github.com/krallin/tini + + Ertuğrul Erata + ertugrulerata@gmail.com + + GPLv2 + app:console + A tiny but valid `init` for containers + A tiny but valid `init` for containers + https://github.com/krallin/tini/archive/v0.18.0.tar.gz + + + cmake + + + tini-cmake-fixes.patch + + + + + tini + + /usr/bin + /usr/share/doc + + + + + + 2018-06-17 + 0.18.0 + First release + Ertuğrul Erata + ertugrulerata@gmail.com + + +