Compare commits

...

No commits in common. 'c9-beta' and 'i10cs' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/yggdrasil-worker-package-manager-0.2.2.tar.xz
SOURCES/yggdrasil-worker-package-manager-0.2.3.tar.xz

@ -1 +1 @@
8a3caef5716c6571d51ff6a478c76717862af943 SOURCES/yggdrasil-worker-package-manager-0.2.2.tar.xz
4b5fbd18095a3e034396a0a1a5d2c217facbe662 SOURCES/yggdrasil-worker-package-manager-0.2.3.tar.xz

@ -1,53 +0,0 @@
From 8c19d5ac3d5731750c935e1e23e9f4add49bff48 Mon Sep 17 00:00:00 2001
From: Link Dupont <link@sub-pop.net>
Date: Tue, 24 Oct 2023 20:45:45 -0400
Subject: [PATCH] refactor: downgrade yggdrasil version to 0.4.1
'latest' contains additional changes to the worker package that aren't
released in a tagged version yet.
---
go.mod | 2 +-
go.sum | 4 ++--
main.go | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/go.mod b/go.mod
index 683d9d2..95a3e2a 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
git.sr.ht/~spc/go-log v0.0.0-20210611184941-ce2f05edb627
github.com/google/uuid v1.3.1
github.com/peterbourgon/ff/v3 v3.1.0
- github.com/redhatinsights/yggdrasil v0.0.0-20231011123719-5130298ed3ac
+ github.com/redhatinsights/yggdrasil v0.0.0-20230918163727-97cd578cc7c6
github.com/sgreben/flagvar v1.10.1
github.com/zcalusic/sysinfo v1.0.2
)
diff --git a/go.sum b/go.sum
index 6420143..5b3b778 100644
--- a/go.sum
+++ b/go.sum
@@ -13,8 +13,8 @@ github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhEC
github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/peterbourgon/ff/v3 v3.1.0 h1:5JAeDK5j/zhKFjyHEZQXwXBoDijERaos10RE+xamOsY=
github.com/peterbourgon/ff/v3 v3.1.0/go.mod h1:XNJLY8EIl6MjMVjBS4F0+G0LYoAqs0DTa4rmHHukKDE=
-github.com/redhatinsights/yggdrasil v0.0.0-20231011123719-5130298ed3ac h1:rqRkjhJWxnNmmxCjxal5PrGuHtp93OCZn1PHPdQMCDQ=
-github.com/redhatinsights/yggdrasil v0.0.0-20231011123719-5130298ed3ac/go.mod h1:Rwya3pQvxCNI/2bjNQ9N6cHTMd2YKrRCJ2sENRawoBg=
+github.com/redhatinsights/yggdrasil v0.0.0-20230918163727-97cd578cc7c6 h1:YLX/bTYS5/BwZt7vw8vIAr3vqM8tioJr3vajhSlCpzg=
+github.com/redhatinsights/yggdrasil v0.0.0-20230918163727-97cd578cc7c6/go.mod h1:Rwya3pQvxCNI/2bjNQ9N6cHTMd2YKrRCJ2sENRawoBg=
github.com/sgreben/flagvar v1.10.1 h1:ukN3zqVj9T9U7CiKG6owmejxswJYMbAg9Mxkhi1B4tw=
github.com/sgreben/flagvar v1.10.1/go.mod h1:AxDmbFDIxZ4dHj2zg8LxuJn5CSwSS28iY/Wy56e+nhI=
github.com/zcalusic/sysinfo v1.0.2 h1:nwTTo2a+WQ0NXwo0BGRojOJvJ/5XKvQih+2RrtWqfxc=
diff --git a/main.go b/main.go
index 719f304..280e7ce 100644
--- a/main.go
+++ b/main.go
@@ -84,7 +84,6 @@ func main() {
"package_manager",
false,
map[string]string{"version": Version},
- nil,
dataRx,
nil,
)

@ -1,9 +1,19 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 3;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
%bcond_without check
# https://github.com/redhatinsights/yggdrasil-worker-package-manager
%global goipath github.com/redhatinsights/yggdrasil-worker-package-manager
Version: 0.2.2
%global tag %{version}
Version: 0.2.3
%global tag v%{version}
%gometa -f
@ -18,24 +28,23 @@ the provided allow-pattern regular expressions.}
%global godocs README.md
Name: yggdrasil-worker-package-manager
Release: 2%{?dist}
Release: %autorelease
Summary: Package manager worker for yggdrasil
License: GPL-3.0-only
URL: %{gourl}
Source: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
Patch100: 8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch
Source: %{url}/releases/download/%{tag}/%{name}-%{version}.tar.xz
BuildRequires: systemd-rpm-macros
BuildRequires: meson
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(systemd)
BuildRequires: golang >= 1.21
%description %{common_description}
%prep
%goprep %{?rhel:-k}
%autopatch -p1 %{?rhel:-M 99}
%if %{undefined rhel}
%generate_buildrequires
@ -57,6 +66,15 @@ export %gomodulesmode
%gocheck
%endif
%post
%systemd_post com.redhat.Yggdrasil1.Worker1.package_manager.service
%preun
%systemd_preun com.redhat.Yggdrasil1.Worker1.package_manager.service
%postun
%systemd_postun_with_restart com.redhat.Yggdrasil1.Worker1.package_manager.service
%files
%license LICENSE
%if %{defined rhel}
@ -66,10 +84,47 @@ export %gomodulesmode
%{_libexecdir}/*
%config(noreplace) %{_sysconfdir}/%{name}
%{_datadir}/dbus-1/system-services/*
%{_datadir}/dbus-1/system.d/*
%{_unitdir}
%changelog
* Tue Jul 9 2024 Link Dupont <link@redhat.com> - 0.2.2-2
- Drop generation of automatic Go source package
## START: Generated by rpmautospec
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.2.3-3
- Bump release for October 2024 mass rebuild:
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.2.3-2
- Rebuilt for MSVSphere 10
* Fri Sep 20 2024 Link Dupont <link@sub-pop.net> - 0.2.3-2
- Bump release to rebuild.
* Mon Sep 16 2024 Link Dupont <link@sub-pop.net> - 0.2.3-1
- Update to 0.2.3 (RHEL-58739)
* Tue Jul 09 2024 Link Dupont <link@sub-pop.net> - 0.2.2-6
- Drop gopkg macros
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.2.2-5
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Nov 06 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.2.2-3
- Only apply devendoring patch in Fedora builds
* Wed Oct 25 2023 Link Dupont <link@sub-pop.net> - 0.2.2-1
- Update to version 0.2.2
* Wed Aug 09 2023 Link Dupont <link@sub-pop.net> - 0.2.1-1
- Update to version 0.2.1
* Wed Aug 09 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.2.0-3
- Use vendored dependencies in RHEL builds
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Jul 8 2024 Link Dupont <link@redhat.com> - 0.2.2-1
- Initial package (RHEL-29802)
* Tue Jun 20 2023 Link Dupont <link@sub-pop.net> - 0.2.0-1
- Initial package (RHBZ#2176342)
## END: Generated by rpmautospec

Loading…
Cancel
Save