Skip to content

Commit

Permalink
format: change dashes to underscores
Browse files Browse the repository at this point in the history
Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
  • Loading branch information
supakeen committed May 28, 2024
1 parent 9230d89 commit e7ff9b5
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion doc/03-omnifest/01-directive.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ otk.meta.kiwi:

External directives. Directives starting with `otk.external` are redirected
to `/usr/libexec/otk/`-binaries. For example the directive
`otk.external.osbuild.depsolve-dnf4` will execute `otk-osbuild depsolve-dnf4`
`otk.external.osbuild.depsolve_dnf4` will execute `otk-osbuild depsolve_dnf4`
with the tree under the directive on stdin and expect a new tree to replace
the directive with on stdout.

Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-x86_64-ami.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ otk.define.centos-9-x86_64-ami:
# [list_item1, list_item2, ..]"
# (i.e. define the partition table as a map of root/boot/boot-efi vars)
# *and* it needs to undstand customizations (e.g. adding extra parititions somehow, size contraints)
otk.external.osbuild.create-partition-table-defines:
otk.external.osbuild.create_partition_table_defines:
total_size: 10G

otk.include.centos-9-x86_64: "common/centos-9.yaml"
2 changes: 1 addition & 1 deletion example/centos/centos-9-x86_64-qcow2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ otk.define.centos-9-x86_64-qcow2:
# [list_item1, list_item2, ..]"
# (i.e. define the partition table as a map of root/boot/boot-efi vars)
# *and* it needs to undstand customizations (e.g. adding extra parititions somehow, size contraints)
otk.external.osbuild.create-partition-table-defines:
otk.external.osbuild.create_partition_table_defines:
total_size: 10G

otk.include.centos-9-x86_64: "common/centos-9.yaml"
2 changes: 1 addition & 1 deletion example/centos/fragment/files.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
otk.op.loop:
item: ${customization.files}
foreach:
- otk.external.osbuild.embed-file:
- otk.external.osbuild.embed_file:
text: ${item.text}
path: ${item.path}
- type: org.osbuild.chmod
Expand Down
2 changes: 1 addition & 1 deletion example/centos/pipeline/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: build
source-epoch: ${source_epoch}
runner: "org.osbuild.centos9"
stages:
- otk.external.osbuild.depsolve-dnf4:
- otk.external.osbuild.depsolve_dnf4:
architecture: ${architecture}
releasever: ${version}
module_platform_id: platform:el${version}
Expand Down
10 changes: 5 additions & 5 deletions example/centos/pipeline/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ name: image
build: "name:build"

stages:
- otk.external.osbuild-partition-table.gen-truncate-stage:
- otk.external.osbuild_partition_table.gen_truncate_stage:
from: filesystems
- otk.external.osbuild.partition-table.gen-sfdisk-stage:
- otk.external.osbuild_partition_table.gen_sfdisk_stage:
from: filesystems
- otk.external.osbuild.partition-table.gen-mkfs-stages:
- otk.external.osbuild_partition_table.gen_mkfs_stages:
from: filesystems
- type: org.osbuild.copy
options:
paths:
from: input://root-tree/
to: mount://-/
devices:
otk.external.osbuild.partition-table.gen-devices:
otk.external.osbuild.partition_table.gen_devices:
from: filesystems
mounts:
otk.external.osbuild.partition-table.gen-mounts:
otk.external.osbuild.partition_table.gen_mounts:
from: filesystems
# TODO drop this stage conditionally on legacy boot support (or not) [is this our use-case for conditionals?]
- type: org.osbuild.grub2.inst
Expand Down
4 changes: 2 additions & 2 deletions example/centos/pipeline/os-ostree.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build: "name:build"

stages:
# Install RPMs
- otk.external.osbuild.depsolve-dnf4:
- otk.external.osbuild.depsolve_dnf4:
architecture: ${architecture}
releasever: ${version}
module_platform_id: platform:el${version}
Expand All @@ -14,7 +14,7 @@ stages:
packages: ${packages.os.packages}

# Disk bits
- otk.external.osbuild.partition-table.gen-fstab-stage:
- otk.external.osbuild.partition_table.gen_fstab_stage:
source: ${filesystem}

# Boot bits
Expand Down
4 changes: 2 additions & 2 deletions example/centos/pipeline/os.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build: "name:build"

stages:
# Install RPMs
- otk.external.osbuild.depsolve-dnf4:
- otk.external.osbuild.depsolve_dnf4:
architecture: ${architecture}
releasever: ${version}
module_platform_id: platform:el${version}
Expand All @@ -14,7 +14,7 @@ stages:
packages: ${packages.os.packages}

# Disk bits
- otk.external.osbuild.partition-table.gen-fstab-stage:
- otk.external.osbuild.partition_table.gen_fstab_stage:
source: ${filesystem}

# Boot bits
Expand Down
2 changes: 1 addition & 1 deletion example/fedora/osbuild/buildroot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: buildroot
source-epoch: 1659397331
stages:
- otk.external.osbuild.depsolve-dnf4:
- otk.external.osbuild.depsolve_dnf4:
architecture: ${architecture}
releasever: "40"
module_platform_id: f${version}
Expand Down
2 changes: 1 addition & 1 deletion example/fedora/osbuild/pipeline/raw.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: raw
source-epoch: 1659397331
stages:
# - otk.external.osbuild.depsolve-dnf4:
# - otk.external.osbuild.depsolve_dnf4:
# architecture: ${architecture}
# module_platform_id: f${version}
# repositories: ${repositories}
Expand Down
2 changes: 1 addition & 1 deletion example/fedora/osbuild/pipeline/tree.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: tree
build: name:root
stages:
- otk.external.osbuild.depsolve-dnf4:
- otk.external.osbuild.depsolve_dnf4:
architecture: ${architecture}
releasever: "40"
module_platform_id: f${version}
Expand Down

0 comments on commit e7ff9b5

Please sign in to comment.