mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-containers/lxd: drop old
Closes: https://github.com/gentoo/gentoo/pull/36933 Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Brahmajit Das
committed by
Joonas Niilola
Joonas Niilola
parent
781f362f70
commit
5763c7144b
@@ -1,11 +1,5 @@
|
||||
DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
|
||||
DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
|
||||
DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b SHA512 e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
|
||||
DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21 SHA512 884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
|
||||
DIST lxd-5.0.3.tar.gz 16628656 BLAKE2B d24b4b2e40635b109b69196995a434fac26e1ffb023bfd2181588ff7543a9022fcd82a0a4ac84d40a7a3f0dceda0167a55e64c40b91c3719dbbeac6e102dd211 SHA512 87f5d9fbe2cef5970c0a95f61dc615f26e4168202d39f53c7323787a246fa1d6a378c7b957d90f6afd02e048fb3080a06f7202d02652973fb33421f18680d9bf
|
||||
DIST lxd-5.0.3.tar.gz.asc 833 BLAKE2B c6ef26dc8ba4033dbc98367609826389640bfd31da25113f9285dc67b2a69da4fe06a3cacbb83fe5b1b984b5eed8ff3a373d5f88693c2999c10b25a7cfd4cd8d SHA512 424e969de30e4fcfabf65062f387d15bd1cc99ed2c984944c529df92d520b3d5de306a8d444850b3916889d318a88e521d275c62353b25853471efb713d58d18
|
||||
DIST lxd-5.19.tar.gz 22506800 BLAKE2B 94940a9e886d005495f8888d4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386 SHA512 11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f
|
||||
DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1 SHA512 2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed
|
||||
DIST lxd-5.20.tar.gz 22825821 BLAKE2B 616e6659c75e87027883dc6643c8c42cce75f69e7781b93371ca8d00078a7c5086679d70dfd5497ec6be9f917f07d81ef826fc0bdd09317d7b98e435f053c465 SHA512 cf593f967d9d595577ab9b05bad99d04b9c30031461fdd4769f4746e651b3aa8e94fca53548da1aec22ff312a91ff46710ab88043a633fbd78ffafe130fed3e3
|
||||
DIST lxd-5.20.tar.gz.asc 833 BLAKE2B 03d469429fee81e6b061de458eeffe7aacf19ccc1dacb73e2e9cf3530439c82fcd016496aa7757d3ff54af2da7372c5ecf0642b3adddff950065b1ceb1e64103 SHA512 e48af466194523903a472a246dfa81cd67ec4ad7b1be6edb1ce9135945be8a810fca3f98de5a4d8b93390119cb0e4eda78a323d5dea0330b0c92e755781982a3
|
||||
DIST lxd-5.21.1.tar.gz 23753867 BLAKE2B 102f3c83faa956f6a5f052912417f595a7374c13ff1da21e43b76e267908323f3db05aed8b83fb99a0b70ee03af9b1df0551a2c535db146d5ea6f415f7671e7a SHA512 809099d16ffd12b785a03ad3ed527fa6f0c7503a41b7c93d41fd3418d18f8c68c79e5a689c8df2ed4157d434742bfb5cc267a5afb9734091b224be644a3a6958
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
# Group which owns the shared socket
|
||||
LXD_OPTIONS+=" --group lxd"
|
||||
|
||||
# Enable cpu profiling into the specified file
|
||||
#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
|
||||
|
||||
# Enable memory profiling into the specified file
|
||||
#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
|
||||
|
||||
# Enable debug mode
|
||||
#LXD_OPTIONS+=" --debug"
|
||||
|
||||
# For debugging, print a complete stack trace every n seconds
|
||||
#LXD_OPTIONS+=" --print-goroutines-every 5"
|
||||
|
||||
# Enable verbose mode
|
||||
#LXD_OPTIONS+=" -v"
|
||||
|
||||
# Logfile to log to
|
||||
#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
|
||||
|
||||
# Enable syslog logging
|
||||
#LXD_OPTIONS+=" --syslog"
|
||||
@@ -1,12 +0,0 @@
|
||||
[Unit]
|
||||
Description=LXD - unix socket
|
||||
Documentation=man:lxd(1)
|
||||
|
||||
[Socket]
|
||||
ListenStream=/var/lib/lxd/unix.socket
|
||||
SocketGroup=lxd
|
||||
SocketMode=0660
|
||||
Service=lxd.service
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
||||
@@ -1,74 +0,0 @@
|
||||
From cc7bab602e6b967fdd31c5feed0f3f6321c0a0a7 Mon Sep 17 00:00:00 2001
|
||||
From: Luca Barbato <lu_zero@gentoo.org>
|
||||
Date: Fri, 13 Jan 2023 21:43:22 +0000
|
||||
Subject: [PATCH] Fix syscall wrappers
|
||||
|
||||
---
|
||||
lxd/include/syscall_wrappers.h | 7 ++++---
|
||||
lxd/main_nsexec.go | 2 +-
|
||||
shared/idmap/shift_linux.go | 2 +-
|
||||
3 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lxd/include/syscall_wrappers.h b/lxd/include/syscall_wrappers.h
|
||||
index 2c28133a8..a6975ab4d 100644
|
||||
--- a/lxd/include/syscall_wrappers.h
|
||||
+++ b/lxd/include/syscall_wrappers.h
|
||||
@@ -26,10 +26,10 @@ static inline int lxd_close_range(unsigned int fd, unsigned int max_fd, unsigned
|
||||
return syscall(__NR_close_range, fd, max_fd, flags);
|
||||
}
|
||||
|
||||
-static inline int open_tree(int dfd, const char *filename, unsigned int flags)
|
||||
+/* static inline int open_tree(int dfd, const char *filename, unsigned int flags)
|
||||
{
|
||||
return syscall(__NR_open_tree, dfd, filename, flags);
|
||||
-}
|
||||
+}*/
|
||||
|
||||
/*
|
||||
* mount_setattr()
|
||||
@@ -40,7 +40,7 @@ struct lxc_mount_attr {
|
||||
__u64 propagation;
|
||||
__u64 userns_fd;
|
||||
};
|
||||
-
|
||||
+/*
|
||||
static inline int mount_setattr(int dfd, const char *path, unsigned int flags,
|
||||
struct lxc_mount_attr *attr, size_t size)
|
||||
{
|
||||
@@ -53,6 +53,7 @@ static inline int move_mount(int from_dfd, const char *from_pathname, int to_dfd
|
||||
return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd,
|
||||
to_pathname, flags);
|
||||
}
|
||||
+*/
|
||||
|
||||
/* arg1 of prctl() */
|
||||
#ifndef PR_SCHED_CORE
|
||||
diff --git a/lxd/main_nsexec.go b/lxd/main_nsexec.go
|
||||
index f11c0d4cb..753024283 100644
|
||||
--- a/lxd/main_nsexec.go
|
||||
+++ b/lxd/main_nsexec.go
|
||||
@@ -298,7 +298,7 @@ static char *file_to_buf(char *path, ssize_t *length)
|
||||
int mount_detach_idmap(const char *path, int fd_userns)
|
||||
{
|
||||
__do_close int fd_tree = -EBADF;
|
||||
- struct lxc_mount_attr attr = {
|
||||
+ struct mount_attr attr = {
|
||||
.attr_set = MOUNT_ATTR_IDMAP,
|
||||
|
||||
};
|
||||
diff --git a/shared/idmap/shift_linux.go b/shared/idmap/shift_linux.go
|
||||
index daaf37275..e219ac01c 100644
|
||||
--- a/shared/idmap/shift_linux.go
|
||||
+++ b/shared/idmap/shift_linux.go
|
||||
@@ -314,7 +314,7 @@ static int get_userns_fd(void)
|
||||
static int create_detached_idmapped_mount(const char *path)
|
||||
{
|
||||
__do_close int fd_tree = -EBADF, fd_userns = -EBADF;
|
||||
- struct lxc_mount_attr attr = {
|
||||
+ struct mount_attr attr = {
|
||||
.attr_set = MOUNT_ATTR_IDMAP,
|
||||
.propagation = MS_SLAVE,
|
||||
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
[Unit]
|
||||
Description=LXD - main daemon
|
||||
After=network-online.target lxcfs.service lxd.socket
|
||||
Requires=network-online.target lxcfs.service lxd.socket
|
||||
Documentation=man:lxd(1)
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/environment
|
||||
ExecStart=/usr/sbin/lxd --group lxd --syslog
|
||||
ExecStartPost=/usr/sbin/lxd waitready --timeout=600
|
||||
ExecStartPre=/bin/mkdir -p /var/log/lxd
|
||||
ExecStartPre=/bin/chown -R root:lxd /var/log/lxd
|
||||
KillMode=process
|
||||
PermissionsStartOnly=true
|
||||
TimeoutStartSec=600s
|
||||
TimeoutStopSec=30s
|
||||
Restart=on-failure
|
||||
LimitNOFILE=1048576
|
||||
LimitNPROC=infinity
|
||||
TasksMax=infinity
|
||||
|
||||
[Install]
|
||||
Also=lxd-containers.service lxd.socket
|
||||
@@ -1,49 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
DAEMON=/usr/sbin/lxd
|
||||
PIDFILE=/run/lxd.pid
|
||||
|
||||
depend() {
|
||||
need net
|
||||
need lxcfs
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting lxd service"
|
||||
|
||||
modprobe -f loop > /dev/null 2>&1
|
||||
|
||||
# Fix permissions on /var/lib/lxd and make sure it exists.
|
||||
# Create a log directory for lxd with correct permissions.
|
||||
install -d /var/lib/lxd --group lxd --owner root --mode 0775
|
||||
install -d /var/log/lxd --group lxd --owner root
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${DAEMON} \
|
||||
--background \
|
||||
--make-pidfile \
|
||||
-- \
|
||||
${LXD_OPTIONS}
|
||||
eend ${?}
|
||||
}
|
||||
|
||||
stop() {
|
||||
if [ "${RC_CMD}" = restart ]; then
|
||||
ebegin "Stopping lxd service (but not containers)"
|
||||
# start-stop-daemon sends SIGTERM with a timeout of 5s by default.
|
||||
# SIGTERM indicates to LXD that it will be stopped temporarily.
|
||||
# Instances will keep running.
|
||||
start-stop-daemon --stop --quiet -p "${PIDFILE}"
|
||||
eend ${?}
|
||||
else
|
||||
ebegin "Stopping lxd service and containers, waiting 40s"
|
||||
# SIGPWR indicates to LXD that the host is going down.
|
||||
# LXD will do a clean shutdown of all instances.
|
||||
# After 30s all remaining instances will be killed.
|
||||
# We wait up to 40s for LXD.
|
||||
start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
|
||||
eend ${?}
|
||||
fi
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
DAEMON=/usr/sbin/lxd
|
||||
PIDFILE=/run/lxd.pid
|
||||
|
||||
depend() {
|
||||
need net
|
||||
need lxcfs
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting lxd service"
|
||||
|
||||
modprobe -f loop > /dev/null 2>&1
|
||||
|
||||
# Fix permissions on /var/lib/lxd and make sure it exists.
|
||||
# Create a log directory for lxd with correct permissions.
|
||||
install -d /var/lib/lxd --group lxd --owner root --mode 0775
|
||||
install -d /var/log/lxd --group lxd --owner root
|
||||
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${DAEMON} \
|
||||
--background \
|
||||
--make-pidfile \
|
||||
-- \
|
||||
${LXD_OPTIONS}
|
||||
eend ${?}
|
||||
|
||||
# Create necessary systemd paths in order for systemd containers to work on openrc host.
|
||||
# /etc/rc.conf should have following values:
|
||||
# rc_cgroup_mode="hybrid"
|
||||
if [ -d /sys/fs/cgroup/unified ] &&
|
||||
[ ! -d /sys/fs/cgroup/systemd ]; then
|
||||
install -d /sys/fs/cgroup/systemd --group lxd --owner root
|
||||
mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd
|
||||
fi
|
||||
}
|
||||
|
||||
stop() {
|
||||
if [ "${RC_CMD}" = restart ]; then
|
||||
ebegin "Stopping lxd service (but not containers)"
|
||||
# start-stop-daemon sends SIGTERM with a timeout of 5s by default.
|
||||
# SIGTERM indicates to LXD that it will be stopped temporarily.
|
||||
# Instances will keep running.
|
||||
start-stop-daemon --stop --quiet -p "${PIDFILE}"
|
||||
eend ${?}
|
||||
else
|
||||
ebegin "Stopping lxd service and containers, waiting 40s"
|
||||
# SIGPWR indicates to LXD that the host is going down.
|
||||
# LXD will do a clean shutdown of all instances.
|
||||
# After 30s all remaining instances will be killed.
|
||||
# We wait up to 40s for LXD.
|
||||
start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
|
||||
eend ${?}
|
||||
fi
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
diff -Naur a/Makefile b/Makefile
|
||||
--- a/Makefile 2023-01-16 21:10:45.000000000 -0000
|
||||
+++ b/Makefile 2023-01-19 14:52:28.488204725 -0000
|
||||
@@ -248,28 +248,6 @@
|
||||
.PHONY: build-mo
|
||||
build-mo: $(MOFILES)
|
||||
|
||||
-.PHONY: static-analysis
|
||||
-static-analysis:
|
||||
-ifeq ($(shell command -v golangci-lint 2> /dev/null),)
|
||||
- go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2
|
||||
-endif
|
||||
-ifeq ($(shell command -v shellcheck 2> /dev/null),)
|
||||
- echo "Please install shellcheck"
|
||||
- exit 1
|
||||
-endif
|
||||
-ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0"
|
||||
- @echo "WARN: shellcheck version is not 0.8.0"
|
||||
-endif
|
||||
-ifeq ($(shell command -v flake8 2> /dev/null),)
|
||||
- echo "Please install flake8"
|
||||
- exit 1
|
||||
-endif
|
||||
- golangci-lint run --timeout 5m
|
||||
- flake8 test/deps/import-busybox
|
||||
- shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh test/backends/*.sh test/lint/*.sh
|
||||
- shellcheck test/extras/*.sh
|
||||
- run-parts --regex '.sh' test/lint
|
||||
-
|
||||
.PHONY: tags
|
||||
tags: *.go lxd/*.go shared/*.go lxc/*.go
|
||||
find . -type f -name '*.go' | xargs gotags > tags
|
||||
@@ -1,16 +0,0 @@
|
||||
[Unit]
|
||||
Description=LXD - container startup/shutdown
|
||||
Documentation=man:lxd(1)
|
||||
After=lxd.socket lxd.service
|
||||
Requires=lxd.socket
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/sbin/lxd activateifneeded
|
||||
ExecStop=/usr/sbin/lxd shutdown
|
||||
TimeoutStartSec=600s
|
||||
TimeoutStopSec=600s
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,186 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
|
||||
|
||||
DESCRIPTION="Fast, dense and secure container management"
|
||||
HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
|
||||
SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
|
||||
verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0/lts"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
IUSE="apparmor ipv6 nls verify-sig"
|
||||
|
||||
DEPEND="acct-group/lxd
|
||||
app-arch/xz-utils
|
||||
>=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
|
||||
dev-db/sqlite:3
|
||||
dev-libs/dqlite
|
||||
dev-libs/lzo
|
||||
dev-libs/raft[lz4]
|
||||
>=dev-util/xdelta-3.0[lzma(+)]
|
||||
net-dns/dnsmasq[dhcp,ipv6(+)?]
|
||||
sys-libs/libcap
|
||||
virtual/udev"
|
||||
RDEPEND="${DEPEND}
|
||||
|| (
|
||||
net-firewall/nftables[json]
|
||||
(
|
||||
net-firewall/ebtables
|
||||
net-firewall/iptables[ipv6(+)?]
|
||||
)
|
||||
)
|
||||
sys-apps/iproute2[ipv6(+)?]
|
||||
sys-fs/fuse:*
|
||||
sys-fs/lxcfs
|
||||
sys-fs/squashfs-tools[lzma]
|
||||
virtual/acl"
|
||||
BDEPEND="dev-lang/go
|
||||
nls? ( sys-devel/gettext )
|
||||
verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
|
||||
|
||||
CONFIG_CHECK="
|
||||
~CGROUPS
|
||||
~IPC_NS
|
||||
~NET_NS
|
||||
~PID_NS
|
||||
|
||||
~SECCOMP
|
||||
~USER_NS
|
||||
~UTS_NS
|
||||
|
||||
~KVM
|
||||
~MACVTAP
|
||||
~VHOST_VSOCK
|
||||
"
|
||||
|
||||
ERROR_IPC_NS="CONFIG_IPC_NS is required."
|
||||
ERROR_NET_NS="CONFIG_NET_NS is required."
|
||||
ERROR_PID_NS="CONFIG_PID_NS is required."
|
||||
ERROR_SECCOMP="CONFIG_SECCOMP is required."
|
||||
ERROR_UTS_NS="CONFIG_UTS_NS is required."
|
||||
|
||||
WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
|
||||
WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
|
||||
WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
|
||||
|
||||
# Go magic.
|
||||
QA_PREBUILT="/usr/bin/fuidshift
|
||||
/usr/bin/lxc
|
||||
/usr/bin/lxc-to-lxd
|
||||
/usr/bin/lxd-agent
|
||||
/usr/bin/lxd-benchmark
|
||||
/usr/bin/lxd-p2c
|
||||
/usr/sbin/lxd"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
|
||||
|
||||
# The testsuite must be run as root.
|
||||
# make: *** [Makefile:156: check] Error 1
|
||||
RESTRICT="test"
|
||||
|
||||
GOPATH="${S}/_dist"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/lxd-4.0.9-glibc-2.36-fix.patch )
|
||||
|
||||
src_prepare() {
|
||||
export GOPATH="${S}/_dist"
|
||||
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
|
||||
-e "s:make:make ${MAKEOPTS}:g" \
|
||||
Makefile || die
|
||||
|
||||
# Fix hardcoded ovmf file path, see bug 763180
|
||||
sed -i \
|
||||
-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
|
||||
-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
|
||||
doc/environment.md \
|
||||
lxd/apparmor/instance.go \
|
||||
lxd/apparmor/instance_qemu.go \
|
||||
lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
|
||||
|
||||
# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
|
||||
sed -i \
|
||||
-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
|
||||
lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
|
||||
|
||||
cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
|
||||
if use apparmor; then
|
||||
sed -i \
|
||||
'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
|
||||
"${T}"/lxd.service || die
|
||||
fi
|
||||
|
||||
# Disable -Werror's from go modules.
|
||||
find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() {
|
||||
export GOPATH="${S}/_dist"
|
||||
export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
|
||||
|
||||
for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
|
||||
go install -v -x "${S}/${k}" || die "failed compiling ${k}"
|
||||
done
|
||||
|
||||
go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon"
|
||||
|
||||
# Needs to be built statically
|
||||
CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-p2c
|
||||
CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent
|
||||
|
||||
use nls && emake build-mo
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
export GOPATH="${S}/_dist"
|
||||
local bindir="_dist/bin"
|
||||
|
||||
dosbin ${bindir}/lxd
|
||||
|
||||
for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
|
||||
dobin ${bindir}/${l}
|
||||
done
|
||||
|
||||
newbashcomp scripts/bash/lxd-client lxc
|
||||
|
||||
newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
|
||||
newinitd "${FILESDIR}"/lxd-4.0.9.initd lxd
|
||||
|
||||
systemd_dounit "${T}"/lxd.service
|
||||
systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
|
||||
systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
|
||||
|
||||
dodoc AUTHORS doc/*
|
||||
use nls && domo po/*.mo
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
|
||||
elog "including a Quick Start."
|
||||
elog "For virtual machine support, see:"
|
||||
elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines"
|
||||
elog
|
||||
elog "Please run 'lxc-checkconfig' to see all optional kernel features."
|
||||
elog
|
||||
optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
|
||||
optfeature "btrfs storage backend" sys-fs/btrfs-progs
|
||||
optfeature "lvm2 storage backend" sys-fs/lvm2
|
||||
optfeature "zfs storage backend" sys-fs/zfs
|
||||
elog
|
||||
elog "Be sure to add your local user to the lxd group."
|
||||
}
|
||||
@@ -1,211 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
|
||||
|
||||
DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
|
||||
HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd"
|
||||
SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
|
||||
verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
|
||||
|
||||
LICENSE="Apache-2.0 BSD LGPL-3 MIT"
|
||||
SLOT="0/lts"
|
||||
KEYWORDS="amd64 ~arm64 ~x86"
|
||||
IUSE="apparmor nls"
|
||||
|
||||
DEPEND="acct-group/lxd
|
||||
app-arch/xz-utils
|
||||
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
|
||||
dev-db/sqlite:3
|
||||
>=dev-libs/dqlite-1.16.4:=[lz4]
|
||||
dev-libs/lzo
|
||||
>=dev-util/xdelta-3.0[lzma(+)]
|
||||
net-dns/dnsmasq[dhcp]
|
||||
sys-libs/libcap
|
||||
virtual/udev"
|
||||
RDEPEND="${DEPEND}
|
||||
|| (
|
||||
net-firewall/nftables[json]
|
||||
(
|
||||
net-firewall/ebtables
|
||||
net-firewall/iptables
|
||||
)
|
||||
)
|
||||
sys-apps/iproute2
|
||||
sys-fs/fuse:*
|
||||
>=sys-fs/lxcfs-5.0.0
|
||||
sys-fs/squashfs-tools[lzma]
|
||||
virtual/acl"
|
||||
BDEPEND="dev-lang/go
|
||||
nls? ( sys-devel/gettext )
|
||||
verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
|
||||
|
||||
CONFIG_CHECK="
|
||||
~CGROUPS
|
||||
~IPC_NS
|
||||
~NET_NS
|
||||
~PID_NS
|
||||
|
||||
~SECCOMP
|
||||
~USER_NS
|
||||
~UTS_NS
|
||||
|
||||
~KVM
|
||||
~MACVTAP
|
||||
~VHOST_VSOCK
|
||||
"
|
||||
|
||||
ERROR_IPC_NS="CONFIG_IPC_NS is required."
|
||||
ERROR_NET_NS="CONFIG_NET_NS is required."
|
||||
ERROR_PID_NS="CONFIG_PID_NS is required."
|
||||
ERROR_SECCOMP="CONFIG_SECCOMP is required."
|
||||
ERROR_UTS_NS="CONFIG_UTS_NS is required."
|
||||
|
||||
WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
|
||||
WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
|
||||
WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
|
||||
|
||||
# Go magic.
|
||||
QA_PREBUILT="/usr/bin/fuidshift
|
||||
/usr/bin/lxc
|
||||
/usr/bin/lxc-to-lxd
|
||||
/usr/bin/lxd-agent
|
||||
/usr/bin/lxd-benchmark
|
||||
/usr/bin/lxd-migrate
|
||||
/usr/sbin/lxd"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
|
||||
|
||||
# The testsuite must be run as root.
|
||||
# make: *** [Makefile:156: check] Error 1
|
||||
RESTRICT="test"
|
||||
|
||||
GOPATH="${S}/_dist"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/lxd-5.0.2-remove-shellcheck-buildsystem-checks.patch
|
||||
"${FILESDIR}"/lxd-5.0.3-btrfs-quota-group-fix.patch )
|
||||
|
||||
src_prepare() {
|
||||
export GOPATH="${S}/_dist"
|
||||
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
|
||||
-e "s:make:make ${MAKEOPTS}:g" \
|
||||
Makefile || die
|
||||
|
||||
# Fix hardcoded ovmf file path, see bug 763180
|
||||
sed -i \
|
||||
-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
|
||||
-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
|
||||
doc/environment.md \
|
||||
lxd/apparmor/instance.go \
|
||||
lxd/apparmor/instance_qemu.go \
|
||||
lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
|
||||
|
||||
# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
|
||||
sed -i \
|
||||
-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
|
||||
lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
|
||||
|
||||
cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
|
||||
if use apparmor; then
|
||||
sed -i \
|
||||
'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
|
||||
"${T}"/lxd.service || die
|
||||
fi
|
||||
|
||||
# Disable -Werror's from go modules.
|
||||
find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() {
|
||||
export GOPATH="${S}/_dist"
|
||||
export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
|
||||
|
||||
for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
|
||||
go install -v -x "${S}/${k}" || die "failed compiling ${k}"
|
||||
done
|
||||
|
||||
go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon"
|
||||
|
||||
# Needs to be built statically
|
||||
CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
|
||||
CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent
|
||||
|
||||
use nls && emake build-mo
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
export GOPATH="${S}/_dist"
|
||||
local bindir="_dist/bin"
|
||||
|
||||
dosbin ${bindir}/lxd
|
||||
|
||||
for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do
|
||||
dobin ${bindir}/${l}
|
||||
done
|
||||
|
||||
newbashcomp scripts/bash/lxd-client lxc
|
||||
|
||||
newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
|
||||
newinitd "${FILESDIR}"/lxd-5.0.2-r1.initd lxd
|
||||
|
||||
systemd_dounit "${T}"/lxd.service
|
||||
systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
|
||||
systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
|
||||
|
||||
dodoc AUTHORS
|
||||
dodoc -r doc/*
|
||||
use nls && domo po/*.mo
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
|
||||
elog "including a Quick Start."
|
||||
elog "For virtual machine support, see:"
|
||||
elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines"
|
||||
elog
|
||||
elog "Please run 'lxc-checkconfig' to see all optional kernel features."
|
||||
elog
|
||||
optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
|
||||
optfeature "btrfs storage backend" sys-fs/btrfs-progs
|
||||
optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
|
||||
optfeature "full lxd-migrate support" net-misc/rsync
|
||||
optfeature "lvm2 storage backend" sys-fs/lvm2
|
||||
optfeature "zfs storage backend" sys-fs/zfs
|
||||
elog
|
||||
elog "Be sure to add your local user to the lxd group."
|
||||
|
||||
if [[ ${REPLACING_VERSIONS} ]] &&
|
||||
ver_test ${REPLACING_VERSIONS} -lt 5.0.1 &&
|
||||
has_version app-emulation/qemu[spice,usbredir,virtfs]; then
|
||||
ewarn ""
|
||||
ewarn "You're updating from <5.0.1. Due to incompatible API updates in the lxd-agent"
|
||||
ewarn "product, you'll have to restart any running virtual machines before they work"
|
||||
ewarn "properly."
|
||||
ewarn ""
|
||||
ewarn "Run: 'lxc restart your-vm' after the update for your vm's managed by lxd."
|
||||
ewarn ""
|
||||
fi
|
||||
|
||||
if [[ ${REPLACING_VERSIONS} ]] &&
|
||||
has_version "sys-apps/openrc"; then
|
||||
elog ""
|
||||
elog "The new init.d script will attempt to mount "
|
||||
elog " /sys/fs/cgroup/systemd"
|
||||
elog "by default, which is needed to run systemd containers with openrc host."
|
||||
elog "See the /etc/init.d/lxd file for requirements."
|
||||
elog ""
|
||||
fi
|
||||
}
|
||||
@@ -1,187 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
|
||||
|
||||
DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
|
||||
HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd"
|
||||
SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
|
||||
verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
|
||||
)"
|
||||
|
||||
LICENSE="Apache-2.0 BSD LGPL-3 MIT"
|
||||
SLOT="0/stable"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
IUSE="apparmor nls"
|
||||
|
||||
DEPEND="acct-group/lxd
|
||||
app-arch/xz-utils
|
||||
>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
|
||||
dev-db/sqlite:3
|
||||
>=dev-libs/dqlite-1.16.4:=[lz4]
|
||||
dev-libs/lzo
|
||||
>=dev-util/xdelta-3.0[lzma(+)]
|
||||
net-dns/dnsmasq[dhcp]
|
||||
sys-libs/libcap
|
||||
virtual/udev"
|
||||
RDEPEND="${DEPEND}
|
||||
|| (
|
||||
net-firewall/nftables[json]
|
||||
(
|
||||
net-firewall/ebtables
|
||||
net-firewall/iptables
|
||||
)
|
||||
)
|
||||
sys-apps/iproute2
|
||||
sys-fs/fuse:3
|
||||
>=sys-fs/lxcfs-5.0.0
|
||||
sys-fs/squashfs-tools[lzma]
|
||||
virtual/acl"
|
||||
BDEPEND="dev-lang/go
|
||||
nls? ( sys-devel/gettext )
|
||||
verify-sig? ( sec-keys/openpgp-keys-canonical )"
|
||||
|
||||
CONFIG_CHECK="
|
||||
~CGROUPS
|
||||
~IPC_NS
|
||||
~NET_NS
|
||||
~PID_NS
|
||||
|
||||
~SECCOMP
|
||||
~USER_NS
|
||||
~UTS_NS
|
||||
|
||||
~KVM
|
||||
~MACVTAP
|
||||
~VHOST_VSOCK
|
||||
"
|
||||
|
||||
ERROR_IPC_NS="CONFIG_IPC_NS is required."
|
||||
ERROR_NET_NS="CONFIG_NET_NS is required."
|
||||
ERROR_PID_NS="CONFIG_PID_NS is required."
|
||||
ERROR_SECCOMP="CONFIG_SECCOMP is required."
|
||||
ERROR_UTS_NS="CONFIG_UTS_NS is required."
|
||||
|
||||
WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
|
||||
WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
|
||||
WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
|
||||
|
||||
# Go magic.
|
||||
QA_PREBUILT="/usr/bin/fuidshift
|
||||
/usr/bin/lxc
|
||||
/usr/bin/lxc-to-lxd
|
||||
/usr/bin/lxd-agent
|
||||
/usr/bin/lxd-benchmark
|
||||
/usr/bin/lxd-migrate
|
||||
/usr/sbin/lxd"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/canonical.asc
|
||||
|
||||
# The testsuite must be run as root.
|
||||
# make: *** [Makefile:156: check] Error 1
|
||||
RESTRICT="test"
|
||||
|
||||
GOPATH="${S}/_dist"
|
||||
|
||||
src_prepare() {
|
||||
export GOPATH="${S}/_dist"
|
||||
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
|
||||
-e "s:make:make ${MAKEOPTS}:g" \
|
||||
Makefile || die
|
||||
|
||||
# Fix hardcoded ovmf file path, see bug 763180
|
||||
sed -i \
|
||||
-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
|
||||
-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
|
||||
doc/environment.md \
|
||||
lxd/apparmor/instance.go \
|
||||
lxd/apparmor/instance_qemu.go \
|
||||
lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
|
||||
|
||||
# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
|
||||
sed -i \
|
||||
-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
|
||||
lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
|
||||
|
||||
cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
|
||||
if use apparmor; then
|
||||
sed -i \
|
||||
'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
|
||||
"${T}"/lxd.service || die
|
||||
fi
|
||||
|
||||
# Disable -Werror's from go modules.
|
||||
find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() {
|
||||
export GOPATH="${S}/_dist"
|
||||
export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
|
||||
|
||||
for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
|
||||
go install -v -x "${S}/${k}" || die "failed compiling ${k}"
|
||||
done
|
||||
|
||||
go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon"
|
||||
|
||||
# Needs to be built statically
|
||||
CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
|
||||
CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent
|
||||
|
||||
use nls && emake build-mo
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
export GOPATH="${S}/_dist"
|
||||
local bindir="_dist/bin"
|
||||
|
||||
dosbin ${bindir}/lxd
|
||||
|
||||
for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do
|
||||
dobin ${bindir}/${l}
|
||||
done
|
||||
|
||||
newbashcomp scripts/bash/lxd-client lxc
|
||||
|
||||
newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
|
||||
newinitd "${FILESDIR}"/lxd-5.0.2-r1.initd lxd
|
||||
|
||||
systemd_dounit "${T}"/lxd.service
|
||||
systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
|
||||
systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
|
||||
|
||||
dodoc AUTHORS
|
||||
dodoc -r doc/*
|
||||
use nls && domo po/*.mo
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
|
||||
elog "including a Quick Start."
|
||||
elog "For virtual machine support, see:"
|
||||
elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines"
|
||||
elog
|
||||
elog "Please run 'lxc-checkconfig' to see all optional kernel features."
|
||||
elog
|
||||
optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
|
||||
optfeature "btrfs storage backend" sys-fs/btrfs-progs
|
||||
optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
|
||||
optfeature "full lxd-migrate support" net-misc/rsync
|
||||
optfeature "lvm2 storage backend" sys-fs/lvm2
|
||||
optfeature "zfs storage backend" sys-fs/zfs
|
||||
elog
|
||||
elog "Be sure to add your local user to the lxd group."
|
||||
}
|
||||
Reference in New Issue
Block a user