JakeHillion/drgn
1
0
Fork 0
mirror of https://github.com/JakeHillion/drgn.git synced 2024-12-23 09:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmtest: rename bzImage uploads to vmlinuz

Browse Source 
Not all architectures name the bootable image bzImage, so to make
supporting other architectures easier in the future, let's use the more
generic name, vmlinuz.
This commit is contained in:
Omar Sandoval 2019-12-03 22:59:57 -08:00
parent a3acea9027
commit 1721a42dcd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/vmtest/manage.py
View File

@ -498,7 +498,7 @@ async def main():
f'/Public/vmlinux-{release}.zst',
autorename=False)
uploader.queue_file(os.path.join(build_dir, image_name),
f'/Public/{os.path.basename(image_name)}-{release}',
f'/Public/vmlinuz-{release}',
autorename=False)
if args.upload or args.upload_files:

6
scripts/vmtest/run.sh
View File

@ -179,7 +179,7 @@ matching_kernel_releases() {
local pattern="$1"
{
for file in "${!URLS[@]}"; do
if [[ $file =~ ^bzImage-(.*)$ ]]; then
if [[ $file =~ ^vmlinux-(.*).zst$ ]]; then
release="${BASH_REMATCH[1]}"
case "$release" in
$pattern)
@ -295,10 +295,10 @@ trap cleanup EXIT
if [[ -v BUILDDIR ]]; then
vmlinuz="$BUILDDIR/$(make -C "$BUILDDIR" -s image_name)"
else
vmlinuz="$DIR/bzImage-$KERNELRELEASE"
vmlinuz="$DIR/vmlinuz-$KERNELRELEASE"
if [[ ! -e $vmlinuz ]]; then
tmp="$(mktemp "$vmlinuz.XXX.part")"
download "bzImage-$KERNELRELEASE" -o "$tmp"
download "vmlinuz-$KERNELRELEASE" -o "$tmp"
mv "$tmp" "$vmlinuz"
tmp=
fi