cmd/otk: rename otk externals

The `otk` externals are moved into a subdirectory of `cmd` and named by their target (they generate things for `osbuild`). Signed-off-by: Simon de Vlieger <[email protected]>
achilleas-k · Oct 7, 2024 · 439bd04 · 439bd04
1 parent 1837244
commit 439bd04
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 8 deletions.
diff --git a/cmd/otk-gen-partition-table/export_test.go → ...sbuild-gen-partition-table/export_test.go b/cmd/otk-gen-partition-table/export_test.go → ...sbuild-gen-partition-table/export_test.go
diff --git a/cmd/otk-gen-partition-table/main.go → cmd/otk/osbuild-gen-partition-table/main.go b/cmd/otk-gen-partition-table/main.go → cmd/otk/osbuild-gen-partition-table/main.go
@@ -76,7 +76,7 @@ type InputModifications struct {
 }
 
 // Output contains a full description of a disk, this can be consumed
-// by other tools like otk-make-*
+// by other tools like osbuild-make-*
 type Output = otkdisk.Data
 
 func makePartMap(pt *disk.PartitionTable) map[string]otkdisk.Partition {

diff --git a/cmd/otk-gen-partition-table/main_test.go → .../osbuild-gen-partition-table/main_test.go b/cmd/otk-gen-partition-table/main_test.go → .../osbuild-gen-partition-table/main_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	genpart "github.com/osbuild/images/cmd/otk-gen-partition-table"
+	genpart "github.com/osbuild/images/cmd/otk/osbuild-gen-partition-table"
 	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/internal/otkdisk"
 	"github.com/osbuild/images/pkg/blueprint"

diff --git a/cmd/otk-make-fstab-stage/export_test.go → ...k/osbuild-make-fstab-stage/export_test.go b/cmd/otk-make-fstab-stage/export_test.go → ...k/osbuild-make-fstab-stage/export_test.go
diff --git a/cmd/otk-make-fstab-stage/main.go → cmd/otk/osbuild-make-fstab-stage/main.go b/cmd/otk-make-fstab-stage/main.go → cmd/otk/osbuild-make-fstab-stage/main.go
diff --git a/cmd/otk-make-fstab-stage/main_test.go → ...otk/osbuild-make-fstab-stage/main_test.go b/cmd/otk-make-fstab-stage/main_test.go → ...otk/osbuild-make-fstab-stage/main_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	makefstab "github.com/osbuild/images/cmd/otk-make-fstab-stage"
+	makefstab "github.com/osbuild/images/cmd/otk/osbuild-make-fstab-stage"
 	"github.com/osbuild/images/internal/otkdisk"
 	"github.com/osbuild/images/internal/testdisk"
 )

diff --git a/cmd/otk-make-grub2-inst-stage/export_test.go → ...uild-make-grub2-inst-stage/export_test.go b/cmd/otk-make-grub2-inst-stage/export_test.go → ...uild-make-grub2-inst-stage/export_test.go
diff --git a/cmd/otk-make-grub2-inst-stage/main.go → ...otk/osbuild-make-grub2-inst-stage/main.go b/cmd/otk-make-grub2-inst-stage/main.go → ...otk/osbuild-make-grub2-inst-stage/main.go
diff --git a/cmd/otk-make-grub2-inst-stage/main_test.go → ...sbuild-make-grub2-inst-stage/main_test.go b/cmd/otk-make-grub2-inst-stage/main_test.go → ...sbuild-make-grub2-inst-stage/main_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	makeGrub2Inst "github.com/osbuild/images/cmd/otk-make-grub2-inst-stage"
+	makeGrub2Inst "github.com/osbuild/images/cmd/otk/osbuild-make-grub2-inst-stage"
 	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/internal/otkdisk"
 	"github.com/osbuild/images/pkg/disk"

diff --git a/...e-partition-mounts-devices/export_test.go → ...e-partition-mounts-devices/export_test.go b/...e-partition-mounts-devices/export_test.go → ...e-partition-mounts-devices/export_test.go
diff --git a/...otk-make-partition-mounts-devices/main.go → ...ild-make-partition-mounts-devices/main.go b/...otk-make-partition-mounts-devices/main.go → ...ild-make-partition-mounts-devices/main.go
diff --git a/...ake-partition-mounts-devices/main_test.go → ...ake-partition-mounts-devices/main_test.go b/...ake-partition-mounts-devices/main_test.go → ...ake-partition-mounts-devices/main_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	mkdevmnt "github.com/osbuild/images/cmd/otk-make-partition-mounts-devices"
+	mkdevmnt "github.com/osbuild/images/cmd/otk/osbuild-make-partition-mounts-devices"
 	"github.com/osbuild/images/internal/otkdisk"
 	"github.com/osbuild/images/internal/testdisk"
 	"github.com/stretchr/testify/assert"

diff --git a/cmd/otk-make-partition-stages/export_test.go → ...uild-make-partition-stages/export_test.go b/cmd/otk-make-partition-stages/export_test.go → ...uild-make-partition-stages/export_test.go
diff --git a/cmd/otk-make-partition-stages/main.go → ...otk/osbuild-make-partition-stages/main.go b/cmd/otk-make-partition-stages/main.go → ...otk/osbuild-make-partition-stages/main.go
diff --git a/cmd/otk-make-partition-stages/main_test.go → ...sbuild-make-partition-stages/main_test.go b/cmd/otk-make-partition-stages/main_test.go → ...sbuild-make-partition-stages/main_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	makestages "github.com/osbuild/images/cmd/otk-make-partition-stages"
+	makestages "github.com/osbuild/images/cmd/otk/osbuild-make-partition-stages"
 	"github.com/osbuild/images/internal/otkdisk"
 	"github.com/osbuild/images/pkg/disk"
 )

diff --git a/cmd/otk-resolve-containers/export_test.go → ...osbuild-resolve-containers/export_test.go b/cmd/otk-resolve-containers/export_test.go → ...osbuild-resolve-containers/export_test.go
diff --git a/cmd/otk-resolve-containers/main.go → cmd/otk/osbuild-resolve-containers/main.go b/cmd/otk-resolve-containers/main.go → cmd/otk/osbuild-resolve-containers/main.go
diff --git a/cmd/otk-resolve-containers/main_test.go → ...k/osbuild-resolve-containers/main_test.go b/cmd/otk-resolve-containers/main_test.go → ...k/osbuild-resolve-containers/main_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	resolver "github.com/osbuild/images/cmd/otk-resolve-containers"
+	resolver "github.com/osbuild/images/cmd/otk/osbuild-resolve-containers"
 )
 
 const (

diff --git a/cmd/otk-resolve-ostree-commit/export_test.go → ...uild-resolve-ostree-commit/export_test.go b/cmd/otk-resolve-ostree-commit/export_test.go → ...uild-resolve-ostree-commit/export_test.go
diff --git a/cmd/otk-resolve-ostree-commit/main.go → ...otk/osbuild-resolve-ostree-commit/main.go b/cmd/otk-resolve-ostree-commit/main.go → ...otk/osbuild-resolve-ostree-commit/main.go
diff --git a/cmd/otk-resolve-ostree-commit/main_test.go → ...sbuild-resolve-ostree-commit/main_test.go b/cmd/otk-resolve-ostree-commit/main_test.go → ...sbuild-resolve-ostree-commit/main_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	resolver "github.com/osbuild/images/cmd/otk-resolve-ostree-commit"
+	resolver "github.com/osbuild/images/cmd/otk/osbuild-resolve-ostree-commit"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )