feat: add headless packages for RHEL (via Rocky Linux) (#380)

* feat: add headless packages for RHEL (via Rocky Linux) * fix: rhel curl package
ilya-zlobintsev · Sep 22, 2024 · 4a092b7 · 4a092b7
1 parent c08bdfe
commit 4a092b7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml
@@ -20,6 +20,10 @@ jobs:
             recipe: lact-libadwaita
           - target-os: opensuse-tumbleweed
             recipe: lact-libadwaita
+          - target-os: rhel-8
+            recipe: lact-headless
+          - target-os: rhel-9
+            recipe: lact-headless
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.pkger.yml b/.pkger.yml
@@ -29,4 +29,10 @@ images:
   - name: opensuse-tumbleweed
     target: rpm
     os: OpenSUSE
+  - name: rhel-8
+    target: rpm
+    os: Red Hat
+  - name: rhel-9
+    target: rpm
+    os: Red Hat
 custom_simple_images: ~
diff --git a/lact-gui/src/lib.rs b/lact-gui/src/lib.rs
@@ -17,10 +17,6 @@ pub fn run(args: GuiArgs) -> anyhow::Result<()> {
         .context("Invalid log level")?;
     tracing_subscriber::fmt().with_env_filter(env_filter).init();
 
-    // if let Err(err) = gtk::init() {
-    //     return Err(anyhow!("Cannot initialize GTK: {err}"));
-    // }
-
     let app = RelmApp::new(APP_ID).with_args(vec![]);
     app.run_async::<AppModel>(args);
     Ok(())

diff --git a/pkg/images/rhel-8/Dockerfile b/pkg/images/rhel-8/Dockerfile
@@ -0,0 +1,2 @@
+FROM rockylinux:8
+RUN dnf install curl --allowerasing -y  # Fix for curl-minimal conflict
diff --git a/pkg/images/rhel-9/Dockerfile b/pkg/images/rhel-9/Dockerfile
@@ -0,0 +1,2 @@
+FROM rockylinux:9
+RUN dnf install curl --allowerasing -y # Fix for curl-minimal conflict
diff --git a/pkg/recipes/lact-headless/recipe.yml b/pkg/recipes/lact-headless/recipe.yml
@@ -13,13 +13,13 @@ metadata:
   depends:
     all: [ hwdata ]
     debian-12+ubuntu-2204+ubuntu-2404: [ libdrm-amdgpu1 ]
-    fedora-39+fedora-40: [ libdrm ]
+    fedora-39+fedora-40+rhel-8+rhel-9: [ libdrm ]
     arch: [ libdrm ]
     opensuse-tumbleweed: [ libdrm ]
   build_depends:
     all: [ curl, make, clang, git ]
     debian-12+ubuntu-2204+ubuntu-2404: [ pkg-config, build-essential, libdrm-dev, dbus ]
-    fedora-39+fedora-40: [ gcc, libdrm-devel, dbus ]
+    fedora-39+fedora-40+rhel-8+rhel-9: [ gcc, libdrm-devel, dbus ]
     arch: [ libdrm, dbus ]
     opensuse-tumbleweed: [ libdrm-devel ]
   all_images: true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		FROM rockylinux:8
		RUN dnf install curl --allowerasing -y # Fix for curl-minimal conflict
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		FROM rockylinux:9
		RUN dnf install curl --allowerasing -y # Fix for curl-minimal conflict