1
0
mirror of https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git synced 2025-12-15 11:22:43 +03:00

enact /usr merge

This commit is contained in:
Jake Buchholz Göktürk 2024-11-07 16:21:05 +00:00
parent 8355e324af
commit 0548b418ec
7 changed files with 19 additions and 23 deletions

View File

@ -7,20 +7,20 @@ SUBPACKAGES = core openrc aws azure gcp hetzner incus nocloud oci scaleway
install: $(SUBPACKAGES) install: $(SUBPACKAGES)
core: core:
install -Dm755 -t "$(PREFIX)"/bin \ install -Dm755 -t "$(PREFIX)"/usr/bin \
bin/imds bin/imds
install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud \
lib/tiny-cloud/common \ lib/tiny-cloud/common \
lib/tiny-cloud/init \ lib/tiny-cloud/init \
lib/tiny-cloud/tiny-cloud.conf lib/tiny-cloud/tiny-cloud.conf
install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/user-data \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/user-data \
lib/tiny-cloud/user-data/alpine-config \ lib/tiny-cloud/user-data/alpine-config \
lib/tiny-cloud/user-data/missing \ lib/tiny-cloud/user-data/missing \
lib/tiny-cloud/user-data/script \ lib/tiny-cloud/user-data/script \
lib/tiny-cloud/user-data/unknown lib/tiny-cloud/user-data/unknown
install -Dm644 lib/tiny-cloud/tiny-cloud.conf \ install -Dm644 lib/tiny-cloud/tiny-cloud.conf \
"$(PREFIX)"/etc/tiny-cloud.conf "$(PREFIX)"/etc/tiny-cloud.conf
install -Dm755 -t "$(PREFIX)"/sbin \ install -Dm755 -t "$(PREFIX)"/usr/sbin \
sbin/tiny-cloud sbin/tiny-cloud
openrc: openrc:
@ -28,40 +28,40 @@ openrc:
dist/openrc/* dist/openrc/*
aws: aws:
install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/cloud/aws \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/aws \
lib/tiny-cloud/cloud/aws/* lib/tiny-cloud/cloud/aws/*
azure: azure:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/azure \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/azure \
lib/tiny-cloud/cloud/azure/* lib/tiny-cloud/cloud/azure/*
gcp: gcp:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/gcp \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/gcp \
lib/tiny-cloud/cloud/gcp/* lib/tiny-cloud/cloud/gcp/*
hetzner: hetzner:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/hetzner \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/hetzner \
lib/tiny-cloud/cloud/hetzner/* lib/tiny-cloud/cloud/hetzner/*
incus: incus:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/incus \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/incus \
lib/tiny-cloud/cloud/incus/imds lib/tiny-cloud/cloud/incus/imds
install -Dm755 -t $(PREFIX)/lib/tiny-cloud/cloud/incus \ install -Dm755 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/incus \
lib/tiny-cloud/cloud/incus/autodetect lib/tiny-cloud/cloud/incus/autodetect
nocloud: nocloud:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/nocloud \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/nocloud \
lib/tiny-cloud/cloud/nocloud/init \ lib/tiny-cloud/cloud/nocloud/init \
lib/tiny-cloud/cloud/nocloud/imds lib/tiny-cloud/cloud/nocloud/imds
install -Dm755 -t $(PREFIX)/lib/tiny-cloud/cloud/nocloud \ install -Dm755 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/nocloud \
lib/tiny-cloud/cloud/nocloud/autodetect lib/tiny-cloud/cloud/nocloud/autodetect
oci: oci:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/oci \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/oci \
lib/tiny-cloud/cloud/oci/* lib/tiny-cloud/cloud/oci/*
scaleway: scaleway:
install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/scaleway \ install -Dm644 -t "$(PREFIX)"/usr/lib/tiny-cloud/cloud/scaleway \
lib/tiny-cloud/cloud/scaleway/* lib/tiny-cloud/cloud/scaleway/*
check: tests/Kyuafile Kyuafile check: tests/Kyuafile Kyuafile

View File

@ -5,6 +5,7 @@
### configuration, common functions ### configuration, common functions
: "${PREFIX:=/usr}"
: "${LIBDIR:=$PREFIX/lib}" : "${LIBDIR:=$PREFIX/lib}"
. "$LIBDIR/tiny-cloud/common" . "$LIBDIR/tiny-cloud/common"

View File

@ -1,4 +0,0 @@
auto %%
iface %%
use dhcp
use imds

View File

@ -1,4 +0,0 @@
auto lo
iface lo
use link
use loopback

View File

@ -3,6 +3,7 @@
# shellcheck shell=sh # shellcheck shell=sh
# set defaults # set defaults
: "${PREFIX:=/usr}"
: "${LIBDIR:=$PREFIX/lib}" : "${LIBDIR:=$PREFIX/lib}"
. "$LIBDIR/tiny-cloud/common" . "$LIBDIR/tiny-cloud/common"

View File

@ -4,6 +4,7 @@
# NOTE: alpine-config extends cloud-config # NOTE: alpine-config extends cloud-config
: "${PREFIX:=/usr}"
: "${LIBDIR:=$PREFIX/lib}" : "${LIBDIR:=$PREFIX/lib}"
. "${LIBDIR}/tiny-cloud/user-data/cloud-config" . "${LIBDIR}/tiny-cloud/user-data/cloud-config"

View File

@ -5,6 +5,7 @@
set -e set -e
: "${PREFIX:=/usr}"
: "${LIBDIR:=$PREFIX/lib}" : "${LIBDIR:=$PREFIX/lib}"
. "$LIBDIR/tiny-cloud/common" . "$LIBDIR/tiny-cloud/common"