improve rockylinux 8 and 9 support (crb vs powertools)

r-lib · Dec 5, 2024 · 3ddff74 · 3ddff74
1 parent 50efafa
commit 3ddff74
Show file tree

Hide file tree

Showing 24 changed files with 231 additions and 55 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"]
         }
       ]
     },