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>
diff --git a/util/intelp2m/Makefile b/util/intelp2m/Makefile
index 524ecd6..1d9ba70 100644
--- a/util/intelp2m/Makefile
+++ b/util/intelp2m/Makefile
@@ -5,7 +5,7 @@
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 3603aac..a70b2a6 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 e8d8625..4f14c81 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 f7d3f3a..b6224cd 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 e6fa25c..fbac5b5 100644
--- a/util/intelp2m/fields/raw/raw.go
+++ b/util/intelp2m/fields/raw/raw.go
@@ -2,7 +2,7 @@
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 0000000..d8ab48f
--- /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 225d369..3de34dd 100644
--- a/util/intelp2m/main.go
+++ b/util/intelp2m/main.go
@@ -4,8 +4,9 @@
"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 34c961c..c6a9388 100644
--- a/util/intelp2m/parser/parser.go
+++ b/util/intelp2m/parser/parser.go
@@ -5,13 +5,14 @@
"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 9ef4cd5..d7b1f58 100644
--- a/util/intelp2m/platforms/adl/macro.go
+++ b/util/intelp2m/platforms/adl/macro.go
@@ -3,11 +3,12 @@
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 491aa3c..672be84 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 5f27074..2098c57 100644
--- a/util/intelp2m/platforms/apl/macro.go
+++ b/util/intelp2m/platforms/apl/macro.go
@@ -3,9 +3,10 @@
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 823b321..05d505f 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 714bfa1..5526b8f 100644
--- a/util/intelp2m/platforms/cnl/macro.go
+++ b/util/intelp2m/platforms/cnl/macro.go
@@ -3,10 +3,11 @@
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 3b028e6..b38d968 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 ed42729..ddb612a 100644
--- a/util/intelp2m/platforms/common/macro.go
+++ b/util/intelp2m/platforms/common/macro.go
@@ -3,7 +3,8 @@
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 003ea3f..db34f8e 100644
--- a/util/intelp2m/platforms/lbg/macro.go
+++ b/util/intelp2m/platforms/lbg/macro.go
@@ -2,10 +2,11 @@
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 cebb0cd..4e17010 100644
--- a/util/intelp2m/platforms/snr/macro.go
+++ b/util/intelp2m/platforms/snr/macro.go
@@ -3,9 +3,10 @@
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 9bcf9e1..2a5dfc3 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