Skip to content
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

Makefile: package -> rpm #19214

Merged
merged 1 commit into from
Jul 13, 2023
+18 −11
Merged

Makefile: package -> rpm #19214

Show file tree
Hide file tree
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: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,8 +792,8 @@ win-gvproxy: test/version/version
cp tmp-gv/bin/gvproxy.exe bin/windows/
rm -rf tmp-gv

.PHONY: package
package: ## Build rpm packages
.PHONY: rpm
rpm: ## Build rpm packages
$(MAKE) -C rpm

###
Expand All @@ -803,9 +803,9 @@ package: ## Build rpm packages
# Remember that rpms install exec to /usr/bin/podman while a `make install`
# installs them to /usr/local/bin/podman which is likely before. Always use
# a full path to test installed podman or you risk to call another executable.
.PHONY: package-install
package-install: package ## Install rpm packages
sudo $(call err_if_empty,PKG_MANAGER) -y install ${HOME}/rpmbuild/RPMS/*/*.rpm
.PHONY: rpm-install
rpm-install: package ## Install rpm packages
$(call err_if_empty,PKG_MANAGER) -y install rpm/RPMS/*/*.rpm
/usr/bin/podman version
/usr/bin/podman info # will catch a broken conmon

Expand Down
2 changes: 2 additions & 0 deletions rpm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ rpm:
--define '_srcrpmdir %{_sourcedir}/SRPMS' \
--define '_builddir %{_sourcedir}/BUILD' \
podman.spec
@echo ___RPMS can be found in rpm/RPMS/.___
@echo ___Undo any changes to Version, Source0 and %autosetup in rpm/podman.spec before committing.___
17 changes: 11 additions & 6 deletions rpm/update-spec-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@
# default. Useful for local manual rpm builds where the Version needs to be set
# correctly.

set -e
set -eox pipefail

# Script is run from git root directory
SPEC_FILE=rpm/podman.spec
PACKAGE=podman
SPEC_FILE=$PACKAGE.spec
GIT_DESCRIBE=$(git describe)
VERSION=$(echo $GIT_DESCRIBE | sed -e 's/^v//' -e 's/-/~/g')

LATEST_TAG=$(git tag --sort=creatordate | tail -1)
LATEST_VERSION=$(echo $LATEST_TAG | sed -e 's/^v//')
# Update spec file to use local changes
sed -i "s/^Version:.*/Version: $VERSION/" $SPEC_FILE
sed -i "s/^Source0:.*/Source0: $PACKAGE-$GIT_DESCRIBE.tar.gz/" $SPEC_FILE
sed -i "s/^%autosetup.*/%autosetup -Sgit -n %{name}-$GIT_DESCRIBE/" $SPEC_FILE

sed -i "s/^Version:.*/Version: $LATEST_VERSION/" $SPEC_FILE
# Generate Source0 archive from HEAD
(cd .. && git archive --format=tar.gz --prefix=$PACKAGE-$GIT_DESCRIBE/ HEAD -o rpm/$PACKAGE-$GIT_DESCRIBE.tar.gz)