diff --git a/src/vpk/Velopack.Packaging.Unix/AppImageTool.cs b/src/vpk/Velopack.Packaging.Unix/AppImageTool.cs index 73bed17b..132ded3a 100644 --- a/src/vpk/Velopack.Packaging.Unix/AppImageTool.cs +++ b/src/vpk/Velopack.Packaging.Unix/AppImageTool.cs @@ -12,7 +12,6 @@ public class AppImageTool compression ??= "xz"; string runtime = machine switch { - RuntimeCpu.x86 => HelperFile.AppImageRuntimeX86, RuntimeCpu.x64 => HelperFile.AppImageRuntimeX64, RuntimeCpu.arm64 => HelperFile.AppImageRuntimeArm64, _ => throw new ArgumentOutOfRangeException(nameof(machine), machine, null) @@ -52,7 +51,7 @@ public class AppImageTool logger.Info("Converting tar into squashfs filesystem"); var tool = HelperFile.FindHelperFile("squashfs-tools\\tar2sqfs.exe"); - logger.Debug(Exe.RunHostedCommand($"\"{tool}\" -c {compression} \"{tmpSquashFile}\" < \"{tmpTarFile}\"")); + logger.Debug(Exe.RunHostedCommand($"\"{tool}\" -c {compression} -b 128K \"{tmpSquashFile}\" < \"{tmpTarFile}\"")); } else { Exe.AssertSystemBinaryExists("mksquashfs", "sudo apt install squashfs-tools", "brew install squashfs"); var tool = "mksquashfs"; @@ -65,7 +64,7 @@ public class AppImageTool "-root-owned", "-noappend", "-b", - "16384", + "128K", "-mkfs-time", "0", ]; diff --git a/src/vpk/Velopack.Packaging/HelperFile.cs b/src/vpk/Velopack.Packaging/HelperFile.cs index 6e755a80..f03ef87d 100644 --- a/src/vpk/Velopack.Packaging/HelperFile.cs +++ b/src/vpk/Velopack.Packaging/HelperFile.cs @@ -57,11 +57,9 @@ public static class HelperFile [SupportedOSPlatform("macos")] public static string VelopackEntitlements => FindHelperFile("Velopack.entitlements"); - public static string AppImageRuntimeArm64 => FindHelperFile("appimagekit-runtime-aarch64"); + public static string AppImageRuntimeArm64 => FindHelperFile("appimage-runtime-aarch64"); - public static string AppImageRuntimeX64 => FindHelperFile("appimagekit-runtime-x86_64"); - - public static string AppImageRuntimeX86 => FindHelperFile("appimagekit-runtime-i686"); + public static string AppImageRuntimeX64 => FindHelperFile("appimage-runtime-x86_64"); public static string SetupPath => FindHelperFile("setup.exe"); diff --git a/vendor/THIRD_PARTY_NOTICES.md b/vendor/THIRD_PARTY_NOTICES.md index 99339d07..bab717de 100644 --- a/vendor/THIRD_PARTY_NOTICES.md +++ b/vendor/THIRD_PARTY_NOTICES.md @@ -11,10 +11,10 @@ This folder contains pre-compiled binaries from a variety of sources. These shou - Can be found at https://github.com/facebook/zstd - License is GPL-2.0 & BSD 3: https://github.com/facebook/zstd/blob/dev/LICENSE, https://github.com/facebook/zstd/blob/dev/COPYING -### appimagekit (continuous Mar 8, 2023) -- Only include the "runtime" binaries needed to create a .AppImage for Linux -- Can be found at https://github.com/AppImage/AppImageKit -- License is MIT https://github.com/AppImage/AppImageKit/blob/master/LICENSE +### appimage/type2-runtime (continuous Aug 17, 2024) +- The "runtime" binaries needed to create a .AppImage for Linux +- Can be found at https://github.com/AppImage/type2-runtime +- License is MIT https://github.com/AppImage/type2-runtime/blob/main/LICENSE ### squashfs-tools-ng v1.3.0 - Squashfs utilities for Windows diff --git a/vendor/appimage-runtime-aarch64 b/vendor/appimage-runtime-aarch64 new file mode 100644 index 00000000..c5724363 Binary files /dev/null and b/vendor/appimage-runtime-aarch64 differ diff --git a/vendor/appimage-runtime-x86_64 b/vendor/appimage-runtime-x86_64 new file mode 100644 index 00000000..5338f2aa Binary files /dev/null and b/vendor/appimage-runtime-x86_64 differ diff --git a/vendor/appimagekit-runtime-aarch64 b/vendor/appimagekit-runtime-aarch64 deleted file mode 100644 index c60ccae0..00000000 Binary files a/vendor/appimagekit-runtime-aarch64 and /dev/null differ diff --git a/vendor/appimagekit-runtime-i686 b/vendor/appimagekit-runtime-i686 deleted file mode 100644 index 5319ae61..00000000 Binary files a/vendor/appimagekit-runtime-i686 and /dev/null differ diff --git a/vendor/appimagekit-runtime-x86_64 b/vendor/appimagekit-runtime-x86_64 deleted file mode 100644 index 3d73e2ab..00000000 Binary files a/vendor/appimagekit-runtime-x86_64 and /dev/null differ