From 60619606899083c37244073f4b41175b65d7e8b0 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Mon, 20 Jan 2025 10:17:49 +0100 Subject: [PATCH] spec: rename to `image-builder` `image-builder` will be the main entrypoint into the Image Builder stack. We will rename the repositories later on; but let's start referring to it in its new official name. Signed-off-by: Simon de Vlieger --- .packit.yaml | 8 ++++---- Makefile | 12 ++++++------ image-builder-cli.spec => image-builder.spec | 2 +- tools/rpm_spec_add_provides_bundle.sh | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) rename image-builder-cli.spec => image-builder.spec (99%) diff --git a/.packit.yaml b/.packit.yaml index 14cb0d7..f25113c 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,9 +1,9 @@ # https://packit.dev/docs/configuration/ -specfile_path: image-builder-cli.spec +specfile_path: image-builder.spec files_to_sync: - - image-builder-cli.spec + - image-builder.spec - .packit.yaml copy_upstream_release_description: true @@ -24,7 +24,7 @@ actions: upstream_tag_include: 'v\d+' jobs: - # image-builder-cli is not yet in Fedora, so we don't need to update it there + # image-builder is not yet in Fedora, so we don't need to update it there # - job: bodhi_update # trigger: commit # dist_git_branches: @@ -58,5 +58,5 @@ jobs: trigger: commit branch: main owner: "@osbuild" # copr repo namespace - project: image-builder-cli # copr repo name so you can consume the builds + project: image-builder # copr repo name so you can consume the builds targets: *build_targets diff --git a/Makefile b/Makefile index 7769151..87cdfd2 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,8 @@ GOLANGCI_COMPOSER_IMAGE=composer_golangci VERSION := $(shell ( git describe --tags --abbrev=0 2>/dev/null || echo v1 ) | sed 's|v||') COMMIT = $(shell (cd "$(SRCDIR)" && git rev-parse HEAD)) -PACKAGE_NAME_VERSION = image-builder-cli-$(VERSION) -PACKAGE_NAME_COMMIT = image-builder-cli-$(COMMIT) +PACKAGE_NAME_VERSION = image-builder-$(VERSION) +PACKAGE_NAME_COMMIT = image-builder-$(COMMIT) # # Generic Targets @@ -77,7 +77,7 @@ PACKAGE_NAME_COMMIT = image-builder-cli-$(COMMIT) help: @echo "make [TARGETS...]" @echo - @echo "This is the maintenance makefile of image-builder-cli. The following" + @echo "This is the maintenance makefile of image-builder. The following" @echo "targets are available:" @echo @echo " help: Print this usage information." @@ -114,7 +114,7 @@ clean: # # Building packages # -# The following rules build image-builder-cli packages from the current HEAD +# The following rules build image-builder packages from the current HEAD # commit, based on the spec file in this directory. The resulting packages # have the commit hash in their version, so that they don't get overwritten # when calling `make rpm` again after switching to another branch. @@ -123,14 +123,14 @@ clean: # ./rpmbuild, using rpmbuild's usual directory structure. # -RPM_SPECFILE=rpmbuild/SPECS/image-builder-cli.spec +RPM_SPECFILE=rpmbuild/SPECS/image-builder.spec RPM_TARBALL=rpmbuild/SOURCES/$(PACKAGE_NAME_COMMIT).tar.gz RPM_TARBALL_VERSIONED=rpmbuild/SOURCES/$(PACKAGE_NAME_VERSION).tar.gz .PHONY: $(RPM_SPECFILE) $(RPM_SPECFILE): mkdir -p $(CURDIR)/rpmbuild/SPECS - git show HEAD:image-builder-cli.spec > $(RPM_SPECFILE) + git show HEAD:image-builder.spec > $(RPM_SPECFILE) go mod vendor ./tools/rpm_spec_add_provides_bundle.sh $(RPM_SPECFILE) diff --git a/image-builder-cli.spec b/image-builder.spec similarity index 99% rename from image-builder-cli.spec rename to image-builder.spec index 11bbde6..8991eec 100644 --- a/image-builder-cli.spec +++ b/image-builder.spec @@ -24,7 +24,7 @@ usage, it can also upload images directly to cloud. It is compatible with composer-cli and cockpit-composer clients. } -Name: image-builder-cli +Name: image-builder Release: 1%{?dist} Summary: An image building service based on osbuild ExcludeArch: i686 armv7hl diff --git a/tools/rpm_spec_add_provides_bundle.sh b/tools/rpm_spec_add_provides_bundle.sh index 790c65b..670d298 100755 --- a/tools/rpm_spec_add_provides_bundle.sh +++ b/tools/rpm_spec_add_provides_bundle.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash -SPEC_FILE=${1:-"image-builder-cli.spec"} +SPEC_FILE=${1:-"image-builder.spec"} # Save the list of bundled packages into a file WORKDIR=$(mktemp -d)