VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

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)
This commit is contained in:
Jörg Deckert 2021-02-05 16:09:03 +01:00
parent 5431e748e5
commit ddcb8119f3
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -74,6 +74,7 @@ export PATH CHROOT container PORTAGE_DIR VA_PKGDIR DISTDIR VA_ARCH
inroot := systemd-nspawn --quiet \ inroot := systemd-nspawn --quiet \
--directory=$(CHROOT) \ --directory=$(CHROOT) \
--machine=$(container) \ --machine=$(container) \
--capability=CAP_NET_ADMIN \
--bind=$(PORTAGE_DIR):/var/db/repos/gentoo \ --bind=$(PORTAGE_DIR):/var/db/repos/gentoo \
--bind=$(VA_PKGDIR):/var/cache/binpkgs \ --bind=$(VA_PKGDIR):/var/cache/binpkgs \
--bind=$(DISTDIR):/var/cache/distfiles --bind=$(DISTDIR):/var/cache/distfiles

2
configs/make.conf.amd64
View File

@ -9,7 +9,7 @@ EMERGE_WARNING_DELAY="0"
AUTO_CLEAN="yes" AUTO_CLEAN="yes"
EPAUSE_IGNORE="1" EPAUSE_IGNORE="1"
EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n" 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" CURL_SSL="openssl"
PYTHON_TARGETS="python3_8" PYTHON_TARGETS="python3_8"
INSTALL_MASK="/etc/default/grub /etc/locale.gen /etc/fstab /etc/issue /usr/share/doc" INSTALL_MASK="/etc/default/grub /etc/locale.gen /etc/fstab /etc/issue /usr/share/doc"

2
configs/make.conf.x86
View File

@ -9,7 +9,7 @@ EMERGE_WARNING_DELAY="0"
AUTO_CLEAN="yes" AUTO_CLEAN="yes"
EPAUSE_IGNORE="1" EPAUSE_IGNORE="1"
EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n" 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" CURL_SSL="openssl"
PYTHON_TARGETS="python3_8" PYTHON_TARGETS="python3_8"
ABI_X86="32" ABI_X86="32"

1
scripts/RUN
View File

@ -12,6 +12,7 @@ def main():
"--quiet", "--quiet",
f"--directory={environ['CHROOT']}", f"--directory={environ['CHROOT']}",
f"--machine={environ['container']}", f"--machine={environ['container']}",
f"--capability=CAP_NET_ADMIN",
f"--bind={environ['PORTAGE_DIR']}:/var/db/repos/gentoo", f"--bind={environ['PORTAGE_DIR']}:/var/db/repos/gentoo",
f"--bind={environ['VA_PKGDIR']}:/var/cache/binpkgs", f"--bind={environ['VA_PKGDIR']}:/var/cache/binpkgs",
f"--bind={environ['DISTDIR']}:/var/cache/distfiles", f"--bind={environ['DISTDIR']}:/var/cache/distfiles",