diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-04 20:01:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-04 20:01:36 +0100 |
commit | 201060464dff846a331496de0e2a5f3ed5926f19 (patch) | |
tree | f02bcaa94e3cd6c56fe4e5bdaa49a46fc7d5e60b | |
parent | ae19fe8462c8fa92690b9926b399d9720f68d407 (diff) |
make sisyphus auto adapt itself to the CPU numbers used in a systemv3.1908.0
-rwxr-xr-x | src/frontend/cli/sisyphus-cli.py | 1 | ||||
-rw-r--r-- | src/frontend/gui/sisyphus-gui.py | 1 | ||||
-rwxr-xr-x | src/helpers/set_jobs | 4 |
3 files changed, 4 insertions, 2 deletions
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 |