1
0
mirror of https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git synced 2025-12-14 19:02:45 +03:00

Move cloud libs deeper.

This commit is contained in:
Jake Buchholz Göktürk 2023-04-30 14:55:51 -07:00
parent 81869cefcc
commit fb2d658d93
11 changed files with 18 additions and 16 deletions

View File

@ -37,24 +37,24 @@ openrc:
aws:
install -Dm755 -t "$(PREFIX)"/lib/mdev \
lib/mdev/nvme-ebs-links
install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/aws \
lib/tiny-cloud/aws/*
install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/cloud/aws \
lib/tiny-cloud/cloud/aws/*
azure:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/azure \
lib/tiny-cloud/azure/*
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/azure \
lib/tiny-cloud/cloud/azure/*
gcp:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/gcp \
lib/tiny-cloud/gcp/*
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/gcp \
lib/tiny-cloud/cloud/gcp/*
oci:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/oci \
lib/tiny-cloud/oci/*
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/oci \
lib/tiny-cloud/cloud/oci/*
nocloud:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/nocloud \
lib/tiny-cloud/nocloud/*
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/nocloud \
lib/tiny-cloud/cloud/nocloud/*
check: tests/Kyuafile Kyuafile
kyua test || (kyua report --verbose && exit 1)

View File

@ -11,6 +11,8 @@
## FUTURE
* cloud auto-detection
* `imds-net-sync` improvements
* Feature parity with current [amazon-ec2-net-utils](
https://github.com/amazonlinux/amazon-ec2-net-utils)

View File

@ -84,10 +84,10 @@ _imds_nic_index() { cat "/sys/class/net/$1/address"; }
### load cloud-specific variables and functions
if [ ! -d "$LIBDIR"/tiny-cloud/"$CLOUD" ]; then
if [ ! -d "$LIBDIR"/tiny-cloud/cloud/"$CLOUD" ]; then
echo "ERROR: Unknown Cloud '$CLOUD'" >&2
fi
. "$LIBDIR"/tiny-cloud/"$CLOUD"/imds
. "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/imds
### non-overrideable functions

View File

@ -155,8 +155,8 @@ run_userdata() {
# load cloud-specific init functions / vars
: "${LIBDIR:=$PREFIX/lib}"
if [ -f "$LIBDIR"/tiny-cloud/"$CLOUD"/init ]; then
. "$LIBDIR"/tiny-cloud/"$CLOUD"/init
if [ -f "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/init ]; then
. "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/init
fi

View File

@ -34,6 +34,6 @@ mod__vnic_eth_hotplug() {
# load cloud-specific functions
: "${LIBDIR:=$PREFIX/lib}"
if [ -f "$LIBDIR"/tiny-cloud/"$CLOUD"/mdev ]; then
. "$LIBDIR"/tiny-cloud/"$CLOUD"/mdev
if [ -f "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/mdev ]; then
. "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/mdev
fi