Rename uroot package to uimage

Signed-off-by: Chris Koch <[email protected]>

cmd/mkuimage/main.go

@@ -19,9 +19,9 @@ import (
  "github.com/hugelgupf/go-shlex"
  "github.com/u-root/gobusybox/src/pkg/golang"
  "github.com/u-root/gobusybox/src/pkg/uflag"
- "github.com/u-root/mkuimage/uroot"
- "github.com/u-root/mkuimage/uroot/builder"
- "github.com/u-root/mkuimage/uroot/initramfs"
+ "github.com/u-root/mkuimage/uimage"
+ "github.com/u-root/mkuimage/uimage/builder"
+ "github.com/u-root/mkuimage/uimage/initramfs"
  "github.com/u-root/uio/llog"
 )
 
@@ -225,7 +225,7 @@ func Main(l *llog.Logger, env *golang.Environ, buildOpts *golang.BuildOpts) erro
  output := getWriter(*format, *outputPath)
 
  var base initramfs.ReadOpener
- base = &initramfs.Archive{Archive: uroot.DefaultRamfs()}
+ base = &initramfs.Archive{Archive: uimage.DefaultRamfs()}
  if *basePath != "" {
  base = getReader(*format, *basePath)
  }
@@ -244,7 +244,7 @@ func Main(l *llog.Logger, env *golang.Environ, buildOpts *golang.BuildOpts) erro
  }
  }
 
