make lint and linux happy

NOTE: Do not use go1.17.7 - some tests will fail because of reversed
      array member order.
Also GO seems to be a little bit more picky on Linux as on Solaris...

generator/Makefile

@@ -60,10 +60,12 @@ clean:
 
 DOLLAR := '$$'
 
+ELFEDIT ?= $(shell test `uname -s` = SunOS && printf /usr/bin/elfedit || printf true )
+
 generator: *.go
 	go build -trimpath -ldflags '-extldflags -zignore' -ldflags '-extldflags -zdefs'
-	ADDR=`/usr/bin/elfedit -e 'dyn:runpath -o num' generator` && \
-	/usr/bin/elfedit -e "str:set -shnam .dynstr -strndx $$ADDR $(DOLLAR)ORIGIN:$(DOLLAR)ORIGIN/../lib/amd64" generator
+	ADDR=`$(ELFEDIT) -e 'dyn:runpath -o num' generator` && \
+	$(ELFEDIT) -e "str:set -shnam .dynstr -strndx $$ADDR $(DOLLAR)ORIGIN:$(DOLLAR)ORIGIN/../lib/amd64" generator
 
 generate: generator mibs
 	MIBDIRS=$(MIB_PATH) ./generator --fail-on-parse-errors generate

generator/main.go

@@ -115,7 +115,7 @@ func generateConfig(nodes *Node, nameToNode map[string]*Node, logger log.Logger)
 		return fmt.Errorf("error parsing generated config: %s", err)
 	}
     annotateOIDs(&node, nameToNode)
-	out, err = yaml.Marshal(&node)
+	out, _ = yaml.Marshal(&node)
 
 	// Check the generated config to catch auth/version issues.
 	err = yaml.Unmarshal(out, &config.Config{})