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

import osbuild-composer-100-1.el9

Browse Source
i9-beta changed/i9-beta/osbuild-composer-100-1.el9.inferit
MSVSphere Packaging Team 9 months ago committed by tigro
parent bfa209af67
commit e1b60d3ee1
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503
4 changed files with 180 additions and 133 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/osbuild-composer-88.3.tar.gz SOURCES/osbuild-composer-100.tar.gz

2
.osbuild-composer.metadata
Unescape View File

@ -1 +1 @@
01ddd9fed89eb5d70e5a33cc7f2a618268087cf7 SOURCES/osbuild-composer-88.3.tar.gz ee2bb2068e42599ca6ef66499d00077ee06b3b44 SOURCES/osbuild-composer-100.tar.gz

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

@ -1,20 +1,43 @@
From 17e598c74ec633a3db0b1d49a4f2824502b0d055 Mon Sep 17 00:00:00 2001 From 94b0c0cd9fac3cfd89905bce97fb7b389cb89487 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru> From: tigro <tigro@msvsphere-os.ru>
Date: Tue, 10 Oct 2023 12:17:22 +0300 Date: Tue, 2 Apr 2024 22:19:23 +0300
Subject: [PATCH] Added MSVSphere support Subject: [PATCH] Added MSVSphere support
--- ---
repositories/msvsphere-89.json | 16 ++++++++++++++ repositories/msvsphere-810.json | 16 ++++++++++++++++
repositories/msvsphere-92.json | 16 ++++++++++++++ repositories/msvsphere-89.json | 16 ++++++++++++++++
repositories/msvsphere-93.json | 16 ++++++++++++++ repositories/msvsphere-93.json | 16 ++++++++++++++++
.../osbuild/images/pkg/distro/rhel8/distro.go | 17 +++++++++++++++ repositories/msvsphere-94.json | 16 ++++++++++++++++
.../osbuild/images/pkg/distro/rhel9/distro.go | 21 +++++++++++++++++++ .../osbuild/images/pkg/distro/rhel8/distro.go | 19 ++++++++++++++++---
.../pkg/distroregistry/distroregistry.go | 3 +++ .../osbuild/images/pkg/distro/rhel9/distro.go | 19 ++++++++++++++++---
6 files changed, 89 insertions(+) 6 files changed, 96 insertions(+), 6 deletions(-)
create mode 100644 repositories/msvsphere-810.json
create mode 100644 repositories/msvsphere-89.json create mode 100644 repositories/msvsphere-89.json
create mode 100644 repositories/msvsphere-92.json
create mode 100644 repositories/msvsphere-93.json create mode 100644 repositories/msvsphere-93.json
create mode 100644 repositories/msvsphere-94.json
diff --git a/repositories/msvsphere-810.json b/repositories/msvsphere-810.json
new file mode 100644
index 0000000..2763185
--- /dev/null
+++ b/repositories/msvsphere-810.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-89.json b/repositories/msvsphere-89.json diff --git a/repositories/msvsphere-89.json b/repositories/msvsphere-89.json
new file mode 100644 new file mode 100644
index 0000000..16ac697 index 0000000..16ac697
@ -37,66 +60,55 @@ index 0000000..16ac697
+ } + }
+ ] + ]
+} +}
diff --git a/repositories/msvsphere-92.json b/repositories/msvsphere-92.json diff --git a/repositories/msvsphere-93.json b/repositories/msvsphere-93.json
new file mode 100644 new file mode 100644
index 0000000..5a6d5b9 index 0000000..ba608f5
--- /dev/null --- /dev/null
+++ b/repositories/msvsphere-92.json +++ b/repositories/msvsphere-93.json
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
+{ +{
+ "x86_64": [ + "x86_64": [
+ { + {
+ "name": "baseos", + "name": "baseos",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.2/BaseOS/x86_64/os/", + "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.3/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", + "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 + "check_gpg": true
+ }, + },
+ { + {
+ "name": "appstream", + "name": "appstream",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.2/AppStream/x86_64/os/", + "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.3/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", + "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 + "check_gpg": true
+ } + }
+ ] + ]
+} +}
diff --git a/repositories/msvsphere-93.json b/repositories/msvsphere-93.json diff --git a/repositories/msvsphere-94.json b/repositories/msvsphere-94.json
new file mode 100644 new file mode 100644
index 0000000..ba608f5 index 0000000..8edfe5e
--- /dev/null --- /dev/null
+++ b/repositories/msvsphere-93.json +++ b/repositories/msvsphere-94.json
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
+{ +{
+ "x86_64": [ + "x86_64": [
+ { + {
+ "name": "baseos", + "name": "baseos",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.3/BaseOS/x86_64/os/", + "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", + "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 + "check_gpg": true
+ }, + },
+ { + {
+ "name": "appstream", + "name": "appstream",
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.3/AppStream/x86_64/os/", + "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", + "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 + "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 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 1bb3ac7..5e2c092 100644 index c20d26a..9831cef 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go --- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
@@ -155,6 +155,10 @@ func NewRHEL89() distro.Distro { @@ -152,6 +152,19 @@ func newDistro(name string, minor int) *distribution {
return newDistro("rhel", 9)
}
+func NewMSVSphere89() distro.Distro {
+ return newDistro("msvsphere", 9)
+}
+
func NewCentos() distro.Distro {
return newDistro("centos", 0)
}
@@ -188,6 +192,19 @@ func newDistro(name string, minor int) *distribution {
runner: &runner.CentOS{Version: uint64(8)}, runner: &runner.CentOS{Version: uint64(8)},
defaultImageConfig: defaultDistroImageConfig, defaultImageConfig: defaultDistroImageConfig,
} }
@ -116,26 +128,35 @@ index 1bb3ac7..5e2c092 100644
default: default:
panic(fmt.Sprintf("unknown distro name: %s", name)) 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 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 index a3b57a9..36ec464 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go --- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
+++ b/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 { @@ -154,6 +154,19 @@ func newDistro(name string, minor int) *distribution {
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)}, runner: &runner.CentOS{Version: uint64(9)},
defaultImageConfig: defaultDistroImageConfig, defaultImageConfig: defaultDistroImageConfig,
} }
@ -155,27 +176,30 @@ index 136ce1b..909df08 100644
default: default:
panic(fmt.Sprintf("unknown distro name: %s", name)) 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 @@ -470,12 +483,12 @@ func ParseID(idStr string) (*distro.ID, error) {
index f17a089..cb02d90 100644 return nil, err
--- a/vendor/github.com/osbuild/images/pkg/distroregistry/distroregistry.go }
+++ b/vendor/github.com/osbuild/images/pkg/distroregistry/distroregistry.go
@@ -30,6 +30,7 @@ var supportedDistros = []func() distro.Distro{ - if id.Name != "rhel" && id.Name != "centos" {
rhel8.NewRHEL87, + if id.Name != "rhel" && id.Name != "centos" && id.Name != "msvsphere" {
rhel8.NewRHEL88, return nil, fmt.Errorf("invalid distro name: %s", id.Name)
rhel8.NewRHEL89, }
+ rhel8.NewMSVSphere89,
rhel8.NewCentos, // 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) {
}
rhel9.New, // RHEL uses minor version
@@ -38,6 +39,8 @@ var supportedDistros = []func() distro.Distro{ - if id.Name == "rhel" && id.MinorVersion == -1 {
rhel9.NewRHEL92, + if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
rhel9.NewRHEL93, return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion)
rhel9.NewCentOS9,
+ rhel9.NewMSVSphere92,
+ rhel9.NewMSVSphere93,
} }
type Registry struct {
-- --
2.43.0 2.44.0

91
SPECS/osbuild-composer.spec
Unescape View File

@ -9,7 +9,7 @@
%global goipath github.com/osbuild/osbuild-composer %global goipath github.com/osbuild/osbuild-composer
Version: 88.3 Version: 100
%gometa %gometa
@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
} }
Name: osbuild-composer Name: osbuild-composer
Release: 1%{?dist}.inferit.1 Release: 1%{?dist}.inferit
Summary: An image building service based on osbuild Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images # osbuild-composer doesn't have support for building i686 and armv7hl images
@ -44,9 +44,13 @@ BuildRequires: make
# Build requirements of 'theproglottis/gpgme' package # Build requirements of 'theproglottis/gpgme' package
BuildRequires: gpgme-devel BuildRequires: gpgme-devel
BuildRequires: libassuan-devel BuildRequires: libassuan-devel
# Build requirements of 'github.com/containers/storage' package
BuildRequires: device-mapper-devel
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: git BuildRequires: git
# Build requirements of 'github.com/containers/storage' package
BuildRequires: btrfs-progs-devel
# DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list # DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list
# BUNDLE_START # BUNDLE_START
# BUNDLE_END # BUNDLE_END
@ -80,6 +84,16 @@ export PATH=$PWD/_bin${PATH:+:$PATH}
export GOPATH=$GO_BUILD_PATH:%{gopath} export GOPATH=$GO_BUILD_PATH:%{gopath}
export GOFLAGS+=" -mod=vendor" export GOFLAGS+=" -mod=vendor"
%endif %endif
%if 0%{?fedora}
# Fedora disables Go modules by default, but we want to use them.
# Undefine the macro which disables it to use the default behavior.
%undefine gomodulesmode
%endif
# btrfs-progs-devel is not available on RHEL
%if 0%{?rhel}
GOTAGS="exclude_graphdriver_btrfs"
%endif
# Set the commit hash so that composer can report what source version # Set the commit hash so that composer can report what source version
# was used to build it. This has to be set explicitly when calling rpmbuild, # was used to build it. This has to be set explicitly when calling rpmbuild,
@ -89,8 +103,8 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm
%endif %endif
export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{?epoch:%epoch:}%{version}-%{release}.%{_arch}'" export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{?epoch:%epoch:}%{version}-%{release}.%{_arch}'"
%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
make man make man
@ -109,15 +123,15 @@ export GOPATH=%{gobuilddir}:%{gopath}
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')" TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
go test -c -tags=integration -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-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
go test -c -tags=integration -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-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/ go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -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${GOTAGS:+,$GOTAGS}" -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${GOTAGS:+,$GOTAGS}" -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-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -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 go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
%endif %endif
@ -208,7 +222,6 @@ install -m 0755 -vp tools/generic_s3_test.sh %{buildroot}%
install -m 0755 -vp tools/generic_s3_https_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/generic_s3_https_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/run-mock-auth-servers.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/run-mock-auth-servers.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/set-env-variables.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/set-env-variables.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
install -m 0755 -vp test/cases/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/ install -m 0755 -vp test/cases/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/
@ -263,7 +276,7 @@ install -m 0644 -vp test/data/upgrade8to9/* %{buildroot}%{
%check %check
export GOFLAGS="-buildmode=pie" export GOFLAGS="-buildmode=pie"
%if 0%{?rhel} %if 0%{?rhel}
export GOFLAGS+=" -mod=vendor" export GOFLAGS+=" -mod=vendor -tags=exclude_graphdriver_btrfs"
export GOPATH=$PWD/_build:%{gopath} export GOPATH=$PWD/_build:%{gopath}
# cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory # cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
cd $PWD/_build/src/%{goipath} cd $PWD/_build/src/%{goipath}
@ -308,10 +321,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer Summary: The worker for osbuild-composer
Requires: systemd Requires: systemd
Requires: qemu-img Requires: qemu-img
Requires: osbuild >= 93 Requires: osbuild >= 98
Requires: osbuild-ostree >= 93 Requires: osbuild-ostree >= 98
Requires: osbuild-lvm2 >= 93 Requires: osbuild-lvm2 >= 98
Requires: osbuild-luks2 >= 93 Requires: osbuild-luks2 >= 98
Requires: %{name}-dnf-json = %{version}-%{release} Requires: %{name}-dnf-json = %{version}-%{release}
%description worker %description worker
@ -430,28 +443,38 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif %endif
%changelog %changelog
* Tue Dec 19 2023 Tomáš Hozza <thozza@redhat.com> - 88.3-1 * Tue Apr 2 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 100-1.inferit
- Fix RHEL-16243 - Added MSVSphere support
* Thu Dec 21 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 88.2-1.inferit.1 * Wed Feb 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
- Change PGP key - New upstream release
- Added MSVSphere 8.9
* Tue Oct 24 2023 Achilleas Koutsou <achilleas@redhat.com> - 88.2-1 * Wed Jan 24 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 99-1
- New upstream release - New upstream release
* Tue Oct 10 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 88.1-1.inferit * Wed Jan 10 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 98-1
- MSVSphere 9.2 and 9.3 support - New upstream release
- Rebuilt for MSVSphere 9.3
* Wed Sep 20 2023 Achilleas Koutsou <achilleas@redhat.com> - 88.1-1 * Wed Dec 13 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 96-1
- New upstream release - New upstream release
- test: remove package version check
* Wed Sep 13 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 76-2.2.inferit.1 * Wed Nov 29 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 95-1
- Changed URLs from repo.msvsphere.ru to repo1.msvsphere-os.ru - New upstream release
- Removed support for MSVSphere 9.1
- Rebuilt for MSVSphere 9.2 * Wed Nov 15 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 94-1
- New upstream release
* Wed Nov 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 93-1
- New upstream release
* Wed Oct 18 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 92-1
- New upstream release
* Wed Oct 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 91-1
- New upstream release
* Wed Sep 06 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 89-1
- New upstream release
* Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1 * Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
- New upstream release - New upstream release

Write Preview
Loading…
Cancel
Save