From 45da4e680fedda03300b64ed728f54747b0387a1 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 5 Dec 2016 15:52:46 -0800 Subject: [PATCH 1/4] sys-apps/systemd: bump to backport the Unmanaged option --- .../systemd/{systemd-231-r7.ebuild => systemd-231-r8.ebuild} | 0 .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-231-r7.ebuild => systemd-231-r8.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r8.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r7.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r8.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 79e01b9cc9..def89d7966 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then # Use ~arch instead of empty keywords for compatibility with cros-workon KEYWORDS="~amd64 ~arm64 ~arm ~x86" else - CROS_WORKON_COMMIT="522db85e629525c744e9443f34275bb0fa935d32" # v231-coreos + CROS_WORKON_COMMIT="3b66242ad59d09895271f0e067bc93680f235dc5" # v231-coreos KEYWORDS="amd64 arm64 ~arm ~x86" fi From fa1e526f2affe9834361a180981bd8baa7692d5a Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 5 Dec 2016 16:04:28 -0800 Subject: [PATCH 2/4] app-admin/flannel: use the Unmanaged networkd option --- .../coreos-overlay/app-admin/flannel/files/50-flannel.network | 3 ++- .../{flannel-0.6.1-r4.ebuild => flannel-0.6.1-r5.ebuild} | 0 .../flannel/{flannel-0.6.2.ebuild => flannel-0.6.2-r1.ebuild} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel/{flannel-0.6.1-r4.ebuild => flannel-0.6.1-r5.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel/{flannel-0.6.2.ebuild => flannel-0.6.2-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network index c0e4e0e6da..e5d48d739b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network @@ -1,4 +1,5 @@ [Match] Name=flannel* -[Network] +[Link] +Unmanaged=yes diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2-r1.ebuild From 9f6c3e3d9f78e326dca3dd8a1470832ef597679f Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 5 Dec 2016 16:05:19 -0800 Subject: [PATCH 3/4] app-admin/flannel-wrapper: use the Unmanaged networkd option --- .../app-admin/flannel-wrapper/files/50-flannel.network | 3 ++- ...annel-wrapper-0.0.2.ebuild => flannel-wrapper-0.0.3.ebuild} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/{flannel-wrapper-0.0.2.ebuild => flannel-wrapper-0.0.3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network index c0e4e0e6da..e5d48d739b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network @@ -1,4 +1,5 @@ [Match] Name=flannel* -[Network] +[Link] +Unmanaged=yes diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.3.ebuild From 9dfb4f7cc39e47ebbf67e575bdca8fb3dde6bacc Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 5 Dec 2016 16:07:08 -0800 Subject: [PATCH 4/4] app-emulation/docker: use the Unmanaged networkd option This also bumps the commit to revert the workaround that previously addressed the issue. --- .../{docker-1.12.3-r1.ebuild => docker-1.12.3-r2.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- .../app-emulation/docker/files/50-docker-veth.network | 3 ++- .../app-emulation/docker/files/50-docker.network | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.3-r1.ebuild => docker-1.12.3-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r2.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 6a4e103356..cab3110c36 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 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="34a2ead3915aa6bf03b5c56b5033203e96e690a1" # coreos-1.12.3 + CROS_WORKON_COMMIT="cc361da5ab1aa7df69604a856c8194468e972105" # coreos-1.12.3 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network index 79e078bdc9..3ca3816c23 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network @@ -1,4 +1,5 @@ [Match] Driver=veth -[Network] +[Link] +Unmanaged=yes diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network index 4fcc34c0c2..4145fd6e37 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network @@ -2,4 +2,5 @@ Type=bridge Name=docker* -[Network] +[Link] +Unmanaged=yes