From 4a092b7109b6ef2e0bcbf29296654716c487c1fb Mon Sep 17 00:00:00 2001 From: Ilya Zlobintsev Date: Sun, 22 Sep 2024 16:14:50 +0300 Subject: [PATCH] feat: add headless packages for RHEL (via Rocky Linux) (#380) * feat: add headless packages for RHEL (via Rocky Linux) * fix: rhel curl package --- .github/workflows/build-packages.yaml | 4 ++++ .pkger.yml | 6 ++++++ lact-gui/src/lib.rs | 4 ---- pkg/images/rhel-8/Dockerfile | 2 ++ pkg/images/rhel-9/Dockerfile | 2 ++ pkg/recipes/lact-headless/recipe.yml | 4 ++-- 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 pkg/images/rhel-8/Dockerfile create mode 100644 pkg/images/rhel-9/Dockerfile diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml index 31c20fa..c8547db 100644 --- 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 index ff2623a..7d5988e 100644 --- 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 index 8271561..174b563 100644 --- 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::(args); Ok(()) diff --git a/pkg/images/rhel-8/Dockerfile b/pkg/images/rhel-8/Dockerfile new file mode 100644 index 0000000..97cf935 --- /dev/null +++ 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 new file mode 100644 index 0000000..546b541 --- /dev/null +++ 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 index 2ba010c..a6406ee 100644 --- 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