diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r6.ebuild deleted file mode 120000 index 348c68c571e..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r6.ebuild +++ /dev/null @@ -1 +0,0 @@ -coreos-oem-gce-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild deleted file mode 100644 index 062aa7eebf3..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2016 CoreOS, Inc.. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="CoreOS OEM suite for Google Compute Engine (meta package)" -HOMEPAGE="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -RDEPEND=" - app-emulation/google-compute-engine - app-shells/bash - sys-apps/gentoo-functions - sys-libs/glibc - sys-libs/nss-usrfiles -" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manglefs.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manglefs.sh deleted file mode 100644 index eab042ad0de..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manglefs.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -set -e - -# GCE can work with our normal file system, but it needs an "init system". -# Here is a better place to install this script so it doesn't get put in real -# images built from the GCE Python package. -cat << 'EOF' > init.sh && chmod 755 init.sh -#!/bin/bash -ex - -# Write a configuration template if it does not exist. -[ -e /etc/default/instance_configs.cfg.template ] || -echo -e > /etc/default/instance_configs.cfg.template \ - '[InstanceSetup]\nset_host_keys = false' - -# Run the initialization scripts. -/usr/bin/google_instance_setup -/usr/bin/google_metadata_script_runner --script-type startup - -# Handle the signal to shut down this service. -trap 'stopping=1 ; kill "${daemon_pids[@]}" || :' SIGTERM - -# Fork the daemon processes. -daemon_pids=() -for d in accounts clock_skew network -do - /usr/bin/google_${d}_daemon & daemon_pids+=($!) -done - -# Notify the host that everything is running. -NOTIFY_SOCKET=/run/systemd/notify /usr/bin/systemd-notify --ready - -# Pause while the daemons are running, and stop them all when one dies. -wait -n "${daemon_pids[@]}" || : -kill "${daemon_pids[@]}" || : - -# If a daemon died while we're not shutting down, fail. -test -n "$stopping" || exit 1 - -# Otherwise, run the shutdown script before quitting. -exec /usr/bin/google_metadata_script_runner --script-type shutdown -EOF - -# Disable PAM checks in the container. -rm -f usr/lib/pam.d/* -cat << 'EOF' > usr/lib/pam.d/other -account optional pam_permit.so -auth optional pam_permit.so -password optional pam_permit.so -session optional pam_permit.so -EOF - -# Don't bundle these paths, since they are useless to us. -mv usr/lib/systemd/lib*.so* usr/lib64/ -rm -fr boot etc/* usr/lib/systemd var/db/pkg - -# Remove test stuff from python - it's quite large. -rm -rf usr/lib/python*/test diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manifest.in b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manifest.in deleted file mode 100644 index b7a8896f855..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manifest.in +++ /dev/null @@ -1,33 +0,0 @@ -{ - "acKind": "ImageManifest", - "acVersion": "0.8.6", - "name": "@ACI_NAME@", - "labels": [ - {"name": "arch", "value": "@ACI_ARCH@"}, - {"name": "os", "value": "linux"}, - {"name": "version", "value": "@ACI_VERSION@"} - ], - "app": { - "exec": [ "/init.sh" ], - "user": "0", - "group": "0", - - "mountPoints": [ - { - "name": "etc", - "path": "/etc", - "readOnly": false - }, - { - "name": "home", - "path": "/home", - "readOnly": false - }, - { - "name": "runsystemd", - "path": "/run/systemd", - "readOnly": false - } - ] - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/metadata.xml deleted file mode 100644 index 097975e3adc..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r6.ebuild index 566c3c70ca3..ca82fb0b21c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r6.ebuild @@ -19,7 +19,9 @@ IUSE="" # no source directory S="${WORKDIR}" -RDEPEND="coreos-base/coreos-oem-gce" +RDEPEND=" + app-emulation/google-compute-engine +" OEM_NAME="Google Compute Engine" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index 308ff191e5f..10ad99010f3 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -21,7 +21,6 @@ DEPEND="" RDEPEND=" amd64? ( app-emulation/open-vm-tools - coreos-base/coreos-oem-gce coreos-base/nova-agent-container coreos-base/nova-agent-watcher )