From 6d9a5749b86afb37392864d5d35573b1b4a73e18 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 7 Jul 2018 01:36:26 -0300 Subject: [PATCH] docker: remove apparmor build_option. it is now available on musl arches. closes void-linux/void-packages#711 --- srcpkgs/docker/template | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index ac48185ec1..d350bdd11d 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,13 +1,13 @@ # Template file for 'docker' pkgname=docker version=18.05.0 -revision=3 +revision=4 _subversion='-ce' _version="$version$_subversion" wrksrc="$pkgname$_subversion-$_version" build_wrksrc=components/engine hostmakedepends="git go pkg-config curl cmake" -makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel $(vopt_if apparmor libapparmor-devel)" +makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel libapparmor-devel" short_desc="Pack, ship and run any application as a lightweight container" maintainer="Andrea Brancaleoni " license="Apache-2.0" @@ -25,15 +25,8 @@ system_groups="docker" _docker_components="runc containerd tini proxy dockercli" -build_options="apparmor" -desc_option_apparmor="apparmor linux kernel security module support" -case "$XBPS_TARGET_MACHINE" in - *-musl) ;; - *) build_options_default="apparmor" -esac - do_build() { - AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp $(vopt_if apparmor apparmor)' DOCKER_GITCOMMIT=v$_version \ + AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v$_version \ hack/make.sh dynbinary }