sprouting.cloud/ansible_role_package
Public Access
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix multiple source install bugs

Browse Source
This commit is contained in:
Matthew Stobbs
2025-03-11 20:16:22 -06:00
parent 5cfa05007c
commit 2fd82b09d5
22 changed files with 99 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
files/aquamarine/Alpine.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cdb340..954de21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ target_include_directories(
PRIVATE "./src" "./src/include" "./protocols" "${CMAKE_BINARY_DIR}")
set_target_properties(aquamarine PROPERTIES VERSION ${AQUAMARINE_VERSION}
SOVERSION 6)
-target_link_libraries(aquamarine OpenGL::EGL OpenGL::OpenGL PkgConfig::deps)
+target_link_libraries(aquamarine OpenGL::EGL OpenGL::GL PkgConfig::deps)
check_include_file("sys/timerfd.h" HAS_TIMERFD)
pkg_check_modules(epoll IMPORTED_TARGET epoll-shim)

2
tasks/config/ghostty.yml
View File

@@ -13,7 +13,9 @@
deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}" deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}"
vers: "{{ pkgconfig.ghostty.version }}" vers: "{{ pkgconfig.ghostty.version }}"
pkg: "{{ pkgconfig.ghostty[ghostty.method] }}" pkg: "{{ pkgconfig.ghostty[ghostty.method] }}"
repo: "{{ pkgconfig.ghostty.git_repo }}"
build_deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}" build_deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}"
optimize: "{{ pkgconfig.ghostty.optimize }}"
- name: Set ghostty config for appimage install - name: Set ghostty config for appimage install
when: when:

1
tasks/config/neovim.yml
View File

@@ -11,6 +11,7 @@
method: "{{ neovim.method }}" method: "{{ neovim.method }}"
vers: "v{{ pkgconfig.neovim.version }}" vers: "v{{ pkgconfig.neovim.version }}"
pkgs: "{{ pkgconfig.neovim.pkgs[ansible_distribution] | default(pkgconfig.neovim.pkgs.default) }}" pkgs: "{{ pkgconfig.neovim.pkgs[ansible_distribution] | default(pkgconfig.neovim.pkgs.default) }}"
git_repo: "{{ pkgconfig.neovim.git_repo }}"
- name: Set neovim config for appimage install - name: Set neovim config for appimage install
when: when:

7
tasks/facts.yml
View File

@@ -19,6 +19,13 @@
pkg_snap: [] # snpacraft.io packages pkg_snap: [] # snpacraft.io packages
pipx_exec: "/usr/bin/pipx" pipx_exec: "/usr/bin/pipx"
sys_pkg_become: true # Linux package managers require sudo access sys_pkg_become: true # Linux package managers require sudo access
lib_path: lib64
- name: Set alpine linux specific facts
when:
- ansible_os_family == 'Alpine'
ansible.builtin.set_fact:
lib_path: lib
- name: Set rpm dist if RedHat based - name: Set rpm dist if RedHat based
when: when:

6
tasks/main.yml
View File

@@ -3,10 +3,10 @@
# create all the facts used throughout the role, but shouldn't be touched # create all the facts used throughout the role, but shouldn't be touched
# by the user # by the user
- name: Create temporary directory for downloads - name: Create temporary directory for downloads
ansible.builtin.tempfile:
state: directory
prefix: ansible_role_package.
register: d_tempdir register: d_tempdir
ansible.builtin.file:
path: /tmp/ansible_role_package
state: directory
- name: Set installation facts - name: Set installation facts
ansible.builtin.include_tasks: ansible.builtin.include_tasks:

2
tasks/pkgs/aquamarine.yml
View File

@@ -5,8 +5,6 @@
- aquamarine_configured is undefined - aquamarine_configured is undefined
block: block:
- name: Load aquamarine config - name: Load aquamarine config
when:
- aquamarine is undefined
ansible.builtin.include_tasks: ansible.builtin.include_tasks:
file: config/aquamarine.yml file: config/aquamarine.yml

14
tasks/src/aquamarine.yml
View File

