From 201060464dff846a331496de0e2a5f3ed5926f19 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Aug 2019 20:01:36 +0100 Subject: make sisyphus auto adapt itself to the CPU numbers used in a system --- src/frontend/cli/sisyphus-cli.py | 1 + src/frontend/gui/sisyphus-gui.py | 1 + src/helpers/set_jobs | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index daf76c9..7954115 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -3,6 +3,7 @@ import sys from libsisyphus import * +setJobs.__wrapped__() #undecorate pkgList = sys.argv[2:] if "__main__" == __name__: diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 52dd829..cc55567 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -382,6 +382,7 @@ class MainWorker(QtCore.QObject): @QtCore.pyqtSlot() def startUpdate(self): self.started.emit() + setJobs.__wrapped__() #undecorate startUpdate.__wrapped__() #undecorate self.finished.emit() diff --git a/src/helpers/set_jobs b/src/helpers/set_jobs index 0d42a1d..58dbf1b 100755 --- a/src/helpers/set_jobs +++ b/src/helpers/set_jobs @@ -5,8 +5,8 @@ portageConfigDir="/opt/redcore-build/conf/intel/portage" setjobs () { # default MAKEOPTS value is -j64, but that's overkill for lower spec machines # this will adjust MAKEOPTS to a value detected by $(getconf _NPROCESSORS_ONLN) - sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$portageConfigDir"/make.conf/00-makeopts.conf # global makeopts (exclude kernel) - sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$portageConfigDir"/env/makenoise.conf # kernel makeopts + sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$portageConfigDir"/make.conf/00-makeopts.conf >/dev/null 2>&1 # global makeopts (exclude kernel) + sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$portageConfigDir"/env/makenoise.conf >/dev/null 2>&1 # kernel makeopts } setjobs -- cgit v1.2.3