From ddcb8119f35d02596eb98711cf668a61d9974635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Deckert?= Date: Fri, 5 Feb 2021 16:09:03 +0100 Subject: [PATCH] fixes to avoid lots of error messages - disable cgroups portage feature - allow CAP_NET_ADMIN for the use of systemd-nspawn (https://github.com/systemd/systemd/issues/13308) --- Makefile | 1 + configs/make.conf.amd64 | 2 +- configs/make.conf.x86 | 2 +- scripts/RUN | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3fc1452..21a2a0d 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ export PATH CHROOT container PORTAGE_DIR VA_PKGDIR DISTDIR VA_ARCH inroot := systemd-nspawn --quiet \ --directory=$(CHROOT) \ --machine=$(container) \ + --capability=CAP_NET_ADMIN \ --bind=$(PORTAGE_DIR):/var/db/repos/gentoo \ --bind=$(VA_PKGDIR):/var/cache/binpkgs \ --bind=$(DISTDIR):/var/cache/distfiles diff --git a/configs/make.conf.amd64 b/configs/make.conf.amd64 index 8f1d8d0..04f945b 100644 --- a/configs/make.conf.amd64 +++ b/configs/make.conf.amd64 @@ -9,7 +9,7 @@ EMERGE_WARNING_DELAY="0" AUTO_CLEAN="yes" EPAUSE_IGNORE="1" EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n" -FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch binpkg-multi-instance cgroup" +FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch binpkg-multi-instance -cgroup" CURL_SSL="openssl" PYTHON_TARGETS="python3_8" INSTALL_MASK="/etc/default/grub /etc/locale.gen /etc/fstab /etc/issue /usr/share/doc" diff --git a/configs/make.conf.x86 b/configs/make.conf.x86 index abf442e..1bed07a 100644 --- a/configs/make.conf.x86 +++ b/configs/make.conf.x86 @@ -9,7 +9,7 @@ EMERGE_WARNING_DELAY="0" AUTO_CLEAN="yes" EPAUSE_IGNORE="1" EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n" -FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch binpkg-multi-instance cgroup" +FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch binpkg-multi-instance -cgroup" CURL_SSL="openssl" PYTHON_TARGETS="python3_8" ABI_X86="32" diff --git a/scripts/RUN b/scripts/RUN index 0439c20..29ef803 100755 --- a/scripts/RUN +++ b/scripts/RUN @@ -12,6 +12,7 @@ def main(): "--quiet", f"--directory={environ['CHROOT']}", f"--machine={environ['container']}", + f"--capability=CAP_NET_ADMIN", f"--bind={environ['PORTAGE_DIR']}:/var/db/repos/gentoo", f"--bind={environ['VA_PKGDIR']}:/var/cache/binpkgs", f"--bind={environ['DISTDIR']}:/var/cache/distfiles",