Skip to content

[release-4.21] USHIFT-6404: Persist microshift_variant macro in specfile #5909

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
openshift-merge-bot merged 1 commit into from
Dec 15, 2025
Merged

[release-4.21] USHIFT-6404: Persist microshift_variant macro in specfile #5909

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
2 changes: 1 addition & 1 deletion packaging/rpm/make-rpm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ build_commit() {
%global commit ${1}
%global embedded_git_tag ${SOURCE_GIT_TAG}
%global embedded_git_tree_state ${SOURCE_GIT_TREE_STATE}
%global microshift_variant ${MICROSHIFT_VARIANT}
EOF
cat "${SCRIPT_DIR}/microshift.spec" >> "${RPMBUILD_DIR}SPECS/microshift.spec"

Expand All @@ -71,7 +72,6 @@ EOF
rpmbuild --quiet ${RPMBUILD_OPT} \
--define "_topdir ${RPMBUILD_DIR}" \
--define "_binary_payload w19T8.zstdio" \
--define "microshift_variant ${MICROSHIFT_VARIANT}" \
"${RPMBUILD_DIR}"SPECS/microshift.spec
}

Expand Down