mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 15:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/google-{compute-daemon,startup-scripts}: drop ebuilds

Browse Source
This commit is contained in:
David Michael 2016-10-07 14:39:32 -07:00
parent 5d0018e594
commit 1c0b8fe8c8
11 changed files with 0 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/Manifest vendored
View File

@ -1 +0,0 @@
DIST google-daemon-1.3.2.tar.gz 18551 SHA256 f2d9476e8fb9134e6d5774838d6dacc4bff9495f29804e2dba7fdee574248d29 SHA512 26e691227d55f85cbac853a0b07d6e7d2cc4c6722987afe243170775bb7ee6db1b904a5996c97a152d5352c2d08b856a2389cb281ee47ee3fdc49508120404dc WHIRLPOOL c43b733d63ae026f8e9895a63f2548ecddab33f7fc399f853db5180f1ead343432aa923e0e0b0fff278064ac5ad3ce4dfc7b7a064197e762fad6bc6cc49092b6

26
sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/files/0001-Add-users-to-docker-group-by-default.patch vendored
View File

@ -1,26 +0,0 @@
From dba9b86ed013b0520fbd731239c5d93769a6a9f4 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Tue, 10 May 2016 14:40:32 -0700
Subject: [PATCH 1/3] Add users to docker group by default
This allows users to use Docker without needing sudo.
---
google-daemon/usr/share/google/google_daemon/accounts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/google-daemon/usr/share/google/google_daemon/accounts.py b/google-daemon/usr/share/google/google_daemon/accounts.py
index e14f5c0..31241f9 100755
--- a/google-daemon/usr/share/google/google_daemon/accounts.py
+++ b/google-daemon/usr/share/google/google_daemon/accounts.py
@@ -76,7 +76,7 @@ class Accounts(object):
self.urllib2 = urllib2_module
self.default_user_groups = self.GroupsThatExist(
- ['adm', 'video', 'dip', 'plugdev', 'sudo'])
+ ['adm', 'video', 'dip', 'plugdev', 'sudo', 'docker'])
def UpdateUser(self, username, ssh_keys):
"""Create username on the system, with authorized ssh_keys."""
--
2.7.3

83
sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/files/0002-Use-ens4v1-instead-of-eth0.patch vendored
View File

