Skip to content

Commit

Permalink
app-containers/incus: don't install fuidshift binary
Browse files Browse the repository at this point in the history
 - fuidshift is a nice extra tool but not critical to incus (or lxd).
   This makes installing incus and lxd parallel possible. Fuidshift
   can still be gotten from lxd. This change is also the initial step
   required to get lxd-to-incus tool working, arriving most likely on
   next incus version (upstream issue #166).

Signed-off-by: Joonas Niilola <juippis@gentoo.org>
  • Loading branch information
juippis committed Oct 14, 2023
1 parent 4b669c2 commit 3e2a74f
Showing 1 changed file with 2 additions and 4 deletions.
Expand Up @@ -15,7 +15,6 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="apparmor nls"

# incus conflicts with lxd due to fuidshift binary. Even if you replace the package, containers will remain.
DEPEND="acct-group/incus
acct-group/incus-admin
app-arch/xz-utils
Expand All @@ -29,7 +28,6 @@ DEPEND="acct-group/incus
sys-libs/libcap
virtual/udev"
RDEPEND="${DEPEND}
!app-containers/lxd
net-firewall/ebtables
net-firewall/iptables
sys-apps/iproute2
Expand Down Expand Up @@ -125,7 +123,7 @@ src_compile() {
export CGO_LDFLAGS_ALLOW="-Wl,-z,now"

# lxd-to-incus: this go module is packaged separately (0.1).
for k in fuidshift incus-benchmark incus-user incus lxc-to-incus ; do
for k in incus-benchmark incus-user incus lxc-to-incus ; do
go install -v -x "${S}/cmd/${k}" || die "failed compiling ${k}"
done

Expand All @@ -148,7 +146,7 @@ src_install() {

dosbin ${bindir}/incusd

for l in fuidshift incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do
for l in incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do
dobin ${bindir}/${l}
done

Expand Down

0 comments on commit 3e2a74f

Please sign in to comment.