mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-22 06:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

docker: downgrade all kernel config checks to warnings

Browse Source 
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.
This commit is contained in:
Michael Marineau 2015-08-12 13:56:43 -07:00
parent aa8c9e1bc5
commit ad01612ce6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r2.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r3.ebuild vendored
View File

17
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -74,15 +74,16 @@ RESTRICT="installsources strip"
# see "contrib/check-config.sh" from upstream's sources # see "contrib/check-config.sh" from upstream's sources
CONFIG_CHECK=" CONFIG_CHECK="
NAMESPACES NET_NS PID_NS IPC_NS UTS_NS ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
DEVPTS_MULTIPLE_INSTANCES ~DEVPTS_MULTIPLE_INSTANCES
CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED
MACVLAN VETH BRIDGE ~CPUSETS
NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE ~MACVLAN ~VETH ~BRIDGE
NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
NF_NAT NF_NAT_NEEDED ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
~NF_NAT ~NF_NAT_NEEDED
POSIX_MQUEUE ~POSIX_MQUEUE
~MEMCG_SWAP ~MEMCG_SWAP_ENABLED ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
~RESOURCE_COUNTERS ~RESOURCE_COUNTERS