opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-19 16:18:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19226 from openshift-cherrypick-robot/cherry-pick-19214-to-v4.6

Browse Source 
[v4.6] Makefile: `package` -> `rpm`
This commit is contained in:
OpenShift Merge Robot
2023-07-13 20:45:23 +02:00
committed by GitHub
parent b8ff7cafd8 145748d1f1
commit f32dd49e20
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -787,8 +787,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
###
@ -798,9 +798,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

2
rpm/Makefile
View File

@ -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
rpm/update-spec-version.sh
View File

@ -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)