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

Revert "Do not build source package when building from onedir"

Browse source 
This reverts commit 6a301e38eb.
This commit is contained in:
Daniel A. Wozniak 2024-12-19 14:11:27 -07:00 • committed by Daniel Wozniak
parent c620f8506f
commit 13f0d59587
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/pkg/build.py
View file

@ -65,7 +65,6 @@ def debian(
f"Building the package using the onedir artifact {str(onedir_artifact)}" f"Building the package using the onedir artifact {str(onedir_artifact)}"
) )
os.environ["SALT_ONEDIR_ARCHIVE"] = str(onedir_artifact) os.environ["SALT_ONEDIR_ARCHIVE"] = str(onedir_artifact)
buildargs = ["-uc"]
else: else:
if arch is None: if arch is None:
ctx.error( ctx.error(
@ -90,7 +89,6 @@ def debian(
for key, value in new_env.items(): for key, value in new_env.items():
os.environ[key] = value os.environ[key] = value
env_args.extend(["-e", key]) env_args.extend(["-e", key])
buildargs = ["-uc", "-us"]
env = os.environ.copy() env = os.environ.copy()
env["PIP_CONSTRAINT"] = str( env["PIP_CONSTRAINT"] = str(
@ -98,7 +96,7 @@ def debian(
) )
ctx.run("ln", "-sf", "pkg/debian/", ".") ctx.run("ln", "-sf", "pkg/debian/", ".")
ctx.run("debuild", *env_args, *buildargs, env=env) ctx.run("debuild", *env_args, "-uc", "-us", env=env)
ctx.info("Done") ctx.info("Done")