Skip to content

Fix OKD version detection in make rpm #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggiguash merged 1 commit into from
Dec 10, 2025
Merged

Fix OKD version detection in make rpm #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,31 @@
# The following variables can be overriden from the command line
# using NAME=value make arguments
#
ARCH := $(shell uname -m)

# Options used in the 'rpm' target
USHIFT_GITREF ?= main
OKD_VERSION_TAG ?= $$(./src/okd/get_version.sh latest)
ifeq ($(ARCH),aarch64)
OKD_VERSION_TAG ?= $$(./src/okd/get_version.sh latest-arm64)
else
OKD_VERSION_TAG ?= $$(./src/okd/get_version.sh latest-amd64)
endif
RPM_OUTDIR ?=

# Options used in the 'image' target
BOOTC_IMAGE_URL ?= quay.io/centos-bootc/centos-bootc
BOOTC_IMAGE_TAG ?= stream9
WITH_KINDNET ?= 1
WITH_TOPOLVM ?= 1
WITH_OLM ?= 0
EMBED_CONTAINER_IMAGES ?= 0

# Options used in the 'run' target
LVM_VOLSIZE ?= 1G
ISOLATED_NETWORK ?= 0

# Internal variables
SHELL := /bin/bash
ARCH := $(shell uname -m)
# Override the default OKD_RELEASE_IMAGE variable based on the architecture
ifeq ($(ARCH),aarch64)
OKD_RELEASE_IMAGE ?= ghcr.io/microshift-io/okd/okd-release-arm64
Expand Down
Loading