mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
All RPM distributions support ARM
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
59ff75ec27
commit
8574012381
1 changed files with 2 additions and 26 deletions
|
@ -339,25 +339,9 @@ def rpm(
|
|||
assert repo_path is not None
|
||||
assert key_id is not None
|
||||
distro_info = {
|
||||
"amazon": {
|
||||
"2": {
|
||||
"arm_support": True,
|
||||
},
|
||||
},
|
||||
"redhat": {
|
||||
"7": {
|
||||
"arm_support": True,
|
||||
},
|
||||
"8": {
|
||||
"arm_support": True,
|
||||
},
|
||||
"9": {
|
||||
"arm_support": True,
|
||||
},
|
||||
},
|
||||
"amazon": ["2"],
|
||||
"redhat": ["7", "8", "9"],
|
||||
}
|
||||
uid = ctx.run("id", "-u", capture=True).stdout.strip().decode()
|
||||
gid = ctx.run("id", "-g", capture=True).stdout.strip().decode()
|
||||
display_name = f"{distro.capitalize()} {distro_version}"
|
||||
if distro_version not in distro_info[distro]:
|
||||
ctx.error(f"Support for {display_name} is missing.")
|
||||
|
@ -367,14 +351,6 @@ def rpm(
|
|||
ctx.info(f"The {distro_arch} arch is an alias for 'arm64'. Adjusting.")
|
||||
distro_arch = "arm64"
|
||||
|
||||
distro_details = distro_info[distro][distro_version]
|
||||
if distro_arch == "arm64" and not distro_details["arm_support"]:
|
||||
ctx.error(f"There's no arm64 support for {display_name}.")
|
||||
ctx.exit(1)
|
||||
|
||||
ctx.info("Distribution Details:")
|
||||
ctx.info(distro_details)
|
||||
|
||||
if key_id == "0E08A149DE57BFBE":
|
||||
saltstack_gpg_key_file = (
|
||||
pathlib.Path("~/SALTSTACK-GPG-KEY.pub").expanduser().resolve()
|
||||
|
|
Loading…
Add table
Reference in a new issue