diff --git a/CHANGELOG.md b/CHANGELOG.md index 2449321c..c1b998fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog - Fyne.io fyne-cross +## 1.1.2 - 05 Oct 2021 + +### Fixed + +- Unsupported target operating system "linux/amd64" #74 + ## 1.1.1 - 29 Sep 2021 ### Added diff --git a/docker/CHANGELOG.md b/docker/CHANGELOG.md index d70320f5..db6b3cba 100644 --- a/docker/CHANGELOG.md +++ b/docker/CHANGELOG.md @@ -23,6 +23,9 @@ above. Example: `fyneio/fyne-cross:1.1-base-21.03.17` +## Release 21.10.05 +- Add xz-utils package to support unix packaging fyne-io/fyne#1919 + ## Release 21.09.29 - Update Go to v1.16.8 - Update fyne CLI to v2.1.0 diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 98e78232..60ce3aa8 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -18,6 +18,8 @@ RUN apt-get update -qq \ gosu \ zip \ unzip \ + # Switch from gz to xz compression for unix packages fyne-io/fyne#1919 + xz-utils \ # fyne deps libgl1-mesa-dev \ libegl1-mesa-dev \ diff --git a/internal/command/docker.go b/internal/command/docker.go index 0ebc86ae..3895305b 100644 --- a/internal/command/docker.go +++ b/internal/command/docker.go @@ -185,7 +185,7 @@ func fynePackage(ctx Context) error { } target := ctx.OS - if ctx.Architecture != ArchMultiple { + if ctx.OS == androidOS && ctx.Architecture != ArchMultiple { target += "/" + ctx.Architecture.String() } @@ -253,9 +253,14 @@ func fyneRelease(ctx Context) error { } } + target := ctx.OS + if ctx.OS == androidOS && ctx.Architecture != ArchMultiple { + target += "/" + ctx.Architecture.String() + } + args := []string{ fyneBin, "release", - "-os", ctx.OS, + "-os", target, "-name", ctx.Name, "-icon", volume.JoinPathContainer(ctx.TmpDirContainer(), ctx.ID, icon.Default), "-appBuild", ctx.AppBuild, diff --git a/internal/command/freebsd.go b/internal/command/freebsd.go index eada2f95..f4279356 100644 --- a/internal/command/freebsd.go +++ b/internal/command/freebsd.go @@ -105,7 +105,7 @@ func (cmd *FreeBSD) Run() error { // log.Info("[i] Packaging app...") - packageName := fmt.Sprintf("%s.tar.gz", ctx.Name) + packageName := fmt.Sprintf("%s.tar.xz", ctx.Name) err = prepareIcon(ctx) if err != nil { diff --git a/internal/command/linux.go b/internal/command/linux.go index fc0997fe..52aafedb 100644 --- a/internal/command/linux.go +++ b/internal/command/linux.go @@ -106,7 +106,7 @@ func (cmd *Linux) Run() error { // log.Info("[i] Packaging app...") - packageName := fmt.Sprintf("%s.tar.gz", ctx.Name) + packageName := fmt.Sprintf("%s.tar.xz", ctx.Name) err = prepareIcon(ctx) if err != nil {