diff --git a/files/0001-Re-enable-systemd-inhibit.patch b/files/0001-Re-enable-systemd-inhibit.patch new file mode 100644 --- /dev/null +++ b/files/0001-Re-enable-systemd-inhibit.patch @@ -0,0 +1,37 @@ +From 9b1f6b5b65abd1aa4076f0c85ed93d31e24277e7 Mon Sep 17 00:00:00 2001 +From: Campbell Jones +Date: Sun, 3 Jan 2021 14:51:39 -0500 +Subject: [PATCH] Re-enable systemd-inhibit + +--- + phoronix-test-suite | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/phoronix-test-suite b/phoronix-test-suite +index 5d978de..e19f333 100755 +--- a/phoronix-test-suite ++++ b/phoronix-test-suite +@@ -294,15 +294,16 @@ PTS_PREPEND_LAUNCH="" + if which systemd-inhibit >/dev/null 2>&1 + then + # At least as of September 2019, some versions of systemd-inhibit are buggy around argv handling +- # PTS_PREPEND_LAUNCH="systemd-inhibit --what=idle:sleep --who=\"Phoronix Test Suite\" --why=\"Phoronix Test Suite benchmarking\" " +- export PTS_SYSTEMD_INHIBITED=0 # Setting to 1 will make toggle_screensaver PTS module disable ++ PTS_PREPEND_LAUNCH='systemd-inhibit --what=idle:sleep --who="Phoronix Test Suite" --why="Phoronix Test Suite benchmarking" ' ++ export PTS_SYSTEMD_INHIBITED=1 # Setting to 1 will make toggle_screensaver PTS module disable + fi + + # Run The Phoronix Test Suite + PTS_EXIT_STATUS=8 + while [ $PTS_EXIT_STATUS -eq 8 ]; do +- $PTS_PREPEND_LAUNCH $PHP_BIN $PTS_DIR/pts-core/phoronix-test-suite.php $@ +- PTS_EXIT_STATUS=$? ++ PTS_LAUNCH_ARGS="$@" ++ sh -c "$PTS_PREPEND_LAUNCH $PHP_BIN $PTS_DIR/pts-core/phoronix-test-suite.php $PTS_LAUNCH_ARGS" ++ PTS_EXIT_STATUS=$? + done + + if [ -f $PTS_EXT_LAUNCH_SCRIPT_DIR/web-server-launcher ] +-- +2.30.0 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : phoronix-test-suite version : 10.0.1 -release : 22 +release : 23 source : - https://github.com/phoronix-test-suite/phoronix-test-suite/releases/download/v10.0.1/phoronix-test-suite-10.0.1.tar.gz : ff575dbbfd80ecb479c85d6890ddd4eab40cb296df5f2cc1e6f7c0ed3acb9927 license : GPL-3.0-or-later @@ -14,6 +14,7 @@ rundeps : - php setup : | + %patch -p1 < $pkgfiles/0001-Re-enable-systemd-inhibit.patch %patch -p1 < $pkgfiles/0002-Enable-stateless-bash_completion.patch install : | - DESTDIR=${installdir} bash ./install-sh %PREFIX% + DESTDIR="$installdir" bash ./install-sh %PREFIX% diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ phoronix-test-suite https://www.phoronix-test-suite.com/ - Pierre-Yves - pyu@riseup.net + Campbell Jones + dev@serebit.com GPL-3.0-or-later programming @@ -4635,12 +4635,12 @@ - - 2020-11-22 + + 2021-01-03 10.0.1 Packaging update - Pierre-Yves - pyu@riseup.net + Campbell Jones + dev@serebit.com \ No newline at end of file