thefossguy/asahi-kiwi-descriptions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder: more packaging bugfixes

Browse Source
This commit is contained in:
Davide Cavalca 2023-07-20 10:00:28 -07:00
parent 1711c0e46a
commit 85c1d1750f
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builder.py
View File

@ -126,18 +126,32 @@ def packageBuild(target):
# TODO: rewrite in python instead of shelling out # TODO: rewrite in python instead of shelling out
runCommand(["./make-asahi-installer-package.sh"]) runCommand(["./make-asahi-installer-package.sh"])
package = f"fedora-{RELEASE}-{target['id']}-{TODAY}.zip" base = f"fedora-{RELEASE}-{target['id']}-{TODAY}"
os.rename(f"fedora-{RELEASE}-{TODAY}.zip", package) os.rename(f"fedora-{RELEASE}-{TODAY}.zip", f"{base}.zip")
with open("installer_data.json", "r") as f: os.rename(f"fedora-{RELEASE}-{TODAY}.logs.zip", f"{base}.logs.zip")
os.rename(f"fedora-{RELEASE}-{TODAY}.raw.zst", f"{base}.raw.zst")
os.rename(f"fedora-{RELEASE}-{TODAY}.json", f"{base}.json")
with open(f"{base}.json", "r") as f:
data = json.load(f) data = json.load(f)
data["os_list"][0]["name"] = target["name"] data["name"] = target["name"]
data["os_list"][0]["default_os_name"] = target["os_name"] data["default_os_name"] = target["os_name"]
data["os_list"][0]["package"] = package data["package"] = f"{base}.zip"
with open("installer_data.json", "w") as f: with open(f"{base}.json", "w") as f:
json.dump(data, f) json.dump(data, f)
if os.path.exists("installer_data.json"):
with open("installer_data.json", "r") as f:
data = json.load(f)
data["os_list"][0]["name"] = target["name"]
data["os_list"][0]["default_os_name"] = target["os_name"]
data["os_list"][0]["package"] = f"{base}.zip"
with open("installer_data.json", "w") as f:
json.dump(data, f)
def uploadToS3(source, destination): def uploadToS3(source, destination):
s3 = boto3.client("s3") s3 = boto3.client("s3")
@ -147,8 +161,8 @@ def uploadToS3(source, destination):
def packageUpload(target): def packageUpload(target):
base = f"fedora-{RELEASE}-{target['id']}-{TODAY}" base = f"fedora-{RELEASE}-{target['id']}-{TODAY}"
package = f"{base}.zip" package = f"{base}.zip"
logs_package = f"{base}-logs.zip" logs_package = f"{base}.logs.zip"
image = f"{base}.raw.zstd" image = f"{base}.raw.zst"
manifest = f"{base}.json" manifest = f"{base}.json"
uploadToS3(package, f"os/{package}") uploadToS3(package, f"os/{package}")
@ -202,9 +216,9 @@ def package(target):
@cli.command() @cli.command()
@click.argument("target")
@click.option("--manifest/--no-manifest", default=True) @click.option("--manifest/--no-manifest", default=True)
def upload(target): @click.argument("target")
def upload(manifest, target):
if target not in TARGETS.keys(): if target not in TARGETS.keys():
fail(f"Unknown target: {target}") fail(f"Unknown target: {target}")

2
make-asahi-installer-package.sh
View File

@ -119,7 +119,7 @@ cp -p \
outdir/kiwi.result.json \ outdir/kiwi.result.json \
"${workdir}/logs/" "${workdir}/logs/"
pushd "${workdir}/logs" > /dev/null pushd "${workdir}/logs" > /dev/null
7z a -tzip -r "${basedir}/${package}-logs" . 7z a -tzip -r "${basedir}/${package}.logs.zip" .
popd > /dev/null popd > /dev/null
# Package up the raw image # Package up the raw image