@@ -12,11 +12,11 @@
- name: Check if aquamarine is installed - name: Check if aquamarine is installed
register: stat_aquamarine_inst register: stat_aquamarine_inst
ansible.builtin.stat: ansible.builtin.stat:
path: "{{ hyprland.prefix }}/lib64/libaquamarine.so" path: "{{ hyprland.prefix }}/{{ lib_path }}/libaquamarine.so"
- name: Build and install aquamarine - name: Build and install aquamarine
when: when:
- stat_aquamarine_inst.stat.exists - not stat_aquamarine_inst.stat.exists
block: block:
- name: Clone git repository - name: Clone git repository
ansible.builtin.git: ansible.builtin.git:
@@ -25,6 +25,12 @@
repo: "{{ aquamarine.repo }}" repo: "{{ aquamarine.repo }}"
version: "{{ aquamarine.vers }}" version: "{{ aquamarine.vers }}"
- name: Apply patch for alpine linux
ansible.posix.patch:
basedir: "{{ aquamarine.git_path }}"
src: aquamarine/Alpine.patch
state: present
- name: Configure aquamarine - name: Configure aquamarine
ansible.builtin.command: ansible.builtin.command:
creates: "{{ aquamarine.git_path }}/build" creates: "{{ aquamarine.git_path }}/build"
@@ -32,7 +38,7 @@
argv: argv:
- cmake - cmake
- --no-warn-unused-cli - --no-warn-unused-cli
- DCMAKE_BUILD_TYPE=Release - -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }} - -DCMAKE_INSTALL_PREFIX={{ hyprland.prefix }}
- -S - -S
- . - .
@@ -57,7 +63,7 @@
- name: Install aquamarine - name: Install aquamarine
become: true become: true
ansible.builtin.command: ansible.builtin.command:
creates: "{{ path.bin }}/aquamarine" creates: "{{ hyprland.prefix }}/{{ lib_path }}/libaquamarine.so"
chdir: "{{ aquamarine.git_path }}" chdir: "{{ aquamarine.git_path }}"
argv: argv:
- cmake - cmake

2
tasks/src/ghostty.yml
View File

@@ -14,4 +14,4 @@
register: c_ghostty_build register: c_ghostty_build
ansible.builtin.command: ansible.builtin.command:
chdir: "{{ d_tempdir.path }}/ghostty" chdir: "{{ d_tempdir.path }}/ghostty"
cmd: "zig build -p {{ path.prefix }} -D{{ pkgconfig_ghostty.optimize }}" cmd: "zig build -p {{ path.prefix }} -Doptimize={{ ghostty.optimize }}"

2
tasks/src/hyprgraphics.yml
View File

@@ -12,7 +12,7 @@
- name: Check if hyprgraphics is installed - name: Check if hyprgraphics is installed
register: stat_hyprgraphics_inst register: stat_hyprgraphics_inst
ansible.builtin.stat: ansible.builtin.stat:
path: "{{ hyprland.prefix }}/lib64/libhyprgraphics.so" path: "{{ hyprland.prefix }}/{{ lib_path }}/libhyprgraphics.so"
- name: Build and install hyprgraphics - name: Build and install hyprgraphics
when: when:

2
tasks/src/hyprlang.yml
View File

@@ -12,7 +12,7 @@
- name: Check if hyprlang is installed - name: Check if hyprlang is installed
register: stat_hyprlang_inst register: stat_hyprlang_inst
ansible.builtin.stat: ansible.builtin.stat:
path: "{{ hyprland.prefix }}/lib64/libhyprlang.so" path: "{{ hyprland.prefix }}/{{ lib_path }}/libhyprlang.so"
- name: Build and install hyprlang - name: Build and install hyprlang
when: when:

2
tasks/src/hyprutils.yml
View File

@@ -12,7 +12,7 @@
- name: Check if hyprutils is installed - name: Check if hyprutils is installed
register: stat_hyprutils_inst register: stat_hyprutils_inst
ansible.builtin.stat: ansible.builtin.stat:
path: "{{ hyprland.prefix }}/lib64/libhyprutils.so" path: "{{ hyprland.prefix }}/{{ lib_path }}/libhyprutils.so"
- name: Build and install hyprutils - name: Build and install hyprutils
when: when:

