Merge pull request #46 from smoser/fix/get-build-working

Fix/get build working

.github/workflows/build.yml

@@ -32,7 +32,10 @@ jobs:
               https://github.com/project-machine/trust/releases/download/v0.0.9/trust-linux-amd64
           sudo chmod 755 /usr/bin/trust
           trust keyset add snakeoil
-      - name: build bootkit
+      - name: build golang
+        run: |
+          make go-stacker-build
+      - name: build layers
         run: |
           make STACKER_COMMON_OPTS=--debug
       - name: Publish zot

Makefile

@@ -4,8 +4,8 @@ COMMANDS = pkg/bkcust pkg/oci-boot
 include subs.mk
 include common.mk
 
-.PHONY: build
-build:
+.PHONY: layers
+layers:
 	$(STACKER_RBUILD)
 
 custom: pkg/bkcust
@@ -14,15 +14,14 @@ custom: pkg/bkcust
 bin: $(COMMANDS)
 
 $(COMMANDS): $(ALL_GO_FILES)
-	@$(call pkg_build,./cmd/$(notdir $@))
+	@$(call go_build,./cmd/$(notdir $@))
 
-.PHONY: pkg-build
-pkg-build:
-	cd pkg && $(STACKER_BUILD)
+.PHONY: go-stacker-build
+go-stacker-build:
+	cd go && $(STACKER_BUILD)
 
 go-build: $(ALL_GO_FILES) $(COMMANDS)
