summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorMaxim Polyakov <max.senia.poliak@gmail.com>2022-05-11 22:49:14 +0300
committerFelix Held <felix-coreboot@felixheld.de>2022-09-12 12:55:05 +0000
commit593b0f1f23505e2eb207649c49d2c96c46f1a2aa (patch)
treeb31b36b86fa57f38b710a94ec9a7793132f33511 /util
parent5004e930532245339cf1165dcdff40b5f1824d1d (diff)
intelp2m: Add Go Managing Dependencies System support
Add go.mod containing the full name of the project according to the docs [1]: review.coreboot.org/coreboot.git/util/intelp2m, and also, based on this, rename the internal packages to point to the absolute path. This will allow Go Managing Dependencies System to integrate packages from intelp2m to third-party Go written on the Go language [1]. This also requires fixing the Golang compiler version in go.mod: use go1.18 [2], the latest up-to-date version. [1] https://web.archive.org/web/20220910100342/https://go.dev/doc/modules/managing-dependencies [2] https://web.archive.org/web/20220910100206/https://tip.golang.org/doc/go1.18 [ TEST ] 1) Import the coreboot project into some go project: $cd path/to/go-project $go get review.coreboot.org/coreboot.git go: downloading review.coreboot.org/coreboot.git v0.0.0-20220903004133 -39914a50ae16 go: added review.coreboot.org/coreboot.git v0.0.0-20220903004133 -39914a50ae16 Thus, 'go get' correctly downloaded the contents of the repository. 2) Import intelp2m: $cd path/to/go-project $go get review.coreboot.org/coreboot.git/util/intelp2m review.coreboot.org/coreboot.git/util/intelp2m imports ./config: "./config" is relative, but relative import paths are not supported in module mode review.coreboot.org/coreboot.git/util/intelp2m imports ./parser: "./parser" is relative, but relative import paths are not supported in module mode Thus, the problem is in the package names, but after this patch, the import should be without errors. 3) Import a repository with an incorrect url: $cd path/to/go-project $go get review.coreboot.org/coreboot/test go: unrecognized import path "review.coreboot.org/coreboot/test": reading https://review.coreboot.org/coreboot/test?go-get=1: 404 Not Found This has not happened in previous cases. Change-Id: I12efae31227129b8c884af10fb233f398c4094e7 Signed-off-by: Maxim Polyakov <max.senia.poliak@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/64724 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Diffstat (limited to 'util')
-rw-r--r--util/intelp2m/Makefile2
-rw-r--r--util/intelp2m/fields/cb/cb.go4
-rw-r--r--util/intelp2m/fields/fields.go10
-rw-r--r--util/intelp2m/fields/fsp/fsp.go2
-rw-r--r--util/intelp2m/fields/raw/raw.go2
-rw-r--r--util/intelp2m/go.mod3
-rw-r--r--util/intelp2m/main.go5
-rw-r--r--util/intelp2m/parser/parser.go15
-rw-r--r--util/intelp2m/platforms/adl/macro.go11
-rw-r--r--util/intelp2m/platforms/adl/template.go2
-rw-r--r--util/intelp2m/platforms/apl/macro.go7
-rw-r--r--util/intelp2m/platforms/apl/template.go2
-rw-r--r--util/intelp2m/platforms/cnl/macro.go9
-rw-r--r--util/intelp2m/platforms/cnl/template.go2
-rw-r--r--util/intelp2m/platforms/common/macro.go3
-rw-r--r--util/intelp2m/platforms/lbg/macro.go9
-rw-r--r--util/intelp2m/platforms/snr/macro.go7
-rw-r--r--util/intelp2m/platforms/snr/template.go2
18 files changed, 54 insertions, 43 deletions
diff --git a/util/intelp2m/Makefile b/util/intelp2m/Makefile
index 524ecd631e..1d9ba70ce3 100644
--- a/util/intelp2m/Makefile
+++ b/util/intelp2m/Makefile
@@ -5,7 +5,7 @@ PROJECT_NAME = intelp2m
default:
go version
- GO111MODULE=off go build -v -o $(PROJECT_NAME)
+ go build -v -o $(PROJECT_NAME)
clean:
rm -Rf $(PROJECT_NAME) $(OUTPUT_DIR)
diff --git a/util/intelp2m/fields/cb/cb.go b/util/intelp2m/fields/cb/cb.go
index 3603aac532..a70b2a63a8 100644
--- a/util/intelp2m/fields/cb/cb.go
+++ b/util/intelp2m/fields/cb/cb.go
@@ -1,8 +1,8 @@
package cb
import (
- "../../config"
- "../../platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
)
type FieldMacros struct {}
diff --git a/util/intelp2m/fields/fields.go b/util/intelp2m/fields/fields.go
index e8d8625d0c..4f14c815d2 100644
--- a/util/intelp2m/fields/fields.go
+++ b/util/intelp2m/fields/fields.go
@@ -1,11 +1,11 @@
package fields
import (
- "../config"
- "../platforms/common"
- "./fsp"
- "./cb"
- "./raw"
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/fields/fsp"
+ "review.coreboot.org/coreboot.git/util/intelp2m/fields/cb"
+ "review.coreboot.org/coreboot.git/util/intelp2m/fields/raw"
)
// InterfaceSet - set the interface for decoding configuration
diff --git a/util/intelp2m/fields/fsp/fsp.go b/util/intelp2m/fields/fsp/fsp.go
index f7d3f3a007..b6224cd03c 100644
--- a/util/intelp2m/fields/fsp/fsp.go
+++ b/util/intelp2m/fields/fsp/fsp.go
@@ -1,6 +1,6 @@
package fsp
-import "../../platforms/common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
type FieldMacros struct {}
diff --git a/util/intelp2m/fields/raw/raw.go b/util/intelp2m/fields/raw/raw.go
index e6fa25c7ee..fbac5b53d0 100644
--- a/util/intelp2m/fields/raw/raw.go
+++ b/util/intelp2m/fields/raw/raw.go
@@ -2,7 +2,7 @@ package raw
import (
"fmt"
- "../../platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
)
type FieldMacros struct {}
diff --git a/util/intelp2m/go.mod b/util/intelp2m/go.mod
new file mode 100644
index 0000000000..d8ab48f61a
--- /dev/null
+++ b/util/intelp2m/go.mod
@@ -0,0 +1,3 @@
+module review.coreboot.org/coreboot.git/util/intelp2m
+
+go 1.18
diff --git a/util/intelp2m/main.go b/util/intelp2m/main.go
index 225d36943f..3de34dd3a5 100644
--- a/util/intelp2m/main.go
+++ b/util/intelp2m/main.go
@@ -4,8 +4,9 @@ import (
"flag"
"fmt"
"os"
- "./parser"
- "./config"
+
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
+ "review.coreboot.org/coreboot.git/util/intelp2m/parser"
)
// generateOutputFile - generates include file
diff --git a/util/intelp2m/parser/parser.go b/util/intelp2m/parser/parser.go
index 34c961cdea..c6a9388a42 100644
--- a/util/intelp2m/parser/parser.go
+++ b/util/intelp2m/parser/parser.go
@@ -5,13 +5,14 @@ import (
"fmt"
"strings"
"strconv"
- "../platforms/common"
- "../platforms/snr"
- "../platforms/lbg"
- "../platforms/apl"
- "../platforms/cnl"
- "../platforms/adl"
- "../config"
+
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/lbg"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/apl"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/cnl"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/adl"
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
)
// PlatformSpecific - platform-specific interface
diff --git a/util/intelp2m/platforms/adl/macro.go b/util/intelp2m/platforms/adl/macro.go
index 9ef4cd5200..d7b1f58f0b 100644
--- a/util/intelp2m/platforms/adl/macro.go
+++ b/util/intelp2m/platforms/adl/macro.go
@@ -3,11 +3,12 @@ package adl
import (
"strings"
"fmt"
- "../common"
- "../../config"
- "../../fields"
- "../snr"
- "../cnl"
+
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/cnl"
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
+ "review.coreboot.org/coreboot.git/util/intelp2m/fields"
)
const (
diff --git a/util/intelp2m/platforms/adl/template.go b/util/intelp2m/platforms/adl/template.go
index 491aa3c93a..672be84070 100644
--- a/util/intelp2m/platforms/adl/template.go
+++ b/util/intelp2m/platforms/adl/template.go
@@ -1,6 +1,6 @@
package adl
-import "../common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
// GroupNameExtract - This function extracts the group ID, if it exists in a row
// line : string from the configuration file
diff --git a/util/intelp2m/platforms/apl/macro.go b/util/intelp2m/platforms/apl/macro.go
index 5f27074570..2098c5788f 100644
--- a/util/intelp2m/platforms/apl/macro.go
+++ b/util/intelp2m/platforms/apl/macro.go
@@ -3,9 +3,10 @@ package apl
import (
"fmt"
"strconv"
- "../common"
- "../../config"
- "../../fields"
+
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
+ "review.coreboot.org/coreboot.git/util/intelp2m/fields"
)
const (
diff --git a/util/intelp2m/platforms/apl/template.go b/util/intelp2m/platforms/apl/template.go
index 823b321f3d..05d505f786 100644
--- a/util/intelp2m/platforms/apl/template.go
+++ b/util/intelp2m/platforms/apl/template.go
@@ -1,6 +1,6 @@
package apl
-import "../common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
// GroupNameExtract - This function extracts the group ID, if it exists in a row
// line : string from the configuration file
diff --git a/util/intelp2m/platforms/cnl/macro.go b/util/intelp2m/platforms/cnl/macro.go
index 714bfa1b66..5526b8f1f5 100644
--- a/util/intelp2m/platforms/cnl/macro.go
+++ b/util/intelp2m/platforms/cnl/macro.go
@@ -3,10 +3,11 @@ package cnl
import (
"strings"
"fmt"
- "../common"
- "../../config"
- "../../fields"
- "../snr"
+
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
+ "review.coreboot.org/coreboot.git/util/intelp2m/fields"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr"
)
const (
diff --git a/util/intelp2m/platforms/cnl/template.go b/util/intelp2m/platforms/cnl/template.go
index 3b028e68ae..b38d9689f4 100644
--- a/util/intelp2m/platforms/cnl/template.go
+++ b/util/intelp2m/platforms/cnl/template.go
@@ -1,6 +1,6 @@
package cnl
-import "../common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
type InheritanceTemplate interface {
KeywordCheck(line string) bool
diff --git a/util/intelp2m/platforms/common/macro.go b/util/intelp2m/platforms/common/macro.go
index ed42729d96..ddb612a9a9 100644
--- a/util/intelp2m/platforms/common/macro.go
+++ b/util/intelp2m/platforms/common/macro.go
@@ -3,7 +3,8 @@ package common
import (
"strconv"
"sync"
- "../../config"
+
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
)
type Fields interface {
diff --git a/util/intelp2m/platforms/lbg/macro.go b/util/intelp2m/platforms/lbg/macro.go
index 003ea3f14b..db34f8e6cf 100644
--- a/util/intelp2m/platforms/lbg/macro.go
+++ b/util/intelp2m/platforms/lbg/macro.go
@@ -2,10 +2,11 @@ package lbg
import (
"fmt"
- "../../config"
- "../../fields"
- "../common"
- "../snr"
+
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
+ "review.coreboot.org/coreboot.git/util/intelp2m/fields"
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr"
)
const (
diff --git a/util/intelp2m/platforms/snr/macro.go b/util/intelp2m/platforms/snr/macro.go
index cebb0cd890..4e170103ba 100644
--- a/util/intelp2m/platforms/snr/macro.go
+++ b/util/intelp2m/platforms/snr/macro.go
@@ -3,9 +3,10 @@ package snr
import (
"strings"
"fmt"
- "../common"
- "../../config"
- "../../fields"
+
+ "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+ "review.coreboot.org/coreboot.git/util/intelp2m/config"
+ "review.coreboot.org/coreboot.git/util/intelp2m/fields"
)
const (
diff --git a/util/intelp2m/platforms/snr/template.go b/util/intelp2m/platforms/snr/template.go
index 9bcf9e1029..2a5dfc3643 100644
--- a/util/intelp2m/platforms/snr/template.go
+++ b/util/intelp2m/platforms/snr/template.go
@@ -1,6 +1,6 @@
package snr
-import "../common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
// GroupNameExtract - This function extracts the group ID, if it exists in a row
// line : string from the configuration file