4
tasks/src/neovim.yml
View File

@@ -4,8 +4,8 @@
ansible.builtin.git: ansible.builtin.git:
depth: 1 depth: 1
dest: "{{ d_tempdir.path }}/neovim" dest: "{{ d_tempdir.path }}/neovim"
repo: "{{ pkgconfig_neovim.git_repo }}" repo: "{{ neovim.git_repo }}"
version: "{{ pkgconfig_neovim.version }}" version: "{{ neovim.version }}"
- name: Build and install neovim - name: Build and install neovim
become: "{{ ext_become }}" become: "{{ ext_become }}"

4
tasks/src/sdbus_cpp_2.yml
View File

@@ -12,7 +12,7 @@
- name: Check if sdbus-cpp-2 is installed - name: Check if sdbus-cpp-2 is installed
register: stat_sdbus_cpp_2_inst register: stat_sdbus_cpp_2_inst
ansible.builtin.stat: ansible.builtin.stat:
path: "{{ sdbus_cpp_2.prefix }}/lib64/libsdbus-c++.so" path: "{{ sdbus_cpp_2.prefix }}/{{ lib_path }}/libsdbus-c++.so"
- name: Build and install sdbus-cpp-2 - name: Build and install sdbus-cpp-2
when: when:
@@ -58,7 +58,7 @@
- name: Install sdbus_cpp_2 - name: Install sdbus_cpp_2
become: true become: true
ansible.builtin.command: ansible.builtin.command:
creates: "{{ sdbus_cpp_2.prefix }}/lib64/libsdbus-c++.so" creates: "{{ sdbus_cpp_2.prefix }}/{{ lib_path }}/libsdbus-c++.so"
chdir: "{{ sdbus_cpp_2.git_path }}" chdir: "{{ sdbus_cpp_2.git_path }}"
argv: argv:
- cmake - cmake

9
vars/pkgs/aquamarine.yml
View File

@@ -24,11 +24,12 @@ aquamarine:
- libinput-dev - libinput-dev
- libseat-dev - libseat-dev
- mesa-gbm - mesa-gbm
- mesa-dev
- wayland-dev - wayland-dev
- wayland-protocols - wayland-protocols
build_installed_files: build_installed_files:
- lib64/libaquamarine.so.0.7.2 - "{{ lib_path }}/libaquamarine.so.0.7.2"
- lib64/libaquamarine.so.6 - "{{ lib_path }}libaquamarine.so.6"
- lib64/libaquamarine.so - "{{ lib_path }}/libaquamarine.so"
- include/aquamarine - include/aquamarine
- lib64/pkgconfig/aquamarine.pc - "{{ lib_path }}/pkgconfig/aquamarine.pc"

6
vars/pkgs/ghostty.yml
View File

@@ -1,6 +1,7 @@
ghostty: ghostty:
version: 1.1.2+1 version: v1.1.2
optimize: ReleaseFast optimize: ReleaseFast
git_repo: https://github.com/ghostty-org/ghostty
build_deps: build_deps:
Debian: Debian:
- libgtk-4-dev - libgtk-4-dev
@@ -11,6 +12,9 @@ ghostty:
Alpine: Alpine:
- gtk4.0-dev - gtk4.0-dev
- libadwaita-dev - libadwaita-dev
- pkgconf
- ncurses
- blueprint-compiler
Darwin: [] Darwin: []
archmap: archmap:
arm64: aarch64 arm64: aarch64

8
vars/pkgs/hyprcursor.yml
View File