- var c []uroot.Commands
+ var c []uimage.Commands
  if !*noCommands {
  var b builder.Builder
  switch *build {
@@ -261,14 +261,14 @@ func Main(l *llog.Logger, env *golang.Environ, buildOpts *golang.BuildOpts) erro
  pkgs = []string{"github.com/u-root/u-root/cmds/core/*"}
  }
 
- c = append(c, uroot.Commands{
+ c = append(c, uimage.Commands{
  Builder: b,
  Packages: pkgs,
  BuildOpts: buildOpts,
  })
  }
 
- opts := uroot.Opts{
+ opts := uimage.Opts{
  Env: env,
  Commands: c,
  UrootSource: *urootSourceDir,
@@ -287,5 +287,5 @@ func Main(l *llog.Logger, env *golang.Environ, buildOpts *golang.BuildOpts) erro
  if len(uinitArgs) > 1 {
  opts.UinitArgs = uinitArgs[1:]
  }
- return uroot.CreateInitramfs(l, opts)
+ return uimage.CreateInitramfs(l, opts)
 }

cmd/mkuimage/main_test.go

@@ -18,7 +18,7 @@ import (
 
  "github.com/u-root/gobusybox/src/pkg/golang"
  "github.com/u-root/mkuimage/cpio"
- itest "github.com/u-root/mkuimage/uroot/initramfs/test"
+ itest "github.com/u-root/mkuimage/uimage/initramfs/test"
  "golang.org/x/sync/errgroup"
 )
 

uroot/builder/binary.go → uimage/builder/binary.go

@@ -10,7 +10,7 @@ import (
  "sync"
 
  "github.com/u-root/gobusybox/src/pkg/golang"
- "github.com/u-root/mkuimage/uroot/initramfs"
+ "github.com/u-root/mkuimage/uimage/initramfs"
  "github.com/u-root/uio/llog"
  "golang.org/x/tools/go/packages"
 )

uroot/builder/binary_test.go → uimage/builder/binary_test.go

@@ -9,7 +9,7 @@ import (
  "testing"
 
  "github.com/u-root/gobusybox/src/pkg/golang"
- "github.com/u-root/mkuimage/uroot/initramfs"
+ "github.com/u-root/mkuimage/uimage/initramfs"
  "github.com/u-root/uio/llog"
 )
 

uroot/builder/builder.go → uimage/builder/builder.go

@@ -10,7 +10,7 @@ import (
  "errors"
 
  "github.com/u-root/gobusybox/src/pkg/golang"
- "github.com/u-root/mkuimage/uroot/initramfs"
+ "github.com/u-root/mkuimage/uimage/initramfs"
  "github.com/u-root/uio/llog"
 )
 

uroot/builder/gbb.go → uimage/builder/gbb.go

@@ -13,7 +13,7 @@ import (
 
  "github.com/u-root/gobusybox/src/pkg/bb"
  "github.com/u-root/mkuimage/cpio"
- "github.com/u-root/mkuimage/uroot/initramfs"
+ "github.com/u-root/mkuimage/uimage/initramfs"
  "github.com/u-root/uio/llog"
 )
 

uroot/builder/gbb_test.go → uimage/builder/gbb_test.go

@@ -11,7 +11,7 @@ import (
 
  "github.com/u-root/gobusybox/src/pkg/golang"
  "github.com/u-root/mkuimage/cpio"
- "github.com/u-root/mkuimage/uroot/initramfs"
+ "github.com/u-root/mkuimage/uimage/initramfs"
  "github.com/u-root/uio/llog"
 )
 

uroot/uroot.go → uimage/uimage.go

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package uroot creates root file systems from Go programs.
+// Package uimage creates root file systems from Go programs.
 //
-// uroot will appropriately compile the Go programs, create symlinks for their
+// uimage will appropriately compile the Go programs, create symlinks for their
 // names, and assemble an initramfs with additional files as specified.
-package uroot
+package uimage
 
 import (
  "debug/elf"
@@ -24,8 +24,8 @@ import (
  "github.com/u-root/mkuimage/cpio"
  "github.com/u-root/mkuimage/fileflag"
  "github.com/u-root/mkuimage/ldd"
- "github.com/u-root/mkuimage/uroot/builder"
- "github.com/u-root/mkuimage/uroot/initramfs"
+ "github.com/u-root/mkuimage/uimage/builder"
+ "github.com/u-root/mkuimage/uimage/initramfs"
  "github.com/u-root/uio/llog"
 )
 

uroot/uroot_test.go → uimage/uimage_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package uroot
+package uimage
 
 import (
  "errors"
@@ -14,9 +14,9 @@ import (
 
  "github.com/u-root/gobusybox/src/pkg/golang"
  "github.com/u-root/mkuimage/cpio"
- "github.com/u-root/mkuimage/uroot/builder"
- "github.com/u-root/mkuimage/uroot/initramfs"
- itest "github.com/u-root/mkuimage/uroot/initramfs/test"
+ "github.com/u-root/mkuimage/uimage/builder"
+ "github.com/u-root/mkuimage/uimage/initramfs"
+ itest "github.com/u-root/mkuimage/uimage/initramfs/test"
  "github.com/u-root/uio/llog"
 )
 
@@ -110,8 +110,8 @@ func TestCreateInitramfs(t *testing.T) {
  somefile,
  // Empty is ignored.
  "",
- "uroot_test.go",
- filepath.Join(cwd, "uroot_test.go"),
+ "uimage_test.go",
+ filepath.Join(cwd, "uimage_test.go"),
  // Parent directory is created.
  somefile + ":somedir/somefile",
  },
@@ -122,8 +122,8 @@ func TestCreateInitramfs(t *testing.T) {
  itest.HasContent{Path: somefile, Content: "foobar"},
  itest.HasContent{Path: "etc/somefile2", Content: "spongebob"},
  // TODO: This behavior is weird.
- itest.HasFile{Path: "uroot_test.go"},
- itest.HasFile{Path: filepath.Join(cwd, "uroot_test.go")},
+ itest.HasFile{Path: "uimage_test.go"},
+ itest.HasFile{Path: filepath.Join(cwd, "uimage_test.go")},
  itest.HasDir{Path: "somedir"},
  itest.HasContent{Path: "somedir/somefile", Content: "foobar"},
  },
@@ -560,8 +560,8 @@ func TestCreateInitramfsWithAPI(t *testing.T) {
  somefile,
  // Empty is ignored.
  "",
- "uroot_test.go",
- filepath.Join(cwd, "uroot_test.go"),
+ "uimage_test.go",
+ filepath.Join(cwd, "uimage_test.go"),
  // Parent directory is created.
  somefile+":somedir/somefile",
  ),
@@ -572,8 +572,8 @@ func TestCreateInitramfsWithAPI(t *testing.T) {
  itest.HasContent{Path: somefile, Content: "foobar"},
  itest.HasContent{Path: "etc/somefile2", Content: "spongebob"},
  // TODO: This behavior is weird.
- itest.HasFile{Path: "uroot_test.go"},
- itest.HasFile{Path: filepath.Join(cwd, "uroot_test.go")},
+ itest.HasFile{Path: "uimage_test.go"},
+ itest.HasFile{Path: filepath.Join(cwd, "uimage_test.go")},
  itest.HasDir{Path: "somedir"},
  itest.HasContent{Path: "somedir/somefile", Content: "foobar"},
  },