particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

runner: add python or platform-python to all build roots

Browse source 
Required for running osbuild modules.
In Fedora, so far, python3 was always pulled by some other build-root
dependency.  We should add it explicitly since it's required by all our
runners.
For RHEL and CentOS, the requirement is platform-python.

For RHEL 8 and CentOS 8, we also need to explicitly add python36 and for
RHEL 9 and CentOS 9 python3 because it's used to run the stages in
osbuild [1].

[1] ea8261cad6/runners/org.osbuild.rhel82 (L61)
This commit is contained in:
Achilleas Koutsou 2022-11-07 14:27:03 +01:00 • committed by Christian Kellner
parent 5592e6a51f
commit 310578757a
4 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/runner/centos.go
View file

@ -12,12 +12,28 @@ func (c *CentOS) String() string {
func (c *CentOS) GetBuildPackages() []string {
packages := []string{
"glibc", // ldconfig
"glibc", // ldconfig
"platform-python", // osbuild
}
if c.Version >= 8 {
packages = append(packages,
"systemd", // systemd-tmpfiles and systemd-sysusers
)
}
if c.Version < 9 {
packages = append(packages,
// The RHEL 8 runner (which is also used for CS8) in osbuild runs
// with platform-python but explicitly symlinks python 3.6 to
// /etc/alternatives (which in turn is the target for
// /usr/bin/python3) for the stages.
// https://github.com/osbuild/osbuild/blob/ea8261cad6c5c606c00c0f2824c3f483c01a0cc9/runners/org.osbuild.rhel82#L61
// Install python36 explicitly for CS8.
"python36",
)
} else {
packages = append(packages,
"python3", // osbuild stages
)
}
return packages
}

1
internal/runner/fedora.go
View file

@ -14,5 +14,6 @@ func (p *Fedora) GetBuildPackages() []string {
return []string{
"glibc", // ldconfig
"systemd", // systemd-tmpfiles and systemd-sysusers
"python3", // osbuild
}
}

1
internal/runner/linux.go
View file

@ -11,5 +11,6 @@ func (p *Linux) GetBuildPackages() []string {
return []string{
"glibc", // ldconfig
"systemd", // systemd-tmpfiles and systemd-sysusers
"python3", // osbuild
}
}

17
internal/runner/rhel.go
View file

@ -13,12 +13,27 @@ func (r *RHEL) String() string {
func (p *RHEL) GetBuildPackages() []string {
packages := []string{
"glibc", // ldconfig
"glibc", // ldconfig
"platform-python", // osbuild
}
if p.Major >= 8 {
packages = append(packages,
"systemd", // systemd-tmpfiles and systemd-sysusers
)
}
if p.Major < 9 {
packages = append(packages,
// The RHEL 8 runner in osbuild runs with platform-python but
// explicitly symlinks python 3.6 to /etc/alternatives (which in turn
// is the target for /usr/bin/python3) for the stages.
// https://github.com/osbuild/osbuild/blob/ea8261cad6c5c606c00c0f2824c3f483c01a0cc9/runners/org.osbuild.rhel82#L61
// Install python36 explicitly for RHEL 8.
"python36",
)
} else {
packages = append(packages,
"python3", // osbuild stages
)
}
return packages
}