From 702269c2d445b9a3c98a7cb64908b9e6481d8543 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 8 Feb 2020 21:02:30 +0100 Subject: phoronix-test-suite: rename package Linux-libre and winetricks-libre are project names. Other packages usually keep the same name than the original ones. Signed-off-by: Denis 'GNUtoo' Carikli --- .../0001-Don-t-download-online-tests.patch | 63 ---------------------- libre/phoronix-test-suite-libre/PKGBUILD | 63 ---------------------- .../phoronix-test-suite-launcher.patch | 4 -- .../0001-Don-t-download-online-tests.patch | 63 ++++++++++++++++++++++ libre/phoronix-test-suite/PKGBUILD | 63 ++++++++++++++++++++++ .../phoronix-test-suite-launcher.patch | 4 ++ 6 files changed, 130 insertions(+), 130 deletions(-) delete mode 100644 libre/phoronix-test-suite-libre/0001-Don-t-download-online-tests.patch delete mode 100644 libre/phoronix-test-suite-libre/PKGBUILD delete mode 100644 libre/phoronix-test-suite-libre/phoronix-test-suite-launcher.patch create mode 100644 libre/phoronix-test-suite/0001-Don-t-download-online-tests.patch create mode 100644 libre/phoronix-test-suite/PKGBUILD create mode 100644 libre/phoronix-test-suite/phoronix-test-suite-launcher.patch diff --git a/libre/phoronix-test-suite-libre/0001-Don-t-download-online-tests.patch b/libre/phoronix-test-suite-libre/0001-Don-t-download-online-tests.patch deleted file mode 100644 index 2ffabf21f..000000000 --- a/libre/phoronix-test-suite-libre/0001-Don-t-download-online-tests.patch +++ /dev/null @@ -1,63 +0,0 @@ -From c6e3cf9dafab33d9484a38e211aafd8a5a26f927 Mon Sep 17 00:00:00 2001 -From: Denis 'GNUtoo' Carikli -Date: Sat, 8 Feb 2020 07:35:10 +0100 -Subject: [PATCH] Don't download online tests - -Signed-off-by: Denis 'GNUtoo' Carikli ---- - pts-core/objects/pts_openbenchmarking.php | 19 +------------------ - pts-core/user-agreement.txt | 2 +- - 2 files changed, 2 insertions(+), 19 deletions(-) - -diff --git a/pts-core/objects/pts_openbenchmarking.php b/pts-core/objects/pts_openbenchmarking.php -index ccfce89a1..50d629646 100644 ---- a/pts-core/objects/pts_openbenchmarking.php -+++ b/pts-core/objects/pts_openbenchmarking.php -@@ -463,7 +463,7 @@ class pts_openbenchmarking - } - public static function linked_repositories() - { -- $repos = array('local', 'pts', 'system', 'git'); -+ $repos = array('local'); - - if(PTS_IS_CLIENT && phodevi::is_windows()) - { -@@ -671,23 +671,6 @@ class pts_openbenchmarking - } - public static function phoromatic_server_ob_cache_request($type_request, $repo = null, $test = null) - { -- if(PTS_IS_CLIENT == false) -- { -- return null; -- } -- -- $archived_servers = pts_client::available_phoromatic_servers(); -- -- foreach($archived_servers as $archived_server) -- { -- $cache = pts_network::http_get_contents('http://' . $archived_server['ip'] . ':' . $archived_server['http_port'] . '/openbenchmarking-cache.php?' . $type_request . '&repo=' . $repo . '&test=' . $test); -- -- if(!empty($cache)) -- { -- return $cache; -- } -- } -- - return null; - } - public static function available_tests($download_tests = true, $all_versions = false, $append_versions = false, $show_deprecated_tests = false, $only_show_available_cached_tests = false) -diff --git a/pts-core/user-agreement.txt b/pts-core/user-agreement.txt -index 92a2eb2ce..eb77b11ab 100644 ---- a/pts-core/user-agreement.txt -+++ b/pts-core/user-agreement.txt -@@ -1,6 +1,6 @@ - Phoronix Test Suite User Agreement / Notices: - --- The Phoronix Test Suite is open-source and licensed under the GNU GPLv3. A copy of the GPLv3 license is included with this software or can also be found at https://www.gnu.org/licenses/gpl-3.0.en.html. However, some tests supported by the Phoronix Test Suite are not open-source software or require commercial software packages. -+- The Phoronix Test Suite is free software and licensed under the GNU GPLv3. A copy of the GPLv3 license is included with this software or can also be found at https://www.gnu.org/licenses/gpl-3.0.en.html. However, some tests originally supported by the Phoronix Test Suite are not free software and were removed in Parabola. - - - The Phoronix Test Suite contains tests which may stress your system and in some cases could exhibit stability problems of the system's hardware or software configuration. The Phoronix Test Suite is provided WITHOUT ANY WARRANTY. In no event shall OpenBenchmarking.org, Phoromatic, Phoronix Media, the Phoronix Test Suite, or any associated stakeholder be liable to any party for any direct or indirect damages for any use of OpenBenchmarking.org -- including, without limitation, any lost profits, business interruption, loss of programs, loss of programmed data, or otherwise. - --- -2.25.0 - diff --git a/libre/phoronix-test-suite-libre/PKGBUILD b/libre/phoronix-test-suite-libre/PKGBUILD deleted file mode 100644 index 63612f5bd..000000000 --- a/libre/phoronix-test-suite-libre/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# Contributor: aimileus -# Maintainer: Fabio 'Lolix' Loli -# Contributor: Sergej Pupykin -# Contributor: Andreas Schönfelder - -_pkgname=phoronix-test-suite -pkgname=$_pkgname-libre -pkgver=9.2.1 -pkgrel=1 -pkgdesc="The most comprehensive testing and benchmarking platform available for Linux without the nonfree tests" -arch=(any) -license=(GPL3) -url="http://www.phoronix-test-suite.com/" -depends=(php) -optdepends=('php-gd' - 'sqlite3: required when running a Phoromatic server.' - 'gcc-fortran: required for universe-cli test suite' - 'blas: required for universe-cli test suite' - 'lapack: required for universe-cli test suite' - 'portaudio: required for universe-cli test suite' - 'unzip: required for universe-cli test suite' - 'mesa-demos: required for universe-cli test suite' - 'openmpi: required for universe-cli test suite') -source=("$_pkgname-$pkgver.tar.gz::https://github.com/phoronix-test-suite/phoronix-test-suite/archive/v${pkgver}.tar.gz" - "https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/phoronix-test-suite-launcher.patch" - "0001-Don-t-download-online-tests.patch") -sha256sums=('28acbcb6c5b8eb27c20329cd1a5ea3f1a27abb69812c4b1eeade4b91c89fc7d8' - '577326343d0303a59fd469c3f9c9740e756dd59c0660c54363b62d6fd1cee26d' - 'SKIP') -options=(!strip) - -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - patch phoronix-test-suite -i "${srcdir}/phoronix-test-suite-launcher.patch" - patch -p1 -i "${srcdir}/0001-Don-t-download-online-tests.patch" - # Remove cached data from openbenchmarking that might include nonfree tests - rm -rf ob-cache/ -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - ./install-sh $pkgdir/usr - - rm -r "${pkgdir}"/usr/share/phoronix-test-suite/deploy - rm -rf "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/{dependency-handlers,scripts,xml}/{*.php,*.sh,*.xml} - - install -D "${srcdir}/phoronix-test-suite-${pkgver}"/pts-core/external-test-dependencies/dependency-handlers/arch_dependency_handler.php \ - "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/dependency-handlers/arch_dependency_handler.php - - install -D "${srcdir}/phoronix-test-suite-${pkgver}"/pts-core/external-test-dependencies/scripts/install-arch-packages.sh \ - "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/scripts/install-arch-packages.sh - - install -D "${srcdir}/phoronix-test-suite-${pkgver}"/pts-core/external-test-dependencies/xml/arch-packages.xml \ - "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/xml/arch-packages.xml - - install -D "${srcdir}/phoronix-test-suite-${pkgver}"/pts-core/external-test-dependencies/xml/generic-packages.xml \ - "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/xml/generic-packages.xml - - install "${srcdir}/phoronix-test-suite-${pkgver}"/phoronix-test-suite \ - "${pkgdir}"/usr/bin/phoronix-test-suite - - ln -s /usr/bin/phoronix-test-suite "$pkgdir/usr/bin/pts" -} diff --git a/libre/phoronix-test-suite-libre/phoronix-test-suite-launcher.patch b/libre/phoronix-test-suite-libre/phoronix-test-suite-launcher.patch deleted file mode 100644 index c10b302ab..000000000 --- a/libre/phoronix-test-suite-libre/phoronix-test-suite-launcher.patch +++ /dev/null @@ -1,4 +0,0 @@ -36c36 -< export PTS_DIR=$(readlink -f `dirname $0`) ---- -> export PTS_DIR=/usr/share/phoronix-test-suite diff --git a/libre/phoronix-test-suite/0001-Don-t-download-online-tests.patch b/libre/phoronix-test-suite/0001-Don-t-download-online-tests.patch new file mode 100644 index 000000000..2ffabf21f --- /dev/null +++ b/libre/phoronix-test-suite/0001-Don-t-download-online-tests.patch @@ -0,0 +1,63 @@ +From c6e3cf9dafab33d9484a38e211aafd8a5a26f927 Mon Sep 17 00:00:00 2001 +From: Denis 'GNUtoo' Carikli +Date: Sat, 8 Feb 2020 07:35:10 +0100 +Subject: [PATCH] Don't download online tests + +Signed-off-by: Denis 'GNUtoo' Carikli +--- + pts-core/objects/pts_openbenchmarking.php | 19 +------------------ + pts-core/user-agreement.txt | 2 +- + 2 files changed, 2 insertions(+), 19 deletions(-) + +diff --git a/pts-core/objects/pts_openbenchmarking.php b/pts-core/objects/pts_openbenchmarking.php +index ccfce89a1..50d629646 100644 +--- a/pts-core/objects/pts_openbenchmarking.php ++++ b/pts-core/objects/pts_openbenchmarking.php +@@ -463,7 +463,7 @@ class pts_openbenchmarking + } + public static function linked_repositories() + { +- $repos = array('local', 'pts', 'system', 'git'); ++ $repos = array('local'); + + if(PTS_IS_CLIENT && phodevi::is_windows()) + { +@@ -671,23 +671,6 @@ class pts_openbenchmarking + } + public static function phoromatic_server_ob_cache_request($type_request, $repo = null, $test = null) + { +- if(PTS_IS_CLIENT == false) +- { +- return null; +- } +- +- $archived_servers = pts_client::available_phoromatic_servers(); +- +- foreach($archived_servers as $archived_server) +- { +- $cache = pts_network::http_get_contents('http://' . $archived_server['ip'] . ':' . $archived_server['http_port'] . '/openbenchmarking-cache.php?' . $type_request . '&repo=' . $repo . '&test=' . $test); +- +- if(!empty($cache)) +- { +- return $cache; +- } +- } +- + return null; + } + public static function available_tests($download_tests = true, $all_versions = false, $append_versions = false, $show_deprecated_tests = false, $only_show_available_cached_tests = false) +diff --git a/pts-core/user-agreement.txt b/pts-core/user-agreement.txt +index 92a2eb2ce..eb77b11ab 100644 +--- a/pts-core/user-agreement.txt ++++ b/pts-core/user-agreement.txt +@@ -1,6 +1,6 @@ + Phoronix Test Suite User Agreement / Notices: + +-- The Phoronix Test Suite is open-source and licensed under the GNU GPLv3. A copy of the GPLv3 license is included with this software or can also be found at https://www.gnu.org/licenses/gpl-3.0.en.html. However, some tests supported by the Phoronix Test Suite are not open-source software or require commercial software packages. ++- The Phoronix Test Suite is free software and licensed under the GNU GPLv3. A copy of the GPLv3 license is included with this software or can also be found at https://www.gnu.org/licenses/gpl-3.0.en.html. However, some tests originally supported by the Phoronix Test Suite are not free software and were removed in Parabola. + + - The Phoronix Test Suite contains tests which may stress your system and in some cases could exhibit stability problems of the system's hardware or software configuration. The Phoronix Test Suite is provided WITHOUT ANY WARRANTY. In no event shall OpenBenchmarking.org, Phoromatic, Phoronix Media, the Phoronix Test Suite, or any associated stakeholder be liable to any party for any direct or indirect damages for any use of OpenBenchmarking.org -- including, without limitation, any lost profits, business interruption, loss of programs, loss of programmed data, or otherwise. + +-- +2.25.0 + diff --git a/libre/phoronix-test-suite/PKGBUILD b/libre/phoronix-test-suite/PKGBUILD new file mode 100644 index 000000000..63612f5bd --- /dev/null +++ b/libre/phoronix-test-suite/PKGBUILD @@ -0,0 +1,63 @@ +# Contributor: aimileus +# Maintainer: Fabio 'Lolix' Loli +# Contributor: Sergej Pupykin +# Contributor: Andreas Schönfelder + +_pkgname=phoronix-test-suite +pkgname=$_pkgname-libre +pkgver=9.2.1 +pkgrel=1 +pkgdesc="The most comprehensive testing and benchmarking platform available for Linux without the nonfree tests" +arch=(any) +license=(GPL3) +url="http://www.phoronix-test-suite.com/" +depends=(php) +optdepends=('php-gd' + 'sqlite3: required when running a Phoromatic server.' + 'gcc-fortran: required for universe-cli test suite' + 'blas: required for universe-cli test suite' + 'lapack: required for universe-cli test suite' + 'portaudio: required for universe-cli test suite' + 'unzip: required for universe-cli test suite' + 'mesa-demos: required for universe-cli test suite' + 'openmpi: required for universe-cli test suite') +source=("$_pkgname-$pkgver.tar.gz::https://github.com/phoronix-test-suite/phoronix-test-suite/archive/v${pkgver}.tar.gz" + "https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/phoronix-test-suite-launcher.patch" + "0001-Don-t-download-online-tests.patch") +sha256sums=('28acbcb6c5b8eb27c20329cd1a5ea3f1a27abb69812c4b1eeade4b91c89fc7d8' + '577326343d0303a59fd469c3f9c9740e756dd59c0660c54363b62d6fd1cee26d' + 'SKIP') +options=(!strip) + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + patch phoronix-test-suite -i "${srcdir}/phoronix-test-suite-launcher.patch" + patch -p1 -i "${srcdir}/0001-Don-t-download-online-tests.patch" + # Remove cached data from openbenchmarking that might include nonfree tests + rm -rf ob-cache/ +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + ./install-sh $pkgdir/usr + + rm -r "${pkgdir}"/usr/share/phoronix-test-suite/deploy + rm -rf "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/{dependency-handlers,scripts,xml}/{*.php,*.sh,*.xml} + + install -D "${srcdir}/phoronix-test-suite-${pkgver}"/pts-core/external-test-dependencies/dependency-handlers/arch_dependency_handler.php \ + "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/dependency-handlers/arch_dependency_handler.php + + install -D "${srcdir}/phoronix-test-suite-${pkgver}"/pts-core/external-test-dependencies/scripts/install-arch-packages.sh \ + "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/scripts/install-arch-packages.sh + + install -D "${srcdir}/phoronix-test-suite-${pkgver}"/pts-core/external-test-dependencies/xml/arch-packages.xml \ + "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/xml/arch-packages.xml + + install -D "${srcdir}/phoronix-test-suite-${pkgver}"/pts-core/external-test-dependencies/xml/generic-packages.xml \ + "${pkgdir}"/usr/share/phoronix-test-suite/pts-core/external-test-dependencies/xml/generic-packages.xml + + install "${srcdir}/phoronix-test-suite-${pkgver}"/phoronix-test-suite \ + "${pkgdir}"/usr/bin/phoronix-test-suite + + ln -s /usr/bin/phoronix-test-suite "$pkgdir/usr/bin/pts" +} diff --git a/libre/phoronix-test-suite/phoronix-test-suite-launcher.patch b/libre/phoronix-test-suite/phoronix-test-suite-launcher.patch new file mode 100644 index 000000000..c10b302ab --- /dev/null +++ b/libre/phoronix-test-suite/phoronix-test-suite-launcher.patch @@ -0,0 +1,4 @@ +36c36 +< export PTS_DIR=$(readlink -f `dirname $0`) +--- +> export PTS_DIR=/usr/share/phoronix-test-suite -- cgit v1.2.3