1 |
commit: b179faba612d58eaa186dca6f3347676ac4e7cf4 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 9 22:42:49 2016 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 9 22:42:49 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b179faba |
7 |
|
8 |
app-emulation/docker: remove 1.12.0-rc2 per #588276 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
app-emulation/docker/Manifest | 2 - |
13 |
app-emulation/docker/docker-1.12.0_rc2-r2.ebuild | 275 ----------------------- |
14 |
2 files changed, 277 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest |
17 |
index 500561b..d2b19e7 100644 |
18 |
--- a/app-emulation/docker/Manifest |
19 |
+++ b/app-emulation/docker/Manifest |
20 |
@@ -1,4 +1,2 @@ |
21 |
DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f |
22 |
-DIST docker-1.12.0_rc2-23859.patch 62625 SHA256 8f424c54df8e387286ac5fc36cf0c0e7b2de72d698ed157197a76050e4f6fbfc SHA512 d86f1741ea88d27039fcbce95f243d5720bbc2fcc5e0ff715345ad674543b553d449a73be09fc5d75664ee5b67cd5e9b67419b027c54258ee7b35f9c2bfdeca5 WHIRLPOOL a34a10108f5e62764c21e138130c57962c3de172fd00235af0d2baa5be482f15913c56426133564f59d8660538f287d787f08750408795aa68040e4e697e4aa0 |
23 |
-DIST docker-1.12.0_rc2.tar.gz 12332409 SHA256 085d79554c5da49d16de04aa06640be45f37535bccbdbf8190790114327a53a4 SHA512 d5b24ee990010e7c1101e238910db29b9aa718396659f2dc0862a626efe98364b0a22489409d131163f6273327b430aa0c5926b371baf47c02b2049ad47537a3 WHIRLPOOL 970de3a3b00aa9bcfff11e4801a16f6979ab459cbc8e66d9dd9a414090d34deffa3e475ced9f4b22d5afe4a10350e6fb96c9b9f4cfb3164fff1db3273da627f1 |
24 |
DIST docker-1.12.0_rc3.tar.gz 12359008 SHA256 3f030c4f084ed518efeb00f21f3fdfb25252dd9c153b1d42da953e59bb41c582 SHA512 438f0f6fa65f7354d3059558427aadcc86139f3c062e30407f249ba8cfcfb307f083cea1a872637dfb4c68481a11cc22580e50ca6eb51d98370665c9fdc42f65 WHIRLPOOL 30914ea9fee3759bb1229329ebc7da35d3ba39abf311abb1f90e12e45899d01954d7903579b253d3cc609ac269ceaf681e58d08e87b31232836322ab3dcc65c1 |
25 |
|
26 |
diff --git a/app-emulation/docker/docker-1.12.0_rc2-r2.ebuild b/app-emulation/docker/docker-1.12.0_rc2-r2.ebuild |
27 |
deleted file mode 100644 |
28 |
index e85287d..0000000 |
29 |
--- a/app-emulation/docker/docker-1.12.0_rc2-r2.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,275 +0,0 @@ |
32 |
-# Copyright 1999-2016 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-EGO_PN="github.com/docker/docker" |
39 |
- |
40 |
-if [[ ${PV} = *9999* ]]; then |
41 |
- # Docker cannot be fetched via "go get", thanks to autogenerated code |
42 |
- EGIT_REPO_URI="https://${EGO_PN}.git" |
43 |
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" |
44 |
- inherit git-r3 |
45 |
-else |
46 |
- MY_PV="${PV/_/-}" |
47 |
- DOCKER_GITCOMMIT="906eacd" |
48 |
- EGIT_COMMIT="v${MY_PV}" |
49 |
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
50 |
- https://dev.gentoo.org/~williamh/dist/${P}-23859.patch" |
51 |
- KEYWORDS="~amd64" |
52 |
- [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" |
53 |
- inherit golang-vcs-snapshot |
54 |
-fi |
55 |
-inherit bash-completion-r1 golang-base linux-info systemd udev user |
56 |
- |
57 |
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers" |
58 |
-HOMEPAGE="https://dockerproject.org" |
59 |
-LICENSE="Apache-2.0" |
60 |
-SLOT="0" |
61 |
-IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp" |
62 |
- |
63 |
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies |
64 |
-CDEPEND=" |
65 |
- >=dev-db/sqlite-3.7.9:3 |
66 |
- device-mapper? ( |
67 |
- >=sys-fs/lvm2-2.02.89[thin] |
68 |
- ) |
69 |
- seccomp? ( >=sys-libs/libseccomp-2.2.1 ) |
70 |
- apparmor? ( sys-libs/libapparmor ) |
71 |
-" |
72 |
- |
73 |
-DEPEND=" |
74 |
- ${CDEPEND} |
75 |
- |
76 |
- dev-go/go-md2man |
77 |
- |
78 |
- btrfs? ( |
79 |
- >=sys-fs/btrfs-progs-3.8 |
80 |
- ) |
81 |
-" |
82 |
- |
83 |
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies |
84 |
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies |
85 |
-RDEPEND=" |
86 |
- ${CDEPEND} |
87 |
- |
88 |
- !app-emulation/docker-bin |
89 |
- >=net-firewall/iptables-1.4 |
90 |
- sys-process/procps |
91 |
- >=dev-vcs/git-1.7 |
92 |
- >=app-arch/xz-utils-4.9 |
93 |
- |
94 |
- >app-emulation/containerd-0.2.2 |
95 |
- app-emulation/runc[apparmor?,seccomp?] |
96 |
-" |
97 |
- |
98 |
-RESTRICT="installsources strip" |
99 |
- |
100 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
101 |
- |
102 |
-# see "contrib/check-config.sh" from upstream's sources |
103 |
-CONFIG_CHECK=" |
104 |
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS |
105 |
- ~DEVPTS_MULTIPLE_INSTANCES |
106 |
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
107 |
- ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
108 |
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
109 |
- ~IP_VS |
110 |
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |
111 |
- ~NF_NAT ~NF_NAT_NEEDED |
112 |
- |
113 |
- ~POSIX_MQUEUE |
114 |
- |
115 |
- ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
116 |
- |
117 |
- ~BLK_CGROUP ~IOSCHED_CFQ |
118 |
- ~CGROUP_PERF |
119 |
- ~CGROUP_HUGETLB |
120 |
- ~NET_CLS_CGROUP |
121 |
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED |
122 |
- ~XFRM_ALGO ~XFRM_USER |
123 |
-" |
124 |
- |
125 |
-ERROR_KEYS="CONFIG_KEYS: is mandatory" |
126 |
-ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
127 |
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" |
128 |
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" |
129 |
- |
130 |
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" |
131 |
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" |
132 |
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" |
133 |
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" |
134 |
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" |
135 |
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" |
136 |
- |
137 |
-pkg_setup() { |
138 |
- if kernel_is lt 3 10; then |
139 |
- ewarn "" |
140 |
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." |
141 |
- ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies" |
142 |
- fi |
143 |
- |
144 |
- # for where these kernel versions come from, see: |
145 |
- # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* |
146 |
- if ! { |
147 |
- kernel_is ge 3 16 \ |
148 |
- || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ |
149 |
- || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ |
150 |
- || { kernel_is 3 12 && kernel_is ge 3 12 25; } |
151 |
- }; then |
152 |
- ewarn "" |
153 |
- ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" |
154 |
- ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" |
155 |
- ewarn "" |
156 |
- ewarn "See also https://github.com/docker/docker/issues/2960" |
157 |
- fi |
158 |
- |
159 |
- if kernel_is le 3 18; then |
160 |
- CONFIG_CHECK+=" |
161 |
- ~RESOURCE_COUNTERS |
162 |
- " |
163 |
- fi |
164 |
- |
165 |
- if kernel_is le 3 13; then |
166 |
- CONFIG_CHECK+=" |
167 |
- ~NETPRIO_CGROUP |
168 |
- " |
169 |
- else |
170 |
- CONFIG_CHECK+=" |
171 |
- ~CGROUP_NET_PRIO |
172 |
- " |
173 |
- fi |
174 |
- |
175 |
- if use aufs; then |
176 |
- CONFIG_CHECK+=" |
177 |
- ~AUFS_FS |
178 |
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
179 |
- " |
180 |
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" |
181 |
- fi |
182 |
- |
183 |
- if use btrfs; then |
184 |
- CONFIG_CHECK+=" |
185 |
- ~BTRFS_FS |
186 |
- " |
187 |
- fi |
188 |
- |
189 |
- if use device-mapper; then |
190 |
- CONFIG_CHECK+=" |
191 |
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
192 |
- " |
193 |
- fi |
194 |
- |
195 |
- if use overlay; then |
196 |
- CONFIG_CHECK+=" |
197 |
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL |
198 |
- " |
199 |
- fi |
200 |
- |
201 |
- linux-info_pkg_setup |
202 |
- |
203 |
- # create docker group for the code checking for it in /etc/group |
204 |
- enewgroup docker |
205 |
-} |
206 |
- |
207 |
-PATCHES=( |
208 |
- # https://github.com/docker/docker/pull/23859 |
209 |
- "${DISTDIR}"/${P}-23859.patch |
210 |
-) |
211 |
- |
212 |
-src_compile() { |
213 |
- export GOPATH="${WORKDIR}/${P}:${PWD}/vendor" |
214 |
- |
215 |
- # setup CFLAGS and LDFLAGS for separate build target |
216 |
- # see https://github.com/tianon/docker-overlay/pull/10 |
217 |
- export CGO_CFLAGS="-I${ROOT}/usr/include" |
218 |
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
219 |
- |
220 |
- # if we're building from a zip, we need the GITCOMMIT value |
221 |
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT |
222 |
- |
223 |
- if gcc-specs-pie; then |
224 |
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die |
225 |
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' |
226 |
- |
227 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
228 |
- -i hack/make/dynbinary || die |
229 |
- grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed' |
230 |
- fi |
231 |
- |
232 |
- # let's set up some optional features :) |
233 |
- export DOCKER_BUILDTAGS='' |
234 |
- for gd in aufs btrfs device-mapper overlay; do |
235 |
- if ! use $gd; then |
236 |
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" |
237 |
- fi |
238 |
- done |
239 |
- |
240 |
- for tag in apparmor seccomp; do |
241 |
- if use $tag; then |
242 |
- DOCKER_BUILDTAGS+=" $tag" |
243 |
- fi |
244 |
- done |
245 |
- |
246 |
- # https://github.com/docker/docker/pull/13338 |
247 |
- if use experimental; then |
248 |
- export DOCKER_EXPERIMENTAL=1 |
249 |
- else |
250 |
- unset DOCKER_EXPERIMENTAL |
251 |
- fi |
252 |
- |
253 |
- # time to build! |
254 |
- ./hack/make.sh dynbinary || die 'dynbinary failed' |
255 |
- |
256 |
- # build the man pages too |
257 |
- ./man/md2man-all.sh || die "unable to generate man pages" |
258 |
-} |
259 |
- |
260 |
-src_install() { |
261 |
- VERSION="$(cat VERSION)" |
262 |
- newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker |
263 |
- newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd |
264 |
- dosym containerd /usr/bin/docker-containerd |
265 |
- dosym containerd-shim /usr/bin/docker-containerd-shim |
266 |
- dosym runc /usr/bin/docker-runc |
267 |
- |
268 |
- newinitd contrib/init/openrc/docker.initd docker |
269 |
- newconfd contrib/init/openrc/docker.confd docker |
270 |
- |
271 |
- systemd_dounit contrib/init/systemd/docker.{service,socket} |
272 |
- |
273 |
- udev_dorules contrib/udev/*.rules |
274 |
- |
275 |
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md |
276 |
- dodoc -r docs/* |
277 |
- doman man/man*/* |
278 |
- |
279 |
- dobashcomp contrib/completion/bash/* |
280 |
- |
281 |
- insinto /usr/share/zsh/site-functions |
282 |
- doins contrib/completion/zsh/* |
283 |
- |
284 |
- insinto /usr/share/vim/vimfiles |
285 |
- doins -r contrib/syntax/vim/ftdetect |
286 |
- doins -r contrib/syntax/vim/syntax |
287 |
- |
288 |
- # note: intentionally not using "doins" so that we preserve +x bits |
289 |
- mkdir -p "${D}/usr/share/${PN}/contrib" |
290 |
- cp -R contrib/* "${D}/usr/share/${PN}/contrib" |
291 |
-} |
292 |
- |
293 |
-pkg_postinst() { |
294 |
- udev_reload |
295 |
- |
296 |
- elog |
297 |
- elog "To use Docker, the Docker daemon must be running as root. To automatically" |
298 |
- elog "start the Docker daemon at boot, add Docker to the default runlevel:" |
299 |
- elog " rc-update add docker default" |
300 |
- elog "Similarly for systemd:" |
301 |
- elog " systemctl enable docker.service" |
302 |
- elog |
303 |
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:" |
304 |
- elog " usermod -aG docker youruser" |
305 |
- elog |
306 |
-} |