Merge pull request #4588 from ilya-fedin/tini-not-mininal-9.2

tini: don't define -DMINIMAL=ON
CoreELEC · Oct 24, 2020 · 6bd7e98 · 6bd7e98
2 parents 9b68353 + c772700
commit 6bd7e98
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/addons/addon-depends/tini/package.mk b/packages/addons/addon-depends/tini/package.mk
@@ -11,8 +11,6 @@ PKG_URL="https://github.com/krallin/tini/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Tini is a simplest init system."
 
-PKG_CMAKE_OPTS_TARGET="-DMINIMAL=ON"
-
 PKG_MAKE_OPTS_TARGET="tini-static"
 
 pre_configure_target(){

diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt
@@ -1,3 +1,6 @@
+127
+- Rebuild tini without -DMINIMAL=ON to fix 'docker run --init'
+
 126
 - Update to docker 18.09.7
 

diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
@@ -5,7 +5,7 @@
 PKG_NAME="docker"
 PKG_VERSION="18.09.7"
 PKG_SHA256="f05dc15f5c11635472534c3aaf759c39c1bba842dd1ac23059431c2fd1ae1795"
-PKG_REV="126"
+PKG_REV="127"
 PKG_ARCH="any"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"