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

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i10-beta
rpms:i10c-beta
rpms:c10-beta
rpms:i9
rpms:i9c
rpms:c9
rpms:i9.5-beta
rpms:i9c-beta
rpms:c9-beta
rpms:i8
rpms:i8c
rpms:c8
rpms:i9-beta
rpms:i8-beta
rpms:i8c-beta
rpms:c8-beta
...
pull from: rpms:i8
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i10-beta
rpms:i10c-beta
rpms:c10-beta
rpms:i9
rpms:i9c
rpms:c9
rpms:i9.5-beta
rpms:i9c-beta
rpms:c9-beta
rpms:i8
rpms:i8c
rpms:c8
rpms:i9-beta
rpms:i8-beta
rpms:i8c-beta
rpms:c8-beta

No commits in common. 'c9' and 'i8' have entirely different histories.
c9 ... i8

4 changed files with 219 additions and 174 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/osbuild-composer-118.tar.gz
SOURCES/osbuild-composer-101.tar.gz

2
.osbuild-composer.metadata
Unescape View File

@ -1 +1 @@
be808e5f869ae48145daef50ed6ed82b91359b48 SOURCES/osbuild-composer-118.tar.gz
0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz

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

@ -0,0 +1,157 @@
From 0d75c8fa72862d56c83426e54daabc4e76f95697 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Fri, 24 May 2024 14:35:25 +0300
Subject: [PATCH] Added MSVSphere support
---
repositories/msvsphere-8.10.json | 16 ++++++++++++++++
repositories/msvsphere-9.4.json | 16 ++++++++++++++++
.../osbuild/images/pkg/distro/rhel8/distro.go | 19 ++++++++++++++++---
.../osbuild/images/pkg/distro/rhel9/distro.go | 19 ++++++++++++++++---
4 files changed, 64 insertions(+), 6 deletions(-)
create mode 100644 repositories/msvsphere-8.10.json
create mode 100644 repositories/msvsphere-9.4.json
diff --git a/repositories/msvsphere-8.10.json b/repositories/msvsphere-8.10.json
new file mode 100644
index 0000000..2763185
--- /dev/null
+++ b/repositories/msvsphere-8.10.json
@@ -0,0 +1,16 @@
+{
+ "x86_64": [
+ {
+ "name": "baseos",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/8.10/BaseOS/x86_64/os/",
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGWBYmMBEADPxCqnOcT9wFITkxY2X5zG+XIOUAHk0TUlevNRpwOsPiRgCX1+\nAbt5eqhiSoFBjqxyDmJ/imwXPhfEkBygBeC91hsY3NQ3+vn4pWmTxXE/j0JYzlHF\n3KA734z9G/oCV1ZwR8hEyUHTyD9+E9rJqVa++eqbql8VtOoC8Ia1+MKyERm3ZYgq\nhAxu/oCUEJpAgNTEM6V34DxKSHRzJsCNafSNL9xJThp/6/GlfeKzHIe+VlfmBuNz\nR7OHBlGtX1cKAxEw/4nb+2WzUnd6kRf7oCPLXzMJd/1eDZSL2v2SsrD6S1Cg/Nl5\ncw3KCdSpC2Nyu3Pi55alkqDyAAEm2MKpcw8XXXspfqTf4jVTBxmsFGir0AQ4VJx7\nLhnJsdje2D+rkiQ7lGcFnbEhudSv1I1H59iIVEp9Flj2GMt1hfwOfdvLhYDSkcFs\nDx3J2j+dqdH0b7ozlRRiLbnM/Ely9SGHHOGky8sWf9NZG4NjppZCkI0no6NLF8g6\nxVZ/yxdT9QQQA7cuGj8IJI1WMNdzG7Mn6twXDlbHBuuCxkqWkq1s7/DSPcyCVAmV\nXcUX89lkuzu/warVbhTSenR1/gNbU4r2VFGT+HoyIBqJrU8V0WhbcZkuZR/PwpJV\nHJSnOxH5DqA2tjXyZueikCIoeJaTI5qt+y14Rw45mjxQCUmzBa22Hk4T9QARAQAB\ntCZNU1ZTcGhlcmUgOCA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCTQQTAQgA\nNxYhBDSxBmiQ6uobOJAkwxRjfysr9IlhBQJlgWJjAhsDBQsJCAcCBRUKCQgCBBYC\nAQMCHgUCF4AACgkQFGN/Kyv0iWHbdQ/+MlvMOkYiJrp4wZE/SgU6XguGj4g2FJ9/\nbelHEA1mfej8LeKk9/DSuTO7Jwn0oL4qw91T3wIJLXxUXkp0lkEUPuA+nyUvvGeH\n2t5Lcvc9gslUOiQfqQ2e1yT3/2ADAyuas2p33Kej7vBwEjKZf+mBbX4PfWTDP/ei\naBE5U5LdwQJ0RNvVqxhRSNHvQksP/pnLalmWbfveFZE+vnyMv7ot+lcYR/EHEIOQ\nQK0PnwXO8D0rYfLhoFB9a9GDHKr6ziVehAVlzM12MM5QlVS+reX4wJRv4UcUi3dh\nYT+r2t6LgiANwPhWZMd4s29uypSpODkxto55Nk9EtxI0YH0wpKHj3nC9R2Cj6SVu\nFZ8Cp5EMfFr7oh+bHhjo7Xp3qc0ZKPvBKSbJ3HJEfueGq0iXFBTcg4vP58dmTThP\n6IkhQdkQwPis+sU9mb7iK4erxgXYKILB8KPUATeSpX3PQ0ohpSZSfIeknSjY31y2\nuGwVjPoad16Z/NqoHqtmqdkbKze4NobAfHssWQ5yXKt6sIfsMWr5x+aeolE4dpWx\n1iXmd9AfF5d0I/B4bToMOegVFow+7ZiZ6ZCYuxyZtdIjeVx/kpWJamqtKkvfIGSw\nEfOLknTKHJisWjyFw8EIg7ITMtLoU2B7reyPoYyauWxGoLrFFmrdD6KVeuUYOxj6\n2ON65s/Q4EM=\n=Co25\n-----END PGP PUBLIC KEY BLOCK-----\n",
+ "check_gpg": true
+ },
+ {
+ "name": "appstream",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/8.10/AppStream/x86_64/os/",
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGWBYmMBEADPxCqnOcT9wFITkxY2X5zG+XIOUAHk0TUlevNRpwOsPiRgCX1+\nAbt5eqhiSoFBjqxyDmJ/imwXPhfEkBygBeC91hsY3NQ3+vn4pWmTxXE/j0JYzlHF\n3KA734z9G/oCV1ZwR8hEyUHTyD9+E9rJqVa++eqbql8VtOoC8Ia1+MKyERm3ZYgq\nhAxu/oCUEJpAgNTEM6V34DxKSHRzJsCNafSNL9xJThp/6/GlfeKzHIe+VlfmBuNz\nR7OHBlGtX1cKAxEw/4nb+2WzUnd6kRf7oCPLXzMJd/1eDZSL2v2SsrD6S1Cg/Nl5\ncw3KCdSpC2Nyu3Pi55alkqDyAAEm2MKpcw8XXXspfqTf4jVTBxmsFGir0AQ4VJx7\nLhnJsdje2D+rkiQ7lGcFnbEhudSv1I1H59iIVEp9Flj2GMt1hfwOfdvLhYDSkcFs\nDx3J2j+dqdH0b7ozlRRiLbnM/Ely9SGHHOGky8sWf9NZG4NjppZCkI0no6NLF8g6\nxVZ/yxdT9QQQA7cuGj8IJI1WMNdzG7Mn6twXDlbHBuuCxkqWkq1s7/DSPcyCVAmV\nXcUX89lkuzu/warVbhTSenR1/gNbU4r2VFGT+HoyIBqJrU8V0WhbcZkuZR/PwpJV\nHJSnOxH5DqA2tjXyZueikCIoeJaTI5qt+y14Rw45mjxQCUmzBa22Hk4T9QARAQAB\ntCZNU1ZTcGhlcmUgOCA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCTQQTAQgA\nNxYhBDSxBmiQ6uobOJAkwxRjfysr9IlhBQJlgWJjAhsDBQsJCAcCBRUKCQgCBBYC\nAQMCHgUCF4AACgkQFGN/Kyv0iWHbdQ/+MlvMOkYiJrp4wZE/SgU6XguGj4g2FJ9/\nbelHEA1mfej8LeKk9/DSuTO7Jwn0oL4qw91T3wIJLXxUXkp0lkEUPuA+nyUvvGeH\n2t5Lcvc9gslUOiQfqQ2e1yT3/2ADAyuas2p33Kej7vBwEjKZf+mBbX4PfWTDP/ei\naBE5U5LdwQJ0RNvVqxhRSNHvQksP/pnLalmWbfveFZE+vnyMv7ot+lcYR/EHEIOQ\nQK0PnwXO8D0rYfLhoFB9a9GDHKr6ziVehAVlzM12MM5QlVS+reX4wJRv4UcUi3dh\nYT+r2t6LgiANwPhWZMd4s29uypSpODkxto55Nk9EtxI0YH0wpKHj3nC9R2Cj6SVu\nFZ8Cp5EMfFr7oh+bHhjo7Xp3qc0ZKPvBKSbJ3HJEfueGq0iXFBTcg4vP58dmTThP\n6IkhQdkQwPis+sU9mb7iK4erxgXYKILB8KPUATeSpX3PQ0ohpSZSfIeknSjY31y2\nuGwVjPoad16Z/NqoHqtmqdkbKze4NobAfHssWQ5yXKt6sIfsMWr5x+aeolE4dpWx\n1iXmd9AfF5d0I/B4bToMOegVFow+7ZiZ6ZCYuxyZtdIjeVx/kpWJamqtKkvfIGSw\nEfOLknTKHJisWjyFw8EIg7ITMtLoU2B7reyPoYyauWxGoLrFFmrdD6KVeuUYOxj6\n2ON65s/Q4EM=\n=Co25\n-----END PGP PUBLIC KEY BLOCK-----\n",
+ "check_gpg": true
+ }
+ ]
+}
diff --git a/repositories/msvsphere-9.4.json b/repositories/msvsphere-9.4.json
new file mode 100644
index 0000000..8edfe5e
--- /dev/null
+++ b/repositories/msvsphere-9.4.json
@@ -0,0 +1,16 @@
+{
+ "x86_64": [
+ {
+ "name": "baseos",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.4/BaseOS/x86_64/os/",
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGUulQgBEACk4aP3eOnKfjklE+EFb4+SsTFzDYuyirSAr60g6YNpFqTd/NVw\n8CH5qd6yqam3myiM1EAYTMDozmzfQ/4D75mdKoQN5IItPoqdpkoJOGPRGciHKtgX\n3ZOBAVFhKRcw7lLrlL/XfBl42L7hxpRj0Xk4YAQxFbk6PmcoAz2oDdHBhQd/R9Pi\nvljTYnnrPy3PakBLPlO2GLDA2KRjzHhI2vEKoSv/nBDn4O6c/RL3usOU9H/gnoc7\nMuNJQMh36xf3lDuqgIwi1D6aG6PoClNVopgbvD8IVDOpairW8TvJPMr3BpXMHwSz\n5ixDFtPnVilYgqhi0cg2AampkS2VdbLn9ofGe00DLSfTBEE4370WAPaff7mtjfbf\nmIKm/rqzW5yixSra21ab6nFE7hRiuzlqJkl9oHzt8NZoWhKp8UeoSDNXrVCLxXsg\nAHsX6dSKAppKmUl9VKXxQk6kFObLsrdD8m/If3Xfj4clikDnuqWweeeQfABuDYx4\nhuoTbeOA/8U03ByCYX6A0zvC+CzHwzzO4gQqdbfaSzce6+20rH7psaAT/97lh7Ec\nA8LNdYA1CoPGDcBr+Rr3DP6NomRzBYYVQ2Tihbp4OPb1WN2FKppvjc6j0QK8ZeQP\ne1Xg4ycv4ZFJP4zJpP7TQvpRoFm2mXv8UMg8J17nKeOFMnwL7pEU1DS1fQARAQAB\ntCZNU1ZTcGhlcmUgOSA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCSwQTAQgA\nNRYhBLQ+/RAbCEoqakRiHJUsZhiL2nOkBQJlLpUIAhsDBAsJCAcEFQoJCAQWAgED\nAh4FAheAAAoJEJUsZhiL2nOkkjoP/1O/ghjcXPqM6qyxwn8sqPawBqHKNB/YgPIK\nWipuxOBQXf/nxtLtne2A+dccuBc6/ghOOIjLSPOYG2LiVg1rlGa2D3465Wv4574e\nJC1Pf/eo4DxJgaotQhzJlTmC1au51ACD3kXpPuCgx88Ys1l6A1AkdraM7OC8qCri\npnKx+Z8/NJgNVUp6eSAh6+KZ/JGA5SqBrYAlYGPgJ1ffjSmb96TUlRdukG13luU2\nZ8JoZORhhovgB2dl02MQCWpe6XRR39h9f4CIgw3w+MQA9r+lK7WLFx5uQCfO3gFq\nIEJ43IhfReiG9tCyY68hsGB0+Evr1KFPs4g1TbMXQFvM3WcanMQbMhrSCCXk+gNh\nQnjYg2/X2lz8JBOTqRulc4YQIxSHiOAT8CMw5oQnhkFwNdUrt+b+W3hUteCX4P5C\no5Cog3EsZTAPQ0+xaZQm2jfwvjnDO1qH0fr/biOpXN4YyvqCBFN0MoWZrpAOp1H3\nubwFmOj59RKniMkzwM8hLIvqqejvY6IEBAVjGAWmRPN9sJGVOWHmK4ZPK6oT7Ggb\nJo64e6kS6XP6JFoL1OUeDYCk+M/ad0UCHMm0mfkQMfPwN+m3eFgJLNqWRtYbuLpX\nd2YMF8ex961XzxWXUPRuE6+ZozNszQ1nE0XQKpo7ovPx3Pp1bRhLxIMZekSfKGJ9\n7TMdj1L4\n=VVm+\n-----END PGP PUBLIC KEY BLOCK-----\n",
+ "check_gpg": true
+ },
+ {
+ "name": "appstream",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.4/AppStream/x86_64/os/",
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGUulQgBEACk4aP3eOnKfjklE+EFb4+SsTFzDYuyirSAr60g6YNpFqTd/NVw\n8CH5qd6yqam3myiM1EAYTMDozmzfQ/4D75mdKoQN5IItPoqdpkoJOGPRGciHKtgX\n3ZOBAVFhKRcw7lLrlL/XfBl42L7hxpRj0Xk4YAQxFbk6PmcoAz2oDdHBhQd/R9Pi\nvljTYnnrPy3PakBLPlO2GLDA2KRjzHhI2vEKoSv/nBDn4O6c/RL3usOU9H/gnoc7\nMuNJQMh36xf3lDuqgIwi1D6aG6PoClNVopgbvD8IVDOpairW8TvJPMr3BpXMHwSz\n5ixDFtPnVilYgqhi0cg2AampkS2VdbLn9ofGe00DLSfTBEE4370WAPaff7mtjfbf\nmIKm/rqzW5yixSra21ab6nFE7hRiuzlqJkl9oHzt8NZoWhKp8UeoSDNXrVCLxXsg\nAHsX6dSKAppKmUl9VKXxQk6kFObLsrdD8m/If3Xfj4clikDnuqWweeeQfABuDYx4\nhuoTbeOA/8U03ByCYX6A0zvC+CzHwzzO4gQqdbfaSzce6+20rH7psaAT/97lh7Ec\nA8LNdYA1CoPGDcBr+Rr3DP6NomRzBYYVQ2Tihbp4OPb1WN2FKppvjc6j0QK8ZeQP\ne1Xg4ycv4ZFJP4zJpP7TQvpRoFm2mXv8UMg8J17nKeOFMnwL7pEU1DS1fQARAQAB\ntCZNU1ZTcGhlcmUgOSA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCSwQTAQgA\nNRYhBLQ+/RAbCEoqakRiHJUsZhiL2nOkBQJlLpUIAhsDBAsJCAcEFQoJCAQWAgED\nAh4FAheAAAoJEJUsZhiL2nOkkjoP/1O/ghjcXPqM6qyxwn8sqPawBqHKNB/YgPIK\nWipuxOBQXf/nxtLtne2A+dccuBc6/ghOOIjLSPOYG2LiVg1rlGa2D3465Wv4574e\nJC1Pf/eo4DxJgaotQhzJlTmC1au51ACD3kXpPuCgx88Ys1l6A1AkdraM7OC8qCri\npnKx+Z8/NJgNVUp6eSAh6+KZ/JGA5SqBrYAlYGPgJ1ffjSmb96TUlRdukG13luU2\nZ8JoZORhhovgB2dl02MQCWpe6XRR39h9f4CIgw3w+MQA9r+lK7WLFx5uQCfO3gFq\nIEJ43IhfReiG9tCyY68hsGB0+Evr1KFPs4g1TbMXQFvM3WcanMQbMhrSCCXk+gNh\nQnjYg2/X2lz8JBOTqRulc4YQIxSHiOAT8CMw5oQnhkFwNdUrt+b+W3hUteCX4P5C\no5Cog3EsZTAPQ0+xaZQm2jfwvjnDO1qH0fr/biOpXN4YyvqCBFN0MoWZrpAOp1H3\nubwFmOj59RKniMkzwM8hLIvqqejvY6IEBAVjGAWmRPN9sJGVOWHmK4ZPK6oT7Ggb\nJo64e6kS6XP6JFoL1OUeDYCk+M/ad0UCHMm0mfkQMfPwN+m3eFgJLNqWRtYbuLpX\nd2YMF8ex961XzxWXUPRuE6+ZozNszQ1nE0XQKpo7ovPx3Pp1bRhLxIMZekSfKGJ9\n7TMdj1L4\n=VVm+\n-----END PGP PUBLIC KEY BLOCK-----\n",
+ "check_gpg": true
+ }
+ ]
+}
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
index c20d26a..290c205 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
@@ -152,6 +152,19 @@ func newDistro(name string, minor int) *distribution {
runner: &runner.CentOS{Version: uint64(8)},
defaultImageConfig: defaultDistroImageConfig,
}
+ case "msvsphere":
+ rd = distribution{
+ name: fmt.Sprintf("msvsphere-8.%d", minor),
+ product: "MSVSphere",
+ osVersion: fmt.Sprintf("8.%d", minor),
+ releaseVersion: "8",
+ modulePlatformID: "platform:el8",
+ vendor: "msvsphere",
+ ostreeRefTmpl: "msvsphere/8/%s/edge",
+ isolabelTmpl: fmt.Sprintf("MSVSphere-8-%d-%%s-dvd", minor),
+ runner: &runner.RHEL{Major: uint64(8), Minor: uint64(minor)},
+ defaultImageConfig: defaultDistroImageConfig,
+ }
default:
panic(fmt.Sprintf("unknown distro name: %s", name))
}
@@ -483,12 +496,12 @@ func ParseID(idStr string) (*distro.ID, error) {
return nil, err
}
- if id.Name != "rhel" && id.Name != "centos" {
+ if id.Name != "rhel" && id.Name != "centos" && id.Name != "msvsphere" {
return nil, fmt.Errorf("invalid distro name: %s", id.Name)
}
// Backward compatibility layer for "rhel-84" or "rhel-810"
- if id.Name == "rhel" && id.MinorVersion == -1 {
+ if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
if id.MajorVersion/10 == 8 {
// handle single digit minor version
id.MinorVersion = id.MajorVersion % 10
@@ -510,7 +523,7 @@ func ParseID(idStr string) (*distro.ID, error) {
}
// RHEL uses minor version
- if id.Name == "rhel" && id.MinorVersion == -1 {
+ if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion)
}
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 6c32ec4..4c0081f 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
@@ -154,6 +154,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))
}
@@ -470,12 +483,12 @@ func ParseID(idStr string) (*distro.ID, error) {
return nil, err
}
- if id.Name != "rhel" && id.Name != "centos" {
+ if id.Name != "rhel" && id.Name != "centos" && id.Name != "msvsphere" {
return nil, fmt.Errorf("invalid distro name: %s", id.Name)
}
// Backward compatibility layer for "rhel-93" or "rhel-910"
- if id.Name == "rhel" && id.MinorVersion == -1 {
+ if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
if id.MajorVersion/10 == 9 {
// handle single digit minor version
id.MinorVersion = id.MajorVersion % 10
@@ -497,7 +510,7 @@ func ParseID(idStr string) (*distro.ID, error) {
}
// RHEL uses minor version
- if id.Name == "rhel" && id.MinorVersion == -1 {
+ if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion)
}
--
2.39.3

232
SPECS/osbuild-composer.spec
Unescape View File

@ -8,11 +8,11 @@
%bcond_with relax_requires
# The minimum required osbuild version
%global min_osbuild_version 120
%global min_osbuild_version 109
%global goipath github.com/osbuild/osbuild-composer
Version: 118
Version: 101
%gometa
@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 2%{?dist}
Release: 2%{?dist}.inferit
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
@ -36,6 +36,7 @@ License: Apache-2.0
URL: %{gourl}
Source0: %{gosource}
Patch1: 0001-Added-MSVSphere-support.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: systemd
@ -106,7 +107,6 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker-executor %{goipath}/cmd/osbuild-worker-executor
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder
@ -127,10 +127,6 @@ export GOPATH=%{gobuilddir}:%{gopath}
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
%if 0%{?rhel}
GOTAGS="${GOTAGS:+$GOTAGS,}rhel%{rhel}"
%endif
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
@ -147,52 +143,32 @@ go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _b
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer
install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vp _bin/osbuild-worker-executor %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vp _bin/osbuild-jobsite-manager %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%{_libexecdir}/osbuild-composer/
# Only include repositories for the distribution and release
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
# CentOS also defines rhel so we check for centos first
%if 0%{?centos}
# Latest CentOS supports building all CentOS versions
%if 0%{?centos} >= 10
# CentOS 9 supports building for CentOS 8 and later
%if 0%{?centos} >= 9
install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%else
# All other CentOS versions support building for the same version
# CentOS 8 only supports building for CentOS 8
install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
%endif
%else
%if 0%{?rhel}
# RHEL 10 supports building all RHEL versions
%if 0%{?rhel} >= 10
for REPO_FILE in $(ls repositories/rhel-* | grep -v 'no-aux-key'); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
# RHEL-8 auxiliary key is signed using SHA-1, which is not enabled by default on RHEL-10 and later
for REPO_FILE in $(ls repositories/rhel-8*-no-aux-key.json); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE} | sed 's/-no-aux-key//g')
done
# RHEL 9 supports building for RHEL 8 and later
%if 0%{?rhel} >= 9
install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%else
# All other RHEL versions support building for the same version
for REPO_FILE in $(ls repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
# RHEL 9 supports building also for RHEL 8
%if 0%{?rhel} == 9
for REPO_FILE in $(ls repositories/rhel-8* | grep -v 'no-aux-key'); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
%endif
# RHEL 8 only supports building for 8
install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
%endif
@ -353,7 +329,6 @@ The worker for osbuild-composer
%files worker
%{_libexecdir}/osbuild-composer/osbuild-worker
%{_libexecdir}/osbuild-composer/osbuild-worker-executor
%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager
%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder
%{_unitdir}/osbuild-worker@.service
@ -421,11 +396,7 @@ Requires: httpd
Requires: mod_ssl
Requires: openssl
Requires: firewalld
# podman-plugins has been deprecated since podman version 5.0.0,
# which is in Fedora 40+ and in c10s / el10
%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40)
Requires: podman-plugins
%endif
Requires: dnf-plugins-core
Requires: skopeo
Requires: make
@ -452,43 +423,15 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Wed Sep 25 2024 Tomáš Hozza <thozza@redhat.com> - 118-2
- Rebuilt to fix:
- CVE-2024-34156
- RHEL-57947
* Fri Aug 23 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 118-1
- New upstream release
* Wed Aug 21 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 117-1
- New upstream release
* Fri Sep 27 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 101-2.inferit
- Update to 101-2
* Thu Aug 15 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 116-1
- New upstream release
* Wed Aug 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 115-1
- New upstream release
* Wed Jul 24 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 114-1
- New upstream release
* Fri Jul 12 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 113-1
- New upstream release
* Wed Jun 12 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 110-1
- New upstream release
* Tue Jun 04 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 109-1
- New upstream release
* Fri May 17 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 108-1
- New upstream release
* Wed Apr 03 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 104-1
- New upstream release
* Wed Mar 06 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 102-1
- New upstream release
* Wed Sep 25 2024 Tomáš Hozza <thozza@redhat.com> - 101-2
- Rebuilt to fix:
- CVE-2024-34156
- CVE-2024-1394
- RHEL-24303
- RHEL-57905
* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
- New upstream release
@ -502,6 +445,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* Wed Jan 10 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 98-1
- New upstream release
* Thu Dec 21 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 88-1.inferit
- Added MSVSphere support
* Wed Dec 13 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 96-1
- New upstream release
@ -520,6 +466,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* Wed Oct 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 91-1
- New upstream release
* Thu Sep 21 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 90-1
- New upstream release
* Wed Sep 06 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 89-1
- New upstream release
@ -529,6 +478,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
- New upstream release
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 86-1
- Rebuilt for MSVSphere 8.8
* Wed Jul 26 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
- New upstream release
@ -550,9 +502,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* 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
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
- New upstream release
@ -577,9 +526,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
- New upstream release
* Thu Nov 03 2022 Tomas Hozza <thozza@redhat.com> - 67-2
- Fix functional tests to make them pass in RHEL-9.2 gating
* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
- New upstream release
@ -589,13 +535,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
- New upstream release
* Wed Aug 10 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
- New upstream release
* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
- New upstream release
* Wed Jul 13 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
- New upstream release
* Wed Jun 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
@ -604,139 +550,81 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* Wed Jun 01 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
- New upstream release
* Fri May 20 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
* Mon May 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
- New upstream release
* Wed May 04 2022 Ondřej Budai <ondrej@budai.cz> - 51-1
- New upstream release
* Mon Feb 28 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
- New upstream release
* Fri Feb 18 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
* Sat Feb 19 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
- New upstream release
* Fri Feb 11 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
* Mon Feb 14 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
- New upstream release
* Wed Jan 26 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
* Mon Feb 07 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
- New upstream release
* Wed Jan 12 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
- New upstream release
* Wed Dec 22 2021 Ondřej Budai <ondrej@budai.cz> - 41-1
* Tue Jan 18 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
- New upstream release
* Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
- New upstream release
* Wed Nov 24 2021 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 39-1
- New upstream release
* Fri Nov 12 2021 'Diaa Sami' <'<disami@redhat.com>'> - 38-1
- New upstream release
* Tue Nov 02 2021 lavocatt - 37-1
* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
- New upstream release
* Thu Oct 14 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
- New upstream release
* Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
- New upstream release
* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-1
- New upstream release
* Sun Aug 15 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
- New upstream release
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jul 02 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-2
- New upstream release
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 29-3
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Fri Mar 05 2021 Martin Sehnoutka <msehnout@redhat.com> - 29-1
* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
- New upstream release
* Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
- New upstream release
* Thu Feb 04 2021 Ondrej Budai <obudai@redhat.com> - 27-1
* Fri Feb 05 2021 Ondrej Budai <obudai@redhat.com> - 27-1
- New upstream release
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-2
- Fix the compatibility with a new golang-github-azure-storage-blob 0.12
* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-1
- New upstream release
* Thu Nov 19 2020 Ondrej Budai <obudai@redhat.com> - 25-1
- New upstream release
* Thu Nov 12 2020 Ondrej Budai <obudai@redhat.com> - 24-1
- New upstream release
* Fri Nov 06 2020 Ondrej Budai <obudai@redhat.com> - 23-1
- New upstream release
* Fri Oct 16 2020 Ondrej Budai <obudai@redhat.com> - 22-1
- New upstream release
* Mon Nov 30 2020 Ondrej Budai <obudai@redhat.com> - 25-1
- New upstream release 25 (rhbz#1883481)
* Sun Aug 23 2020 Tom Gundersen <teg@jklm.no> - 20-1
- New upstream release
* Tue Aug 11 2020 Tom Gundersen <teg@jklm.no> - 19-1
- New upstream release
* Thu Sep 03 2020 Tom Gundersen <tgunders@redhat.com> - 20.1-1
- New upstream release 20.1 (rhbz#1872370)
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun Aug 23 2020 Tom Gundersen <tgunders@redhat.com> - 20-1
- New upstream release 20 (rhbz#1871184 and rhbz#1871179)
* Wed Jul 22 2020 Ondrej Budai <obudai@redhat.com> - 18-1
- New upstream release
* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
* Wed Jul 08 2020 Ondrej Budai <obudai@redhat.com> - 17-1
- New upstream release
* Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
- New upstream release 17 (rhbz#1831653)
- Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)
* Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
- New upstream release
- New upstream release 16 (rhbz#1831653)
* Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
- New upstream release
- New upstream release 15 (rhbz#1831653)
* Thu Jun 04 2020 Ondrej Budai <obudai@redhat.com> - 14-1
- New upstream release
* Fri May 29 2020 Ondrej Budai <obudai@redhat.com> - 13-2
- Add missing osbuild-ostree dependency
- New upstream release 14 (rhbz#1831653)
* Thu May 28 2020 Ondrej Budai <obudai@redhat.com> - 13-1
- New upstream release
* Thu May 14 2020 Ondrej Budai <obudai@redhat.com> - 12-1
- New upstream release
* Wed Apr 29 2020 Ondrej Budai <obudai@redhat.com> - 11-1
- New upstream release
* Wed Apr 15 2020 Ondrej Budai <obudai@redhat.com> - 10-1
- New upstream release
* Wed Apr 01 2020 Ondrej Budai <obudai@redhat.com> - 9-1
- New upstream release
- New upstream release 13 (rhbz#1831653)
* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
- Initial package (renamed from golang-github-osbuild-composer)
* Tue May 05 2020 Ondrej Budai <obudai@redhat.com> - 11-1
- Initial package (renamed from golang-github-osbuild-composer) (rhbz#1771887)

Write Preview
Loading…
Cancel
Save