Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/docker: docker-1.7.1.ebuild ChangeLog
Date: Tue, 28 Jul 2015 13:57:12
Message-Id: 20150728135707.97984BF@oystercatcher.gentoo.org
1 xarthisius 15/07/28 13:57:07
2
3 Modified: docker-1.7.1.ebuild ChangeLog
4 Log:
5 Make kernel chchecks non fatal. Thanks to Tianon <admwiggin@×××××.com> for the patch. Fixes #555434 by Deniss Gaplevsky <slim@×××××.lv>
6
7 (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
8
9 Revision Changes Path
10 1.2 app-emulation/docker/docker-1.7.1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-1.7.1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-1.7.1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-1.7.1.ebuild?r1=1.1&r2=1.2
15
16 Index: docker-1.7.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.7.1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- docker-1.7.1.ebuild 24 Jul 2015 18:48:39 -0000 1.1
23 +++ docker-1.7.1.ebuild 28 Jul 2015 13:57:07 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2015 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.7.1.ebuild,v 1.1 2015/07/24 18:48:39 xarthisius Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.7.1.ebuild,v 1.2 2015/07/28 13:57:07 xarthisius Exp $
29
30 EAPI=5
31
32 @@ -76,15 +76,15 @@
33
34 # see "contrib/check-config.sh" from upstream's sources
35 CONFIG_CHECK="
36 - NAMESPACES NET_NS PID_NS IPC_NS UTS_NS
37 - DEVPTS_MULTIPLE_INSTANCES
38 - CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS
39 - MACVLAN VETH BRIDGE BRIDGE_NETFILTER
40 - NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
41 - NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK
42 - NF_NAT NF_NAT_NEEDED
43 + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS UTS_NS
44 + ~DEVPTS_MULTIPLE_INSTANCES
45 + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS
46 + ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
47 + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
48 + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
49 + ~NF_NAT ~NF_NAT_NEEDED
50
51 - POSIX_MQUEUE
52 + ~POSIX_MQUEUE
53
54 ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
55
56 @@ -101,10 +101,9 @@
57
58 pkg_setup() {
59 if kernel_is lt 3 10; then
60 - eerror ""
61 - eerror "Using Docker with kernels older than 3.10 is unstable and unsupported."
62 - eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
63 - die 'Kernel is too old - need 3.10 or above'
64 + ewarn ""
65 + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
66 + ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
67 fi
68
69 # for where these kernel versions come from, see:
70
71
72
73 1.56 app-emulation/docker/ChangeLog
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.56&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.56&content-type=text/plain
77 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?r1=1.55&r2=1.56
78
79 Index: ChangeLog
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v
82 retrieving revision 1.55
83 retrieving revision 1.56
84 diff -u -r1.55 -r1.56
85 --- ChangeLog 24 Jul 2015 18:48:39 -0000 1.55
86 +++ ChangeLog 28 Jul 2015 13:57:07 -0000 1.56
87 @@ -1,6 +1,10 @@
88 # ChangeLog for app-emulation/docker
89 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
90 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.55 2015/07/24 18:48:39 xarthisius Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.56 2015/07/28 13:57:07 xarthisius Exp $
92 +
93 + 28 Jul 2015; Kacper Kowalik <xarthisius@g.o> docker-1.7.1.ebuild:
94 + Make kernel chchecks non fatal. Thanks to Tianon <admwiggin@×××××.com> for the
95 + patch. Fixes #555434 by Deniss Gaplevsky <slim@×××××.lv>
96
97 *docker-1.7.1 (24 Jul 2015)