From e09d0c4bc60263124c5ec443794eb1934240a2c5 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 17 Jan 2026 15:18:26 +1100 Subject: [PATCH] chore: update build tool, puppet-initial - update build tool with github_release_pattern - update puppet-initial to reduce impact on upgrades --- rpms/incus/metadata.yaml | 8 ++++---- rpms/jellyfin-ffmpeg-bin/metadata.yaml | 8 ++++---- rpms/openbao-plugins/metadata.yaml | 1 + rpms/puppet-initial/resources/scripts/postinstall.sh | 7 +++++-- rpms/puppet-initial/resources/scripts/preinstall.sh | 7 +++++-- tools/build | 7 ++++++- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/rpms/incus/metadata.yaml b/rpms/incus/metadata.yaml index ff411d3..656bf79 100644 --- a/rpms/incus/metadata.yaml +++ b/rpms/incus/metadata.yaml @@ -1,11 +1,11 @@ name: incus github: lxc/incus -description: incus package +description: Powerful system container and virtual machine manager arch: amd64 platform: linux -maintainer: '' -homepage: '' -license: '' +maintainer: unkin +homepage: https://linuxcontainers.org/incus/ +license: Apache-2.0 builds: - repository: - almalinux/el9 diff --git a/rpms/jellyfin-ffmpeg-bin/metadata.yaml b/rpms/jellyfin-ffmpeg-bin/metadata.yaml index a4df5b2..f9fbd96 100644 --- a/rpms/jellyfin-ffmpeg-bin/metadata.yaml +++ b/rpms/jellyfin-ffmpeg-bin/metadata.yaml @@ -1,11 +1,11 @@ name: jellyfin-ffmpeg-bin github: jellyfin/jellyfin-ffmpeg -description: jellyfin-ffmpeg-bin package +description: FFmpeg binary package optimized for Jellyfin media server arch: amd64 platform: linux -maintainer: '' -homepage: '' -license: '' +maintainer: unkin +homepage: https://github.com/jellyfin/jellyfin-ffmpeg +license: GPL-3.0 builds: - repository: - almalinux/el8 diff --git a/rpms/openbao-plugins/metadata.yaml b/rpms/openbao-plugins/metadata.yaml index aa1320d..25b1123 100644 --- a/rpms/openbao-plugins/metadata.yaml +++ b/rpms/openbao-plugins/metadata.yaml @@ -1,4 +1,5 @@ name: openbao-plugins +github: openbao/openbao-plugins description: Meta package that installs all OpenBao plugins arch: amd64 platform: linux diff --git a/rpms/puppet-initial/resources/scripts/postinstall.sh b/rpms/puppet-initial/resources/scripts/postinstall.sh index 6d1113f..af61eb5 100755 --- a/rpms/puppet-initial/resources/scripts/postinstall.sh +++ b/rpms/puppet-initial/resources/scripts/postinstall.sh @@ -1,3 +1,6 @@ #!/usr/bin/env bash -systemctl daemon-reload -systemctl enable puppet-initial.service +# Only run on fresh install, not upgrade +if [ "$1" -eq 1 ]; then + systemctl daemon-reload + systemctl enable puppet-initial.service +fi diff --git a/rpms/puppet-initial/resources/scripts/preinstall.sh b/rpms/puppet-initial/resources/scripts/preinstall.sh index a06c6bd..e52703b 100755 --- a/rpms/puppet-initial/resources/scripts/preinstall.sh +++ b/rpms/puppet-initial/resources/scripts/preinstall.sh @@ -1,3 +1,6 @@ #!/usr/bin/env bash -systemctl stop puppet -systemctl disable puppet +# Only run on fresh install, not upgrade +if [ "$1" -eq 1 ]; then + systemctl stop puppet + systemctl disable puppet +fi diff --git a/tools/build b/tools/build index b1775e9..8c2d765 100755 --- a/tools/build +++ b/tools/build @@ -105,7 +105,7 @@ METADATA_SCHEMA = { 'regex': r'^[a-zA-Z0-9\-_\.:\/]+$' }, 'release': { - 'type': 'string', + 'type': ['string', 'integer', 'float'], 'required': True, 'empty': False }, @@ -117,6 +117,11 @@ METADATA_SCHEMA = { } } } + }, + 'github_release_pattern': { + 'type': 'string', + 'required': False, + 'empty': False } }