saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove all references to the patch in the build steps and add a note about relenv needing to be installed for building the onedir dependencies

Browse source
This commit is contained in:
MKLeb 2023-03-07 13:24:31 -05:00 • committed by Megan Wilhite
parent f4761fea30
commit 35a91e713b
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tools/pkgbuild.py
View file

@ -34,9 +34,6 @@ build = command_group(
"onedir": {
"help": "The name of the onedir artifact, if given it should be under artifacts/",
},
"patch": {
"help": "The name of the patch artifact, if given it should be under the root of the checkout",
},
"use_existing_onedir": {
"help": "Whether to build using the existing onedir or not",
},
@ -45,7 +42,6 @@ build = command_group(
def debian(
ctx: Context,
onedir: str = None, # pylint: disable=bad-whitespace
patch: str = None, # pylint: disable=bad-whitespace
use_existing_onedir: bool = True,
):
"""
@ -54,12 +50,8 @@ def debian(
checkout = pathlib.Path.cwd()
if use_existing_onedir:
assert onedir is not None
assert patch is not None
onedir_artifact = checkout / "artifacts" / onedir
patch_artifact = checkout / patch
_check_pkg_build_files_exist(
ctx, patch_artifact=patch_artifact, onedir_artifact=onedir_artifact
)
_check_pkg_build_files_exist(ctx, onedir_artifact=onedir_artifact)
ctx.info(
f"Building the package using the onedir artifact {str(onedir_artifact)}"
)
@ -79,9 +71,6 @@ def debian(
"onedir": {
"help": "The name of the onedir artifact, if given it should be under artifacts/",
},
"patch": {
"help": "The name of the patch artifact, if given it should be under the root of the checkout",
},
"use_existing_onedir": {
"help": "Whether to build using the existing onedir or not",
},
@ -90,7 +79,6 @@ def debian(
def rpm(
ctx: Context,
onedir: str = None, # pylint: disable=bad-whitespace
patch: str = None, # pylint: disable=bad-whitespace
use_existing_onedir: bool = True,
):
"""
@ -99,12 +87,8 @@ def rpm(
checkout = pathlib.Path.cwd()
if use_existing_onedir:
assert onedir is not None
assert patch is not None
onedir_artifact = checkout / "artifacts" / onedir
patch_artifact = checkout / patch
_check_pkg_build_files_exist(
ctx, patch_artifact=patch_artifact, onedir_artifact=onedir_artifact
)
_check_pkg_build_files_exist(ctx, onedir_artifact=onedir_artifact)
ctx.info(
f"Building the package using the onedir artifact {str(onedir_artifact)}"
)
@ -259,6 +243,8 @@ def onedir_dependencies(
):
"""
Create a relenv environment with the onedir dependencies installed.
NOTE: relenv needs to be installed into your environment and builds and toolchains (linux) fetched.
"""
if TYPE_CHECKING:
assert arch is not None