rpms
/
osbuild-composer
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'changed/i9-beta/osbuild-composer-88.2-1.el9_3.inferit' into i9

Browse Source
i9-beta changed/i9/osbuild-composer-88.2-1.el9_3.inferit
Alexey Lyubimov 1 year ago
parent 303bfb63ea 4e145c290c
commit b848da4b09
4 changed files with 169 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/osbuild-composer-76.tar.gz
SOURCES/osbuild-composer-88.2.tar.gz

2
.osbuild-composer.metadata
Unescape View File

@ -1 +1 @@
f68a24e9d6a407708e33d72240b140e9c60378f1 SOURCES/osbuild-composer-76.tar.gz
a8cadabdb422de148aa9a375631e1ef32b52afaa SOURCES/osbuild-composer-88.2.tar.gz

113
SOURCES/0001-Added-MSVSphere-support.patch
Unescape View File

@ -0,0 +1,113 @@
From 38f51c9207b8d32d669153abd1392f5a723a21a6 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Tue, 10 Oct 2023 12:17:22 +0300
Subject: [PATCH] Added MSVSphere support
---
repositories/msvsphere-92.json | 16 ++++++++++++++
repositories/msvsphere-93.json | 16 ++++++++++++++
.../osbuild/images/pkg/distro/rhel9/distro.go | 21 +++++++++++++++++++
.../pkg/distroregistry/distroregistry.go | 2 ++
4 files changed, 55 insertions(+)
create mode 100644 repositories/msvsphere-92.json
create mode 100644 repositories/msvsphere-93.json
diff --git a/repositories/msvsphere-92.json b/repositories/msvsphere-92.json
new file mode 100644
index 0000000..793350d
--- /dev/null
+++ b/repositories/msvsphere-92.json
@@ -0,0 +1,16 @@
+{
+ "x86_64": [
+ {
+ "name": "baseos",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.2/BaseOS/x86_64/os/",
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGPvra8BEAC06qzoXEPc0vEThWkSLK2TdSmQnJuVePkP8dLPGb7BXN2eM+/R\niefFDWihMD6Xc5cDnNkPdkqUgOvy+LwQJmOnsXx16MvHtX0M2hQ31VHouslULtZN\nfFhfBZK1e6/RCWhrAcAUcbW3/L2wS2yiz9jFXDHhzi4Xa1iVZKXN0QtsebZfe6Fq\nUC1ERGgYjnjMyJnIJbcpJQLvbSgW4BC9sC0JM+HiIpsLsHZuYPsxwQuV3Drn6Pa4\nAM/jgR5Jgm8n8/eQva+jYOurhUdDXQAUYVvD4BWB4LKhkuWbEZktavUhRenExEst\nYVfZ//G3wJ+fpfTjvYwv9o64sxDWC8zMxNeYyKz/ql+lYq17zy9cTQXpb4NCH2Vg\n2uW8oqbMpbrIzPGhMengBEk0+gwg+a8+KKr95LhxeBOpkG/DsbNNLYOidMl4z+vl\nexQFkkgQ/42byw3Q+ug8RpNUT9iB01TKSq2YX+mGAv2MYDvTK2rsZ2UGTpbSkqIF\nXrlXtV/zOeAFitYW9nZxtM1PG699hyoXavOfa90+xx28ehPAZDGE3nn1NU5Ot/U6\n4srGHsQ5gZaUlZqbeg27EXDrISnk2deE6ghnBR6eWpL41RNBDha3YnlCTPA6ywvb\nskgzVhu+IkdUBDA511QwpEMNXq8Kobm3r1TlJN/h2qmoFTZZq0tOW7PvEQARAQAB\ntCNNU1ZTcGhlcmUgOSA8cGFja2FnZXJAbXN2c3BoZXJlLnJ1PokCRwQTAQgAMQIb\nAwIeBQIXgBYhBNov2+wFtangA4C5svE4zaMmVa2CBQJkIrDDAgsJAxUKCAMWAQAA\nCgkQ8TjNoyZVrYK59A/+NNtcvaHz6RjmUE5jezEX4Y+bDq3yH0eMWQwO2jDVEOJi\ncapqQYec5gtGoXJmS/1Z40d8fMQhA8VUW5MAqmPNX68RmsZnSmHFi9Gtm4n/cZ6R\nmynmPDmMmtKtGesXZ25mdHG9dattBHIiScgCNqVT+ftCl4R7drtTtVVLiixPSn6+\ni+tkEaRoVIgM40JFm5ubae84bw+OhvyOYYFqKommvl/fk5xeCoXXPexf/J1dTLA5\n7fti3sW6d22ENnB1GM7FDZbqOdFQGD9IdlzQv94hzWyxLL4Qr6lHMFsznx/BX2hd\nUheb1udeab1LHfjV33laHMn9AZ8Ok9zkYXQy4MOU/wxHxnQUHF2Klgw3BivhcteE\ntVYngOLei+rQGMoMfsM5GkWlp8ddOBsPAiLhi6nBp1EVY2hEzTI8YkgFcB+TcFmb\niGys+bFsfENIVOVmiTBkMfmDY168D6We3Jwp/MNybbcb3rcuv9yn4K2iNtl7bPJA\nuD2S+595b15NrwMl2RhuC+FnjclWq58KFR2NpgaPiE92Jo+rH8XoxxLwn/2G0vvQ\nKLfr/CoZQvfRvl07ufbsZba3C1ndjpy4nl4Gl4f7ZhGBDIuEOaWb1SEhL6V3Hw2w\nnMR7nSrloxQgfy7s2P0tgneed2G9frXRR/4V1ArcdhBrk1Iif0PScMICo/OQdPe5\nAg0EY++trwEQAOKHAhuf1xnDcAzZDCyRpmmtO8Jj+RODNrd2iQZd9Z4e1XFN012j\nNlXrYSCkN7NxDwm9U3KWM0VZdr7ERs6RzgZY3g6pzhGqL63jAoJ32FdT4n5DvAxL\nOMbk8k4yZ3jj0eQy65ZxJYfBtor1MKcJUkDLMUc9huWupiz/BJXWji9AcKe3eZrR\noUnBqoMvxrINNoLep1+cPinMxoY4fjMND0l+gbKyCIe/zyMDGTh5ZHe7QwzvrDU/\nBpo9LBHXF2aseOD3O5GARAVvfyuSM69l3vIBu6VZKSEAUxLVQHb5UPsYRrj1y31Z\nB0ZzSAaoYxUTB5yXT2xchY0pfeGbKK4NSul6tdfUKTei+Y3Pc7/V70rNE+Juezk2\n3KfKZo2s7mJhZXYPXavRnaP9xkmFtoP6UEMSkPtOaPGrwfX4Dl+YDr5M7oTKpXiI\nhe/MKTKN48BEmhPPwJqbxV/UiWaBH7N1n9Y/TJnZ3vifivgA5Wpq4nwY2XIzjWBL\nuIataV2JJGAkFqC7mZdHnYzt8TL064T/jF5lhdUXl5XJucpvpvtPdHcMDp8uGMzU\nk/H7Oh0TYGyWFqODBQesXUXaZLoBsiSlU2Vt21xmj4GvNmZIpTCZ4AyvNE3lePGb\nN1fMr7D6DUSCqTxHlQ1hELSoOOyNelt6cTJqeFDl9Jt0IFSTfNihT/fVABEBAAGJ\nAjYEGAEIACAWIQTaL9vsBbWp4AOAubLxOM2jJlWtggUCY++trwIbDAAKCRDxOM2j\nJlWtgkZDEACc2t5iL+1jsJb+d3Hfv4mitEbAVm9DCeqF32BkayZbKsOR5LpDAncW\nkz8/MLjNzAWDp9Ew1nOtIBSYgEuZyq0al8vdC9CFSwohN/U1tj0kS6j21srBCWK9\n2d6OiFTAbzxqU/cdvKeI8DDqKZU1uWDR8QwXJMOxKCSrGDbDyu+TlNjPs0zTPFs/\nanC+0GPQG6qK9vAF7oX47c7os6TeelbnhJG0WDyIKdO2f4QRK/uPhW5+2Y11M1NU\nyJjgnRsPeQ7cPhBvaip4U3vdnOJqTtz5TS6dFOexocDueDVPrK/RjxOwnpSKk20G\nwMepzcxPHhwcyj9xuN8FDcflfoczwKxapzawtuuJJC4EhR6e3fBIGJJ5S6PVs/8Y\nBOdTTuLG2uwALRPe5wLUNw7aIbxYBcZ26boKRnN9FPNUjxahRpVKXPigrBuAsZ4K\nWcwSr4MTWj57lsvvrdfUDfMNSbgE0LR8rFnWAF9bWs8/u1s0BNGfr7KyRUZTyfFd\nzsnSGR1izFlj8HwTnB0cRF1GTSr/oVto2mkqX2YdE8FVxj2rhO3Z2RO5XVe+V1GC\nfdtk8S3HNesfHYEqvXsaTksnSHRB0crHFzv/JtsZInI3XXC8TiVS3qmA3mBig2av\ncmzRHFrWvSTVM49qZ5pyDMf+6OEEcgoqxMTqsDS0eNudiSfasZlGCQ==\n=PzTF\n-----END PGP PUBLIC KEY BLOCK-----\n",
+ "check_gpg": true
+ },
+ {
+ "name": "appstream",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.2/AppStream/x86_64/os/",
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGPvra8BEAC06qzoXEPc0vEThWkSLK2TdSmQnJuVePkP8dLPGb7BXN2eM+/R\niefFDWihMD6Xc5cDnNkPdkqUgOvy+LwQJmOnsXx16MvHtX0M2hQ31VHouslULtZN\nfFhfBZK1e6/RCWhrAcAUcbW3/L2wS2yiz9jFXDHhzi4Xa1iVZKXN0QtsebZfe6Fq\nUC1ERGgYjnjMyJnIJbcpJQLvbSgW4BC9sC0JM+HiIpsLsHZuYPsxwQuV3Drn6Pa4\nAM/jgR5Jgm8n8/eQva+jYOurhUdDXQAUYVvD4BWB4LKhkuWbEZktavUhRenExEst\nYVfZ//G3wJ+fpfTjvYwv9o64sxDWC8zMxNeYyKz/ql+lYq17zy9cTQXpb4NCH2Vg\n2uW8oqbMpbrIzPGhMengBEk0+gwg+a8+KKr95LhxeBOpkG/DsbNNLYOidMl4z+vl\nexQFkkgQ/42byw3Q+ug8RpNUT9iB01TKSq2YX+mGAv2MYDvTK2rsZ2UGTpbSkqIF\nXrlXtV/zOeAFitYW9nZxtM1PG699hyoXavOfa90+xx28ehPAZDGE3nn1NU5Ot/U6\n4srGHsQ5gZaUlZqbeg27EXDrISnk2deE6ghnBR6eWpL41RNBDha3YnlCTPA6ywvb\nskgzVhu+IkdUBDA511QwpEMNXq8Kobm3r1TlJN/h2qmoFTZZq0tOW7PvEQARAQAB\ntCNNU1ZTcGhlcmUgOSA8cGFja2FnZXJAbXN2c3BoZXJlLnJ1PokCRwQTAQgAMQIb\nAwIeBQIXgBYhBNov2+wFtangA4C5svE4zaMmVa2CBQJkIrDDAgsJAxUKCAMWAQAA\nCgkQ8TjNoyZVrYK59A/+NNtcvaHz6RjmUE5jezEX4Y+bDq3yH0eMWQwO2jDVEOJi\ncapqQYec5gtGoXJmS/1Z40d8fMQhA8VUW5MAqmPNX68RmsZnSmHFi9Gtm4n/cZ6R\nmynmPDmMmtKtGesXZ25mdHG9dattBHIiScgCNqVT+ftCl4R7drtTtVVLiixPSn6+\ni+tkEaRoVIgM40JFm5ubae84bw+OhvyOYYFqKommvl/fk5xeCoXXPexf/J1dTLA5\n7fti3sW6d22ENnB1GM7FDZbqOdFQGD9IdlzQv94hzWyxLL4Qr6lHMFsznx/BX2hd\nUheb1udeab1LHfjV33laHMn9AZ8Ok9zkYXQy4MOU/wxHxnQUHF2Klgw3BivhcteE\ntVYngOLei+rQGMoMfsM5GkWlp8ddOBsPAiLhi6nBp1EVY2hEzTI8YkgFcB+TcFmb\niGys+bFsfENIVOVmiTBkMfmDY168D6We3Jwp/MNybbcb3rcuv9yn4K2iNtl7bPJA\nuD2S+595b15NrwMl2RhuC+FnjclWq58KFR2NpgaPiE92Jo+rH8XoxxLwn/2G0vvQ\nKLfr/CoZQvfRvl07ufbsZba3C1ndjpy4nl4Gl4f7ZhGBDIuEOaWb1SEhL6V3Hw2w\nnMR7nSrloxQgfy7s2P0tgneed2G9frXRR/4V1ArcdhBrk1Iif0PScMICo/OQdPe5\nAg0EY++trwEQAOKHAhuf1xnDcAzZDCyRpmmtO8Jj+RODNrd2iQZd9Z4e1XFN012j\nNlXrYSCkN7NxDwm9U3KWM0VZdr7ERs6RzgZY3g6pzhGqL63jAoJ32FdT4n5DvAxL\nOMbk8k4yZ3jj0eQy65ZxJYfBtor1MKcJUkDLMUc9huWupiz/BJXWji9AcKe3eZrR\noUnBqoMvxrINNoLep1+cPinMxoY4fjMND0l+gbKyCIe/zyMDGTh5ZHe7QwzvrDU/\nBpo9LBHXF2aseOD3O5GARAVvfyuSM69l3vIBu6VZKSEAUxLVQHb5UPsYRrj1y31Z\nB0ZzSAaoYxUTB5yXT2xchY0pfeGbKK4NSul6tdfUKTei+Y3Pc7/V70rNE+Juezk2\n3KfKZo2s7mJhZXYPXavRnaP9xkmFtoP6UEMSkPtOaPGrwfX4Dl+YDr5M7oTKpXiI\nhe/MKTKN48BEmhPPwJqbxV/UiWaBH7N1n9Y/TJnZ3vifivgA5Wpq4nwY2XIzjWBL\nuIataV2JJGAkFqC7mZdHnYzt8TL064T/jF5lhdUXl5XJucpvpvtPdHcMDp8uGMzU\nk/H7Oh0TYGyWFqODBQesXUXaZLoBsiSlU2Vt21xmj4GvNmZIpTCZ4AyvNE3lePGb\nN1fMr7D6DUSCqTxHlQ1hELSoOOyNelt6cTJqeFDl9Jt0IFSTfNihT/fVABEBAAGJ\nAjYEGAEIACAWIQTaL9vsBbWp4AOAubLxOM2jJlWtggUCY++trwIbDAAKCRDxOM2j\nJlWtgkZDEACc2t5iL+1jsJb+d3Hfv4mitEbAVm9DCeqF32BkayZbKsOR5LpDAncW\nkz8/MLjNzAWDp9Ew1nOtIBSYgEuZyq0al8vdC9CFSwohN/U1tj0kS6j21srBCWK9\n2d6OiFTAbzxqU/cdvKeI8DDqKZU1uWDR8QwXJMOxKCSrGDbDyu+TlNjPs0zTPFs/\nanC+0GPQG6qK9vAF7oX47c7os6TeelbnhJG0WDyIKdO2f4QRK/uPhW5+2Y11M1NU\nyJjgnRsPeQ7cPhBvaip4U3vdnOJqTtz5TS6dFOexocDueDVPrK/RjxOwnpSKk20G\nwMepzcxPHhwcyj9xuN8FDcflfoczwKxapzawtuuJJC4EhR6e3fBIGJJ5S6PVs/8Y\nBOdTTuLG2uwALRPe5wLUNw7aIbxYBcZ26boKRnN9FPNUjxahRpVKXPigrBuAsZ4K\nWcwSr4MTWj57lsvvrdfUDfMNSbgE0LR8rFnWAF9bWs8/u1s0BNGfr7KyRUZTyfFd\nzsnSGR1izFlj8HwTnB0cRF1GTSr/oVto2mkqX2YdE8FVxj2rhO3Z2RO5XVe+V1GC\nfdtk8S3HNesfHYEqvXsaTksnSHRB0crHFzv/JtsZInI3XXC8TiVS3qmA3mBig2av\ncmzRHFrWvSTVM49qZ5pyDMf+6OEEcgoqxMTqsDS0eNudiSfasZlGCQ==\n=PzTF\n-----END PGP PUBLIC KEY BLOCK-----\n",
+ "check_gpg": true
+ }
+ ]
+}
diff --git a/repositories/msvsphere-93.json b/repositories/msvsphere-93.json
new file mode 100644
index 0000000..7ffb299
--- /dev/null
+++ b/repositories/msvsphere-93.json
@@ -0,0 +1,16 @@
+{
+ "x86_64": [
+ {
+ "name": "baseos",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.3/BaseOS/x86_64/os/",
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=PzTF\n-----END PGP PUBLIC KEY BLOCK-----\n",
+ "check_gpg": true
+ },
+ {
+ "name": "appstream",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.3/AppStream/x86_64/os/",
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=PzTF\n-----END PGP PUBLIC KEY BLOCK-----\n",
+ "check_gpg": true
+ }
+ ]
+}
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
index 136ce1b..909df08 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
@@ -151,6 +151,14 @@ func NewRHEL93() distro.Distro {
return newDistro("rhel", 3)
}
+func NewMSVSphere92() distro.Distro {
+ return newDistro("msvsphere", 2)
+}
+
+func NewMSVSphere93() distro.Distro {
+ return newDistro("msvsphere", 3)
+}
+
func newDistro(name string, minor int) *distribution {
var rd distribution
switch name {
@@ -180,6 +188,19 @@ func newDistro(name string, minor int) *distribution {
runner: &runner.CentOS{Version: uint64(9)},
defaultImageConfig: defaultDistroImageConfig,
}
+ case "msvsphere":
+ rd = distribution{
+ name: fmt.Sprintf("msvsphere-9%d", minor),
+ product: "MSVSphere",
+ osVersion: fmt.Sprintf("9.%d", minor),
+ releaseVersion: "9",
+ modulePlatformID: "platform:el9",
+ vendor: "msvsphere",
+ ostreeRefTmpl: "msvsphere/9/%s/edge",
+ isolabelTmpl: fmt.Sprintf("MSVSphere-9-%d-%%s-dvd", minor),
+ runner: &runner.RHEL{Major: uint64(9), Minor: uint64(minor)},
+ defaultImageConfig: defaultDistroImageConfig,
+ }
default:
panic(fmt.Sprintf("unknown distro name: %s", name))
}
diff --git a/vendor/github.com/osbuild/images/pkg/distroregistry/distroregistry.go b/vendor/github.com/osbuild/images/pkg/distroregistry/distroregistry.go
index f17a089..c1a5ef1 100644
--- a/vendor/github.com/osbuild/images/pkg/distroregistry/distroregistry.go
+++ b/vendor/github.com/osbuild/images/pkg/distroregistry/distroregistry.go
@@ -38,6 +38,8 @@ var supportedDistros = []func() distro.Distro{
rhel9.NewRHEL92,
rhel9.NewRHEL93,
rhel9.NewCentOS9,
+ rhel9.NewMSVSphere92,
+ rhel9.NewMSVSphere93,
}
type Registry struct {
--
2.41.0

84
SPECS/osbuild-composer.spec
Unescape View File

@ -9,7 +9,7 @@
%global goipath github.com/osbuild/osbuild-composer
Version: 76
Version: 88.2
%gometa
@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 2%{?dist}.2.inferit.1
Release: 1%{?dist}.inferit
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
@ -33,24 +33,8 @@ License: Apache-2.0
URL: %{gourl}
Source0: %{gosource}
# Patches were generated from the upstream 'rhel-9.2.0' branch:
# git clone https://github.com/osbuild/osbuild-composer.git
# cd osbuild-composer/
# git checkout rhel-9.2.0
# git format-patch HEAD...v76
#
# https://github.com/osbuild/osbuild-composer/pull/3349
Patch0: 0001-tests-ostree-Change-centos-8-BOOT_LOCATION-to-a-work.patch
Patch1: 0002-distro-rhel-add-payload-repos-to-os-package-set.patch
# https://github.com/osbuild/osbuild-composer/pull/3348
Patch2: 0003-Manifest-always-set-kernel-options-in-grub2-stage.patch
# https://github.com/osbuild/osbuild-composer/pull/3410
Patch3: 0004-simplified-installer-enable-isolinux.patch
# https://github.com/osbuild/osbuild-composer/pull/3411
Patch4: 0005-Save-manifest-lists-when-pulling-containers-Set-container-local-names-explicitly.patch
# MSVSphere patches
Patch1001: 0001-Updated-MSVSphere-support.patch
Patch1001: 0001-Added-MSVSphere-support.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: systemd
@ -132,7 +116,6 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-te
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance
go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
@ -156,7 +139,7 @@ install -m 0644 -vp repositories/msvsphere-* %{buildroot}%
# MSVSphere 8 only supports building for MSVSphere 8
install -m 0644 -vp repositories/msvsphere-%{msvsphere}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
%else # end of MSVSphere support
%else
# CentOS also defines rhel so we check for centos first
%if 0%{?centos}
@ -182,7 +165,7 @@ install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%
%endif
%endif
%endif
%endif # end of MSVSphere support block
%endif
# Fedora can build for all included fedora releases
%if 0%{?fedora}
@ -210,7 +193,6 @@ install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%
install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-composer-manifest-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-service-maintenance-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp _bin/osbuild-mock-openid-provider %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/define-compose-url.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
@ -291,13 +273,13 @@ cd $PWD/_build/src/%{goipath}
%endif
%post
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
%preun
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
%postun
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
%files
%license LICENSE
@ -306,6 +288,7 @@ cd $PWD/_build/src/%{goipath}
%{_unitdir}/osbuild-composer.service
%{_unitdir}/osbuild-composer.socket
%{_unitdir}/osbuild-composer-api.socket
%{_unitdir}/osbuild-composer-prometheus.socket
%{_unitdir}/osbuild-local-worker.socket
%{_unitdir}/osbuild-remote-worker.socket
%{_sysusersdir}/osbuild-composer.conf
@ -325,10 +308,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer
Requires: systemd
Requires: qemu-img
Requires: osbuild >= 81-1.el9_2.1
Requires: osbuild-ostree >= 81-1.el9_2.1
Requires: osbuild-lvm2 >= 81-1.el9_2.1
Requires: osbuild-luks2 >= 81-1.el9_2.1
Requires: osbuild >= 93
Requires: osbuild-ostree >= 93
Requires: osbuild-lvm2 >= 93
Requires: osbuild-luks2 >= 93
Requires: %{name}-dnf-json = %{version}-%{release}
%description worker
@ -447,24 +430,62 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Tue Oct 24 2023 Achilleas Koutsou <achilleas@redhat.com> - 88.2-1.inferit
- New upstream release
* Tue Oct 10 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 88.1-1.inferit
- MSVSphere 9.2 and 9.3 support
- Rebuilt for MSVSphere 9.3
* Wed Sep 20 2023 Achilleas Koutsou <achilleas@redhat.com> - 88.1-1
- New upstream release
- test: remove package version check
* Wed Sep 13 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 76-2.2.inferit.1
- Changed URLs from repo.msvsphere.ru to repo1.msvsphere-os.ru
- Removed support for MSVSphere 9.1
- Rebuilt for MSVSphere 9.2
* Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
- New upstream release
* Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
- New upstream release
* Wed Jul 26 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
- New upstream release
* Fri Jul 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
- New upstream release
* Wed Jun 21 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 76-2.2.inferit
- Rebuilt for MSVSphere 9.2
* Wed Jun 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
- New upstream release
* Thu May 25 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 76-2.inferit
- Added MSVSphere 9.2 support
- Rebuilt for MSVSphere 9.2
* Wed May 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
- New upstream release
* Tue Apr 25 2023 Achilleas Koutsou <achilleas@redhat.com> - 76-2.2
- Save manifest lists when pulling containers & Set container local names explicitly (rhbz#2189400)
* Tue Apr 25 2023 Tomáš Hozza <thozza@redhat.com> - 76-2.1
- simplified-installer: enable isolinux (rhbz#2178130)
* Wed Apr 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
- New upstream release
* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 79-1
- Rebuilt for MSVSphere 9.2 beta
* Wed Apr 05 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
- New upstream release
* Thu Mar 30 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 62.1-1.inferit
- Added MSVSphere 9.1 support
- Rebuilt for MSVSphere 9.1
@ -476,6 +497,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 62.1-1
- Rebuilt for MSVSphere 9.1.
* Wed Mar 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
- New upstream release
* Wed Mar 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
- New upstream release

Write Preview
Loading…
Cancel
Save