From ad01612ce60b0aafa76e838eda1a07723a602514 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 12 Aug 2015 13:56:43 -0700 Subject: [PATCH] docker: downgrade all kernel config checks to warnings The linux-info eclass sets variables referring to the kernel source and build trees when a binary package is built. This is problematic when linux-info uses the default build path /lib/modules/$V/build which includes the built kernel version. So if the kernel has changed since the docker package was built installing docker from the binary package will fail, breaking build_image and more. To work around the issue just make the config checks non-fatal. They really aren't all that useful to us anyway. --- ...r-1.7.1-r2.ebuild => docker-1.7.1-r3.ebuild} | 0 .../app-emulation/docker/docker-9999.ebuild | 17 +++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.7.1-r2.ebuild => docker-1.7.1-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 62a289fbb6..0c401dac51 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -74,15 +74,16 @@ RESTRICT="installsources strip" # see "contrib/check-config.sh" from upstream's sources CONFIG_CHECK=" - NAMESPACES NET_NS PID_NS IPC_NS UTS_NS - DEVPTS_MULTIPLE_INSTANCES - CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS - MACVLAN VETH BRIDGE - NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE - NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK - NF_NAT NF_NAT_NEEDED + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~DEVPTS_MULTIPLE_INSTANCES + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED + ~CPUSETS + ~MACVLAN ~VETH ~BRIDGE + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK + ~NF_NAT ~NF_NAT_NEEDED - POSIX_MQUEUE + ~POSIX_MQUEUE ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED ~RESOURCE_COUNTERS