@@ -15,10 +15,10 @@ hyprcursor:
- librsvg-dev - librsvg-dev
- tomlplusplus-dev - tomlplusplus-dev
build_installed_files: build_installed_files:
- lib64/libhyprcursor.so.0.1.11 - "{{ lib_path }}/libhyprcursor.so.0.1.11"
- lib64/libhyprcursor.so.0 - "{{ lib_path }}/libhyprcursor.so.0"
- lib64/libhyprcursor.so - "{{ lib_path }}/libhyprcursor.so"
- include/hyprcursor.hpp - include/hyprcursor.hpp
- bin/hyprcursor-util - bin/hyprcursor-util
- include/hyprcursor - include/hyprcursor
- lib64/pkgconfig/hyprcursor.pc - "{{ lib_path }}/pkgconfig/hyprcursor.pc"

8
vars/pkgs/hyprgraphics.yml
View File

@@ -25,8 +25,8 @@ hyprgraphics:
- file - file
- libspng-dev - libspng-dev
build_installed_files: build_installed_files:
- lib64/libhyprgraphics.so.0.1.2 - "{{ lib_path }}/libhyprgraphics.so.0.1.2"
- lib64/libhyprgraphics.so.0 - "{{ lib_path }}/libhyprgraphics.so.0"
- lib64/libhyprgraphics.so - "{{ lib_path }}/libhyprgraphics.so"
- include/hyprgraphics - include/hyprgraphics
- lib64/pkgconfig/hyprgraphics.pc - "{{ lib_path }}/pkgconfig/hyprgraphics.pc"

14
vars/pkgs/hyprlang.yml
View File

@@ -6,12 +6,12 @@ hyprlang:
RedHat: [] RedHat: []
Alpine: [] Alpine: []
build_installed_files: build_installed_files:
- lib64/libhyprlang.so.0.6.0 - "{{ lib_path }}/libhyprlang.so.0.6.0"
- lib64/libhyprlang.so.2 - "{{ lib_path }}/libhyprlang.so.2"
- lib64/libhyprlang.so - "{{ lib_path }}/libhyprlang.so"
- include/hyprlang.hpp - include/hyprlang.hpp
- lib64/libhyprlang.so.0.6.0 - "{{ lib_path }}/libhyprlang.so.0.6.0"
- lib64/libhyprlang.so.2 - "{{ lib_path }}/libhyprlang.so.2"
- lib64/libhyprlang.so - "{{ lib_path }}/libhyprlang.so"
- include/hyprlang.hpp - include/hyprlang.hpp
- lib64/pkgconfig/hyprlang.pc - "{{ lib_path }}/pkgconfig/hyprlang.pc"

8
vars/pkgs/hyprutils.yml
View File

@@ -7,8 +7,8 @@ hyprutils:
Alpine: Alpine:
- pixman-dev - pixman-dev
build_installed_files: build_installed_files:
- lib64/libhyprutils.so.0.5.1 - "{{ lib_path }}/libhyprutils.so.0.5.1"
- lib64/libhyprutils.so.4 - "{{ lib_path }}/libhyprutils.so.4"
- lib64/libhyprutils.so - "{{ lib_path }}/libhyprutils.so"
- include/hyprutils - include/hyprutils
- lib64/pkgconfig/hyprutils.pc - "{{ lib_path }}/pkgconfig/hyprutils.pc"

4
vars/pkgs/hyprwayland_scanner.yml
View File

@@ -8,5 +8,5 @@ hyprwayland_scanner:
- pugixml-dev - pugixml-dev
build_installed_files: build_installed_files:
- bin/hyprwayland-scanner - bin/hyprwayland-scanner
- lib64/pkgconfig/hyprwayland-scanner.pc - "{{ lib_path }}/pkgconfig/hyprwayland-scanner.pc"
- lib64/cmake/hyprwayland-scanner - "{{ lib_path }}/cmake/hyprwayland-scanner"

2
vars/pkgs/neovim.yml
View File

@@ -1,5 +1,5 @@
neovim: neovim:
version: 0.10.4 version: nightly
git_repo: https://github.com/neovim/neovim git_repo: https://github.com/neovim/neovim
appimage: appimage:
base_url: https://github.com/neovim/neovim/releases/download base_url: https://github.com/neovim/neovim/releases/download

46
vars/pkgs/sdbus_cpp_2.yml
View File

