-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade Buildroot to 2021.02 LTS with Linux 4.19
Upgrade kernel minor version to distribution default
Add patch to allow building go inside minikube mod
Add sysctl override to revert systemd 245+ rp_filter
BR2_PACKAGE_LUAJIT
Make sure to build lua required for sysdig
BR2_PACKAGE_LZ4_PROGS
Make sure to build lz4 required for preload
BR2_PACKAGE_UTIL_LINUX_NOLOGIN
Make sure to build lsblk required for automount- Loading branch information
1 parent
c3c4d04
commit f81b500
Showing
4 changed files
with
87 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
...e-iso/board/coreos/minikube/patches/go/1.15.15/dist-generate-stub-go.mod-in-workdir.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| From 2b512af2ddaae01926fdcc9056b71017cac2a8d2 Mon Sep 17 00:00:00 2001 | ||
| From: Tamir Duberstein <tamird@google.com> | ||
| Date: Thu, 25 Feb 2021 16:44:46 -0500 | ||
| Subject: [PATCH] dist: generate stub go.mod in workdir | ||
|
|
||
| (cherry picked from commit c6374f516206c02b905d0d76ee1a66dab6fcd212) | ||
| --- | ||
| src/cmd/dist/build.go | 26 ++++++-------------------- | ||
| 1 file changed, 6 insertions(+), 20 deletions(-) | ||
|
|
||
| diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go | ||
| index 9e2b4f33b8..e5a7f9e9c4 100644 | ||
| --- a/src/cmd/dist/build.go | ||
| +++ b/src/cmd/dist/build.go | ||
| @@ -110,9 +110,6 @@ func xinit() { | ||
| fatalf("$GOROOT must be set") | ||
| } | ||
| goroot = filepath.Clean(b) | ||
| - if modRoot := findModuleRoot(goroot); modRoot != "" { | ||
| - fatalf("found go.mod file in %s: $GOROOT must not be inside a module", modRoot) | ||
| - } | ||
|
|
||
| b = os.Getenv("GOROOT_FINAL") | ||
| if b == "" { | ||
| @@ -244,6 +241,9 @@ func xinit() { | ||
| os.Setenv("LANGUAGE", "en_US.UTF8") | ||
|
|
||
| workdir = xworkdir() | ||
| + if err := ioutil.WriteFile(pathf("%s/go.mod", workdir), []byte("module bootstrap"), 0666); err != nil { | ||
| + fatalf("cannot write stub go.mod: %s", err) | ||
| + } | ||
| xatexit(rmworkdir) | ||
|
|
||
| tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) | ||
| @@ -1484,11 +1484,11 @@ func goCmd(goBinary string, cmd string, args ...string) { | ||
| goCmd = append(goCmd, "-p=1") | ||
| } | ||
|
|
||
| - run(goroot, ShowOutput|CheckExit, append(goCmd, args...)...) | ||
| + run(workdir, ShowOutput|CheckExit, append(goCmd, args...)...) | ||
| } | ||
|
|
||
| func checkNotStale(goBinary string, targets ...string) { | ||
| - out := run(goroot, CheckExit, | ||
| + out := run(workdir, CheckExit, | ||
| append([]string{ | ||
| goBinary, | ||
| "list", "-gcflags=all=" + gogcflags, "-ldflags=all=" + goldflags, | ||
| @@ -1498,7 +1498,7 @@ func checkNotStale(goBinary string, targets ...string) { | ||
| os.Setenv("GODEBUG", "gocachehash=1") | ||
| for _, target := range []string{"runtime/internal/sys", "cmd/dist", "cmd/link"} { | ||
| if strings.Contains(out, "STALE "+target) { | ||
| - run(goroot, ShowOutput|CheckExit, goBinary, "list", "-f={{.ImportPath}} {{.Stale}}", target) | ||
| + run(workdir, ShowOutput|CheckExit, goBinary, "list", "-f={{.ImportPath}} {{.Stale}}", target) | ||
| break | ||
| } | ||
| } | ||
| @@ -1590,20 +1590,6 @@ func checkCC() { | ||
| } | ||
| } | ||
|
|
||
| -func findModuleRoot(dir string) (root string) { | ||
| - for { | ||
| - if fi, err := os.Stat(filepath.Join(dir, "go.mod")); err == nil && !fi.IsDir() { | ||
| - return dir | ||
| - } | ||
| - d := filepath.Dir(dir) | ||
| - if d == dir { | ||
| - break | ||
| - } | ||
| - dir = d | ||
| - } | ||
| - return "" | ||
| -} | ||
| - | ||
| func defaulttarg() string { | ||
| // xgetwd might return a path with symlinks fully resolved, and if | ||
| // there happens to be symlinks in goroot, then the hasprefix test |
2 changes: 2 additions & 0 deletions
2
...o/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/sysctl.d/90-cilium-rp_filter.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| net.ipv4.conf.lxc*.rp_filter = 0 | ||
| net.ipv4.conf.cilium_*.rp_filter = 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters