From c772700121a898762bdc63a5203c266c295e2d5e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 18 Sep 2020 11:55:35 +0400 Subject: [PATCH] tini: don't define -DMINIMAL=ON -DMINIMAL=ON is not compatible with docker --- packages/addons/addon-depends/tini/package.mk | 2 -- packages/addons/service/docker/changelog.txt | 3 +++ packages/addons/service/docker/package.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/tini/package.mk b/packages/addons/addon-depends/tini/package.mk index 62fa3cfe4e..5db564aa79 100644 --- 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 index 90cff0a235..0d910bd30c 100644 --- 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 index eb00da9568..afcc7ce13b 100644 --- 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/"