@ -1,83 +0,0 @@
From 1eff70fe7f0083d7aee76e18c89e92fce278a57a Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Tue, 10 May 2016 14:45:16 -0700
Subject: [PATCH 2/3] Use ens4v1 instead of eth0
The network interface under systemd is ens4v1
(http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/).
---
.../share/google/google_daemon/address_manager.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/google-daemon/usr/share/google/google_daemon/address_manager.py b/google-daemon/usr/share/google/google_daemon/address_manager.py
index 7a0e911..ba3be6e 100644
--- a/google-daemon/usr/share/google/google_daemon/address_manager.py
+++ b/google-daemon/usr/share/google/google_daemon/address_manager.py
@@ -15,16 +15,16 @@
"""Manage extra network interface addresses on a GCE instance.
Fetch a list of public endpoint IPs from the metadata server, compare it with
-what's configured on eth0, and add/remove addresses from eth0 to make them
+what's configured on ens4v1, and add/remove addresses from ens4v1 to make them
match. Only remove those which match our proto code.
This must be run by root. If it reads any malformed data, it will take no
action.
Command used to add ips:
- ip route add to local $IP/32 dev eth0 proto 66
+ ip route add to local $IP/32 dev ens4v1 proto 66
Command used to fetch list of configured IPs:
- ip route ls table local type local dev eth0 scope host proto 66
+ ip route ls table local type local dev ens4v1 scope host proto 66
"""
@@ -106,8 +106,8 @@ class AddressManager(object):
return self.ParseIPAddrs(addrs_data)
def ReadLocalConfiguredAddrs(self):
- """Fetch list of addresses we've configured on eth0 already."""
- cmd = ('{0} route ls table local type local dev eth0 scope host ' +
+ """Fetch list of addresses we've configured on ens4v1 already."""
+ cmd = ('{0} route ls table local type local dev ens4v1 scope host ' +
'proto {1:d}').format(self.ip_path, GOOGLE_PROTO_ID)
result = self.system.RunCommand(cmd.split())
if self.IPCommandFailed(result, cmd):
@@ -135,27 +135,27 @@ class AddressManager(object):
to_remove or None))
def AddAddresses(self, to_add):
- """Configure new addresses on eth0."""
+ """Configure new addresses on ens4v1."""
for addr in to_add:
self.AddOneAddress(addr)
def AddOneAddress(self, addr):
- """Configure one address on eth0."""
- cmd = '%s route add to local %s/32 dev eth0 proto %d' % (
+ """Configure one address on ens4v1."""
+ cmd = '%s route add to local %s/32 dev ens4v1 proto %d' % (
self.ip_path, addr, GOOGLE_PROTO_ID)
result = self.system.RunCommand(cmd.split())
self.IPCommandFailed(result, cmd) # Ignore return code
def DeleteAddresses(self, to_remove):
- """Un-configure a list of addresses from eth0."""
+ """Un-configure a list of addresses from ens4v1."""
for addr in to_remove:
self.DeleteOneAddress(addr)
def DeleteOneAddress(self, addr):
- """Delete one address from eth0."""
+ """Delete one address from ens4v1."""
# This will fail if it doesn't match exactly the specs listed.
# That'll help ensure we don't remove one added by someone else.
- cmd = '%s route delete to local %s/32 dev eth0 proto %d' % (
+ cmd = '%s route delete to local %s/32 dev ens4v1 proto %d' % (
self.ip_path, addr, GOOGLE_PROTO_ID)
result = self.system.RunCommand(cmd.split())
self.IPCommandFailed(result, cmd) # Ignore return code
--
2.7.3

29
sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/google-compute-daemon-1.3.2.ebuild vendored
View File

@ -1,29 +0,0 @@
# Copyright (c) 2014 CoreOS, Inc. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils
DESCRIPTION="Google Daemon for Compute Engine"
HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages"
SRC_URI="https://github.com/GoogleCloudPlatform/compute-image-packages/releases/download/${PV}/google-daemon-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-lang/python-oem"
S="${WORKDIR}"
src_prepare() {
epatch "${FILESDIR}/0001-Add-users-to-docker-group-by-default.patch"
epatch "${FILESDIR}/0002-Use-ens4v1-instead-of-eth0.patch"
}
src_install() {
insinto "/usr/share/oem/google-compute-daemon/"
doins -r "${S}/usr/share/google/google_daemon/."
}

4
sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/metadata.xml vendored
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
</pkgmetadata>

1
sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/Manifest vendored
View File

@ -1 +0,0 @@
DIST google-startup-scripts-1.3.2.tar.gz 15750 SHA256 e26f70714d9bfc8feba83d44c0881b2c10f54a594bc206e77c03c2f0611a5f39 SHA512 f5c2d4bca4030426dbec9103c0b53cb8c166645ae0d6926bfc318112c6b14743dd2df8834cd35e5f5eb73a4862b709deda50e95018250abf069cac52ec436217 WHIRLPOOL a09f4b169e87301f23688d2404d12e546d19930e87894c79bf5f5253ebc05ed796d49ab3dfe8233de50797ec50afbb0ffc935c881f0f00f975363e5a4189592e

163
sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/files/0001-Allow-location-of-startup-scripts-to-be-overridden.patch vendored
View File

@ -1,163 +0,0 @@
From 73c4917ef66a0be37b625f00d0c38dffe5cbc70c Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Thu, 12 May 2016 14:28:01 -0700
Subject: [PATCH] Allow location of startup scripts to be overridden
---
google-startup-scripts/usr/share/google/fetch_script | 3 ++-
google-startup-scripts/usr/share/google/first-boot | 7 ++++---
google-startup-scripts/usr/share/google/onboot | 19 ++++++++++---------
.../usr/share/google/run-shutdown-scripts | 5 +++--
.../usr/share/google/run-startup-scripts | 5 +++--
5 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/google-startup-scripts/usr/share/google/fetch_script b/google-startup-scripts/usr/share/google/fetch_script
index 72ba9ac..2946a71 100755
--- a/google-startup-scripts/usr/share/google/fetch_script
+++ b/google-startup-scripts/usr/share/google/fetch_script
@@ -24,6 +24,7 @@ fi
declare -r CURL_RETRY_LIMIT=10
declare -r CURL_TIMEOUT=10
+declare -r SCRIPTS_PREFIX=${GOOGLE_SCRIPTS_PREFIX:-/usr/share/google/}
function log() {
echo "$@" | ${LOGGER} -t google -p daemon.info
@@ -109,7 +110,7 @@ function download_url() {
function get_metadata_attribute() {
local readonly varname=$1
- /usr/share/google/get_metadata_value "attributes/${varname}"
+ ${SCRIPTS_PREFIX}/get_metadata_value "attributes/${varname}"
return $?
}
diff --git a/google-startup-scripts/usr/share/google/first-boot b/google-startup-scripts/usr/share/google/first-boot
index b346b65..836857d 100755
--- a/google-startup-scripts/usr/share/google/first-boot
+++ b/google-startup-scripts/usr/share/google/first-boot
@@ -17,6 +17,7 @@
declare -r INSTANCE_FILE=${PREFIX}/var/lib/google/vm-instance-id
declare -r LOCK_FILE=${INSTANCE_FILE}.lock
+declare -r SCRIPTS_PREFIX=${GOOGLE_SCRIPTS_PREFIX:-/usr/share/google/}
mkdir -p ${PREFIX}/var/lib/google/per-instance
@@ -29,7 +30,7 @@ function log() {
}
function get_instance_id() {
- ${PREFIX}/usr/share/google/get_metadata_value id 2>/dev/null
+ ${PREFIX}/${SCRIPTS_PREFIX}/get_metadata_value id 2>/dev/null
}
# Checks the instance id has changed.
@@ -71,8 +72,8 @@ function manage_stored_instance_id() {
log "Running first-boot"
# Regenerate host keys for ssh.
- if [[ -x ${PREFIX}/usr/share/google/regenerate-host-keys ]]; then
- ${PREFIX}/usr/share/google/regenerate-host-keys
+ if [[ -x ${PREFIX}/${SCRIPTS_PREFIX}/regenerate-host-keys ]]; then
+ ${PREFIX}/${SCRIPTS_PREFIX}/regenerate-host-keys
fi
# We are booting this instance for the first time.
diff --git a/google-startup-scripts/usr/share/google/onboot b/google-startup-scripts/usr/share/google/onboot
index 482d384..a3df445 100755
--- a/google-startup-scripts/usr/share/google/onboot
+++ b/google-startup-scripts/usr/share/google/onboot
@@ -33,7 +33,8 @@ else
declare -r LOGGER=/bin/logger
fi
-declare -r BOTO_SETUP_SCRIPT=/usr/share/google/boto/boot_setup.py
+declare -r SCRIPTS_PREFIX=${GOOGLE_SCRIPTS_PREFIX:-/usr/share/google/}
+declare -r BOTO_SETUP_SCRIPT=${SCRIPTS_PREFIX}/boto/boot_setup.py
declare -r GOOGLE_ENVIRONMENT=/var/run/google.environment
function log() {
@@ -42,26 +43,26 @@ function log() {
}
function set_interrupts() {
- if [[ -x /usr/share/google/set-interrupts ]]; then
- /usr/share/google/set-interrupts
+ if [[ -x ${SCRIPTS_PREFIX}/set-interrupts ]]; then
+ ${SCRIPTS_PREFIX}/set-interrupts
fi
}
function virtionet_irq_affinity() {
- if [[ -x /usr/share/google/virtionet-irq-affinity ]]; then
- /usr/share/google/virtionet-irq-affinity
+ if [[ -x ${SCRIPTS_PREFIX}/virtionet-irq-affinity ]]; then
+ ${SCRIPTS_PREFIX}/virtionet-irq-affinity
fi
}
function first_boot() {
- if [[ -x /usr/share/google/first-boot ]]; then
- /usr/share/google/first-boot
+ if [[ -x ${SCRIPTS_PREFIX}/first-boot ]]; then
+ ${SCRIPTS_PREFIX}/first-boot
fi
}
function get_metadata_value() {
local readonly varname=$1
- /usr/share/google/get_metadata_value ${varname}
+ ${SCRIPTS_PREFIX}/get_metadata_value ${varname}
return $?
}
@@ -119,7 +120,7 @@ function check_for_connection() {
log "Checking for metadata server connection."
while true; do
((count++))
- MDS_TRIES=1 /usr/share/google/get_metadata_value "?recursive=True"
+ MDS_TRIES=1 ${SCRIPTS_PREFIX}/get_metadata_value "?recursive=True"
return_code=$?
case ${return_code} in
# No error. Connection is active.
diff --git a/google-startup-scripts/usr/share/google/run-shutdown-scripts b/google-startup-scripts/usr/share/google/run-shutdown-scripts
index 61377e9..b81f49b 100755
--- a/google-startup-scripts/usr/share/google/run-shutdown-scripts
+++ b/google-startup-scripts/usr/share/google/run-shutdown-scripts
@@ -20,6 +20,7 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
declare -r SHUTDOWN_SCRIPT=/var/run/google.shutdown.script
+declare -r SCRIPTS_PREFIX=${GOOGLE_SCRIPTS_PREFIX:-/usr/share/google/}
# NOTE
# Make sure that the shutdown script completes within 90 seconds, so
@@ -27,5 +28,5 @@ declare -r SHUTDOWN_SCRIPT=/var/run/google.shutdown.script
# buffers to disk.
#
# The shutdown script blocks other shutdown operations from proceeding.
-/usr/share/google/fetch_script ${SHUTDOWN_SCRIPT} shutdown
-/usr/share/google/run-scripts ${SHUTDOWN_SCRIPT} shutdown
+${SCRIPTS_PREFIX}/fetch_script ${SHUTDOWN_SCRIPT} shutdown
+${SCRIPTS_PREFIX}/run-scripts ${SHUTDOWN_SCRIPT} shutdown
diff --git a/google-startup-scripts/usr/share/google/run-startup-scripts b/google-startup-scripts/usr/share/google/run-startup-scripts
index b9e2667..c9afddf 100755
--- a/google-startup-scripts/usr/share/google/run-startup-scripts
+++ b/google-startup-scripts/usr/share/google/run-startup-scripts
@@ -19,9 +19,10 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
declare -r STARTUP_SCRIPT=/var/run/google.startup.script
+declare -r SCRIPTS_PREFIX=${GOOGLE_SCRIPTS_PREFIX:-/usr/share/google/}
# Make sure all udev changes settle before running startup scripts.
udevadm settle
-/usr/share/google/fetch_script ${STARTUP_SCRIPT} startup
-/usr/share/google/run-scripts ${STARTUP_SCRIPT} startup
+${SCRIPTS_PREFIX}/fetch_script ${STARTUP_SCRIPT} startup
+${SCRIPTS_PREFIX}/run-scripts ${STARTUP_SCRIPT} startup
--
2.7.3

28
sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.3.2.ebuild vendored
View File

@ -1,28 +0,0 @@
# Copyright (c) 2014 CoreOS, Inc. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils
DESCRIPTION="Google Startup Scripts for Compute Engine"
HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages"
SRC_URI="https://github.com/GoogleCloudPlatform/compute-image-packages/releases/download/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-lang/python-oem"
S="${WORKDIR}"
src_prepare() {
epatch "${FILESDIR}/0001-Allow-location-of-startup-scripts-to-be-overridden.patch"
}
src_install() {
exeinto "/usr/share/oem/google-startup-scripts/"
doexe "${S}"/usr/share/google/*
}

4
sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/metadata.xml vendored
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
</pkgmetadata>

0
sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r6.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r7.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild vendored
View File

@ -16,9 +16,7 @@ IUSE=""
DEPEND=""
RDEPEND="
amd64? (
app-emulation/google-compute-daemon
app-emulation/google-compute-engine
app-emulation/google-startup-scripts
app-emulation/open-vm-tools
app-emulation/wa-linux-agent
coreos-base/nova-agent-container