diff --git a/.gitignore b/.gitignore index 40e73ed..4424966 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-101.tar.gz +SOURCES/osbuild-composer-118.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 7f36b97..f3abeaa 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz +be808e5f869ae48145daef50ed6ed82b91359b48 SOURCES/osbuild-composer-118.tar.gz diff --git a/SOURCES/0001-Added-MSVSphere-support.patch b/SOURCES/0001-Added-MSVSphere-support.patch index 95eaf23..5edb406 100644 --- a/SOURCES/0001-Added-MSVSphere-support.patch +++ b/SOURCES/0001-Added-MSVSphere-support.patch @@ -1,21 +1,82 @@ -From 94b0c0cd9fac3cfd89905bce97fb7b389cb89487 Mon Sep 17 00:00:00 2001 +From 2fc76a02b634a3660a5429c631ba41de5d43c495 Mon Sep 17 00:00:00 2001 From: tigro -Date: Tue, 2 Apr 2024 22:19:23 +0300 +Date: Sun, 13 Oct 2024 21:32:45 +0300 Subject: [PATCH] Added MSVSphere support --- + cmd/osbuild-composer/config.go | 2 ++ + cmd/osbuild-composer/config_test.go | 6 ++++++ + cmd/osbuild-composer/testdata/test.toml | 2 ++ repositories/msvsphere-810.json | 16 ++++++++++++++++ repositories/msvsphere-89.json | 16 ++++++++++++++++ repositories/msvsphere-93.json | 16 ++++++++++++++++ repositories/msvsphere-94.json | 16 ++++++++++++++++ - .../osbuild/images/pkg/distro/rhel8/distro.go | 19 ++++++++++++++++--- - .../osbuild/images/pkg/distro/rhel9/distro.go | 19 ++++++++++++++++--- - 6 files changed, 96 insertions(+), 6 deletions(-) + repositories/msvsphere-95.json | 16 ++++++++++++++++ + .../images/pkg/distro/rhel/distribution.go | 19 +++++++++++++++++++ + .../images/pkg/distro/rhel/imagetype.go | 4 ++++ + .../images/pkg/distro/rhel/rhel8/distro.go | 12 ++++++++---- + .../images/pkg/distro/rhel/rhel9/distro.go | 12 ++++++++---- + 12 files changed, 129 insertions(+), 8 deletions(-) create mode 100644 repositories/msvsphere-810.json create mode 100644 repositories/msvsphere-89.json create mode 100644 repositories/msvsphere-93.json create mode 100644 repositories/msvsphere-94.json + create mode 100644 repositories/msvsphere-95.json +diff --git a/cmd/osbuild-composer/config.go b/cmd/osbuild-composer/config.go +index 4bed222..50dbf3e 100644 +--- a/cmd/osbuild-composer/config.go ++++ b/cmd/osbuild-composer/config.go +@@ -128,6 +128,8 @@ func GetDefaultConfig() *ComposerConfigFile { + "rhel-8": "rhel-8.10", + "rhel-9": "rhel-9.5", + "rhel-10": "rhel-10.0", ++ "msvsphere-8": "msvsphere-8.10", ++ "msvsphere-9": "msvsphere-9.5", + }, + LogLevel: "info", + LogFormat: "journal", +diff --git a/cmd/osbuild-composer/config_test.go b/cmd/osbuild-composer/config_test.go +index 2e7e999..2583cd0 100644 +--- a/cmd/osbuild-composer/config_test.go ++++ b/cmd/osbuild-composer/config_test.go +@@ -74,6 +74,8 @@ func TestDefaultConfig(t *testing.T) { + "rhel-7": "rhel-7.9", + "rhel-8": "rhel-8.10", + "rhel-9": "rhel-9.5", ++ "msvsphere-8": "msvsphere-8.10", ++ "msvsphere-9": "msvsphere-9.5", + } + require.Equal(t, expectedDistroAliases, defaultConfig.DistroAliases) + +@@ -113,6 +115,8 @@ func TestConfig(t *testing.T) { + "rhel-7": "rhel-7.9", // this value is from the default config + "rhel-8": "rhel-8.9", + "rhel-9": "rhel-9.3", ++ "msvsphere-8": "msvsphere-8.9", ++ "msvsphere-9": "msvsphere-9.3", + } + require.Equal(t, expectedDistroAliases, config.DistroAliases) + } +@@ -176,6 +180,8 @@ func TestConfigFromEnv(t *testing.T) { + "rhel-8": "rhel-8.9", + "rhel-9": "rhel-9.3", + "rhel-10": "rhel-10.0", // this value is from the default config ++ "msvsphere-8": "msvsphere-8.10", ++ "msvsphere-9": "msvsphere-9.5", + } + + config, err := LoadConfig("") +diff --git a/cmd/osbuild-composer/testdata/test.toml b/cmd/osbuild-composer/testdata/test.toml +index 2ba1b7a..bd081a9 100644 +--- a/cmd/osbuild-composer/testdata/test.toml ++++ b/cmd/osbuild-composer/testdata/test.toml +@@ -22,3 +22,5 @@ image_type_denylist = [ "qcow2" ] + [distro_aliases] + rhel-8 = "rhel-8.9" + rhel-9 = "rhel-9.3" ++msvsphere-8 = "msvsphere-8.9" ++msvsphere-9 = "msvsphere-9.3" diff --git a/repositories/msvsphere-810.json b/repositories/msvsphere-810.json new file mode 100644 index 0000000..2763185 @@ -104,31 +165,100 @@ index 0000000..8edfe5e + } + ] +} -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..9831cef 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, +diff --git a/repositories/msvsphere-95.json b/repositories/msvsphere-95.json +new file mode 100644 +index 0000000..5be6c20 +--- /dev/null ++++ b/repositories/msvsphere-95.json +@@ -0,0 +1,16 @@ ++{ ++ "x86_64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.5/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.5/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/rhel/distribution.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +index 849ca43..b7cbd51 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +@@ -97,6 +97,10 @@ func (d *Distribution) IsRHEL() bool { + return strings.HasPrefix(d.name, "rhel") + } + ++func (d *Distribution) IsMSVSphere() bool { ++ return strings.HasPrefix(d.name, "msvsphere") ++} ++ + func (d *Distribution) GetDefaultImageConfig() *distro.ImageConfig { + if d.DefaultImageConfig == nil { + return nil +@@ -138,6 +142,21 @@ func NewDistribution(name string, major, minor int) (*Distribution, error) { + ostreeRefTmpl: fmt.Sprintf("centos/%d/%%s/edge", major), + runner: &runner.CentOS{Version: uint64(major)}, + } ++ case "msvsphere": ++ if minor == -1 { ++ return nil, errors.New("MSVSphere requires a minor version") ++ } ++ ++ rd = &Distribution{ ++ name: fmt.Sprintf("msvsphere-%d.%d", major, minor), ++ product: "MSVSphere", ++ osVersion: fmt.Sprintf("%d.%d", major, minor), ++ releaseVersion: fmt.Sprintf("%d", major), ++ modulePlatformID: fmt.Sprintf("platform:el%d", major), ++ vendor: "msvsphere", ++ ostreeRefTmpl: fmt.Sprintf("msvsphere/%d/%%s/edge", major), ++ runner: &runner.RHEL{Major: uint64(major), Minor: uint64(minor)}, ++ } default: - panic(fmt.Sprintf("unknown distro name: %s", name)) + return nil, fmt.Errorf("unknown distro name: %s", name) } -@@ -483,12 +496,12 @@ func ParseID(idStr string) (*distro.ID, error) { +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go +index 0c055c9..5a20827 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go +@@ -126,6 +126,10 @@ func (t *ImageType) IsRHEL() bool { + return t.arch.distro.IsRHEL() + } + ++func (t *ImageType) IsMSVSphere() bool { ++ return t.arch.distro.IsMSVSphere() ++} ++ + func (t *ImageType) ISOLabel() (string, error) { + if !t.BootISO { + return "", fmt.Errorf("image type %q is not an ISO", t.name) +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +index f35f450..277f8f7 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +@@ -60,10 +60,14 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { + func distroISOLabelFunc(t *rhel.ImageType) string { + const RHEL_ISO_LABEL = "RHEL-%s-%s-0-BaseOS-%s" + const CS_ISO_LABEL = "CentOS-Stream-%s-%s-dvd" ++ const MSVSPHERE_ISO_LABEL = "MSVSphere-%s-%s-%s-dvd" + + if t.IsRHEL() { + osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") + return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) ++ } else if t.IsMSVSphere() { ++ osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") ++ return fmt.Sprintf(MSVSPHERE_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) + } else { + return fmt.Sprintf(CS_ISO_LABEL, t.Arch().Distro().Releasever(), t.Arch().Name()) + } +@@ -418,12 +422,12 @@ func ParseID(idStr string) (*distro.ID, error) { return nil, err } @@ -139,44 +269,41 @@ index c20d26a..9831cef 100644 // 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.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) { +@@ -445,8 +449,8 @@ func ParseID(idStr string) (*distro.ID, error) { } // RHEL uses minor version - if id.Name == "rhel" && id.MinorVersion == -1 { +- return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion) + if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 { - return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion) ++ return nil, fmt.Errorf("%s requires minor version, but got: %d", id.Name, 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 a3b57a9..36ec464 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)) + return id, nil +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +index 2e77b6b..041a863 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +@@ -43,10 +43,14 @@ var ( + func distroISOLabelFunc(t *rhel.ImageType) string { + const RHEL_ISO_LABEL = "RHEL-%s-%s-0-BaseOS-%s" + const CS_ISO_LABEL = "CentOS-Stream-%s-BaseOS-%s" ++ const MSVSPHERE_ISO_LABEL = "MSVSphere-%s-%s-%s-dvd" + + if t.IsRHEL() { + osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") + return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) ++ } else if t.IsMSVSphere() { ++ osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") ++ return fmt.Sprintf(MSVSPHERE_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) + } else { + return fmt.Sprintf(CS_ISO_LABEL, t.Arch().Distro().Releasever(), t.Arch().Name()) } -@@ -470,12 +483,12 @@ func ParseID(idStr string) (*distro.ID, error) { +@@ -379,12 +383,12 @@ func ParseID(idStr string) (*distro.ID, error) { return nil, err } @@ -191,15 +318,17 @@ index a3b57a9..36ec464 100644 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) { +@@ -406,8 +410,8 @@ func ParseID(idStr string) (*distro.ID, error) { } // RHEL uses minor version - if id.Name == "rhel" && id.MinorVersion == -1 { +- return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion) + if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 { - return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion) ++ return nil, fmt.Errorf("%s requires minor version, but got: %d", id.Name, id.MinorVersion) } + return id, nil -- -2.44.0 +2.47.0 diff --git a/SOURCES/0001-Updated-MSVSphere-support.patch b/SOURCES/0001-Updated-MSVSphere-support.patch deleted file mode 100644 index 4b72217..0000000 --- a/SOURCES/0001-Updated-MSVSphere-support.patch +++ /dev/null @@ -1,84 +0,0 @@ -From c02c94480dc9e748503e9aa13afe04645405e03d Mon Sep 17 00:00:00 2001 -From: Sergey Cherevko -Date: Wed, 13 Sep 2023 15:30:43 +0300 -Subject: [PATCH] Updated MSVSphere support - ---- - internal/distro/rhel9/distro.go | 17 +++++++++++++++++ - internal/distroregistry/distroregistry.go | 1 + - repositories/msvsphere-92.json | 16 ++++++++++++++++ - 3 files changed, 34 insertions(+) - create mode 100644 repositories/msvsphere-92.json - -diff --git a/internal/distro/rhel9/distro.go b/internal/distro/rhel9/distro.go -index cdd54d1..a747a45 100644 ---- a/internal/distro/rhel9/distro.go -+++ b/internal/distro/rhel9/distro.go -@@ -147,6 +147,10 @@ func NewRHEL92() distro.Distro { - return newDistro("rhel", 2) - } - -+func NewMSVSphere92() distro.Distro { -+ return newDistro("msvsphere", 2) -+} -+ - func newDistro(name string, minor int) *distribution { - var rd distribution - switch name { -@@ -176,6 +180,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-0-BaseOS-%%s", minor), -+ runner: &runner.RHEL{Major: uint64(9), Minor: uint64(minor)}, -+ defaultImageConfig: defaultDistroImageConfig, -+ } - default: - panic(fmt.Sprintf("unknown distro name: %s", name)) - } -diff --git a/internal/distroregistry/distroregistry.go b/internal/distroregistry/distroregistry.go -index 9dc32d4..76e0fe4 100644 ---- a/internal/distroregistry/distroregistry.go -+++ b/internal/distroregistry/distroregistry.go -@@ -35,6 +35,7 @@ var supportedDistros = []func() distro.Distro{ - rhel9.NewRHEL91, - rhel9.NewRHEL92, - rhel9.NewCentOS9, -+ rhel9.NewMSVSphere92, - } - - type Registry struct { -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\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.2/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 -+ } -+ ] -+} --- -2.41.0 - diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 657b9bc..25f77c4 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -8,11 +8,11 @@ %bcond_with relax_requires # The minimum required osbuild version -%global min_osbuild_version 109 +%global min_osbuild_version 120 %global goipath github.com/osbuild/osbuild-composer -Version: 101 +Version: 118 %gometa @@ -107,6 +107,7 @@ 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,6 +128,10 @@ 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/ @@ -143,12 +148,14 @@ 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 + # MSVSphere support block %if 0%{?msvsphere} # MSVSphere 9 supports building for all MSVSphere versions @@ -162,24 +169,42 @@ install -m 0644 -vp repositories/msvsphere-%{msvsphere}* %{buildroot}% # CentOS also defines rhel so we check for centos first %if 0%{?centos} -# CentOS 9 supports building for CentOS 8 and later -%if 0%{?centos} >= 9 +# Latest CentOS supports building all CentOS versions +%if 0%{?centos} >= 10 install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + %else -# CentOS 8 only supports building for CentOS 8 +# All other CentOS versions support building for the same version 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 + %else + %if 0%{?rhel} -# RHEL 9 supports building for RHEL 8 and later -%if 0%{?rhel} >= 9 -install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +# 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 %else -# RHEL 8 only supports building for 8 -install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +# 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 %endif %endif @@ -341,6 +366,7 @@ 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 @@ -408,7 +434,11 @@ 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 @@ -435,17 +465,53 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Mon Nov 18 2024 Sergey Cherevko - 118-2.inferit +- Update to 118-2 + * Fri Sep 27 2024 Sergey Cherevko - 101-2.inferit - Update to 101-2 -* Wed Sep 25 2024 Tomáš Hozza - 101-2 -- Rebuilt to fix: +* Wed Sep 25 2024 Tomáš Hozza - 118-2 +- Rebuilt to fix: - CVE-2024-34156 - - RHEL-57945 + - RHEL-57947 + +* Fri Aug 23 2024 imagebuilder-bot - 118-1 +- New upstream release + +* Wed Aug 21 2024 imagebuilder-bot - 117-1 +- New upstream release + +* Thu Aug 15 2024 imagebuilder-bot - 116-1 +- New upstream release + +* Wed Aug 07 2024 imagebuilder-bot - 115-1 +- New upstream release + +* Wed Jul 24 2024 imagebuilder-bot - 114-1 +- New upstream release + +* Fri Jul 12 2024 imagebuilder-bot - 113-1 +- New upstream release + +* Wed Jun 12 2024 imagebuilder-bot - 110-1 +- New upstream release + +* Tue Jun 04 2024 imagebuilder-bot - 109-1 +- New upstream release + +* Fri May 17 2024 imagebuilder-bot - 108-1 +- New upstream release * Wed May 1 2024 Arkady L. Shane - 101-1.inferit - Added MSVSphere support +* Wed Apr 03 2024 imagebuilder-bot - 104-1 +- New upstream release + +* Wed Mar 06 2024 imagebuilder-bot - 102-1 +- New upstream release + * Mon Feb 26 2024 imagebuilder-bot - 101-1 - New upstream release @@ -503,10 +569,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c * Wed Apr 05 2023 imagebuilder-bot - 79-1 - New upstream release -* Thu Mar 30 2023 Eugene Zamriy - 62.1-1.inferit -- Added MSVSphere 9.1 support -- Rebuilt for MSVSphere 9.1 - * Wed Mar 15 2023 MSVSphere Packaging Team - 77-1 - Rebuilt for MSVSphere 9.1.