From 5b03566d3b182febad29391d525b1b55e9a1a212 Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Thu, 24 Oct 2019 02:15:23 +0200 Subject: Virtualization --- extraconf/local.conf | 3 --- extraconf/local.conf.disabled | 3 +++ make.conf | 17 +++++++++++++++-- package.keywords/sorcery.keywords | 2 +- package.keywords/unstable-virt.keywords | 12 ++++++++++++ package.keywords/unstable.keywords | 14 +++++++++++--- package.keywords/update-bugs.keywords | 3 +++ package.mask/manual.mask | 2 +- package.mask/problems.mask | 1 + package.use/config_bindings.use | 1 + package.use/config_vm.keywords | 2 ++ sets/admin-vm | 4 ++++ sets/desktop-apps | 1 + sets/dev-scipy | 2 ++ 14 files changed, 57 insertions(+), 10 deletions(-) delete mode 100644 extraconf/local.conf create mode 100644 extraconf/local.conf.disabled create mode 100644 package.keywords/unstable-virt.keywords create mode 100644 package.use/config_vm.keywords diff --git a/extraconf/local.conf b/extraconf/local.conf deleted file mode 100644 index c87e1fc..0000000 --- a/extraconf/local.conf +++ /dev/null @@ -1,3 +0,0 @@ -FEATURES="$FEATURES -buildpkg getbinpkg" -PKGDIR="/var/cache/binpkgs" -PORTAGE_BINHOST="http://ipepdvcompute4.ipe.kit.edu/binpkgs/" diff --git a/extraconf/local.conf.disabled b/extraconf/local.conf.disabled new file mode 100644 index 0000000..c87e1fc --- /dev/null +++ b/extraconf/local.conf.disabled @@ -0,0 +1,3 @@ +FEATURES="$FEATURES -buildpkg getbinpkg" +PKGDIR="/var/cache/binpkgs" +PORTAGE_BINHOST="http://ipepdvcompute4.ipe.kit.edu/binpkgs/" diff --git a/make.conf b/make.conf index 80c1649..c9e44f0 100644 --- a/make.conf +++ b/make.conf @@ -13,12 +13,25 @@ CPU_FLAGS_X86="mmx mmxext sse sse2 sse3 ssse3 sse4_1 sse4_2 aes" # DistCC build (Twice total CPUs + 1, Local CPUs). MAKEOPTS="-j59 -l5" # Default 2-jobs per localhost and 4-jobs per other nodes (increase recommended only on 4-head systems) -DISTCC_HOSTS="localhost ipepdvcompute4/16" +DISTCC_HOSTS="ipepdvcompute4/16,lzo ipepdvcompute1/8,lzo ipepdvcompute3/8,lzo localhost/4" +#DISTCC_HOSTS="localhost ipepdvcompute4/16 ipepdvcompute1/8 ipepdvcompute3/8" +#DISTCC_HOSTS="localhost ipepdvcompute4/16" +#DISTCC_HOSTS="ipepdvcompute4/16" +# DISTCC server will be blacklisted if compilation fails (which may happen intentionally during configuration stage). +# Short timeout is necessary to avoid it (0 disables it alltogether). Backof should be enabled to avoid failing while in backof. +# Manually cleaning backoff files in '/root/.distc' and '/var/tmp/portage/.distcc' does not help +# Check with verbose as after a while may start defaulting to localhost for some reason. +DISTCC_BACKOFF_PERIOD=5 +#DISTCC_FALLBACK=0 +#DISTCC_VERBOSE=1 + +# Emerge level parallelism (but suppesses output, only logs are written) +#EMERGE_DEFAULT_OPTS="--jobs 4 --keep-going y" FEATURES="${FEATURES} distcc splitdebug -test" #ccache is reported to cause problems. #FEATURES="ccache buildpkg getbinpkg nostrip" -#FEATURES="-collision-protect" +#FEATURES="${FEATURES} -collision-protect" USE_SYSTEM="-systemd -consolekit elogind -doc multislot eselect ccache pch dbus timezone syslog unicode nls icu rcc" USE_GENERAL="utils tools script scripts scripting extensions extras applet plugins importers imaging rendering stream video audio sound encode printsupport extra archive" diff --git a/package.keywords/sorcery.keywords b/package.keywords/sorcery.keywords index 46a163b..eaa3208 100644 --- a/package.keywords/sorcery.keywords +++ b/package.keywords/sorcery.keywords @@ -1,6 +1,6 @@ #Sorcery app-portage/g-sorcery ~amd64 -#??? app-portage/gs-pypi ~amd64 +#app-portage/gs-pypi ~amd64 # Broken, will not work with new pypi.org (can't resolve URLs, and also can't build afterwards) # Packages dev-python/PyAutoGUI ~amd64 diff --git a/package.keywords/unstable-virt.keywords b/package.keywords/unstable-virt.keywords new file mode 100644 index 0000000..e6df167 --- /dev/null +++ b/package.keywords/unstable-virt.keywords @@ -0,0 +1,12 @@ +# Vagrant +=app-emulation/vagrant-2.2* ~amd64 + +# Buildah/Podman +=app-emulation/skopeo-0.1* ~amd64 +=app-emulation/buildah-1.11* ~amd64 +=app-emulation/libpod-1.5* ~amd64 +=app-emulation/slirp4netns-0.4* ~amd64 +=app-emulation/conmon-2.0* ~amd64 + +# Kiwi +=app-emulation/umoci-0.2* ~amd64 diff --git a/package.keywords/unstable.keywords b/package.keywords/unstable.keywords index 449c071..84a7c67 100644 --- a/package.keywords/unstable.keywords +++ b/package.keywords/unstable.keywords @@ -18,9 +18,6 @@ dev-util/perf ~amd64 dev-util/mutrace ~amd64 dev-util/fatrace ~amd64 -# Virtualization -=app-emulation/vagrant-2.2* ~amd64 - # Audio/Video media-sound/lossless2lossy ~amd64 =sci-biology/imagej-1.51* ** @@ -28,3 +25,14 @@ media-sound/lossless2lossy ~amd64 # Hardware =net-wireless/blueberry-1.1* ~amd64 =net-wireless/bluez-tools-0_p20161212 ~amd64 #blueberry + +# Python +sci-libs/scikits ~amd64 +sci-libs/scikits_image ~amd64 +sci-libs/scikits_learn ~amd64 +sci-libs/scikits_optimization ~amd64 +sci-libs/scikits_timeseries ~amd64 +dev-python/pywavelets ~amd64 + +# Ruby +dev-ruby/inifile ~amd64 diff --git a/package.keywords/update-bugs.keywords b/package.keywords/update-bugs.keywords index c09efe7..e77787a 100644 --- a/package.keywords/update-bugs.keywords +++ b/package.keywords/update-bugs.keywords @@ -4,3 +4,6 @@ =sys-fs/fuse-2.9* ~amd64 # potential source of problems with exfat =sys-fs/fuse-3.6* ~amd64 =sys-fs/fuse-common-3.4* ~amd64 + +=dev-java/xom-1.3* ~amd64 # compilation failure with 1.2.10, see https://bugs.gentoo.org/683718 +=dev-java/jaxen-1.1* ~amd64 # circular dependencies with xom \ No newline at end of file diff --git a/package.mask/manual.mask b/package.mask/manual.mask index 5bedcc7..9da0a8a 100644 --- a/package.mask/manual.mask +++ b/package.mask/manual.mask @@ -1,3 +1,3 @@ # This is for manual upgrades (with cross-checking that all is fine) ->=app-admin/ansible-2.5 # To prevent problems with Ands for the moment (not checked if there are any) +#>=app-admin/ansible-2.5 # To prevent problems with Ands for the moment (2.4.3.0-r2 works, not checked if there are any with later versions) diff --git a/package.mask/problems.mask b/package.mask/problems.mask index ae4dc73..a00080c 100644 --- a/package.mask/problems.mask +++ b/package.mask/problems.mask @@ -4,3 +4,4 @@ =app-admin/conky-1.8.1* =media-libs/gupnp-dlna-0.10.2 =app-backup/duplicity-0.7.17 +=net-misc/rdesktop-1.8.6* diff --git a/package.use/config_bindings.use b/package.use/config_bindings.use index 7c30158..60d339a 100644 --- a/package.use/config_bindings.use +++ b/package.use/config_bindings.use @@ -2,5 +2,6 @@ dev-vcs/subversion -java net-analyzer/rrdtool perl -ruby app-accessibility/speech-dispatcher -python +dev-libs/libsolv ruby rpm # \ No newline at end of file diff --git a/package.use/config_vm.keywords b/package.use/config_vm.keywords new file mode 100644 index 0000000..e4c65f9 --- /dev/null +++ b/package.use/config_vm.keywords @@ -0,0 +1,2 @@ +app-emulation/buildah -ostree +app-emulation/libpod rootless btrfs -ostree diff --git a/sets/admin-vm b/sets/admin-vm index 0c762da..49d6c67 100644 --- a/sets/admin-vm +++ b/sets/admin-vm @@ -5,6 +5,10 @@ app-emulation/virt-manager # Containers app-emulation/docker app-emulation/docker-compose +app-emulation/skopeo +app-emulation/libpod +app-emulation/buildah +dev-ruby/dice # DOS app-emulation/dosemu diff --git a/sets/desktop-apps b/sets/desktop-apps index b1072a8..c75355f 100644 --- a/sets/desktop-apps +++ b/sets/desktop-apps @@ -17,6 +17,7 @@ app-office/libreoffice-bin app-officeext/languagetool # File Viewers +app-editors/gedit kde-apps/okular app-text/calibre app-text/fbreader diff --git a/sets/dev-scipy b/sets/dev-scipy index 31c3512..7b9a4ca 100644 --- a/sets/dev-scipy +++ b/sets/dev-scipy @@ -1,5 +1,7 @@ sci-libs/scipy +sci-libs/scikits_image dev-python/pandas dev-python/matplotlib dev-python/pillowfight +dev-python/jmespath dev-python/pycuda -- cgit v1.2.1