From 40e9e97cce817be6036e9078a394957c04c32afb Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Thu, 20 Mar 2025 21:56:33 -0600 Subject: [PATCH] adding more alpine specific build_deps --- tasks/facts.yml | 26 +++++++++++++------------- tasks/main.yml | 24 ++++++++++++++++++++++++ vars/main.yml | 1 + vars/pkgs/greetd.yml | 6 ++++++ vars/pkgs/hypridle.yml | 4 ++++ vars/pkgs/hyprland_qt_support.yml | 2 ++ vars/pkgs/hyprland_qtutils.yml | 6 ++++++ vars/pkgs/hyprpaper.yml | 9 +++++++++ vars/pkgs/hyrplock.yml | 13 +++++++++++++ vars/pkgs/hyrppicker.yml | 7 +++++++ vars/pkgs/zfs.yml | 3 +++ 11 files changed, 88 insertions(+), 13 deletions(-) diff --git a/tasks/facts.yml b/tasks/facts.yml index 3da3b7a..dc38f52 100644 --- a/tasks/facts.yml +++ b/tasks/facts.yml @@ -1,10 +1,21 @@ # vim: set filetype=yaml.ansible : --- -- name: Set facts for installation +- name: Set path prefix + ansible.builtin.set_fact: + path: + prefix: "{{ path.prefix | default(defaults.path.prefix) }}" + +- name: Set install variables ansible.builtin.set_fact: ext_become: "{{ not use_local }}" path: - prefix: "{% if use_local %}{{ lookup('ansible.builtin.env', 'HOME') }}/.local{% else %}{{ defaults.path.prefix }}{% endif %}" + prefix: "{{ path.prefix }}" + appimage: "{{ path.appimage | default(path.prefix ~ defaults.path.suffix.appimage) }}" + archive: "{{ path.archive | default(path.prefix ~ defaults.path.suffix.archive) }}" + bin: "{{ path.bin | default(path.prefix ~ defaults.path.suffix.bin) }}" + cargo: "{{ path.cargo | default(path.prefix ~ defaults.path.suffix.cargo) }}" + go: "{% if ansible_distribution == 'MacOSX' %}/usr/local/go{% else %}{{ path.go | default(path.prefix ~ defaults.path.suffix.go) }}{% endif %}" + pipx: "{{ path.pipx | default(path.prefix ~ defaults.path.suffix.pipx) }}" - name: Set Linux specific facts when: @@ -46,17 +57,6 @@ sys_pkg_become: false # homebrew doesn't require sudo access lib_path: lib -- name: Set paths - ansible.builtin.set_fact: - path: - prefix: "{{ path.prefix }}" - appimage: "{{ path.appimage | default(path.prefix ~ defaults.path.suffix.appimage) }}" - archive: "{{ path.archive | default(path.prefix ~ defaults.path.suffix.archive) }}" - bin: "{{ path.bin | default(path.prefix ~ defaults.path.suffix.bin) }}" - cargo: "{{ path.cargo | default(path.prefix ~ defaults.path.suffix.cargo) }}" - go: "{% if ansible_distribution == 'MacOSX' %}/usr/local/go{% else %}{{ path.go | default(path.prefix ~ defaults.path.suffix.go) }}{% endif %}" - pipx: "{{ path.pipx | default(path.prefix ~ defaults.path.suffix.pipx) }}" - - name: Set OS independant facts ansible.builtin.set_fact: pkg_archive: [] # packages installed via prebuilt archive diff --git a/tasks/main.yml b/tasks/main.yml index 8b18dff..b4d06e2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -13,6 +13,30 @@ ansible.builtin.include_tasks: file: facts.yml +- name: Dump paths + when: + - debug + ansible.builtin.debug: + msg: "{{ path | dict2items }}" + +- name: Dump vars + when: + - debug + ansible.builtin.debug: + var: ext_become + +- name: Dump use_local + when: + - debug + ansible.builtin.debug: + var: use_local + +- name: Dump packages + when: + - debug + ansible.builtin.debug: + var: packages + - name: Ensure required path exist become: "{{ ext_become }}" loop: "{{ path | dict2items }}" diff --git a/vars/main.yml b/vars/main.yml index e8dd0c8..c8493c8 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,6 +1,7 @@ # vim: set filetype=yaml.ansible : # variables used in ansible_role_package --- +debug: false use_local: true prefer_method: system packages: [] # list of packages to install diff --git a/vars/pkgs/greetd.yml b/vars/pkgs/greetd.yml index 58c39bb..851d854 100644 --- a/vars/pkgs/greetd.yml +++ b/vars/pkgs/greetd.yml @@ -3,3 +3,9 @@ greetd: RedHat: - greetd - tuigreet + Alpine: + - greetd + - greetd-doc + - greetd-openrc + - greetd-tuigreet + - greetd-tuigreet-doc diff --git a/vars/pkgs/hypridle.yml b/vars/pkgs/hypridle.yml index 2aaadd9..1222142 100644 --- a/vars/pkgs/hypridle.yml +++ b/vars/pkgs/hypridle.yml @@ -10,6 +10,10 @@ hypridle: - patch - wayland-devel - wayland-protocols-devel + Alpine: + - patch + - wayland-dev + - wayland-protocols build_installed_files: - bin/hypridle - lib/systemd/user/hypridle.service diff --git a/vars/pkgs/hyprland_qt_support.yml b/vars/pkgs/hyprland_qt_support.yml index f99d1bb..606a08f 100644 --- a/vars/pkgs/hyprland_qt_support.yml +++ b/vars/pkgs/hyprland_qt_support.yml @@ -6,6 +6,8 @@ hyprland_qt_support: build_deps: RedHat: - qt6-qtdeclarative-devel + Alpine: + - qt6-qtdeclarative-dev build_installed_files: - lib/libhyprland-quick-style-impl.so - lib/qt6/qml/org/hyprland/style/impl/libhyprland-quick-style-implplugin.so diff --git a/vars/pkgs/hyprland_qtutils.yml b/vars/pkgs/hyprland_qtutils.yml index d02cc3f..ec77402 100644 --- a/vars/pkgs/hyprland_qtutils.yml +++ b/vars/pkgs/hyprland_qtutils.yml @@ -11,6 +11,12 @@ hyprland_qtutils: - wayland-devel - wayland-protocols-devel - qt6-qtwayland-devel + Alpine: + - qt6-qtbase-dev + - qt6-qtdeclarative-dev + - wayland-dev + - wayland-protocols + - qt6-qtwayland-dev build_installed_files: - bin/hyprland-dialog - bin/hyprland-update-screen diff --git a/vars/pkgs/hyprpaper.yml b/vars/pkgs/hyprpaper.yml index 1b9e8c3..b1bf693 100644 --- a/vars/pkgs/hyprpaper.yml +++ b/vars/pkgs/hyprpaper.yml @@ -17,6 +17,15 @@ hyprpaper: - libjpeg-turbo-devel - libwebp-devel - gcc-c++ + Alpine: + - wayland-dev + - wayland-protocols + - pango-dev + - cairo-dev + - file-dev + - libjpeg-turbo-dev + - libwebp-dev + - g++ build_installed_files: - bin/hyprpaper - "{{ lib_path }}/systemd/user/hyprpaper.service" diff --git a/vars/pkgs/hyrplock.yml b/vars/pkgs/hyrplock.yml index fd1d2af..bd2add6 100644 --- a/vars/pkgs/hyrplock.yml +++ b/vars/pkgs/hyrplock.yml @@ -22,6 +22,19 @@ hyprlock: - libjpeg-turbo-devel - libwebp-devel - gcc-c++ + Alpine: + - patch + - wayland-dev + - wayland-protocols + - pango-dev + - cairo-dev + - libdrm-dev + - linux-pam-dev + - file-dev + - libxkbcommon-dev + - libjpeg-turbo-dev + - libwebp-dev + - g++ build_installed_files: - bin/hyprlock - etc/pam.d/hyprlock diff --git a/vars/pkgs/hyrppicker.yml b/vars/pkgs/hyrppicker.yml index 2005381..82fcf5f 100644 --- a/vars/pkgs/hyrppicker.yml +++ b/vars/pkgs/hyrppicker.yml @@ -11,6 +11,13 @@ hyprpicker: - cairo-devel - libxkbcommon-devel - cmake + Alpine: + - wayland-dev + - wayland-protocols + - pango-dev + - cairo-dev + - libxkbcommon-dev + - cmake build_installed_files: - bin/hyprpicker - share/man/man1/hyprpicker.1 diff --git a/vars/pkgs/zfs.yml b/vars/pkgs/zfs.yml index d350fe5..0cd8053 100644 --- a/vars/pkgs/zfs.yml +++ b/vars/pkgs/zfs.yml @@ -12,6 +12,9 @@ zfs: Debian: - zfs-dkms - zfsutils-linux + Alpine: + - zfs + - zfs-lts build_deps: Fedora: - kernel-devel