From 3ddff74164e842a32942b6e79a7817d953359cb6 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Thu, 5 Dec 2024 12:05:23 +0100 Subject: [PATCH 1/2] improve rockylinux 8 and 9 support (crb vs powertools) --- inst/sysreqs/rules/chrome.json | 19 ++++++++++++++++++- inst/sysreqs/rules/eigen.json | 5 +++++ inst/sysreqs/rules/gdal.json | 8 +++++++- inst/sysreqs/rules/glpk.json | 12 +----------- inst/sysreqs/rules/gpgme.json | 22 +++++++++++++++++++++- inst/sysreqs/rules/grpcpp.json | 15 +++++++++++++++ inst/sysreqs/rules/gsl.json | 14 +++----------- inst/sysreqs/rules/leptonica.json | 8 +++++++- inst/sysreqs/rules/libarchive.json | 17 ++++++++++++++++- inst/sysreqs/rules/libavfilter.json | 18 +++++++++++++++++- inst/sysreqs/rules/libjq.json | 17 ++++++++++++++++- inst/sysreqs/rules/libmagic.json | 8 +++++++- inst/sysreqs/rules/libmecab.json | 21 +++++++-------------- inst/sysreqs/rules/libmysqlclient.json | 8 +++++++- inst/sysreqs/rules/libprotobuf.json | 22 +++++++++++++++++++++- inst/sysreqs/rules/libsndfile.json | 8 +++++++- inst/sysreqs/rules/odbc.json | 8 +++++++- inst/sysreqs/rules/opencv.json | 8 +++++++- inst/sysreqs/rules/poppler-glib.json | 8 +++++++- inst/sysreqs/rules/poppler.json | 8 +++++++- inst/sysreqs/rules/protobuf-compiler.json | 8 +++++++- inst/sysreqs/rules/redland.json | 8 +++++++- inst/sysreqs/rules/suitesparse.json | 8 +++++++- inst/sysreqs/rules/tesseract.json | 8 +++++++- 24 files changed, 231 insertions(+), 55 deletions(-) diff --git a/inst/sysreqs/rules/chrome.json b/inst/sysreqs/rules/chrome.json index 731d2087..d1d3f606 100644 --- a/inst/sysreqs/rules/chrome.json +++ b/inst/sysreqs/rules/chrome.json @@ -50,7 +50,24 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] + } + ] + }, + { + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertoools" }, + { "command": "dnf install -y epel-release" } + ], + "packages": ["chromium"], + "post_install": [], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, diff --git a/inst/sysreqs/rules/eigen.json b/inst/sysreqs/rules/eigen.json index 419f9475..100eb34b 100644 --- a/inst/sysreqs/rules/eigen.json +++ b/inst/sysreqs/rules/eigen.json @@ -72,6 +72,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, diff --git a/inst/sysreqs/rules/gdal.json b/inst/sysreqs/rules/gdal.json index 64a550b0..23a1320a 100644 --- a/inst/sysreqs/rules/gdal.json +++ b/inst/sysreqs/rules/gdal.json @@ -108,6 +108,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -139,7 +144,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/glpk.json b/inst/sysreqs/rules/glpk.json index 1f5165ad..1d4e4f7f 100644 --- a/inst/sysreqs/rules/glpk.json +++ b/inst/sysreqs/rules/glpk.json @@ -58,17 +58,7 @@ "os": "linux", "distribution": "centos", "versions": ["8"] - } - ] - }, - { - "packages": ["glpk-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled crb" }, - { "command": "dnf install -y epel-release" } - ], - "constraints": [ + }, { "os": "linux", "distribution": "rockylinux" diff --git a/inst/sysreqs/rules/gpgme.json b/inst/sysreqs/rules/gpgme.json index d504566a..13d1a188 100644 --- a/inst/sysreqs/rules/gpgme.json +++ b/inst/sysreqs/rules/gpgme.json @@ -39,6 +39,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -51,7 +56,22 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] + } + ] + }, + { + "packages": ["gpgme-devel"], + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertools" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, diff --git a/inst/sysreqs/rules/grpcpp.json b/inst/sysreqs/rules/grpcpp.json index 5102cdc7..48a6860e 100644 --- a/inst/sysreqs/rules/grpcpp.json +++ b/inst/sysreqs/rules/grpcpp.json @@ -38,6 +38,21 @@ } ] }, + { + "pre_install": [ + { "command": "yum install -y epel-release" }, + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertools" } + ], + "packages": ["grpc-devel", "pkgconf"], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] + } + ] + }, { "packages": ["grpc-devel"], "constraints": [ diff --git a/inst/sysreqs/rules/gsl.json b/inst/sysreqs/rules/gsl.json index 8e589436..648029ad 100644 --- a/inst/sysreqs/rules/gsl.json +++ b/inst/sysreqs/rules/gsl.json @@ -29,19 +29,11 @@ "os": "linux", "distribution": "redhat", "versions": ["7", "8"] - } - ] - }, - { - "packages": ["gsl-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled crb" } - ], - "constraints": [ + }, { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["8","9"] } ] }, diff --git a/inst/sysreqs/rules/leptonica.json b/inst/sysreqs/rules/leptonica.json index 12606b47..9f4c0ecd 100644 --- a/inst/sysreqs/rules/leptonica.json +++ b/inst/sysreqs/rules/leptonica.json @@ -40,6 +40,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -52,7 +57,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libarchive.json b/inst/sysreqs/rules/libarchive.json index d7f0156d..5ca49f85 100644 --- a/inst/sysreqs/rules/libarchive.json +++ b/inst/sysreqs/rules/libarchive.json @@ -51,7 +51,22 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] + } + ] + }, + { + "packages": ["libarchive-devel"], + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertools" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, diff --git a/inst/sysreqs/rules/libavfilter.json b/inst/sysreqs/rules/libavfilter.json index 22e24cba..749e1bb2 100644 --- a/inst/sysreqs/rules/libavfilter.json +++ b/inst/sysreqs/rules/libavfilter.json @@ -33,7 +33,23 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] + } + ] + }, + { + "packages": ["libavfilter-free-devel"], + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertools" }, + { "command": "dnf install -y epel-release" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, diff --git a/inst/sysreqs/rules/libjq.json b/inst/sysreqs/rules/libjq.json index bf56f0c6..8add37fe 100644 --- a/inst/sysreqs/rules/libjq.json +++ b/inst/sysreqs/rules/libjq.json @@ -38,7 +38,22 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] + } + ] + }, + { + "packages": ["jq-devel"], + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertools" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, diff --git a/inst/sysreqs/rules/libmagic.json b/inst/sysreqs/rules/libmagic.json index ef7643df..d6339068 100644 --- a/inst/sysreqs/rules/libmagic.json +++ b/inst/sysreqs/rules/libmagic.json @@ -49,6 +49,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -61,7 +66,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libmecab.json b/inst/sysreqs/rules/libmecab.json index 0035d31c..b349cdf9 100644 --- a/inst/sysreqs/rules/libmecab.json +++ b/inst/sysreqs/rules/libmecab.json @@ -37,7 +37,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, @@ -47,6 +48,11 @@ { "os": "linux", "distribution": "fedora" + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -85,19 +91,6 @@ "versions": ["9"] } ] - }, - { - "packages": ["mecab-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled crb" } - ], - "constraints": [ - { - "os": "linux", - "distribution": "rockylinux" - } - ] } ] } diff --git a/inst/sysreqs/rules/libmysqlclient.json b/inst/sysreqs/rules/libmysqlclient.json index 873d8021..b0437a41 100644 --- a/inst/sysreqs/rules/libmysqlclient.json +++ b/inst/sysreqs/rules/libmysqlclient.json @@ -50,6 +50,11 @@ { "os": "linux", "distribution": "fedora" + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -62,7 +67,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libprotobuf.json b/inst/sysreqs/rules/libprotobuf.json index b347393c..a3b7ceee 100644 --- a/inst/sysreqs/rules/libprotobuf.json +++ b/inst/sysreqs/rules/libprotobuf.json @@ -50,6 +50,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -71,7 +76,22 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] + } + ] + }, + { + "packages": ["protobuf-devel"], + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertools" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, diff --git a/inst/sysreqs/rules/libsndfile.json b/inst/sysreqs/rules/libsndfile.json index d37797ed..41132f4a 100644 --- a/inst/sysreqs/rules/libsndfile.json +++ b/inst/sysreqs/rules/libsndfile.json @@ -44,6 +44,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -56,7 +61,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/odbc.json b/inst/sysreqs/rules/odbc.json index 2e466a7b..c086ce0f 100644 --- a/inst/sysreqs/rules/odbc.json +++ b/inst/sysreqs/rules/odbc.json @@ -29,6 +29,11 @@ { "os": "linux", "distribution": "fedora" + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -41,7 +46,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/opencv.json b/inst/sysreqs/rules/opencv.json index a9475dda..5031ddb5 100644 --- a/inst/sysreqs/rules/opencv.json +++ b/inst/sysreqs/rules/opencv.json @@ -70,6 +70,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -97,7 +102,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/poppler-glib.json b/inst/sysreqs/rules/poppler-glib.json index e797ff00..5d3619f2 100644 --- a/inst/sysreqs/rules/poppler-glib.json +++ b/inst/sysreqs/rules/poppler-glib.json @@ -44,6 +44,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -56,7 +61,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/poppler.json b/inst/sysreqs/rules/poppler.json index 347a300f..e2b0bf28 100644 --- a/inst/sysreqs/rules/poppler.json +++ b/inst/sysreqs/rules/poppler.json @@ -44,6 +44,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -56,7 +61,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/protobuf-compiler.json b/inst/sysreqs/rules/protobuf-compiler.json index 8a57578d..86985cb9 100644 --- a/inst/sysreqs/rules/protobuf-compiler.json +++ b/inst/sysreqs/rules/protobuf-compiler.json @@ -50,6 +50,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -71,7 +76,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/redland.json b/inst/sysreqs/rules/redland.json index 0237a8d5..e26c340a 100644 --- a/inst/sysreqs/rules/redland.json +++ b/inst/sysreqs/rules/redland.json @@ -39,6 +39,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["9"] } ] }, @@ -51,7 +56,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/suitesparse.json b/inst/sysreqs/rules/suitesparse.json index 99189bc7..45c62cee 100644 --- a/inst/sysreqs/rules/suitesparse.json +++ b/inst/sysreqs/rules/suitesparse.json @@ -52,6 +52,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -64,7 +69,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/tesseract.json b/inst/sysreqs/rules/tesseract.json index a363ae99..c1b721ba 100644 --- a/inst/sysreqs/rules/tesseract.json +++ b/inst/sysreqs/rules/tesseract.json @@ -48,6 +48,11 @@ { "os": "linux", "distribution": "centos", + "versions": ["8"], + }, + { + "os": "linux", + "distribution": "rockylinux", "versions": ["8"] } ] @@ -61,7 +66,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, From 11daa091e4a4a432a8182455da26350fc2ea87f5 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Thu, 5 Dec 2024 12:38:45 +0100 Subject: [PATCH 2/2] add a few more --- inst/sysreqs/rules/gpgme.json | 14 -------------- inst/sysreqs/rules/libarchive.json | 17 ++++------------- inst/sysreqs/rules/libprotobuf.json | 14 -------------- inst/sysreqs/rules/tesseract.json | 2 +- 4 files changed, 5 insertions(+), 42 deletions(-) diff --git a/inst/sysreqs/rules/gpgme.json b/inst/sysreqs/rules/gpgme.json index 13d1a188..2ed11f06 100644 --- a/inst/sysreqs/rules/gpgme.json +++ b/inst/sysreqs/rules/gpgme.json @@ -61,20 +61,6 @@ } ] }, - { - "packages": ["gpgme-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled powertools" } - ], - "constraints": [ - { - "os": "linux", - "distribution": "rockylinux", - "versions": ["8"] - } - ] - }, { "packages": ["gpgme"], "constraints": [ diff --git a/inst/sysreqs/rules/libarchive.json b/inst/sysreqs/rules/libarchive.json index 5ca49f85..19bdb2c7 100644 --- a/inst/sysreqs/rules/libarchive.json +++ b/inst/sysreqs/rules/libarchive.json @@ -39,20 +39,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] - } - ] - }, - { - "packages": ["libarchive-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled crb" } - ], - "constraints": [ + }, { "os": "linux", "distribution": "rockylinux", - "versions": ["9"] + "versions": ["8"] } ] }, @@ -60,13 +51,13 @@ "packages": ["libarchive-devel"], "pre_install": [ { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled powertools" } + { "command": "dnf config-manager --set-enabled crb" } ], "constraints": [ { "os": "linux", "distribution": "rockylinux", - "versions": ["8"] + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libprotobuf.json b/inst/sysreqs/rules/libprotobuf.json index a3b7ceee..12b11411 100644 --- a/inst/sysreqs/rules/libprotobuf.json +++ b/inst/sysreqs/rules/libprotobuf.json @@ -81,20 +81,6 @@ } ] }, - { - "packages": ["protobuf-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled powertools" } - ], - "constraints": [ - { - "os": "linux", - "distribution": "rockylinux", - "versions": ["8"] - } - ] - }, { "packages": ["protobuf"], "constraints": [ diff --git a/inst/sysreqs/rules/tesseract.json b/inst/sysreqs/rules/tesseract.json index c1b721ba..aae459ab 100644 --- a/inst/sysreqs/rules/tesseract.json +++ b/inst/sysreqs/rules/tesseract.json @@ -48,7 +48,7 @@ { "os": "linux", "distribution": "centos", - "versions": ["8"], + "versions": ["8"] }, { "os": "linux",