diff --git a/cmd/mkuimage/main.go b/cmd/mkuimage/main.go index 8b4f04a..5ba46d1 100644 --- a/cmd/mkuimage/main.go +++ b/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) } diff --git a/cmd/mkuimage/main_test.go b/cmd/mkuimage/main_test.go index 81a1177..af74d05 100644 --- a/cmd/mkuimage/main_test.go +++ b/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" ) diff --git a/uroot/builder/binary.go b/uimage/builder/binary.go similarity index 97% rename from uroot/builder/binary.go rename to uimage/builder/binary.go index 9439ace..431b7f9 100644 --- a/uroot/builder/binary.go +++ b/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" ) diff --git a/uroot/builder/binary_test.go b/uimage/builder/binary_test.go similarity index 97% rename from uroot/builder/binary_test.go rename to uimage/builder/binary_test.go index e899431..8b881c7 100644 --- a/uroot/builder/binary_test.go +++ b/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" ) diff --git a/uroot/builder/builder.go b/uimage/builder/builder.go similarity index 97% rename from uroot/builder/builder.go rename to uimage/builder/builder.go index e7ed803..4ee070a 100644 --- a/uroot/builder/builder.go +++ b/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" ) diff --git a/uroot/builder/gbb.go b/uimage/builder/gbb.go similarity index 98% rename from uroot/builder/gbb.go rename to uimage/builder/gbb.go index 2e819d4..a6d7e79 100644 --- a/uroot/builder/gbb.go +++ b/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" ) diff --git a/uroot/builder/gbb_test.go b/uimage/builder/gbb_test.go similarity index 98% rename from uroot/builder/gbb_test.go rename to uimage/builder/gbb_test.go index 0bbb2a4..b7bee6a 100644 --- a/uroot/builder/gbb_test.go +++ b/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" ) diff --git a/uroot/initramfs/archive.go b/uimage/initramfs/archive.go similarity index 100% rename from uroot/initramfs/archive.go rename to uimage/initramfs/archive.go diff --git a/uroot/initramfs/cpio.go b/uimage/initramfs/cpio.go similarity index 100% rename from uroot/initramfs/cpio.go rename to uimage/initramfs/cpio.go diff --git a/uroot/initramfs/dir.go b/uimage/initramfs/dir.go similarity index 100% rename from uroot/initramfs/dir.go rename to uimage/initramfs/dir.go diff --git a/uroot/initramfs/files.go b/uimage/initramfs/files.go similarity index 100% rename from uroot/initramfs/files.go rename to uimage/initramfs/files.go diff --git a/uroot/initramfs/files_test.go b/uimage/initramfs/files_test.go similarity index 100% rename from uroot/initramfs/files_test.go rename to uimage/initramfs/files_test.go diff --git a/uroot/initramfs/test/ramfs.go b/uimage/initramfs/test/ramfs.go similarity index 100% rename from uroot/initramfs/test/ramfs.go rename to uimage/initramfs/test/ramfs.go diff --git a/uroot/uroot.go b/uimage/uimage.go similarity index 98% rename from uroot/uroot.go rename to uimage/uimage.go index 635c343..b8237b3 100644 --- a/uroot/uroot.go +++ b/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" ) diff --git a/uroot/uroot_test.go b/uimage/uimage_test.go similarity index 99% rename from uroot/uroot_test.go rename to uimage/uimage_test.go index 80fccff..c623f03 100644 --- a/uroot/uroot_test.go +++ b/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" )