diff options
| -rw-r--r-- | controlBox.go | 10 | ||||
| -rw-r--r-- | examples/mirrors.wit.com/Makefile | 2 | ||||
| -rw-r--r-- | examples/mirrors.wit.com/control | 7 | ||||
| -rw-r--r-- | examples/mirrors.wit.com/wit-sid.asc | 76 | ||||
| -rw-r--r-- | readControlFile.go | 8 |
5 files changed, 52 insertions, 51 deletions
diff --git a/controlBox.go b/controlBox.go index e16b131..5f0b118 100644 --- a/controlBox.go +++ b/controlBox.go @@ -48,12 +48,12 @@ func newControl(parent *gui.Node) *controlBox { c.grid.NextRow() c.Architecture = gadgets.NewBasicDropdown(c.grid, "Architecture") - c.Architecture.AddText("riscv") + c.Architecture.AddText("all") + c.Architecture.AddText("riscv64") + c.Architecture.AddText("ppc64") c.Architecture.AddText("amd64") - c.Architecture.AddText("arm") - c.Architecture.AddText("noarch") - c.Architecture.AddText("src") - c.Architecture.SetText("amd64") + c.Architecture.AddText("arm64") + c.Architecture.SetText("riscv64") c.grid.NextRow() c.InstallPath = gadgets.NewBasicCombobox(c.grid, "Install Path") diff --git a/examples/mirrors.wit.com/Makefile b/examples/mirrors.wit.com/Makefile index d28f0e1..ecaad6a 100644 --- a/examples/mirrors.wit.com/Makefile +++ b/examples/mirrors.wit.com/Makefile @@ -1,5 +1,7 @@ .PHONY: build +# this is how the mirrors.wit.com debian package is created + all: build build: diff --git a/examples/mirrors.wit.com/control b/examples/mirrors.wit.com/control index 9cfe939..5e06931 100644 --- a/examples/mirrors.wit.com/control +++ b/examples/mirrors.wit.com/control @@ -1,11 +1,12 @@ -Build-Depends: +Source: Package: mirrors.wit.com +Build-Depends: Maintainer: Jeff Carr <[email protected]> Packager: Jeff Carr <[email protected]> -Architecture: noarch +Architecture: all Depends: URL: https://mirrors.wit.com/ Recommends: -Version: 0.0.3 +Version: 0.0.6 Description: apt keys and source file This was packaged with go-deb from go.wit.com diff --git a/examples/mirrors.wit.com/wit-sid.asc b/examples/mirrors.wit.com/wit-sid.asc index 7f50c36..8648d6c 100644 --- a/examples/mirrors.wit.com/wit-sid.asc +++ b/examples/mirrors.wit.com/wit-sid.asc @@ -1,41 +1,41 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -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 -X4aT7W+u+dxTCOk1pVyKT3Vo -=N1/z +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 +yGA= +=tw/F -----END PGP PUBLIC KEY BLOCK----- diff --git a/readControlFile.go b/readControlFile.go index 84008a4..184767b 100644 --- a/readControlFile.go +++ b/readControlFile.go @@ -73,12 +73,10 @@ func (c *controlBox) readControlFile() error { // log.Warn("not sure what to do with Package", c.Package.String(), value) // } case "Architecture": + // todo: add logic to find OS arch if c.Architecture.String() != value { - log.Warn("not sure what to do with Architecture", c.Architecture.String(), value) - if value == "noarch" { - log.Warn("attempting to set noarch") - c.Architecture.SetText(value) - } + log.Warn("attempting to set arch to", value) + c.Architecture.SetText(value) } default: |