-	@$(call pkg_build,./... ./cmd/*)
-
+	@$(call go_build,./...)
 
 LAYERS := $(shell cd $(TOP_D)/layers && \
 				  for d in *; do [ -f "$$d/stacker.yaml" ] && echo "$$d"; done )

common.mk

@@ -30,9 +30,9 @@ STACKER_PUBLISH = stacker $(STACKER_OPTS) publish \
 # [ -n "value-of-$VARNAME" ] || { echo "rule-name ...VARNAME"; exit 1; }
 required_var = [ -n "$(value $1)" ] || { echo "$@ requires environment variable $1"; exit 1; }
 
-ALL_GO_FILES := $(wildcard pkg/*.go pkg/*/*.go pkg/*/*/*.go)
+ALL_GO_FILES := $(wildcard go/*/*.go go/*/*/*.go)
 
-pkg_build = vr() { echo "$$@" 1>&2; "$$@"; } ; \
+go_build = vr() { echo "$$@" 1>&2; "$$@"; } ; \
 		build() { for f in "$$@"; do \
-		  vr go build -buildmode=exe -tags containers_image_openpgp "$$f" || break; done; } ; \
-		  vr cd pkg && export GO_BIN=. && build $(1)
+		  vr go build -buildmode=exe -tags containers_image_openpgp "$$f" || return; done; } ; \
+		  vr cd go && export GO_BIN=. && build $(1)

cmd/bkcust/initrd.go → go/cmd/bkcust/initrd.go

@@ -7,7 +7,7 @@ import (
 
 	"compress/gzip"
 
-	"github.com/project-machine/bootkit/pkg/initrd"
+	"github.com/project-machine/bootkit/go/pkg/initrd"
 	cli "github.com/urfave/cli/v2"
 )
 

cmd/bkcust/shim.go → go/cmd/bkcust/shim.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 
 	efi "github.com/canonical/go-efilib"
-	"github.com/project-machine/bootkit/pkg/cert"
-	"github.com/project-machine/bootkit/pkg/shim"
-	"github.com/project-machine/bootkit/pkg/util"
+	"github.com/project-machine/bootkit/go/pkg/cert"
+	"github.com/project-machine/bootkit/go/pkg/shim"
+	"github.com/project-machine/bootkit/go/pkg/util"
 	cli "github.com/urfave/cli/v2"
 )
 

cmd/bkcust/signefi.go → go/cmd/bkcust/signefi.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/foxboron/go-uefi/efi/pecoff"
-	"github.com/project-machine/bootkit/pkg/cert"
+	"github.com/project-machine/bootkit/go/pkg/cert"
 	cli "github.com/urfave/cli/v2"
 )
 

pkg/cmd/bkcust/stubby.go → go/cmd/bkcust/stubby.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/project-machine/bootkit/pkg/stubby"
+	"github.com/project-machine/bootkit/go/pkg/stubby"
 	cli "github.com/urfave/cli/v2"
 )
 

cmd/bkcust/virtfw.go → go/cmd/bkcust/virtfw.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	efi "github.com/canonical/go-efilib"
-	"github.com/project-machine/bootkit/pkg/cert"
-	"github.com/project-machine/bootkit/pkg/firmware"
-	"github.com/project-machine/bootkit/pkg/util"
+	"github.com/project-machine/bootkit/go/pkg/cert"
+	"github.com/project-machine/bootkit/go/pkg/firmware"
+	"github.com/project-machine/bootkit/go/pkg/util"
 	cli "github.com/urfave/cli/v2"
 )
 

go.mod → go/go.mod

@@ -1,6 +1,6 @@
-module github.com/project-machine/bootkit
+module github.com/project-machine/bootkit/go
 
-go 1.21
+go 1.20
 
 require (
 	github.com/anuvu/disko v0.0.11

pkg/cert/cert_test.go → go/pkg/cert/cert_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	efi "github.com/canonical/go-efilib"
-	. "github.com/project-machine/bootkit/pkg/cert"
+	. "github.com/project-machine/bootkit/go/pkg/cert"
 )
 
 var uefiDBPEM = []byte(`-----BEGIN CERTIFICATE-----

pkg/firmware/ovmf.go → go/pkg/firmware/ovmf.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/project-machine/bootkit/pkg/cert"
-	"github.com/project-machine/bootkit/pkg/run"
+	"github.com/project-machine/bootkit/go/pkg/cert"
+	"github.com/project-machine/bootkit/go/pkg/run"
 
 	efi "github.com/canonical/go-efilib"
 )

pkg/obj/update.go → go/pkg/obj/update.go

@@ -3,7 +3,7 @@ package obj
 import (
 	"fmt"
 
-	"github.com/project-machine/bootkit/pkg/run"
+	"github.com/project-machine/bootkit/go/pkg/run"
 )
 
 type SectionInput struct {

pkg/shim/shim.go → go/pkg/shim/shim.go

@@ -9,7 +9,7 @@ import (
 	"unsafe"
 
 	efi "github.com/canonical/go-efilib"
-	"github.com/project-machine/bootkit/pkg/obj"
+	"github.com/project-machine/bootkit/go/pkg/obj"
 )
 
 var nativeEndian binary.ByteOrder

pkg/stubby/stubby.go → go/pkg/stubby/stubby.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/project-machine/bootkit/pkg/obj"
-	"github.com/project-machine/bootkit/pkg/util"
+	"github.com/project-machine/bootkit/go/pkg/obj"
+	"github.com/project-machine/bootkit/go/pkg/util"
 )
 
 // Smoosh - create unified kernel image 'uki' from stubby 'stubEfi'

pkg/stacker.yaml → go/stacker.yaml

@@ -8,7 +8,7 @@ buildenv-pkg:
     type: built
     tag: minbase
   import:
-    - https://go.dev/dl/go1.19.4.linux-amd64.tar.gz
+    - https://go.dev/dl/go1.20.8.linux-amd64.tar.gz
   run: |
     pkgtool install gcc git libc6-dev make pkg-config \
       libcap-dev libacl1-dev libsquashfs-dev libdevmapper-dev \
@@ -51,7 +51,7 @@ build-pkg:
   binds:
     - ${{TOP_D}} -> /build/bootkit
   run: |
-    cd /build/bootkit/pkg
+    cd /build/bootkit/
     export GOPATH=/build/bootkit/.go
     export GOCACHE=$GOPATH/cache