@@ -8,38 +8,38 @@ sdbus_cpp_2:
Alpine: Alpine:
- elogind-dev - elogind-dev
build_installed_files: build_installed_files:
- share/doc/sdbus-c++/sdbus-c++-class-diagram.png - "{{ lib_path }}/cmake/sdbus-c++/sdbus-c++-config-version.cmake"
- share/doc/sdbus-c++/sdbus-c++-class-diagram.uml - "{{ lib_path }}/cmake/sdbus-c++/sdbus-c++-config.cmake"
- share/doc/sdbus-c++/systemd-dbus-config.md - "{{ lib_path }}/cmake/sdbus-c++/sdbus-c++-targets-release.cmake"
- share/doc/sdbus-c++/using-sdbus-c++.md - "{{ lib_path }}/cmake/sdbus-c++/sdbus-c++-targets.cmake"
- lib64/libsdbus-c++.so.2.0.0 - "{{ lib_path }}/libsdbus-c++.so"
- lib64/libsdbus-c++.so.2 - "{{ lib_path }}/libsdbus-c++.so.2"
- lib64/libsdbus-c++.so - "{{ lib_path }}/libsdbus-c++.so.2.0.0"
- "{{ lib_path }}/pkgconfig/sdbus-c++.pc"
- include/sdbus-c++/AdaptorInterfaces.h
- include/sdbus-c++/ConvenienceApiClasses.h - include/sdbus-c++/ConvenienceApiClasses.h
- include/sdbus-c++/ConvenienceApiClasses.inl - include/sdbus-c++/ConvenienceApiClasses.inl
- include/sdbus-c++/VTableItems.h
- include/sdbus-c++/VTableItems.inl
- include/sdbus-c++/Error.h - include/sdbus-c++/Error.h
- include/sdbus-c++/Flags.h
- include/sdbus-c++/IConnection.h - include/sdbus-c++/IConnection.h
- include/sdbus-c++/AdaptorInterfaces.h
- include/sdbus-c++/ProxyInterfaces.h
- include/sdbus-c++/StandardInterfaces.h
- include/sdbus-c++/IObject.h - include/sdbus-c++/IObject.h
- include/sdbus-c++/IProxy.h - include/sdbus-c++/IProxy.h
- include/sdbus-c++/Message.h - include/sdbus-c++/Message.h
- include/sdbus-c++/MethodResult.h - include/sdbus-c++/MethodResult.h
- include/sdbus-c++/Types.h - include/sdbus-c++/ProxyInterfaces.h
- include/sdbus-c++/StandardInterfaces.h
- include/sdbus-c++/TypeTraits.h - include/sdbus-c++/TypeTraits.h
- include/sdbus-c++/Flags.h - include/sdbus-c++/Types.h
- include/sdbus-c++/VTableItems.h
- include/sdbus-c++/VTableItems.inl
- include/sdbus-c++/sdbus-c++.h - include/sdbus-c++/sdbus-c++.h
- lib64/cmake/sdbus-c++/sdbus-c++-targets.cmake - share/doc/sdbus-c++/AUTHORS
- lib64/cmake/sdbus-c++/sdbus-c++-targets-release.cmake
- lib64/cmake/sdbus-c++/sdbus-c++-config.cmake
- lib64/cmake/sdbus-c++/sdbus-c++-config-version.cmake
- lib64/pkgconfig/sdbus-c++.pc
- share/doc/sdbus-c++/README
- share/doc/sdbus-c++/README.md
- share/doc/sdbus-c++/NEWS
- share/doc/sdbus-c++/COPYING - share/doc/sdbus-c++/COPYING
- share/doc/sdbus-c++/ChangeLog - share/doc/sdbus-c++/ChangeLog
- share/doc/sdbus-c++/AUTHORS - share/doc/sdbus-c++/NEWS
- share/doc/sdbus-c++/README
- share/doc/sdbus-c++/README.md
- share/doc/sdbus-c++/sdbus-c++-class-diagram.png
- share/doc/sdbus-c++/sdbus-c++-class-diagram.uml
- share/doc/sdbus-c++/systemd-dbus-config.md
- share/doc/sdbus-c++/using-sdbus-c++.md