Deprecated: pour one out for source mode

Source mode becomes harder to maintain with Go modules. We're getting ready to add Go module support. Goodbye, source mode. Go is not what it used to be! Signed-off-by: Chris Koch <[email protected]>
Raysmond · Jun 9, 2021 · 5611826 · 5611826
1 parent ffd18dd
commit 5611826
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 592 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -191,7 +191,6 @@ jobs:
                   # Fails because of dups. Is this supposed to work?
                   #$goruncmd -build=bb all core
                   #$goruncmd all core
-                  go run u-root.go templates.go -fourbins minimal
                   GOOS=plan9 $goruncmd -defaultsh=/bbin/rush plan9
                   cat /tmp/stats.json
       - store_artifacts:

diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ u-root core boot
 u-root cmds/core/{init,ls,ip,dhclient,wget,cat,elvish}
 
 # Generate an archive with all of the core tools with some exceptions
-u-root core -cmds/core/{installcommand,losetup}
+u-root core -cmds/core/{ls,losetup}
 
 # Generate an archive with a tool outside of u-root
 u-root cmds/core/{init,ls,elvish} github.com/u-root/cpu/cmds/cpud
@@ -375,22 +375,17 @@ assuming your kernel is configured to work that way.
 
 ## Build Modes
 
-u-root can create an initramfs in two different modes:
+u-root can create an initramfs in two different modes, specified by `-build`:
 
-*   source mode includes Go toolchain binaries + simple shell + Go source files
-    in the initramfs archive. Tools are compiled from source on the fly by the
-    shell.
-
-    When you try to run a command that is not built, it is compiled first and
-    stored in tmpfs. From that point on, when you run the command, you get the
-    one in tmpfs. Don't worry: the Go compiler is pretty fast.
-
-*   bb mode: One busybox-like binary comprising all the Go tools you ask to
+*   `bb` mode: One busybox-like binary comprising all the Go tools you ask to
     include. See [here for how it works](pkg/bb/README.md).
 
     In this mode, u-root copies and rewrites the source of the tools you asked
     to include to be able to compile everything into one busybox-like binary.
 
+*   `binary` mode: each specified binary is compiled separately and all binaries
+    are added to the initramfs.
+
 ## Updating Dependencies
 
 ```shell

diff --git a/cmds/core/init/bgbuild.go b/cmds/core/init/bgbuild.go
diff --git a/cmds/core/init/init.go b/cmds/core/init/init.go
@@ -62,11 +62,6 @@ func main() {
 	// to be used in the rest of init.
 	ic := osInitGo()
 
-	// Start background build.
-	if isBgBuildEnabled() {
-		go startBgBuild()
-	}
-
 	cmdCount := libinit.RunCommands(debug, ic.cmds...)
 	if cmdCount == 0 {
 		log.Printf("No suitable executable found in %v", ic.cmds)

diff --git a/cmds/core/installcommand/installcommand.go b/cmds/core/installcommand/installcommand.go
diff --git a/cmds/core/installcommand/installcommand_linux.go b/cmds/core/installcommand/installcommand_linux.go
diff --git a/cmds/core/installcommand/installcommand_plan9.go b/cmds/core/installcommand/installcommand_plan9.go
diff --git a/pkg/uroot/builder/builder.go b/pkg/uroot/builder/builder.go
@@ -11,7 +11,6 @@ import (
 
 var (
 	BusyBox = BBBuilder{}
-	Source  = SourceBuilder{}
 	Binary  = BinaryBuilder{}
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ import ( @@
     var (
     	BusyBox = BBBuilder{}
-    	Source  = SourceBuilder{}
     	Binary  = BinaryBuilder{}
     )
@@ Expand Down @@