Merge pull request #170 from pat-s/aarch-rhel8

Use dynamic arch for redhat-8
rstudio · Jul 29, 2024 · 4bf1ffc · 4bf1ffc
2 parents c8fd1f6 + 7716c8f
commit 4bf1ffc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/rules/eigen.json b/rules/eigen.json
@@ -68,7 +68,7 @@
     {
       "packages": ["eigen3-devel"],
       "pre_install": [
-        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms" }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" }
       ],
       "constraints": [
         {

diff --git a/rules/gdal.json b/rules/gdal.json
@@ -113,7 +113,7 @@
     },
     {
       "pre_install": [
-        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms" },
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" },
         { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" }
       ],
       "packages": [

diff --git a/rules/libavfilter.json b/rules/libavfilter.json
@@ -97,7 +97,7 @@
     },
     {
       "pre_install": [
-        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms" },
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" },
         { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" },
         { "command": "dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm" }
       ],

diff --git a/rules/libgit2.json b/rules/libgit2.json
@@ -114,7 +114,7 @@
     {
       "pre_install": [
         {
-          "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms"
+          "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms"
         }
       ],
       "packages": ["libgit2-devel"],

diff --git a/rules/opencv.json b/rules/opencv.json
@@ -75,7 +75,7 @@
     },
     {
       "pre_install": [
-        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms" },
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" },
         { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" }
       ],
       "packages": ["opencv-devel"],

diff --git a/rules/poppler.json b/rules/poppler.json
@@ -63,7 +63,7 @@
     {
       "packages": ["poppler-cpp-devel"],
       "pre_install": [
-        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms" }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" }
       ],
       "constraints": [
         {